From: gouki <gouki@fastmail.fm>
Date: Mon, 12 Jan 2009 14:14:08 +0000 (+0000)
Subject: Clean languages updated
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f0724e49ad528f08389d5004952518e490da6c66;p=quix0rs-gnu-social.git

Clean languages updated
---

diff --git a/CLEAN b/CLEAN
deleted file mode 100755
index cbb5f25360..0000000000
--- a/CLEAN
+++ /dev/null
@@ -1,3 +0,0 @@
-find . -type f -name "pootle*" -exec rm -f {} \;
-find . -type f -name "laconica.po.pending" -exec rm -f {} \;
-find . -type f -name "laconica.po.stats" -exec rm -f {} \;
diff --git a/bg_BG/LC_MESSAGES/laconica.po b/bg_BG/LC_MESSAGES/laconica.po
index cbdbc8ba49..6cc0001291 100644
--- a/bg_BG/LC_MESSAGES/laconica.po
+++ b/bg_BG/LC_MESSAGES/laconica.po
@@ -8,34 +8,111 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"#-#-#-#-#  laconica.pot (Laconica 0.6.4)  #-#-#-#-#\n"
 "Project-Id-Version: Laconica 0.6.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-14 21:07+1200\n"
+"POT-Creation-Date: 2009-01-12 12:10+0000\n"
 "PO-Revision-Date: 2008-12-12 00:00+0300\n"
 "Last-Translator: Yasen Pramatarov <yasen@lindeas.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  laconica.pot (Laconica 0.6.4)  #-#-#-#-#\n"
 
-#: ../actions/noticesearchrss.php:64
+#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:61
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr "Търсене на \"%s\" в потока"
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: actions/finishopenidlogin.php:88 actions/register.php:205
+#: actions/register.php:232
 msgid ""
-" except this private data: password, email address, IM address, phone "
-"number."
+" except this private data: password, email address, IM address, phone number."
 msgstr "освен тези лични данни: парола, е-поща, месинджър, телефон."
 
-#: ../actions/subscribe.php:84
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+#: lib/facebookaction.php:195 lib/noticelist.php:160
+msgid " from "
+msgstr "от"
+
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: actions/twitapistatuses.php:341
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr ""
+
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "%1$s ви кани да ползвате заедно %2$s"
+
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+"%1$s ви кани да се присъедините към %2$s (%3$s).\n"
+"\n"
+"%2$s е услуга за микроблогване, чрез която лесно поддържате връзка с хората, "
+"които познавате или които са ви интересни.\n"
+"\n"
+"Също така можете да публикувате кратки новини за себе си, свои размисли и да "
+"ги обсъждате в мрежата с хора, които ви познават. Това също е и добър начин "
+"за запознаване с нови хора, които споделят интересите ви.\n"
+"\n"
+"%1$s ви казва:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Можете да видите профила на %1$s в %2$s тук:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Ако искате да опитате услугата на сайта, проследете препратката по-долу, за "
+"да приемете поканата.\n"
+"\n"
+"%6$s\n"
+"\n"
+"Ако не желаете, пропуснете това писмо. Благодарим ви за търпението и "
+"отделеното време.\n"
+"\n"
+"Искрено ваши, %2$s\n"
+
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:115
+#: lib/mail.php:117
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s вече получава бележките ви в %2$s."
 
-#: ../actions/subscribe.php:86
+#: ../lib/mail.php:126
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -47,980 +124,1666 @@ msgid ""
 msgstr ""
 "%1$s вече получава бележките ви в %2$s.\n"
 "\n"
-"\t%3$s\n\nС уважение,\n%4$s.\n"
+"\t%3$s\n"
+"\n"
+"С уважение,\n"
+"%4$s.\n"
 
-#: ../actions/shownotice.php:45
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#: actions/twitapistatuses.php:344
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
+
+#: ../actions/shownotice.php:45 actions/shownotice.php:45
+#: actions/shownotice.php:73
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "Бележка на %1$s от %2$s"
 
-#: ../actions/publicrss.php:60
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../actions/publicrss.php:62 actions/publicrss.php:48
 #, php-format
 msgid "%s Public Stream"
 msgstr "Общ поток в %s"
 
-#: ../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/twitapistatuses.php:123
 #, php-format
 msgid "%s and friends"
 msgstr "%s и приятели"
 
-#: ../lib/util.php:233
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:31
+#, php-format
+msgid "%s public timeline"
+msgstr "Общ поток на %s"
+
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:217
+#, php-format
+msgid "%s status"
+msgstr "Състояние на %s"
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:195
+#, php-format
+msgid "%s timeline"
+msgstr "Поток на %s"
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:34
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+"(Трябва да получите веднага електронно писмо с указания за потвърждаване "
+"адреса на е-пощата ви.)"
+
+#: ../lib/util.php:257 lib/util.php:273 lib/util.php:284
 #, 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%%** е услуга за микроблогване, "
-"предоставена ви от [%%site.broughtby%%](%%site.broughtbyurl%%). "
+"**%%site.name%%** е услуга за микроблогване, предоставена ви от [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
 
-#: ../lib/util.php:235
+#: ../lib/util.php:259 lib/util.php:275 lib/util.php:286
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** е услуга за микроблогване. "
 
-#: ../lib/util.php:250
+#: ../lib/util.php:274 lib/util.php:290 lib/util.php:301
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ". Изписват се пълните имена или псевдоними на участниците."
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: ../actions/register.php:176
+#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
+#: actions/profilesettings.php:78
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "От 1 до 64 малки букви или цифри, без пунктоация и интервали"
 
-#: ../actions/password.php:42 ../actions/register.php:178
+#: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:193
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+"От 1 до 64 малки букви или цифри, без пунктоация и интервали. Задължително "
+"поле."
+
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/profilesettings.php:186
 msgid "6 or more characters"
 msgstr "6 или повече знака"
 
-#: ../actions/recoverpassword.php:165
+#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 или повече знака. И не ги забравяйте!"
 
-#: ../actions/imsettings.php:188
+#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:195
+msgid "6 or more characters. Required."
+msgstr "6 или повече знака. Задължително поле."
+
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, 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 ""
+"На месинджъра ви е изпратен код за потвърждение. За да получавате съобщения "
+"от %s, трябва да го одобрите."
+
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:234
+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 ""
+"На адреса на е-поща, който сте въвели, беше изпратен код за потвърждение. "
+"Проверете кутията (или папката за спам) за кода и указанията за използването "
+"му."
+
+#: ../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 ""
-"На месинджъра ви е изпратен код за "
-"потвърждение. За да получавате съобщения от %s, трябва да го одобрите."
+"На телефонния номер, който сте въвели, беше изпратен код за потвърждение. "
+"Проверете съобщенията (или папката за спам) за кода и указанията за "
+"използването му."
+
+#: ../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:30
+#: actions/twitapidirect_messages.php:107 actions/twitapifavorites.php:83
+#: actions/twitapifavorites.php:99 actions/twitapifriendships.php:117
+#: actions/twitapihelp.php:42 actions/twitapistatuses.php:77
+#: actions/twitapistatuses.php:144 actions/twitapistatuses.php:224
+#: actions/twitapistatuses.php:234 actions/twitapistatuses.php:386
+#: actions/twitapistatuses.php:395 actions/twitapistatuses.php:421
+#: actions/twitapiusers.php:30
+msgid "API method not found!"
+msgstr "Не е открит методът в API."
+
+#: ../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:39
+#: actions/twitapiaccount.php:89 actions/twitapiaccount.php:94
+#: actions/twitapidirect_messages.php:178 actions/twitapifavorites.php:139
+#: actions/twitapihelp.php:49 actions/twitapistatuses.php:549
+msgid "API method under construction."
+msgstr "Методът в API все още се разработва."
 
-#: ../lib/util.php:296
+#: ../lib/util.php:324 lib/util.php:340 lib/util.php:352
 msgid "About"
 msgstr "Относно"
 
-#: ../actions/userauthorization.php:118
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
 msgid "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/twittersettings.php:84
 msgid "Add"
 msgstr "Добавяне"
 
-#: ../actions/openidsettings.php:43
+#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
 msgid "Add OpenID"
 msgstr "Добавяне на OpenID"
 
-#: ../actions/imsettings.php:39
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: actions/deleteprofile.php:248
+msgid "Add or remove OpenIDs"
+msgstr "Добавяне или премахване OpenID"
+
+#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
 msgid "Address"
 msgstr "Адрес"
 
-#: ../actions/showstream.php:254
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr "Адреси на приятели, които каните (по един на ред)"
+
+#: ../actions/showstream.php:273 actions/showstream.php:288
+#: actions/showstream.php:336
 msgid "All subscriptions"
 msgstr "Всички абонаменти"
 
-#: ../actions/publicrss.php:62
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
 #, php-format
 msgid "All updates for %s"
 msgstr "Всички бележки за %s"
 
-#: ../actions/noticesearchrss.php:66
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:63
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "Всички бележки, намерени с \"%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
 msgid "Already logged in."
 msgstr "Вече сте влезли."
 
-#: ../actions/subscribe.php:48
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:47
 msgid "Already subscribed!."
 msgstr "Вече сте абонирани!"
 
-#: ../actions/userauthorization.php:76
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+msgid "Are you sure you want to delete this notice?"
+msgstr "Наистина ли искате да изтриете тази бележка?"
+
+#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
 msgid "Authorize subscription"
 msgstr "Одобряване на абонамента"
 
-#: ../actions/login.php:100 ../actions/register.php:184
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192 actions/register.php:219
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Автоматично влизане занапред. Да не се ползва на общи компютри!"
 
-#: ../actions/avatar.php:32
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:103
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
+"Автоматично абониране за всеки, който се абонира за мен (подходящо за "
+"ботове)."
+
+#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: actions/profilesettings.php:34
 msgid "Avatar"
 msgstr "Аватар"
 
-#: ../actions/avatar.php:113
+#: ../actions/avatar.php:113 actions/profilesettings.php:350
+#: actions/profilesettings.php:379
 msgid "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 ""
-"Oчаква се потвърждение на този адрес. "
-"Проверете акаунта си в Jabber/GTalk за съобщение с инструкции. (Добавихте ли %s в списъка си там?)"
+"Oчаква се потвърждение на този адрес. Проверете акаунта си в Jabber/GTalk за "
+"съобщение с инструкции. (Добавихте ли %s в списъка си там?)"
+
+#: ../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 ""
+"Очаква се потвърждение за този адрес. Проверете кутията си (или папката за "
+"спам) за съобщение с указания."
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+msgid "Awaiting confirmation on this phone number."
+msgstr "Очаква се потвърждение за този телефонен номер."
 
-#: ../lib/util.php:1136
-msgid "Before »"
+#: ../lib/util.php:1318 lib/util.php:1452 lib/facebookaction.php:259
+#: lib/util.php:1792
+#, fuzzy
+msgid "Before »"
 msgstr "Преди »"
 
-#: ../actions/profilesettings.php:52
+#: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: actions/profilesettings.php:82 actions/register.php:184
+#: actions/profilesettings.php:84 actions/register.php:211
 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:222 actions/register.php:98
 msgid "Bio is too long (max 140 chars)."
 msgstr "Автобиографията е твърде дълга (до 140 символа)."
 
-#: ../actions/updateprofile.php:118
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+msgid "Can't delete this notice."
+msgstr "Грешка при изтриване на бележката."
+
+#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "Грешка при четене адреса на аватара '%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/profilesettings.php:433
 msgid "Can't save new password."
 msgstr "Грешка при запазване на новата парола."
 
-#: ../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
 msgid "Cancel"
 msgstr "Отказ"
 
-#: ../lib/openid.php:121
+#: ../lib/openid.php:121 lib/openid.php:121
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Грешка при създаване на потребителски OpenID обект"
 
-#: ../actions/imsettings.php:154
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
 msgid "Cannot normalize that Jabber ID"
 msgstr "Грешка при нормализация на този Jabber ID"
 
-#: ../actions/password.php:45
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:204
+msgid "Cannot normalize that email address"
+msgstr "Грешка при нормализиране адреса на е-пощата"
+
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/profilesettings.php:189
 msgid "Change"
 msgstr "Промяна"
 
-#: ../actions/password.php:32
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: actions/deleteprofile.php:245
+msgid "Change email handling"
+msgstr "Промяна обработката на писмата"
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
 msgid "Change password"
 msgstr "Смяна на паролата"
 
-#: ../actions/password.php:43 ../actions/recoverpassword.php:166
-#: ../actions/register.php:179
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr "Смяна на паролата"
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#: actions/deleteprofile.php:242
+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/profilesettings.php:187 actions/register.php:196
 msgid "Confirm"
 msgstr "Потвърждаване"
 
-#: ../actions/confirmaddress.php:84
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
 msgid "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:259
 msgid "Confirmation cancelled."
 msgstr "Потвърждаването е прекъснато."
 
-#: ../actions/confirmaddress.php:38
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+msgid "Confirmation code"
+msgstr "Код за потвърждение"
+
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
 msgid "Confirmation code not found."
 msgstr "Кодът за потвърждение не е открит."
 
-#: ../actions/finishopenidlogin.php:91
+#: ../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 ""
+"Поздравления, %s! И добре дошли в %%%%site.name%%%%! от тук можете да...\n"
+"\n"
+"* Отидете в [профила си](%s) и да публикувате първата си бележка.\n"
+"* Добавите [адрес в Jabber/GTalk](%%%%action.imsettings%%%%), за да "
+"изпращате бележки от програмата си за моментни съобщения.\n"
+"* [Търсите хора](%%%%action.peoplesearch%%%%), които познавате или с които "
+"споделяте общи интереси. \n"
+"* Обновите [настройките на профила(%%%%action.profilesettings%%%%) си, за да "
+"кажете повече за себе си на другите. \n"
+"* Прочетете наличната [документация](%%%%doc.help%%%%) на сайта, за да се "
+"запознаете с възможностите му. \n"
+"\n"
+"Благодарим, че се включихте в сайта и дано ползването на услугата ви носи "
+"само приятни мигове!"
+
+#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
 msgid "Connect"
 msgstr "Свързване"
 
-#: ../actions/finishopenidlogin.php:86
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
 msgid "Connect existing account"
 msgstr "Свързване на съществуваща сметка"
 
-#: ../lib/util.php:304
+#: ../lib/util.php:332 lib/util.php:348 lib/util.php:360
 msgid "Contact"
 msgstr "Контакт"
 
-#: ../lib/openid.php:178
+#: ../lib/openid.php:178 lib/openid.php:178
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "Грешка при създаване на OpenID форма: %s"
 
-#: ../lib/openid.php:160
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:46 actions/twitapifriendships.php:62
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr "Грешка при проследяване на потребител: %s вече е в списъка ви."
+
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+#: actions/twitapifriendships.php:39
+msgid "Could not follow user: User not found."
+msgstr "Грешка при проследяване — потребителят не е намерен."
+
+#: ../lib/openid.php:160 lib/openid.php:160
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "Грешка при пренасочване към сървър: %s"
 
-#: ../actions/updateprofile.php:161
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
 msgid "Could not save avatar info"
 msgstr "Грешка при запазване данните на аватара"
 
-#: ../actions/updateprofile.php:154
+#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
 msgid "Could not save new profile info"
 msgstr "Грешка при запазване на новия профил"
 
-#: ../actions/profilesettings.php:146
-msgid "Couldn't confirm email."
-msgstr "Не може да се потвърди електронната поща."
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:70
+msgid "Could not subscribe other to you."
+msgstr "Грешка при абониране на друг потребител за вас."
+
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:55
+msgid "Could not subscribe."
+msgstr "Грешка при абониране."
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr ""
 
 #: ../actions/finishremotesubscribe.php:99
+#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:112
 msgid "Couldn't convert request tokens to access tokens."
 msgstr "Грешка при преобразуване на tokens за одобрение в tokens за достъп."
 
-#: ../actions/subscribe.php:59
-msgid "Couldn't create subscription."
-msgstr "Грешка при създаване на нов абонамент."
-
-#: ../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/emailsettings.php:255
 msgid "Couldn't delete email confirmation."
 msgstr "Грешка при изтриване потвърждението по е-поща."
 
-#: ../actions/unsubscribe.php:56
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:129
 msgid "Couldn't delete subscription."
 msgstr "Грешка при изтриване на абонамента."
 
-#: ../actions/remotesubscribe.php:125
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+#: actions/twitapistatuses.php:82
+msgid "Couldn't find any statuses."
+msgstr "Не са открити бележки."
+
+#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
+#: actions/remotesubscribe.php:148
 msgid "Couldn't get a request token."
 msgstr "Не е получен 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:228
 msgid "Couldn't insert confirmation code."
 msgstr "Не може да се вмъкне код за потвърждение."
 
 #: ../actions/finishremotesubscribe.php:180
+#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:216
 msgid "Couldn't insert new subscription."
 msgstr "Грешка при добавяне на нов абонамент."
 
-#: ../actions/profilesettings.php:175
+#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
+#: actions/profilesettings.php:319 actions/twitapiaccount.php:74
 msgid "Couldn't save profile."
 msgstr "Грешка при запазване на профила."
 
-#: ../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:296
+msgid "Couldn't update user for autosubscribe."
+msgstr ""
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+#: actions/emailsettings.php:301 actions/emailsettings.php:315
+msgid "Couldn't update user record."
+msgstr "Грешка при обновяване записа на потребител."
+
+#: ../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/emailsettings.php:179 actions/emailsettings.php:280
+#: actions/othersettings.php:173 actions/profilesettings.php:276
 msgid "Couldn't update user."
 msgstr "Грешка при обновяване на потребителя."
 
-#: ../actions/finishopenidlogin.php:84
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
 msgid "Create"
 msgstr "Създаване"
 
-#: ../actions/finishopenidlogin.php:70
+#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
 msgid "Create a new user with this nickname."
 msgstr "Създаване на нов потребител с този псевдоним."
 
-#: ../actions/finishopenidlogin.php:68
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
 msgid "Create new account"
 msgstr "Създаване на нова сметка"
 
-#: ../actions/finishopenidlogin.php:191
+#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+#: actions/finishopenidlogin.php:208
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Създаване на нов акаунт за OpenID, който вече има потребител."
 
-#: ../actions/imsettings.php:45
+#: ../actions/imsettings.php:45 actions/imsettings.php:46
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Текущ потвърден Jabber/GTalk адрес."
 
-#: ../actions/showstream.php:337
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+msgid "Current confirmed SMS-enabled phone number."
+msgstr "Текущ потвърден телефонен номер за SMS-и."
+
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+msgid "Current confirmed email address."
+msgstr "Текущ потвърден адрес на е-поща."
+
+#: ../actions/showstream.php:356 actions/showstream.php:367
+#: actions/showstream.php:418
 msgid "Currently"
 msgstr "В момента"
 
-#: ../lib/util.php:893
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:87
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: ../lib/util.php:1061 lib/util.php:1110 lib/util.php:1417
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Грешка в базата от данни — отговор при вмъкването: %s"
 
-#: ../actions/profilesettings.php:54
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+msgid "Delete notice"
+msgstr "Изтриване на бележката"
+
+#: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: actions/profilesettings.php:84 actions/register.php:186
+#: actions/profilesettings.php:86 actions/register.php:213
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Опишете себе си и интересите си в до 140 букви"
 
-#: ../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/deleteprofile.php:244 actions/register.php:199
+#: actions/register.php:202
 msgid "Email"
 msgstr "Е-поща"
 
-#: ../actions/profilesettings.php:46
-msgid "Email address"
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+msgid "Email Address"
 msgstr "Адрес на е-поща"
 
-#: ../actions/profilesettings.php:102 ../actions/register.php:63
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+msgid "Email Settings"
+msgstr "Настройки на е-поща"
+
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:89
 msgid "Email address already exists."
 msgstr "Адресът на е-поща вече се използва."
 
-#: ../lib/mail.php:82
+#: ../lib/mail.php:90 lib/mail.php:90
 msgid "Email address confirmation"
 msgstr "Потвърждаване адреса на е-поща"
 
-#: ../actions/recoverpassword.php:176
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+msgid "Email address, like \"UserName@example.org\""
+msgstr "Адрес на е-поща, като \"UserName@example.org\""
+
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr "Адреси на е-поща"
+
+#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
 msgid "Enter a nickname or email address."
 msgstr "Въведете псевдоним или е-поща."
 
-#: ../actions/userauthorization.php:136
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+msgid "Enter the code you received on your phone."
+msgstr "Въведете кода, който получихте по телефона."
+
+#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
 msgid "Error authorizing token"
 msgstr "Грешка при одобряване на token"
 
-#: ../actions/finishopenidlogin.php:282
+#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
+#: actions/finishopenidlogin.php:274
 msgid "Error connecting user to OpenID."
 msgstr "Грешка при свързване на потребителя към OpenID."
 
-#: ../actions/finishaddopenid.php:78
+#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
 msgid "Error connecting user."
 msgstr "Грешка при свързване на потребителя."
 
 #: ../actions/finishremotesubscribe.php:151
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:164
 msgid "Error inserting avatar"
 msgstr "Грешка при вмъкване на аватар"
 
 #: ../actions/finishremotesubscribe.php:143
+#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:156
 msgid "Error inserting new profile"
 msgstr "Грешка при вмъкване на нов профил"
 
-#: ../actions/postnotice.php:88
-msgid "Error inserting notice"
-msgstr "Грешка при вмъкване на бележка"
-
 #: ../actions/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:180
 msgid "Error inserting remote profile"
 msgstr "Грешка при вмъкване на отдалечен профил"
 
-#: ../actions/recoverpassword.php:201
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
 msgid "Error saving address confirmation."
 msgstr "Грешка при запазване на потвърждение за адрес"
 
-#: ../actions/userauthorization.php:139
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
 msgid "Error saving remote profile"
 msgstr "Грешка при запазване на отдалечен профил"
 
-#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
+#: ../lib/openid.php:226 lib/openid.php:226
 msgid "Error saving the profile."
 msgstr "Грешка при запазване на профил"
 
-#: ../lib/openid.php:237
+#: ../lib/openid.php:237 lib/openid.php:237
 msgid "Error saving the user."
 msgstr "Грешка при запазване на потребител."
 
-#: ../actions/password.php:80
+#: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/profilesettings.php:428
 msgid "Error saving user; invalid."
 msgstr "Грешка при запазване на потребител — невалидност."
 
-#: ../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:54 actions/login.php:80
+#: actions/register.php:117
 msgid "Error setting user."
 msgstr "Грешка в настройките на потребителя."
 
-#: ../actions/finishaddopenid.php:83
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
 msgid "Error updating profile"
 msgstr "Грешка при обновяване на профил"
 
 #: ../actions/finishremotesubscribe.php:161
+#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:174
 msgid "Error updating remote profile"
 msgstr "Грешка при обновяване на отдалечен профил"
 
-#: ../actions/recoverpassword.php:79
+#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
 msgid "Error with confirmation code."
 msgstr "Грешка в кода за потвърждение."
 
-#: ../actions/finishopenidlogin.php:89
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
 msgid "Existing nickname"
 msgstr "Съществуващ псевдоним"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:326 lib/util.php:342 lib/util.php:354
 msgid "FAQ"
 msgstr "Въпроси"
 
-#: ../actions/avatar.php:115
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/profilesettings.php:381
 msgid "Failed updating avatar."
 msgstr "Неуспешно обновяване на аватара."
 
-#: ../actions/all.php:61 ../actions/allrss.php:74
+#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
+#: actions/allrss.php:64
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Емисия с приятелите на %s"
 
-#: ../actions/replies.php:61 ../actions/repliesrss.php:80
+#: ../actions/replies.php:65 ../actions/repliesrss.php:80
+#: actions/replies.php:65 actions/repliesrss.php:66
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Емисия с отговорите към %s"
 
-#: ../actions/login.php:118
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:54
+#, php-format
+msgid "Feed for tag %s"
+msgstr "Емисия за етикета %s"
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+msgid "Find content of notices"
+msgstr "Търсене в съдържанието на бележките"
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+msgid "Find people on this site"
+msgstr "Търсене на хора в сайта"
+
+#: ../actions/login.php:122
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
-"За по-голяма сигурност, моля въведете "
-"отново потребителското си име и парола при промяна на настройките."
+"За по-голяма сигурност, моля въведете отново потребителското си име и парола "
+"при промяна на настройките."
 
-#: ../actions/profilesettings.php:44
+#: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: actions/profilesettings.php:77 actions/register.php:178
+#: actions/profilesettings.php:79 actions/register.php:205
 msgid "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/profilesettings.php:219 actions/register.php:95
 msgid "Full name is too long (max 255 chars)."
 msgstr "Пълното име е твърде дълго (макс. 255 знака)"
 
-#: ../lib/util.php:279
+#: ../lib/util.php:322 lib/util.php:338 lib/util.php:343 lib/util.php:350
 msgid "Help"
 msgstr "Помощ"
 
-#: ../lib/util.php:274
+#: ../lib/util.php:298 lib/util.php:314 lib/util.php:325
 msgid "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:81 actions/register.php:208
 msgid "Homepage"
 msgstr "Лична страница"
 
-#: ../actions/profilesettings.php:87
+#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: actions/profilesettings.php:210 actions/register.php:83
+#: actions/profilesettings.php:216 actions/register.php:92
 msgid "Homepage is not a valid URL."
 msgstr "Адресът на личната страница не е правилен URL."
 
-#: ../actions/imsettings.php:61
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+#: actions/emailsettings.php:101
+msgid "I want to post notices by email."
+msgstr "Искам да изпращам бележки по пощата."
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+#: actions/deleteprofile.php:253
+msgid "IM"
+msgstr "IM"
+
+#: ../actions/imsettings.php:60 actions/imsettings.php:61
 msgid "IM Address"
 msgstr "IM адрес"
 
-#: ../actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
 msgid "IM Settings"
 msgstr "IM настройки"
 
-#: ../actions/finishopenidlogin.php:88
+#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
 msgstr ""
-"Ако вече имате сметка, за да я свържете с "
-"OpenID влезте с потребителско си име и парола."
+"Ако вече имате сметка, за да я свържете с OpenID влезте с потребителско си "
+"име и парола."
 
 #: ../actions/openidsettings.php:45
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
 msgstr ""
-"Ако искате да добавите OpenID към сметката "
-"си, въведете го в кутийката отдолу и натиснете \"Добавяне\"."
+"Ако искате да добавите OpenID към сметката си, въведете го в кутийката "
+"отдолу и натиснете \"Добавяне\"."
 
-#: ../actions/recoverpassword.php:122
+#: ../actions/recoverpassword.php:137
 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 ""
-"Ако сте забравили или изгубили паролата "
-"си, може да ви бъде изпратена нова на е-пощата, записана в сметката ви."
+"Ако сте забравили или загубили паролата си, може да получите нова на е-"
+"пощата, въведена в профила ви."
+
+#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
+#: actions/emailsettings.php:68 actions/smssettings.php:76
+msgid "Incoming email"
+msgstr "Входяща поща"
+
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+#: actions/emailsettings.php:304
+msgid "Incoming email address removed."
+msgstr "Входящият адрес на е-поща е премахнат."
 
-#: ../actions/password.php:69
+#: ../actions/password.php:69 actions/profilesettings.php:388
+#: actions/profilesettings.php:417
 msgid "Incorrect old password"
 msgstr "Грешна стара парола"
 
-#: ../actions/login.php:63
+#: ../actions/login.php:67 actions/login.php:67 actions/login.php:74
 msgid "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."
 msgstr ""
-"На е-пощата, с която сте регистрирани са "
-"изпратени инструкции за възстановяване на паролата."
+"На е-пощата, с която сте регистрирани са изпратени инструкции за "
+"възстановяване на паролата."
 
-#: ../actions/updateprofile.php:113
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "Неправилен адрес на аватар '%s'"
 
-#: ../actions/updateprofile.php:97
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr "Неправилен адрес на е-поща: %s"
+
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "Неправилен адрес на домашна страница '%s'"
 
-#: ../actions/updateprofile.php:81
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "Неправилен адрес на лиценз '%s'"
 
-#: ../actions/postnotice.php:61
+#: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:63
 msgid "Invalid notice content"
 msgstr "Невалидно съдържание на бележка"
 
-#: ../actions/postnotice.php:67
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:69
 msgid "Invalid notice uri"
 msgstr "Неправилен адрес на бележка"
 
-#: ../actions/postnotice.php:72
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:74
 msgid "Invalid notice url"
 msgstr "Неправилен адрес на бележка"
 
-#: ../actions/updateprofile.php:86
+#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "Неправилен адрес на профил '%s'."
 
-#: ../actions/remotesubscribe.php:96
+#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
 msgid "Invalid profile URL (bad format)"
 msgstr "Неправилен адрес на профил (грешен формат)"
 
 #: ../actions/finishremotesubscribe.php:77
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:78
 msgid "Invalid profile URL returned by server."
 msgstr "Върнат от сървъра неправилен адрес на профила."
 
-#: ../actions/avatarbynickname.php:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
 msgid "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:256 actions/register.php:112
+#: actions/register.php:130
 msgid "Invalid username or password."
 msgstr "Неправилно име или парола."
 
-#: ../lib/util.php:237
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr "Поканите са изпратени."
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr "Изпратени са покани до следните хора:"
+
+#: ../lib/util.php:306 lib/util.php:322 lib/util.php:332
+msgid "Invite"
+msgstr "Покани"
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr "Покани за нови потребители"
+
+#: ../lib/util.php:261 lib/util.php:277 lib/util.php:288
 #, 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 ""
-"Ползва [Laconica](http://laconi.ca/) версия %s, система "
-"за микроблогване, достъпна под [GNU Affero General "
-"Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"Ползва [Laconica](http://laconi.ca/) версия %s, система за микроблогване, "
+"достъпна под [GNU Affero General Public License](http://www.fsf.org/"
+"licensing/licenses/agpl-3.0.html)."
 
-#: ../actions/imsettings.php:164
+#: ../actions/imsettings.php:173 actions/imsettings.php:181
 msgid "Jabber ID already belongs to another user."
 msgstr "Този Jabber ID принадлежи на друг потребител."
 
-#: ../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 ""
-"Jabber или GTalk адрес, като \"UserName@example.org\". "
-"Първо се уверете, че сте добавили %s в "
-"списъка си с приятели в IM или GTalk клиента си."
+"Jabber или GTalk адрес, като \"UserName@example.org\". Първо се уверете, че "
+"сте добавили %s в списъка си с приятели в IM или GTalk клиента си."
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
+msgid "Language"
+msgstr "Език"
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr "Името на езика е твърде дълго (може да е до 50 знака)."
 
-#: ../actions/profilesettings.php:55
+#: ../actions/profilesettings.php:52 ../actions/register.php:173
+#: actions/profilesettings.php:85 actions/register.php:187
+#: actions/profilesettings.php:87 actions/register.php:214
 msgid "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/profilesettings.php:225 actions/register.php:101
 msgid "Location is too long (max 255 chars)."
 msgstr "Името на местоположението е твърде дълго (макс. 255 знака)."
 
-#: ../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/login.php:104 actions/login.php:113 actions/openidlogin.php:88
+#: lib/util.php:336
 msgid "Login"
 msgstr "Вход"
 
-#: ../actions/openidlogin.php:44
+#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:60
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Влизане с [OpenID](%%doc.openid%%)."
 
-#: ../actions/login.php:122
+#: ../actions/login.php:126
 #, 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 ""
-"Влезте с име и парола. Нямате такива? "
-"[Регистрирайте](%%action.register%%) нова сметка или опитайте с [OpenID](%%action.openidlogin%%). "
+"Влезте с име и парола. Нямате такива? [Регистрирайте](%%action.register%%) "
+"нова сметка или опитайте с [OpenID](%%action.openidlogin%%). "
 
-#: ../lib/util.php:284
+#: ../lib/util.php:308 lib/util.php:324 lib/util.php:334
 msgid "Logout"
 msgstr "Изход"
 
-#: ../actions/login.php:106
+#: ../actions/register.php:166 actions/register.php:180
+#: actions/register.php:207
+msgid "Longer name, preferably your \"real\" name"
+msgstr "По-дълго име, за предпочитане \"истинското\" ви име."
+
+#: ../actions/login.php:110 actions/login.php:110 actions/login.php:118
 msgid "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 ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr "Управление на пощата, идваща от %%site.name%%."
+
+#: ../actions/showstream.php:300 actions/showstream.php:315
+#: actions/showstream.php:363
 msgid "Member since"
 msgstr "Участник от"
 
-#: ../actions/userrss.php:70
+#: ../actions/userrss.php:70 actions/userrss.php:67
 #, php-format
 msgid "Microblog by %s"
 msgstr "Микроблог на %s"
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
+#: ../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 ""
+"Мобилен оператор за SMS. Ако знаете оператор, поддържащ SMS от е-поща, който "
+"не фигурира тук, пишете ни на адрес %s."
+
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php:85 actions/register.php:202
+#: actions/register.php:229
 msgid "My text and files are available under "
 msgstr "Текстовете и файловите ми са достъпни под"
 
-#: ../actions/finishopenidlogin.php:71
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+#, fuzzy
+msgid "New"
+msgstr "Ново"
+
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:138
+#, php-format
+msgid "New email address for posting to %s"
+msgstr "Нов адрес на е-поща за публикщуване в %s"
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+#: actions/emailsettings.php:318
+msgid "New incoming email address added."
+msgstr "Добавен е нов входящ адрес на е-поща."
+
+#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
 msgid "New nickname"
 msgstr "Нов псевдоним"
 
-#: ../actions/newnotice.php:100
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:141
 msgid "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/profilesettings.php:185
 msgid "New password"
 msgstr "Нова парола"
 
-#: ../actions/recoverpassword.php:275
+#: ../actions/recoverpassword.php:314
 msgid "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:108 actions/profilesettings.php:76
+#: actions/register.php:192
 msgid "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/finishopenidlogin.php:192 actions/profilesettings.php:231
+#: actions/register.php:85
 msgid "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:182 actions/profilesettings.php:209
+#: actions/register.php:83
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
-"Псевдонимът може да съдържа само малки "
-"букви, числа и никакво разстояние между тях."
+"Псевдонимът може да съдържа само малки букви, числа и никакво разстояние "
+"между тях."
 
-#: ../actions/finishopenidlogin.php:170
+#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:187
 msgid "Nickname not allowed."
 msgstr "Този псевдоним не е разрешен тук."
 
-#: ../actions/remotesubscribe.php:72
+#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
 msgid "Nickname of the user you want to follow"
 msgstr "Псевдоним на потребител, когото искате да следите"
 
-#: ../actions/recoverpassword.php:147
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
 msgid "Nickname or email"
 msgstr "Псевдоним или е-поща"
 
-#: ../actions/imsettings.php:147
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:104
+msgid "No"
+msgstr "Не"
+
+#: ../actions/imsettings.php:156 actions/imsettings.php:164
 msgid "No Jabber ID."
 msgstr "Няма Jabber ID."
 
-#: ../actions/userauthorization.php:128
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
 msgid "No authorization request!"
 msgstr "Няма заявка за одобрение."
 
-#: ../actions/confirmaddress.php:33
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+msgid "No carrier selected."
+msgstr "Не е избран оператор."
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+msgid "No code entered"
+msgstr "Не е въведен код."
+
+#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
 msgid "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:52
+#: actions/newnotice.php:53
 msgid "No content!"
 msgstr "Няма съдържание!"
 
-#: ../actions/userbyid.php:27
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+#: actions/emailsettings.php:197
+msgid "No email address."
+msgstr "Не е въведена е-поща."
+
+#: ../actions/userbyid.php:32 actions/userbyid.php:32
 msgid "No id."
 msgstr "Няма id."
 
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+#: actions/emailsettings.php:292
+msgid "No incoming email address."
+msgstr "Няма входящ адрес на е-поща."
+
 #: ../actions/finishremotesubscribe.php:65
+#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:66
 msgid "No nickname provided by remote server."
 msgstr "Отдалеченият сървър не е предоставил псевдоним."
 
-#: ../actions/avatarbynickname.php:27
+#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 msgid "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:243
 msgid "No pending confirmation to cancel."
 msgstr "Няма потвърждения, очакващи да бъдат отказани."
 
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+msgid "No phone number."
+msgstr "Не е въведен телефонен номер."
+
 #: ../actions/finishremotesubscribe.php:72
+#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:73
 msgid "No profile URL returned by server."
 msgstr "Сървърът не е върнал адрес на профила."
 
-#: ../actions/recoverpassword.php:189
+#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
 msgid "No registered email address for that user."
 msgstr "Няма указана е-поща за този потребител."
 
-#: ../actions/userauthorization.php:48
+#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
 msgid "No request found!"
 msgstr "Заявката не е намерена!"
 
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
+#: actions/noticesearch.php:69 actions/peoplesearch.php:69
+#: actions/noticesearch.php:68 actions/peoplesearch.php:59
 msgid "No results"
 msgstr "Няма резултати"
 
-#: ../actions/avatarbynickname.php:32
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
 msgid "No size."
 msgstr "Няма размер."
 
-#: ../actions/openidsettings.php:135
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:109
+#: actions/twitapistatuses.php:438
+msgid "No status found with that ID."
+msgstr "Не е открита бележка с такъв идентификатор."
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:411
+msgid "No status with that ID found."
+msgstr "Не е открита бележка с такъв идентификатор."
+
+#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
 msgid "No such OpenID."
 msgstr "Няма такъв OpenID-адрес."
 
-#: ../actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29
 msgid "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:38
+#: actions/shownotice.php:114
 msgid "No such notice."
 msgstr "Няма такава бележка."
 
-#: ../actions/recoverpassword.php:56
+#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
 msgid "No such recovery code."
 msgstr "Няма такъв код за възстановяване."
 
-#: ../actions/postnotice.php:56
+#: ../actions/postnotice.php:56 actions/postnotice.php:57
 msgid "No such subscription"
 msgstr "Няма такъв абонамент"
 
 #: ../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/showstream.php:157
+#: classes/Command.php:208 classes/Command.php:242 lib/gallery.php:85
+#: lib/subs.php:105
 msgid "No such user."
 msgstr "Няма такъв потребител"
 
-#: ../lib/gallery.php:76
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr "Няма потребител с такава е-поща или потребителско име."
+
+#: ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
 msgstr "Няма никого за показване!"
 
-#: ../actions/recoverpassword.php:60
+#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
 msgid "Not a recovery code."
 msgstr "Това не е код за възстановяване."
 
-#: ../actions/imsettings.php:158
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+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:423 lib/twitterapi.php:450
+#: lib/twitterapi.php:534
+msgid "Not a supported data format."
+msgstr "Неподдържан формат на данните"
+
+#: ../actions/imsettings.php:167 actions/imsettings.php:175
 msgid "Not a valid Jabber ID"
 msgstr "Неправилен Jabber ID"
 
-#: ../lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131
 msgid "Not a valid OpenID."
 msgstr "Неправилен OpenID"
 
-#: ../actions/profilesettings.php:75 ../actions/register.php:53
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+#: actions/emailsettings.php:208
+msgid "Not a valid email address"
+msgstr "Това не е правилен адрес на е-поща."
+
+#: ../actions/register.php:63 actions/register.php:70 actions/register.php:79
 msgid "Not a valid email address."
 msgstr "Неправилен адрес на е-поща."
 
-#: ../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/profilesettings.php:212 actions/register.php:87
 msgid "Not a valid nickname."
 msgstr "Неправилен псевдоним."
 
-#: ../actions/remotesubscribe.php:118
+#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
 msgid "Not a valid profile URL (incorrect services)."
 msgstr "Неправилен адрес на профил (грешна услуга)."
 
-#: ../actions/remotesubscribe.php:111
+#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr "Неправилен адрес на профил (няма зададен XRDS)."
 
-#: ../actions/remotesubscribe.php:104
+#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
 msgid "Not a valid profile URL (no YADIS document)."
 msgstr "Неправилен адрес на профил (няма YADIS документ)."
 
-#: ../actions/avatar.php:95
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: actions/profilesettings.php:361
 msgid "Not an image or corrupt file."
 msgstr "Файлът не е изображение или е повреден."
 
 #: ../actions/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:52
 msgid "Not authorized."
 msgstr "Забранено."
 
 #: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38
 msgid "Not expecting this response!"
 msgstr "Неочакван отговор."
 
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
-#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+#: actions/twitapistatuses.php:304
+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:31 actions/newnotice.php:30
+#: actions/nudge.php:30 actions/subedit.php:31 actions/unblock.php:31
 msgid "Not logged in."
 msgstr "Не сте влезли в системата."
 
-#: ../actions/unsubscribe.php:43
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:117
 msgid "Not subscribed!."
 msgstr "Не сте абонирани!"
 
-#: ../actions/showstream.php:82
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+msgid "Notice Search"
+msgstr "Търсене на бележки"
+
+#: ../actions/showstream.php:82 actions/showstream.php:82
+#: actions/showstream.php:111 actions/showstream.php:118
+#: actions/showstream.php:123
 #, php-format
 msgid "Notice feed for %s"
 msgstr "Емисия с бележки на %s"
 
-#: ../actions/shownotice.php:39
+#: ../actions/shownotice.php:39 actions/shownotice.php:39
+#: actions/shownotice.php:45
 msgid "Notice has no profile"
 msgstr "Бележката няма профил"
 
-#: ../actions/showstream.php:297
+#: ../actions/showstream.php:316 actions/showstream.php:331
+#: actions/showstream.php:379
 msgid "Notices"
 msgstr "Бележки"
 
-#: ../actions/password.php:39
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
+#, php-format
+msgid "Notices tagged with %s"
+msgstr "Бележки с етикет %s"
+
+#: ../actions/password.php:39 actions/profilesettings.php:178
+#: actions/profilesettings.php:183
 msgid "Old password"
 msgstr "Стара парола"
 
-#: ../lib/util.php:288
+#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
+#: lib/util.php:330 actions/deleteprofile.php:247 lib/util.php:340
 msgid "OpenID"
 msgstr "OpenID"
 
-#: ../actions/finishopenidlogin.php:61
+#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
 msgid "OpenID Account Setup"
 msgstr "Настройки на OpenID"
 
-#: ../lib/openid.php:180
+#: ../lib/openid.php:180 lib/openid.php:180
 msgid "OpenID Auto-Submit"
 msgstr "Автоматично предаване на OpenID"
 
 #: ../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/finishopenidlogin.php:150 actions/openidlogin.php:76
 msgid "OpenID Login"
 msgstr "Влизане с OpenID"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
+#: actions/openidlogin.php:74 actions/openidsettings.php:50
+#: actions/openidlogin.php:82
 msgid "OpenID URL"
 msgstr "OpenID URL"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
+#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 msgid "OpenID authentication cancelled."
 msgstr "Влизането с OpenID е прекратено."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
+#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "Грешка при влизане с OpenID: %s"
 
-#: ../lib/openid.php:133
+#: ../lib/openid.php:133 lib/openid.php:133
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "Проблем с OpenID: %s"
 
-#: ../actions/openidsettings.php:144
+#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
 msgid "OpenID removed."
 msgstr "OpenID е премахнат."
 
-#: ../actions/openidsettings.php:37
+#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
 msgid "OpenID settings"
 msgstr "Настройки на OpenID"
 
-#: ../actions/avatar.php:84
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr "Може да добавите и лично съобщение към поканата."
+
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: actions/profilesettings.php:350
 msgid "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/login.php:109 actions/register.php:194
 msgid "Password"
 msgstr "Парола"
 
-#: ../actions/recoverpassword.php:249
+#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
 msgid "Password and confirmation do not match."
 msgstr "Паролата и потвърждението й не съвпадат."
 
-#: ../actions/recoverpassword.php:245
+#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
 msgid "Password must be 6 chars or more."
 msgstr "Паролата трябва да е от поне 6 знака."
 
-#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
+#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 msgid "Password recovery requested"
 msgstr "Поискано е възстановяване на парола"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:274
+#: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: actions/profilesettings.php:408 actions/recoverpassword.php:326
+#: actions/profilesettings.php:437
 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/profilesettings.php:409 actions/register.php:107
 msgid "Passwords don't match."
 msgstr "Паролите не съвпадат."
 
-#: ../actions/peoplesearch.php:33
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+msgid "People"
+msgstr "Хора"
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+msgid "People Search"
+msgstr "Търсене на хора"
+
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
 msgid "People search"
 msgstr "Търсене на хора"
 
-#: ../lib/stream.php:44
+#: ../lib/stream.php:50 lib/personal.php:50
 msgid "Personal"
 msgstr "Лично"
 
-#: ../actions/userauthorization.php:77
+#: ../actions/invite.php:133 actions/invite.php:141
+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 ""
-"Проверете тези детайли и се уверете, че "
-"искате да се абонирате за бележките на "
-"този потребител. Ако не искате абонамента, натиснете \"Cancel\" (Отказ)."
+"Проверете тези детайли и се уверете, че искате да се абонирате за бележките "
+"на този потребител. Ако не искате абонамента, натиснете \"Cancel\" (Отказ)."
 
-#: ../actions/imsettings.php:74
+#: ../actions/imsettings.php:73 actions/imsettings.php:74
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Публикуване промяната на състоянието ми в Jabber/GTalk."
 
-#: ../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
 msgid "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:185 actions/othersettings.php:179
 msgid "Preferences saved."
 msgstr "Настройките са запазени."
 
-#: ../lib/util.php:300
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
+msgid "Preferred language"
+msgstr "Предпочитан език"
+
+#: ../lib/util.php:328 lib/util.php:344 lib/util.php:356
 msgid "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:139 classes/Notice.php:149
 msgid "Problem saving notice."
 msgstr "Проблем при записване на бележката."
 
-#: ../lib/stream.php:54
+#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
+#: lib/settingsaction.php:84 actions/deleteprofile.php:241
 msgid "Profile"
 msgstr "Профил"
 
-#: ../actions/remotesubscribe.php:73
+#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
 msgid "Profile URL"
 msgstr "Адрес на профила"
 
-#: ../actions/profilesettings.php:34
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
 msgid "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
 msgid "Profile unknown"
 msgstr "Непознат профил"
 
-#: ../lib/util.php:276
-msgid "Public"
-msgstr "Общ поток"
-
-#: ../actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:77
 msgid "Public Stream Feed"
 msgstr "Емисия на общия поток"
 
-#: ../actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 lib/stream.php:34
 msgid "Public timeline"
 msgstr "Общ поток"
 
-#: ../actions/recoverpassword.php:151
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr "Публикуване на MicroID за адреса в Jabber/GTalk."
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:104
+msgid "Publish a MicroID for my email address."
+msgstr "Публикуване на MicroID за адреса на е-пощата."
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr "Скорошни етикети"
+
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
 msgid "Recover"
 msgstr "Възстановяване"
 
-#: ../actions/recoverpassword.php:141
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
 msgid "Recover password"
 msgstr "Възстановяване на паролата"
 
-#: ../actions/recoverpassword.php:67
+#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
 msgid "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:181 actions/register.php:234 lib/util.php:338
 msgid "Register"
 msgstr "Регистриране"
 
-#: ../actions/userauthorization.php:119
+#: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:173
+msgid "Registration not allowed."
+msgstr "Записването не е позволено."
+
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:241
+msgid "Registration successful"
+msgstr "Записването е успешно."
+
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
 msgid "Reject"
 msgstr "Охвърляне"
 
-#: ../actions/login.php:99 ../actions/register.php:183
+#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
+#: actions/register.php:190 actions/login.php:110 actions/openidlogin.php:85
+#: actions/register.php:217
 msgid "Remember me"
 msgstr "Запомни ме"
 
-#: ../actions/updateprofile.php:69
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
 msgid "Remote profile with no matching profile"
 msgstr "Отдалечен профил без съответстващ локален"
 
-#: ../actions/remotesubscribe.php:65
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
 msgid "Remote subscribe"
 msgstr "Отдалечен абонамент"
 
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php:48 actions/emailsettings.php:76
+#: actions/imsettings.php:49 actions/openidsettings.php:108
+#: actions/smssettings.php:50 actions/smssettings.php:84
+#: actions/twittersettings.php:59 actions/twittersettings.php:61
 msgid "Remove"
 msgstr "Премахване"
 
-#: ../actions/openidsettings.php:68
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
 msgid "Remove OpenID"
 msgstr "Премахване на OpenID"
 
@@ -1029,50 +1792,82 @@ msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
 msgstr ""
-"Премахването на единствения OpenID ще "
-"направи влизането в системата невъзможно. За да го изтриете, първо добавете друг OpenID."
+"Премахването на единствения OpenID ще направи влизането в системата "
+"невъзможно. За да го изтриете, първо добавете друг OpenID."
 
-#: ../lib/stream.php:49
+#: ../lib/stream.php:55 lib/personal.php:55
 msgid "Replies"
 msgstr "Отговори"
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:50
+#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
+#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #, php-format
 msgid "Replies to %s"
 msgstr "Отговори на %s"
 
-#: ../actions/recoverpassword.php:168
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
 msgid "Reset"
 msgstr "Обновяване"
 
-#: ../actions/recoverpassword.php:158
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
 msgid "Reset password"
 msgstr "Нова парола"
 
-#: ../actions/recoverpassword.php:167 ../actions/register.php:180
-msgid "Same as password above"
-msgstr "Също като паролата по-горе"
-
-#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
-msgid "Save"
-msgstr "Запазване"
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/deleteprofile.php:250 actions/subscriptions.php:73
+msgid "SMS"
+msgstr "SMS"
 
-#: ../lib/searchaction.php:73 ../lib/util.php:277
-msgid "Search"
-msgstr "Търсене"
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+msgid "SMS Phone number"
+msgstr "Телефонен номер за SMS"
 
-#: ../actions/noticesearch.php:80
-msgid "Search Stream Feed"
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+msgid "SMS Settings"
+msgstr "Настройки за SMS"
+
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:230
+msgid "SMS confirmation"
+msgstr "Потвърждение за SMS"
+
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
+msgid "Same as password above"
+msgstr "Също като паролата по-горе"
+
+#: ../actions/register.php:156 actions/register.php:170
+#: actions/register.php:197
+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/twittersettings.php:83 actions/emailsettings.php:107
+#: actions/othersettings.php:56 actions/profilesettings.php:106
+#: actions/subscriptions.php:74 actions/tagother.php:100
+#: actions/twittersettings.php:82
+msgid "Save"
+msgstr "Запазване"
+
+#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
+#: lib/util.php:316 lib/util.php:327
+msgid "Search"
+msgstr "Търсене"
+
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:84
+msgid "Search Stream Feed"
 msgstr "Търсене в емисията на потока"
 
-#: ../actions/noticesearch.php:30
+#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
+#: actions/noticesearch.php:29
 #, 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 ""
-"Търсене на бележки в %%site.name%% по "
-"съдържанието им. Отделяйте фразите за "
+"Търсене на бележки в %%site.name%% по съдържанието им. Отделяйте фразите за "
 "търсене (трябва да са по-дълги от 3 символа) с интервали."
 
 #: ../actions/peoplesearch.php:28
@@ -1081,154 +1876,265 @@ 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 ""
-"Търсене на хора в %%site.name%% по техните име, "
-"място или интереси. Отделяйте фразите за "
+"Търсене на хора в %%site.name%% по техните име, място или интереси. "
+"Отделяйте фразите за "
+
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+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 lib/util.php:1646 lib/util.php:2158
 msgid "Send"
 msgstr "Прати"
 
-#: ../actions/imsettings.php:71
+#: ../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."
+msgstr "Изпратете писмо до този адрес за публикуване като бележка."
+
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+msgid "Send me notices of new subscriptions through email."
+msgstr "Изпращане на уведомления за нови абонаменти по пощата."
+
+#: ../actions/imsettings.php:70 actions/imsettings.php:71
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Изпращане на бележките по Jabber/GTalk."
 
-#: ../lib/util.php:282
+#: ../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 ""
+"Получаване на бележки в SMS. Имайте предвид, че може да има допълнителни "
+"такси от оператора."
+
+#: ../actions/imsettings.php:76 actions/imsettings.php:77
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr "Изпращане по Jabber/GTalk на отговори от хора, "
+
+#: ../lib/util.php:304 lib/util.php:320 lib/util.php:330
 msgid "Settings"
 msgstr "Настройки"
 
-#: ../actions/profilesettings.php:183
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:336
 msgid "Settings saved."
 msgstr "Настройките са запазени."
 
-#: ../actions/finishaddopenid.php:66
+#: ../actions/tag.php:60 actions/tag.php:60 actions/tag.php:59
+msgid "Showing most popular tags from the last week"
+msgstr "Най-популярните етикети за изминалата седмица"
+
+#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
 msgid "Someone else already has this OpenID."
 msgstr "Някой друг вече използва този OpenID."
 
 #: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
+#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
 msgid "Something weird happened."
 msgstr "Случи се нещо странно."
 
-#: ../lib/util.php:302
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr "Входящата поща не е разрешена."
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr "Това не е вашият входящ адрес."
+
+#: ../lib/util.php:330 lib/util.php:346 lib/util.php:358
 msgid "Source"
 msgstr "Изходен код"
 
-#: ../actions/showstream.php:277
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:359
 msgid "Statistics"
 msgstr "Статистики"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
+#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
+#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
+#: actions/finishopenidlogin.php:199 actions/finishopenidlogin.php:267
 msgid "Stored OpenID not found."
 msgstr "Няма запазен OpenID."
 
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:172
-#: ../actions/showstream.php:181
+#: ../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:254 lib/util.php:2078
 msgid "Subscribe"
 msgstr "Абониране"
 
-#: ../actions/showstream.php:294 ../actions/subscribers.php:27
+#: ../actions/showstream.php:313 ../actions/subscribers.php:27
+#: actions/showstream.php:328 actions/subscribers.php:27
+#: actions/showstream.php:376 lib/gallery.php:136 lib/gallery.php:137
 msgid "Subscribers"
 msgstr "Абонати"
 
-#: ../actions/userauthorization.php:309
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
 msgid "Subscription authorized"
 msgstr "Абонаментът е одобрен"
 
-#: ../actions/userauthorization.php:319
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
 msgid "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:288 actions/showstream.php:370 lib/gallery.php:131
+#: lib/gallery.php:132
 msgid "Subscriptions"
 msgstr "Абонаменти"
 
-#: ../actions/avatar.php:87
+#: ../actions/avatar.php:87 actions/profilesettings.php:324
+#: actions/profilesettings.php:353
 msgid "System error uploading file."
 msgstr "Системна грешка при качване на файл."
 
-#: ../actions/noticesearch.php:34
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317 actions/profilesettings.php:90 actions/showstream.php:382
+#: actions/tag.php:40 actions/tagother.php:96 actions/tagother.php:162
+#: lib/profilelist.php:126 lib/profilelist.php:128
+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:33
 msgid "Text search"
 msgstr "Търсене на текст"
 
-#: ../actions/openidsettings.php:140
+#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
 msgid "That OpenID does not belong to you."
 msgstr "Този OpenID не ви принадлежи."
 
-#: ../actions/confirmaddress.php:52
+#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
 msgid "That address has already been confirmed."
 msgstr "Този адрес е вече потвърден."
 
-#: ../actions/confirmaddress.php:43
+#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
 msgid "That confirmation code is not for you!"
 msgstr "Този код за потвърждение не е за вас!"
 
-#: ../actions/avatar.php:80
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:214
+msgid "That email address already belongs to another user."
+msgstr "Тази е-поща вече се използва от друг потребител."
+
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: actions/profilesettings.php:346
 msgid "That file is too big."
 msgstr "Файлът е твърде голям."
 
-#: ../actions/imsettings.php:161
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
 msgid "That is already your Jabber ID."
 msgstr "Това вече е вашият Jabber ID."
 
-#: ../actions/imsettings.php:224
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:211
+msgid "That is already your email address."
+msgstr "Това и сега е адресът на е-пощата ви."
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+msgid "That is already your phone number."
+msgstr "Това  сега е номерът на телефона ви."
+
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
 msgid "That is not your Jabber ID."
 msgstr "Това не е вашият Jabber ID."
 
-#: ../actions/imsettings.php:201
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+#: actions/emailsettings.php:270
+msgid "That is not your email address."
+msgstr "Това не е вашият адрес на е-поща."
+
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+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:247
 msgid "That is the wrong IM address."
 msgstr "Грешен IM адрес."
 
-#: ../actions/newnotice.php:52
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+msgid "That is the wrong confirmation number."
+msgstr "Този код за потвърждение е грешен."
+
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+msgid "That phone number already belongs to another user."
+msgstr "Този телефонен номер вече се използва от друг потребител."
+
+#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: actions/newnotice.php:49 actions/twitapistatuses.php:330
+#: actions/newnotice.php:61 actions/twitapistatuses.php:271
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "Твърде дълга бележка. Трябва да е най-много 140 знака."
 
-#: ../actions/confirmaddress.php:86
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+#: actions/twitapiaccount.php:55
+msgid "That's too long. Max notice size is 255 chars."
+msgstr "Това е твърде дълго. Трябва да е най-много 255 знака."
+
+#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Адресът \"%s\" е потвърден за сметката ви."
 
-#: ../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:285
 msgid "The address was removed."
 msgstr "Адресът е премахнат."
 
-#: ../actions/userauthorization.php:311
+#: ../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 ""
-"Абонаментът е одобрен, но не е зададен "
-"callback URL. За да завършите одобряването, "
-"проверете инструкциите на сайта. Вашият token за абонамент е:"
+"Абонаментът е одобрен, но не е зададен callback URL. За да завършите "
+"одобряването, проверете инструкциите на сайта. Вашият token за абонамент е:"
 
-#: ../actions/userauthorization.php:321
+#: ../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 ""
-"Абонаментът е отказан, но не е зададен "
-"callback URL. За да откажете напълно абонамента, проверете инструкциите на сайта."
+"Абонаментът е отказан, но не е зададен callback URL. За да откажете напълно "
+"абонамента, проверете инструкциите на сайта."
 
-#: ../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 "Това са хората, които четат бележките на %s."
 
-#: ../actions/subscribers.php:33
+#: ../actions/subscribers.php:33 actions/subscribers.php:33
 msgid "These are the people who listen to your notices."
 msgstr "Tова са хората, които четат бележките ви."
 
-#: ../actions/subscriptions.php:35
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Хора, чийто бележки %s чете."
 
-#: ../actions/subscriptions.php:33
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
 msgid "These are the people whose notices you listen to."
 msgstr "Няма хора, чийто бележки четете."
 
-#: ../actions/recoverpassword.php:87
+#: ../actions/invite.php:89 actions/invite.php:96
+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 "Кодът за потвърждение е твърде стар. Започнете процеса отново."
 
@@ -1237,84 +2143,151 @@ msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
 msgstr ""
-"Формата би трябвало да се изпрати "
-"автоматично. Ако това не се случи, за да "
+"Формата би трябвало да се изпрати автоматично. Ако това не се случи, за да "
 "преминете към OpenID доставчика си натиснете бутона за изпращане."
 
-#: ../actions/finishopenidlogin.php:56
+#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
 #, 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 ""
-"За първи път влизате в системата като %s, "
-"затова трябва да присъединим OpenID към "
-"локалния ви профил. Можете да създадете нова сметка или да използвате съществуваща, ако имате такава."
+"За първи път влизате в системата като %s, затова трябва да присъединим "
+"OpenID към локалния ви профил. Можете да създадете нова сметка или да "
+"използвате съществуваща, ако имате такава."
+
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:94
+#: actions/twitapifriendships.php:82 actions/twitapistatuses.php:428
+msgid "This method requires a POST or DELETE."
+msgstr "Този метод изисква заявка POST или DELETE."
+
+#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
+#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
+#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
+#: actions/twitapistatuses.php:303 actions/twitapiaccount.php:46
+#: actions/twitapidirect_messages.php:117 actions/twitapifriendships.php:30
+#: actions/twitapistatuses.php:239
+msgid "This method requires a POST."
+msgstr "Този метод изисква заявка POST."
 
-#: ../lib/util.php:147
+#: ../lib/util.php:164 lib/util.php:246 lib/util.php:257
 msgid "This page is not available in a media type you accept"
 msgstr "Страницата не е достъпна във вида медия, който приемате"
 
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
+msgid "Timezone"
+msgstr "Часови пояс"
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr "Не е избран часови пояс"
+
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"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 ""
+"За да се абонирате, можете да  [влезете](%%action.login%%) или да "
+"[регистрирате](%%action.register%%) нова сметка. Ако имате сметка на друга, "
+"[подобна услуга за микроблогване](%%doc.openmublog%%), въведете адреса на "
+"профила си в нея по-долу."
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: actions/twitapifriendships.php:128
+msgid "Two user ids or screen_names must be supplied."
 msgstr ""
-"За да се абонирате, можете да  "
-"[влезете](%%action.login%%) или да "
-"[регистрирате](%%action.register%%) нова сметка. "
-"Ако имате сметка на друга, [подобна услуга за микроблогване](%%doc.openmublog%%), въведете адреса на профила си в нея по-долу."
 
-#: ../actions/profilesettings.php:51
+#: ../actions/profilesettings.php:48 ../actions/register.php:169
+#: actions/profilesettings.php:81 actions/register.php:183
+#: actions/profilesettings.php:83 actions/register.php:210
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "Адрес на личната ви страница, блог или профил в друг сайт"
 
-#: ../actions/remotesubscribe.php:74
+#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
 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/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/emailsettings.php:147
+#: actions/othersettings.php:146 actions/twittersettings.php:199
 msgid "Unexpected form submission."
 msgstr "Неочаквано изпращане на форма."
 
-#: ../actions/recoverpassword.php:237
+#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
 msgid "Unexpected password reset."
 msgstr "Неочаквано подновяване на паролата."
 
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr "Непознато действие"
+
 #: ../actions/finishremotesubscribe.php:58
+#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:59
 msgid "Unknown version of OMB protocol."
 msgstr "Непозната версия на протокола OMB."
 
-#: ../lib/util.php:245
+#: ../lib/util.php:269 lib/util.php:285 lib/util.php:296
 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:48
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr "Неразпознат вид адрес %s"
 
-#: ../actions/showstream.php:193
+#: ../actions/showstream.php:209 actions/showstream.php:219
+#: actions/showstream.php:267 lib/util.php:2094
 msgid "Unsubscribe"
 msgstr "Отписване"
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
+#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
+#: actions/postnotice.php:45 actions/updateprofile.php:46
 msgid "Unsupported OMB version"
 msgstr "Неподдържана версия на OMB"
 
-#: ../actions/avatar.php:105
+#: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: actions/profilesettings.php:371
 msgid "Unsupported image file format."
 msgstr "Форматът на файла с изображението не се поддържа."
 
-#: ../actions/avatar.php:68
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: actions/deleteprofile.php:251
+msgid "Updates by SMS"
+msgstr "Бележки през SMS"
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: actions/deleteprofile.php:254
+msgid "Updates by instant messenger (IM)"
+msgstr "Бележки през месинджър (IM)"
+
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/twitapistatuses.php:126
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:198
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
+
+#: ../actions/avatar.php:68 actions/profilesettings.php:161
+#: actions/profilesettings.php:166
 msgid "Upload"
 msgstr "Качване"
 
@@ -1325,108 +2298,204 @@ msgid ""
 "site license, also. Use a picture that belongs to you and that you want to "
 "share."
 msgstr ""
-"Качете нов \"аватар\" (потребителско "
-"изображение) тук. Не можете да го "
-"промените по-късно, затова се уверете, че "
-"е поне приблизително квадратен. Трябва да е с лиценз като самия сайт. Използвайте картинка, която ви принадлежи и искате да споделите."
+"Качете нов \"аватар\" (потребителско изображение) тук. Не можете да го "
+"промените по-късно, затова се уверете, че е поне приблизително квадратен. "
+"Трябва да е с лиценз като самия сайт. Използвайте картинка, която ви "
+"принадлежи и искате да споделите."
+
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr "Качване на нова снимка за профила"
+
+#: ../actions/invite.php:114 actions/invite.php:121
+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 actions/register.php:200
+#: actions/register.php:203
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Използва се само за промени, обяви или възстановяване на паролата"
 
 #: ../actions/finishremotesubscribe.php:86
+#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:92
 msgid "User being listened to doesn't exist."
 msgstr "Потребителят, когото проследявате, не съществува. "
 
 #: ../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/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/showstream.php:57
+#: actions/twitapiaccount.php:63 actions/twitapifavorites.php:40
+#: actions/twitapistatuses.php:163 actions/twitapistatuses.php:492
+#: lib/twitterapi.php:590
 msgid "User has no profile."
 msgstr "Потребителят няма профил."
 
-#: ../actions/remotesubscribe.php:71
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
 msgid "User nickname"
 msgstr "Потребителски псевдоним"
 
-#: ../lib/util.php:969
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr "Потребителят не е открит."
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
+msgid "What timezone are you normally in?"
+msgstr "В кой часови пояс сте обикновено?"
+
+#: ../lib/util.php:1159 lib/util.php:1293 lib/util.php:1630
 #, php-format
 msgid "What's up, %s?"
 msgstr "Какво става, %s?"
 
-#: ../actions/profilesettings.php:57
+#: ../actions/profilesettings.php:54 ../actions/register.php:175
+#: actions/profilesettings.php:87 actions/register.php:189
+#: actions/profilesettings.php:89 actions/register.php:216
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Къде се намирате (град, община, държава и т.н.)"
 
-#: ../actions/updateprofile.php:127
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Грешен вид изображение за '%s'"
 
-#: ../actions/updateprofile.php:122
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Грешен размер на изображението '%s'"
 
-#: ../actions/finishaddopenid.php:64
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+#: actions/block.php:105
+msgid "Yes"
+msgstr "Да"
+
+#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
 msgid "You already have this OpenID!"
 msgstr "Вече използвате този OpenID!"
 
-#: ../actions/recoverpassword.php:31
+#: ../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
 msgid "You are already logged in!"
 msgstr "Вече сте влезли!"
 
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr "Вече сте абонирани за следните потребители:"
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:102
+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/register.php:164
+#: ../actions/register.php:135 actions/register.php:145
 msgid "You can create a new account to start posting notices."
 msgstr "Първо се регистрирайте, за да започнете да публикувате бележки."
 
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
 #: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr ""
-"Можете да премахнете OpenID от сметката си, "
-"като натиснете бутона \"Премахване\"."
+"Можете да премахнете OpenID от сметката си, като натиснете бутона "
+"\"Премахване\"."
 
-#: ../actions/imsettings.php:28
+#: ../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 ""
-"Можете да получавате съобщения по Jabber/GTalk "
-"[instant messages](%%doc.im%%). Въведете адреса си в настройките по-долу."
+"Можете да получавате съобщения по Jabber/GTalk [instant messages](%%doc.im%"
+"%). Въведете адреса си в настройките по-долу."
 
 #: ../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
+#: actions/finishremotesubscribe.php:83 actions/finishremotesubscribe.php:99
 msgid "You can use the local subscription!"
 msgstr "Можете да ползвате локален абонамент!"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:51
+#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
+#: actions/finishopenidlogin.php:38 actions/register.php:68
+#: actions/register.php:77
 msgid "You can't register if you don't agree to the license."
 msgstr "Не можете да се регистрате, ако не сте съгласни с  лиценза."
 
-#: ../actions/updateprofile.php:62
+#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
 msgid "You did not send us that profile"
 msgstr "Не сте ни изпратили този профил"
 
-#: ../actions/recoverpassword.php:134
+#: ../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 ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: actions/twitapistatuses.php:455
+msgid "You may not delete another user's status."
+msgstr "Не може да изтривате бележки на друг потребител."
+
+#: ../actions/invite.php:31 actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr "За да каните хора в %s, трябва да сте влезли."
+
+#: ../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!"
+msgstr ""
+"Ще ви уведомим при приемане на покана и записване в сайта. Благодарим ви за "
+"увеличаването на общността тук!"
+
+#: ../actions/recoverpassword.php:149
 msgid "You've been identified. Enter a  new password below. "
 msgstr "Разпознати сте. Въведете паролата си по-долу. "
 
-#: ../actions/openidlogin.php:67
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:84
 msgid "Your OpenID URL"
 msgstr "Вашият OpenID URL"
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:164
 msgid "Your nickname on this server, or your registered email address."
 msgstr "Псевдонимът ви на този сървър или е-пощата, с която сте регистрирани."
 
@@ -1436,1438 +2505,1167 @@ 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%%) ви позволява влизане в "
-"различни сайтове с един и същ акаунт. От тук се управляват съответните OpenID."
+"[OpenID](%%doc.openid%%) ви позволява влизане в различни сайтове с един и "
+"същ акаунт. От тук се управляват съответните OpenID."
 
-#: ../lib/util.php:814
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:1287
 msgid "a few seconds ago"
 msgstr "преди няколко секунди"
 
-#: ../lib/util.php:826
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:1299
 #, php-format
 msgid "about %d days ago"
 msgstr "преди около %d дни"
 
-#: ../lib/util.php:822
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:1295
 #, php-format
 msgid "about %d hours ago"
 msgstr "преди около %d часа"
 
-#: ../lib/util.php:818
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:1291
 #, php-format
 msgid "about %d minutes ago"
 msgstr "преди около %d минути"
 
-#: ../lib/util.php:830
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:1303
 #, php-format
 msgid "about %d months ago"
 msgstr "преди около %d месеца"
 
-#: ../lib/util.php:824
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:1297
 msgid "about a day ago"
 msgstr "преди около ден"
 
-#: ../lib/util.php:816
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:1289
 msgid "about a minute ago"
 msgstr "преди около минута"
 
-#: ../lib/util.php:828
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:1301
 msgid "about a month ago"
 msgstr "преди около месец"
 
-#: ../lib/util.php:832
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:1305
 msgid "about a year ago"
 msgstr "преди около година"
 
-#: ../lib/util.php:820
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:1293
 msgid "about an hour ago"
 msgstr "преди около час"
 
-#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
-#: ../lib/stream.php:101
+#: ../actions/showstream.php:423 ../lib/stream.php:132
+#: actions/showstream.php:441 lib/stream.php:99 lib/noticelist.php:211
+msgid "delete"
+msgstr "изтриване"
+
+#: ../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:135
+#: lib/facebookaction.php:202 lib/noticelist.php:189
 msgid "in reply to..."
 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:142
+#: lib/noticelist.php:199
 msgid "reply"
 msgstr "отговор"
 
-#: ../actions/password.php:44
+#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/profilesettings.php:188
 msgid "same as password above"
 msgstr "също като паролата по-горе"
 
-#: ../lib/util.php:1127
-msgid "« After"
+#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+#: actions/twitapistatuses.php:543
+msgid "unsupported file type"
+msgstr "неподдържан вид файл"
+
+#: ../lib/util.php:1309 lib/util.php:1443 lib/facebookaction.php:251
+#: lib/util.php:1783
+#, fuzzy
+msgid "« After"
 msgstr "« След"
 
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-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
+#: actions/block.php:38 actions/deleteprofile.php:127 actions/disfavor.php:47
+#: actions/emailsettings.php:130 actions/favor.php:49 actions/login.php:45
+#: actions/newmessage.php:44 actions/newnotice.php:36 actions/nudge.php:47
+#: actions/othersettings.php:139 actions/profilesettings.php:49
+#: actions/subedit.php:38 actions/tagother.php:113
+#: actions/twittersettings.php:188 actions/unblock.php:38
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Имаше проблем със сесията ви в сайта. Моля, опитайте отново!"
 
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
+#: actions/disfavor.php:55
+msgid "This notice is not a favorite!"
+msgstr "Тази бележка не е отбелязана като любима!"
 
-#: ../actions/invite.php:168 actions/invite.php:176
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s ви кани да ползвате заедно %2$s"
+#: actions/disfavor.php:63
+msgid "Could not delete favorite."
+msgstr "Грешка при изтриване на любима бележка."
 
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-"%1$s ви кани да се присъедините към %2$s "
-"(%3$s).\n"
-"\n"
-"%2$s е услуга за микроблогване, чрез която "
-"лесно поддържате връзка с хората, които "
-"познавате или които са ви интересни.\n"
-"\n"
-"Също така можете да публикувате кратки "
-"новини за себе си, свои размисли и да ги "
-"обсъждате в мрежата с хора, които ви "
-"познават. Това също е и добър начин за "
-"запознаване с нови хора, които споделят "
-"интересите ви.\n"
-"\n"
-"%1$s ви казва:\n\n%4$s\n\nМожете да видите профила на %1$s в %2$s тук:\n\n%5$s\n\nАко искате да опитате услугата на сайта, проследете препратката по-долу, за да приемете поканата.\n\n%6$s\n\nАко не желаете, пропуснете това писмо. Благодарим ви за търпението и отделеното време.\n\nИскрено ваши, %2$s\n"
+#: actions/disfavor.php:72
+msgid "Favor"
+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 ""
+#: actions/emailsettings.php:92
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr "Изпращане на писмо при отбелязване на моя бележка като любима."
 
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
-#, php-format
-msgid "%s (%s)"
-msgstr ""
+#: actions/emailsettings.php:95
+msgid "Send me email when someone sends me a private message."
+msgstr "Изпращане на писмо при ново лично съобщение."
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#, php-format
-msgid "%s public timeline"
-msgstr "Общ поток на %s"
+#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:54
+#: actions/twitapifavorites.php:115
+msgid "This notice is already a favorite!"
+msgstr "Тази бележка вече е отбелязана като любима!"
 
-#: ../lib/mail.php:206 lib/mail.php:212
-#, php-format
-msgid "%s status"
-msgstr "Състояние на %s"
+#: actions/favor.php:60 actions/twitapifavorites.php:151
+#: classes/Command.php:132 actions/favor.php:61
+#: actions/twitapifavorites.php:122
+msgid "Could not create favorite."
+msgstr "Грешка при отбелязване като любима."
 
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#, php-format
-msgid "%s timeline"
-msgstr "Поток на %s"
+#: actions/favor.php:70
+msgid "Disfavor"
+msgstr "Нелюбимо"
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:62
 #, php-format
-msgid "%s updates from everyone!"
-msgstr ""
-
-#: ../actions/register.php:213
-msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
-msgstr ""
-"(Трябва да получите веднага електронно "
-"писмо с указания за потвърждаване адреса на е-пощата ви.)"
-
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"От 1 до 64 малки букви или цифри, без "
-"пунктоация и интервали. Задължително поле."
-
-#: ../actions/register.php:154 actions/register.php:168
-msgid "6 or more characters. Required."
-msgstr "6 или повече знака. Задължително поле."
-
-#: ../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 ""
-"На адреса на е-поща, който сте въвели, беше "
-"изпратен код за потвърждение. Проверете "
-"кутията (или папката за спам) за кода и указанията за използването му."
-
-#: ../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/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!"
-msgstr "Не е открит методът в API."
-
-#: ../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 "Методът в API все още се разработва."
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-msgid "Add or remove OpenIDs"
-msgstr "Добавяне или премахване OpenID"
-
-#: ../actions/invite.php:131 actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
-msgstr "Адреси на приятели, които каните (по един на ред)"
-
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-msgid "Are you sure you want to delete this notice?"
-msgstr "Наистина ли искате да изтриете тази бележка?"
-
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
-msgstr ""
-"Автоматично абониране за всеки, който се "
-"абонира за мен (подходящо за ботове)."
-
-#: ../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 ""
-"Очаква се потвърждение за този адрес. "
-"Проверете кутията си (или папката за спам) за съобщение с указания."
-
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr "Очаква се потвърждение за този телефонен номер."
-
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
-msgid "Can't delete this notice."
-msgstr "Грешка при изтриване на бележката."
-
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-msgid "Cannot normalize that email address"
-msgstr "Грешка при нормализиране адреса на е-пощата"
-
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr "Промяна обработката на писмата"
-
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
-msgstr "Смяна на паролата"
-
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-msgid "Change your profile settings"
-msgstr "Промяна настройките на профила"
-
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-msgid "Confirmation code"
-msgstr "Код за потвърждение"
+msgid "%s favorite notices"
+msgstr "%s любими бележки"
 
-#: ../actions/register.php:202
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:66
 #, 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 ""
-"Поздравления, %s! И добре дошли в %%%%site.name%%%%! "
-"от тук можете да...\n"
-"\n"
-"* Отидете в [профила си](%s) и да публикувате "
-"първата си бележка.\n"
-"* Добавите [адрес в Jabber/GTalk](%%%%action.imsettings%%%%), "
-"за да изпращате бележки от програмата си "
-"за моментни съобщения.\n"
-"* [Търсите хора](%%%%action.peoplesearch%%%%), които "
-"познавате или с които споделяте общи "
-"интереси. \n"
-"* Обновите [настройките на "
-"профила(%%%%action.profilesettings%%%%) си, за да кажете повече за себе си на другите. \n* Прочетете наличната [документация](%%%%doc.help%%%%) на сайта, за да се запознаете с възможностите му. \n\nБлагодарим, че се включихте в сайта и дано ползването на услугата ви носи само приятни мигове!"
+msgid "Feed of favorite notices of %s"
+msgstr "Емисия с любимите бележки на %s"
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: actions/inbox.php:28
 #, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr "Грешка при проследяване на потребител: %s вече е в списъка ви."
-
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
-msgstr "Грешка при проследяване — потребителят не е намерен."
-
-#: ../lib/subs.php:54 lib/subs.php:61
-msgid "Could not subscribe other to you."
-msgstr "Грешка при абониране на друг потребител за вас."
-
-#: ../lib/subs.php:46 lib/subs.php:46
-msgid "Could not subscribe."
-msgstr "Грешка при абониране."
-
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-msgid "Could not update user with confirmed email address."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-msgid "Couldn't find any statuses."
-msgstr "Не са открити бележки."
-
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-msgid "Couldn't update user for autosubscribe."
-msgstr ""
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-msgid "Couldn't update user record."
-msgstr "Грешка при обновяване записа на потребител."
-
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
-msgstr "Текущ потвърден телефонен номер за SMS-и."
-
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-msgid "Current confirmed email address."
-msgstr "Текущ потвърден адрес на е-поща."
+msgid "Inbox for %s - page %d"
+msgstr "Входяща кутия за %s — страница %d"
 
-#: ../classes/Notice.php:72 classes/Notice.php:86
+#: actions/inbox.php:30
 #, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr ""
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-msgid "Delete notice"
-msgstr "Изтриване на бележката"
-
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-msgid "Email Address"
-msgstr "Адрес на е-поща"
-
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-msgid "Email Settings"
-msgstr "Настройки на е-поща"
-
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-msgid "Email address, like \"UserName@example.org\""
-msgstr "Адрес на е-поща, като \"UserName@example.org\""
-
-#: ../actions/invite.php:129 actions/invite.php:137
-msgid "Email addresses"
-msgstr "Адреси на е-поща"
+msgid "Inbox for %s"
+msgstr "Входяща кутия за %s"
 
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
-msgstr "Въведете кода, който получихте по телефона."
+#: actions/inbox.php:53
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr "Това е входящата ви кутия с лични съобщения от други потребители."
 
-#: ../actions/tag.php:55 actions/tag.php:55
+#: actions/invite.php:178
 #, php-format
-msgid "Feed for tag %s"
-msgstr "Емисия за етикета %s"
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr "Търсене в съдържанието на бележките"
-
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr "Търсене на хора в сайта"
-
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-msgid "I want to post notices by email."
-msgstr "Искам да изпращам бележки по пощата."
-
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
-msgstr "IM"
-
-#: ../actions/recoverpassword.php:137
 msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
-"email address you have stored  in your account."
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
 msgstr ""
-"Ако сте забравили или загубили паролата "
-"си, може да получите нова на е-пощата, въведена в профила ви."
-
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-msgid "Incoming email"
-msgstr "Входяща поща"
-
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-msgid "Incoming email address removed."
-msgstr "Входящият адрес на е-поща е премахнат."
-
-#: ../actions/invite.php:55 actions/invite.php:62
-#, php-format
-msgid "Invalid email address: %s"
-msgstr "Неправилен адрес на е-поща: %s"
-
-#: ../actions/invite.php:79 actions/invite.php:86
-msgid "Invitation(s) sent"
-msgstr "Поканите са изпратени."
-
-#: ../actions/invite.php:97 actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
-msgstr "Изпратени са покани до следните хора:"
-
-#: ../lib/util.php:306 lib/util.php:322
-msgid "Invite"
-msgstr "Покани"
+"%1$s използва %2$s (%3$s) и ви кани да се присъедините.\n"
+"\n"
 
-#: ../actions/invite.php:123 actions/invite.php:130
-msgid "Invite new users"
-msgstr "Покани за нови потребители"
+#: actions/login.php:104 actions/login.php:111 actions/openidlogin.php:86
+msgid "Automatically login in the future; "
+msgstr "Автоматично влизане за в бъдеще:"
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Language"
-msgstr "Език"
+#: actions/login.php:122 actions/login.php:130
+msgid "For security reasons, please re-enter your "
+msgstr ""
 
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-msgid "Language is too long (max 50 chars)."
-msgstr "Името на езика е твърде дълго (може да е до 50 знака)."
+#: actions/login.php:126 actions/login.php:134
+msgid "Login with your username and password. "
+msgstr "Влезте с името и паролата си."
 
-#: ../actions/register.php:166 actions/register.php:180
-msgid "Longer name, preferably your \"real\" name"
-msgstr "По-дълго име, за предпочитане \"истинското\" ви име."
+#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+#: actions/newmessage.php:60 actions/twitapidirect_messages.php:136
+msgid "That's too long. Max message size is 140 chars."
+msgstr "Твърде дълго. Може да е най-много 140 знака."
 
-#: ../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 ""
+#: actions/newmessage.php:65 actions/newmessage.php:68
+msgid "No recipient specified."
+msgstr "Не е указан получател."
 
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr "Управление на пощата, идваща от %%site.name%%."
+#: actions/newmessage.php:68 actions/newmessage.php:113
+#: classes/Command.php:206 actions/newmessage.php:71
+#: actions/newmessage.php:116 classes/Command.php:211
+msgid "You can't send a message to this user."
+msgstr "Не може да изпращате съобщения до този потребител."
 
-#: ../actions/smssettings.php:304
-#, php-format
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209 actions/newmessage.php:74
+#: actions/twitapidirect_messages.php:153 classes/Command.php:214
 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."
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
-"Мобилен оператор за SMS. Ако знаете "
-"оператор, поддържащ SMS от е-поща, който не фигурира тук, пишете ни на адрес %s."
-
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-#, fuzzy
-msgid "New"
-msgstr "Ново"
+"Не може да изпращате съобщения до себе си. По-добре си го кажете на себе си "
+"тихичко."
 
-#: ../lib/mail.php:144 lib/mail.php:144
-#, php-format
-msgid "New email address for posting to %s"
-msgstr "Нов адрес на е-поща за публикщуване в %s"
-
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-msgid "New incoming email address added."
-msgstr "Добавен е нов входящ адрес на е-поща."
-
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-msgid "No"
-msgstr "Не"
-
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-msgid "No carrier selected."
-msgstr "Не е избран оператор."
-
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-msgid "No code entered"
-msgstr "Не е въведен код."
-
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-msgid "No email address."
-msgstr "Не е въведена е-поща."
-
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-msgid "No incoming email address."
-msgstr "Няма входящ адрес на е-поща."
-
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-msgid "No phone number."
-msgstr "Не е въведен телефонен номер."
-
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-msgid "No status found with that ID."
-msgstr "Не е открита бележка с такъв идентификатор."
-
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-msgid "No status with that ID found."
-msgstr "Не е открита бележка с такъв идентификатор."
-
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-msgid "No user with that email address or username."
-msgstr "Няма потребител с такава е-поща или потребителско име."
-
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-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
-msgid "Not a supported data format."
-msgstr "Неподдържан формат на данните"
-
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-msgid "Not a valid email address"
-msgstr "Това не е правилен адрес на е-поща."
-
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-msgid "Not found"
-msgstr "Не е открито."
-
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-msgid "Notice Search"
-msgstr "Търсене на бележки"
-
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81
-#, php-format
-msgid "Notices tagged with %s"
-msgstr "Бележки с етикет %s"
+#: actions/newmessage.php:108 actions/microsummary.php:32
+#: actions/newmessage.php:111
+msgid "No such user"
+msgstr "Няма такъв потребител"
 
-#: ../actions/invite.php:135 actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
-msgstr "Може да добавите и лично съобщение към поканата."
+#: actions/newmessage.php:117 actions/newmessage.php:120
+msgid "New message"
+msgstr "Ново съобщение"
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-msgid "People"
-msgstr "Хора"
+#: actions/noticesearch.php:95 actions/noticesearch.php:94
+msgid "Notice without matching profile"
+msgstr "Бележка без съответстващ профил"
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-msgid "People Search"
-msgstr "Търсене на хора"
+#: actions/openidsettings.php:28
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgstr "[OpenID](%%doc.openid%%) ви позволява да влизате в различни сайтове"
 
-#: ../actions/invite.php:133 actions/invite.php:141
-msgid "Personal message"
-msgstr "Лично съобщение"
+#: actions/openidsettings.php:46
+msgid "If you want to add an OpenID to your account, "
+msgstr ""
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "Телефонен номер — с код, без пунктоация и без интервали."
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
+msgstr "Ако премахнете единствения си OpenID, няма да можете да влизате!"
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Preferred language"
-msgstr "Предпочитан език"
+#: actions/openidsettings.php:87
+msgid "You can remove an OpenID from your account "
+msgstr "Можете да премахнете OpenID от профила си"
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Публикуване на MicroID за адреса в Jabber/GTalk."
+#: actions/outbox.php:28
+#, php-format
+msgid "Outbox for %s - page %d"
+msgstr "Изходяща кутия за %s — страница %d"
 
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-msgid "Publish a MicroID for my email address."
-msgstr "Публикуване на MicroID за адреса на е-пощата."
+#: actions/outbox.php:30
+#, php-format
+msgid "Outbox for %s"
+msgstr "Изходяща кутия за %s"
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr "Скорошни етикети"
+#: actions/outbox.php:53
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr "Това е изходящата ви кутия с лични съобщения до други потребители. "
 
-#: ../actions/register.php:28 actions/register.php:28
-msgid "Registration not allowed."
-msgstr "Записването не е позволено."
+#: actions/peoplesearch.php:28
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+msgstr "Търсене на хора в %%site.name%% по име, местоположение или интереси."
 
-#: ../actions/register.php:200 actions/register.php:214
-msgid "Registration successful"
-msgstr "Записването е успешно."
+#: actions/profilesettings.php:27
+msgid "You can update your personal profile info here "
+msgstr "Можете а обновите личните си данни тук"
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
-msgstr "SMS"
+#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
+#: actions/userauthorization.php:159 actions/userrss.php:76
+#: actions/profilesettings.php:120 actions/remotesubscribe.php:333
+msgid "User without matching profile"
+msgstr "Потребител без съответстващ профил"
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-msgid "SMS Phone number"
-msgstr "Телефонен номер за SMS"
+#: actions/recoverpassword.php:91
+msgid "This confirmation code is too old. "
+msgstr "Кодът ви за потвърждение е твърде стар."
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-msgid "SMS Settings"
-msgstr "Настройки за SMS"
+#: actions/recoverpassword.php:141
+msgid "If you've forgotten or lost your"
+msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225
-msgid "SMS confirmation"
-msgstr "Потвърждение за SMS"
+#: actions/recoverpassword.php:154
+msgid "You've been identified. Enter a "
+msgstr ""
 
-#: ../actions/register.php:156 actions/register.php:170
-msgid "Same as password above. Required."
-msgstr "Същото като паролата по-горе. Задължително поле."
+#: actions/recoverpassword.php:169
+msgid "Your nickname on this server, "
+msgstr "Псевдонимът ви на този сървър."
 
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-msgid "Select a carrier"
-msgstr "Изберете оператор"
+#: actions/recoverpassword.php:271
+msgid "Instructions for recovering your password "
+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."
-msgstr "Изпратете писмо до този адрес за публикуване като бележка."
+#: actions/recoverpassword.php:327
+msgid "New password successfully saved. "
+msgstr "Новата парола е записана."
 
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-msgid "Send me notices of new subscriptions through email."
-msgstr "Изпращане на уведомления за нови абонаменти по пощата."
+#: actions/register.php:95 actions/register.php:104
+msgid "Password must be 6 or more characters."
+msgstr "Паролата трябва да е 6 или повече знака."
 
-#: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: actions/register.php:216 actions/register.php:243
+#, php-format
 msgid ""
-"Send me notices through SMS; I understand I may incur exorbitant charges "
-"from my carrier."
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to..."
+msgstr "Поздравления, %s! И добре дошли в %%%%site.name%%%%. "
+
+#: actions/register.php:227 actions/register.php:254
+msgid "(You should receive a message by email momentarily, with "
 msgstr ""
-"Получаване на бележки в SMS. Имайте "
-"предвид, че може да има допълнителни такси от оператора."
 
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#: actions/remotesubscribe.php:51
+#, php-format
+msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr ""
-"Изпращане по Jabber/GTalk на отговори от хора, "
 
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr "Най-популярните етикети за изминалата седмица"
+#: actions/showfavorites.php:61
+#, php-format
+msgid "Feed for favorites of %s"
+msgstr "Емисия с любимите бележки на %s"
 
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr "Входящата поща не е разрешена."
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:88 actions/twitapifavorites.php:57
+msgid "Could not retrieve favorite notices."
+msgstr "Грешка при изтегляне на любимите бележки"
 
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
-msgstr "Това не е вашият входящ адрес."
+#: actions/showmessage.php:33
+msgid "No such message."
+msgstr "Няма такова съобщение"
 
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317
-msgid "Tags"
-msgstr "Етикети"
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
+msgstr "Само подателят и получателят могат да четат това съобщение."
 
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr "Текст"
+#: actions/showmessage.php:61
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr "Съобщение до %1$s в %2$s"
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr "Тази е-поща вече се използва от друг потребител."
+#: actions/showmessage.php:66
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr "Съобщение от %1$s в %2$s"
 
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-msgid "That is already your email address."
-msgstr "Това и сега е адресът на е-пощата ви."
+#: actions/showstream.php:154 lib/util.php:2105
+msgid "Send a message"
+msgstr "Изпращане на съобщение"
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-msgid "That is already your phone number."
-msgstr "Това  сега е номерът на телефона ви."
+#: actions/smssettings.php:312
+#, php-format
+msgid "Mobile carrier for your phone. "
+msgstr "Мобилен оператор на телефона ви."
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-msgid "That is not your email address."
-msgstr "Това не е вашият адрес на е-поща."
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:64
+#, php-format
+msgid "Direct messages to %s"
+msgstr "Преки съобщения до %s"
 
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-msgid "That is not your phone number."
-msgstr "Това не е вашият телефонен номер."
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:65
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr "Всички преки съобщения, изпратени до %s"
 
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-msgid "That is the wrong confirmation number."
-msgstr "Този код за потвърждение е грешен."
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:69
+msgid "Direct Messages You've Sent"
+msgstr "Изпратени от вас преки съобщения"
 
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-msgid "That phone number already belongs to another user."
-msgstr "Този телефонен номер вече се използва от друг потребител."
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:70
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr "Всички преки съобщения, изпратени от %s"
 
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-msgid "That's too long. Max notice size is 255 chars."
-msgstr "Това е твърде дълго. Трябва да е най-много 255 знака."
+#: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:132
+msgid "No message text!"
+msgstr "Липсва текст на съобщението"
 
-#: ../actions/invite.php:89 actions/invite.php:96
-msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
-msgstr "Тези хора са потребители тук и автоматично сте абонирани за тях:"
+#: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:145
+msgid "Recipient user not found."
+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."
-msgstr "Този метод изисква заявка POST или DELETE."
+#: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:148
+msgid "Can't send direct messages to users who aren't your friend."
+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."
-msgstr "Този метод изисква заявка POST."
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:64
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr "%s / Отбелязани като любими от %s"
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "Timezone"
-msgstr "Часови пояс"
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:67
+#, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr "%s бележки отбелязани като любими от %s / %s."
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-msgid "Timezone not selected."
-msgstr "Не е избран часови пояс"
+#: actions/twitapifavorites.php:187 lib/mail.php:275
+#: actions/twitapifavorites.php:158 lib/mail.php:303
+#, php-format
+msgid "%s added your notice as a favorite"
+msgstr "%s отбеляза бележката ви като любима"
 
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-msgid "Two user ids or screen_names must be supplied."
+#: actions/twitapifavorites.php:188 lib/mail.php:276
+#: actions/twitapifavorites.php:159 lib/mail.php:304
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
 msgstr ""
+"%1$s току-що отбеляза като любима бележката ви от %2$s.\n"
+"\n"
 
-#: ../index.php:57 index.php:57
-msgid "Unknown action"
-msgstr "Непознато действие"
+#: actions/twittersettings.php:27 actions/twittersettings.php:29
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
+msgstr ""
+"Добавяне на профила ви в Twitter за автоматично препращане на бележките ви и "
+"там."
+
+#: actions/twittersettings.php:41 actions/twittersettings.php:43
+msgid "Twitter settings"
+msgstr "Настройки за Twitter"
+
+#: actions/twittersettings.php:48 actions/twittersettings.php:50
+msgid "Twitter Account"
+msgstr "Профил в Twitter"
+
+#: actions/twittersettings.php:56 actions/twittersettings.php:58
+msgid "Current verified Twitter account."
+msgstr "Текущ проверен профил в Twitter"
+
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
+msgstr "Име в Twitter"
 
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-msgid "Updates by SMS"
-msgstr "Бележки през SMS"
+#: actions/twittersettings.php:65
+msgid "No spaces, please."
+msgstr "Без интервали, моля!"
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-msgid "Updates by instant messenger (IM)"
-msgstr "Бележки през месинджър (IM)"
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
+msgstr "Парола за Twitter"
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
+#: actions/twittersettings.php:72
+msgid "Automatically send my notices to Twitter."
+msgstr "Автоматично препращане на бележките ми към Twitter"
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
+#: actions/twittersettings.php:75
+msgid "Send local \"@\" replies to Twitter."
+msgstr "Препращане на локалните отговори с \"@\" и към Twitter"
 
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr "Качване на нова снимка за профила"
+#: actions/twittersettings.php:78
+msgid "Subscribe to my Twitter friends here."
+msgstr "Абониране за приятелите ми от Twitter тук"
 
-#: ../actions/invite.php:114 actions/invite.php:121
+#: actions/twittersettings.php:122 actions/twittersettings.php:216
 msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
 msgstr ""
-"Използвайте това поле, за да поканите "
-"приятели и колеги да използват услугата на сайта."
-
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr "Потребителят не е открит."
+"Потребителското име може да съдържа само цифри, малки и главни букви и добна "
+"черта. Може да е най-много 15 знака."
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "What timezone are you normally in?"
-msgstr "В кой часови пояс сте обикновено?"
+#: actions/twittersettings.php:128 actions/twittersettings.php:221
+msgid "Could not verify your Twitter credentials!"
+msgstr "Грешка при сверяване на данните ви с Twitter"
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-msgid "Yes"
-msgstr "Да"
+#: actions/twittersettings.php:137 actions/twittersettings.php:228
+#, php-format
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgstr "Грешка при извличане данните на профила \"%s\" от Twitter."
 
-#: ../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/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:234 actions/twittersettings.php:253
+msgid "Unable to save your Twitter settings!"
+msgstr "Грешка при записване настройките за Twitter"
 
-#: ../actions/invite.php:81 actions/invite.php:88
-msgid "You are already subscribed to these users:"
-msgstr "Вече сте абонирани за следните потребители:"
+#: actions/twittersettings.php:174 actions/twittersettings.php:261
+msgid "Twitter settings saved."
+msgstr "Настройките за Twitter са запазени."
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
-msgstr "С указания потребител не сте записани като приятели."
+#: actions/twittersettings.php:192 actions/twittersettings.php:272
+msgid "That is not your Twitter account."
+msgstr "Това не е вашият профил в Twitter."
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:280
+msgid "Couldn't remove Twitter user."
+msgstr "Грешка при премахване на профила от Twitter"
 
-#: ../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 ""
+#: actions/twittersettings.php:212 actions/twittersettings.php:284
+msgid "Twitter account removed."
+msgstr "Профилът от Twitter е премахнат."
 
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-msgid "You may not delete another user's status."
-msgstr "Не може да изтривате бележки на друг потребител."
+#: actions/twittersettings.php:225 actions/twittersettings.php:239
+#: actions/twittersettings.php:299 actions/twittersettings.php:310
+#: actions/twittersettings.php:322
+msgid "Couldn't save Twitter preferences."
+msgstr "Грешка при записване настройките за Twitter"
 
-#: ../actions/invite.php:31 actions/invite.php:31
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr "За да каните хора в %s, трябва да сте влезли."
+#: actions/twittersettings.php:245 actions/twittersettings.php:330
+msgid "Twitter preferences saved."
+msgstr "Настройките за Twitter са запазени."
 
-#: ../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/userauthorization.php:84
+msgid "Please check these details to make sure "
 msgstr ""
-"Ще ви уведомим при приемане на покана и "
-"записване в сайта. Благодарим ви за увеличаването на общността тук!"
-
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
-msgstr "изтриване"
 
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-msgid "unsupported file type"
-msgstr "неподдържан вид файл"
+#: actions/userauthorization.php:324
+msgid "The subscription has been authorized, but no "
+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."
-msgstr "Имаше проблем със сесията ви в сайта. Моля, опитайте отново!"
+#: actions/userauthorization.php:334
+msgid "The subscription has been rejected, but no "
+msgstr ""
 
-#: actions/disfavor.php:55
-msgid "This notice is not a favorite!"
-msgstr "Тази бележка не е отбелязана като любима!"
+#: classes/Channel.php:113 classes/Channel.php:129
+msgid "Command results"
+msgstr "Резултат от командата"
 
-#: actions/disfavor.php:63
-msgid "Could not delete favorite."
-msgstr "Грешка при изтриване на любима бележка."
+#: classes/Channel.php:148 classes/Channel.php:175
+msgid "Command complete"
+msgstr "Командата е изпълнена"
 
-#: actions/disfavor.php:72
-msgid "Favor"
-msgstr "Любимо"
+#: classes/Channel.php:158 classes/Channel.php:185
+msgid "Command failed"
+msgstr "Грешка при изпълнение на командата"
 
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
-msgstr "Изпращане на писмо при отбелязване на моя бележка като любима."
+#: classes/Command.php:39
+msgid "Sorry, this command is not yet implemented."
+msgstr "За съжаление тази команда все още не се поддържа."
 
-#: actions/emailsettings.php:95
-msgid "Send me email when someone sends me a private message."
-msgstr "Изпращане на писмо при ново лично съобщение."
+#: classes/Command.php:96
+#, php-format
+msgid "Subscriptions: %1$s\n"
+msgstr "Абонаменти: %1$s\n"
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142
-msgid "This notice is already a favorite!"
-msgstr "Тази бележка вече е отбелязана като любима!"
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:247
+msgid "User has no last notice"
+msgstr "Потребителят няма последна бележка"
 
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
-msgid "Could not create favorite."
-msgstr "Грешка при отбелязване като любима."
+#: classes/Command.php:146
+msgid "Notice marked as fave."
+msgstr "Бележката е отбелязана като любима."
 
-#: actions/favor.php:70
-msgid "Disfavor"
-msgstr "Нелюбимо"
+#: classes/Command.php:166
+#, fuzzy, php-format
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: classes/Command.php:169
 #, php-format
-msgid "%s favorite notices"
-msgstr "%s любими бележки"
+msgid "Fullname: %s"
+msgstr "Пълно име: %s"
 
-#: actions/favoritesrss.php:64
+#: classes/Command.php:172
 #, php-format
-msgid "Feed of favorite notices of %s"
-msgstr "Емисия с любимите бележки на %s"
+msgid "Location: %s"
+msgstr "Местоположение: %s"
 
-#: actions/inbox.php:28
+#: classes/Command.php:175
 #, php-format
-msgid "Inbox for %s - page %d"
-msgstr "Входяща кутия за %s — страница %d"
+msgid "Homepage: %s"
+msgstr "Домашна страница: %s"
 
-#: actions/inbox.php:30
+#: classes/Command.php:178
 #, php-format
-msgid "Inbox for %s"
-msgstr "Входяща кутия за %s"
+msgid "About: %s"
+msgstr "Относно: %s"
 
-#: actions/inbox.php:53
-msgid "This is your inbox, which lists your incoming private messages."
-msgstr "Това е входящата ви кутия с лични съобщения от други потребители."
+#: classes/Command.php:200 classes/Command.php:202
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
+msgstr ""
+"Съобщението е твърде дълго. Най-много може да е 140 знака, а сте въвели %d."
 
-#: actions/invite.php:178
+#: classes/Command.php:214 classes/Command.php:219
 #, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-msgstr "%1$s използва %2$s (%3$s) и ви кани да се присъедините.\n\n"
+msgid "Direct message to %s sent"
+msgstr "Прякото съобщение до %s е изпратено."
 
-#: actions/login.php:104
-msgid "Automatically login in the future; "
-msgstr "Автоматично влизане за в бъдеще:"
+#: classes/Command.php:216 classes/Command.php:221
+msgid "Error sending direct message."
+msgstr "Грешка при изпращане на прякото съобщение"
 
-#: actions/login.php:122
-msgid "For security reasons, please re-enter your "
-msgstr ""
+#: classes/Command.php:263 classes/Command.php:268
+msgid "Specify the name of the user to subscribe to"
+msgstr "Уточнете името на потребителя, за когото се абонирате."
 
-#: actions/login.php:126
-msgid "Login with your username and password. "
-msgstr "Влезте с името и паролата си."
+#: classes/Command.php:270 classes/Command.php:275
+#, php-format
+msgid "Subscribed to %s"
+msgstr "Абонирани сте за %s."
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-msgid "That's too long. Max message size is 140 chars."
-msgstr "Твърде дълго. Може да е най-много 140 знака."
+#: classes/Command.php:288 classes/Command.php:293
+msgid "Specify the name of the user to unsubscribe from"
+msgstr "Уточнете името на потребителя, от когото се отписвате."
 
-#: actions/newmessage.php:65
-msgid "No recipient specified."
-msgstr "Не е указан получател."
+#: classes/Command.php:295 classes/Command.php:300
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr "Отписани сте от %s."
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
-msgid "You can't send a message to this user."
-msgstr "Не може да изпращате съобщения до този потребител."
+#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:315
+#: classes/Command.php:335
+msgid "Command not yet implemented."
+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."
-msgstr ""
-"Не може да изпращате съобщения до себе си. "
-"По-добре си го кажете на себе си тихичко."
+#: classes/Command.php:313 classes/Command.php:318
+msgid "Notification off."
+msgstr "Уведомлението е изключено."
 
-#: actions/newmessage.php:108
-msgid "No such user"
-msgstr "Няма такъв потребител"
+#: classes/Command.php:315 classes/Command.php:320
+msgid "Can't turn off notification."
+msgstr "Грешка при изключване на уведомлението."
 
-#: actions/newmessage.php:117
-msgid "New message"
-msgstr "Ново съобщение"
+#: classes/Command.php:333 classes/Command.php:338
+msgid "Notification on."
+msgstr "Уведомлението е включено."
 
-#: actions/noticesearch.php:95
-msgid "Notice without matching profile"
-msgstr "Бележка без съответстващ профил"
+#: classes/Command.php:335 classes/Command.php:340
+msgid "Can't turn on notification."
+msgstr "Грешка при включване на уведомлението."
 
-#: actions/openidsettings.php:28
-#, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
-msgstr "[OpenID](%%doc.openid%%) ви позволява да влизате в различни сайтове"
+#: classes/Command.php:344 classes/Command.php:349
+msgid "Commands:\n"
+msgstr "Команди:\n"
 
-#: actions/openidsettings.php:46
-msgid "If you want to add an OpenID to your account, "
-msgstr ""
+#: classes/Message.php:53
+msgid "Could not insert message."
+msgstr "Грешка при вмъкване на съобщението."
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
-msgstr "Ако премахнете единствения си OpenID, няма да можете да влизате!"
+#: classes/Message.php:63
+msgid "Could not update message with new URI."
+msgstr "Грешка при обновяване на бележката с нов URL-адрес."
 
-#: actions/openidsettings.php:87
-msgid "You can remove an OpenID from your account "
-msgstr "Можете да премахнете OpenID от профила си"
+#: lib/gallery.php:46 lib/gallery.php:55
+msgid "User without matching profile in system."
+msgstr "Потребител без съответстващ профил в системата."
 
-#: actions/outbox.php:28
+#: lib/mail.php:147 lib/mail.php:141
 #, php-format
-msgid "Outbox for %s - page %d"
-msgstr "Изходяща кутия за %s — страница %d"
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+msgstr ""
 
-#: actions/outbox.php:30
+#: lib/mail.php:249 lib/mail.php:275
 #, php-format
-msgid "Outbox for %s"
-msgstr "Изходяща кутия за %s"
-
-#: actions/outbox.php:53
-msgid "This is your outbox, which lists private messages you have sent."
-msgstr "Това е изходящата ви кутия с лични съобщения до други потребители. "
+msgid "New private message from %s"
+msgstr "Ново лично съобщение от %s"
 
-#: actions/peoplesearch.php:28
+#: lib/mail.php:253 lib/mail.php:279
 #, php-format
 msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
-msgstr "Търсене на хора в %%site.name%% по име, местоположение или интереси."
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+msgstr ""
+"%1$s (%2$s) ви изпрати лично съобщение:\n"
+"\n"
 
-#: actions/profilesettings.php:27
-msgid "You can update your personal profile info here "
-msgstr "Можете а обновите личните си данни тук"
+#: lib/mailbox.php:43
+msgid "Only the user can read their own mailboxes."
+msgstr "Само потребителят може да отваря собствената си кутия."
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-msgid "User without matching profile"
-msgstr "Потребител без съответстващ профил"
+#: lib/openid.php:195
+msgid "This form should automatically submit itself. "
+msgstr "Тази форма сама ще се изпрати автоматично."
 
-#: actions/recoverpassword.php:91
-msgid "This confirmation code is too old. "
-msgstr "Кодът ви за потвърждение е твърде стар."
+#: lib/personal.php:65
+msgid "Favorites"
+msgstr "Любими"
 
-#: actions/recoverpassword.php:141
-msgid "If you've forgotten or lost your"
-msgstr ""
+#: lib/personal.php:66
+#, php-format
+msgid "%s's favorite notices"
+msgstr "Любими бележки на %s"
 
-#: actions/recoverpassword.php:154
-msgid "You've been identified. Enter a "
-msgstr ""
+#: lib/personal.php:66
+msgid "User"
+msgstr "Потребител"
 
-#: actions/recoverpassword.php:169
-msgid "Your nickname on this server, "
-msgstr "Псевдонимът ви на този сървър."
+#: lib/personal.php:75
+msgid "Inbox"
+msgstr "Входящи"
 
-#: actions/recoverpassword.php:271
-msgid "Instructions for recovering your password "
-msgstr "Упътване за възстановяване на паролата"
+#: lib/personal.php:76
+msgid "Your incoming messages"
+msgstr "Получените от вас съобщения"
 
-#: actions/recoverpassword.php:327
-msgid "New password successfully saved. "
-msgstr "Новата парола е записана."
+#: lib/personal.php:80
+msgid "Outbox"
+msgstr "Изходящи"
 
-#: actions/register.php:95
-msgid "Password must be 6 or more characters."
-msgstr "Паролата трябва да е 6 или повече знака."
+#: lib/personal.php:81
+msgid "Your sent messages"
+msgstr "Изпратените от вас съобщения"
 
-#: actions/register.php:216
-#, php-format
-msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
-msgstr ""
-"Поздравления, %s! И добре дошли в %%%%site.name%%%%. "
+#: lib/settingsaction.php:99 actions/deleteprofile.php:256
+msgid "Twitter"
+msgstr "Twitter"
 
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
-msgstr ""
+#: lib/settingsaction.php:100 actions/deleteprofile.php:257
+msgid "Twitter integration options"
+msgstr "Настройки за интеграция с Twitter"
 
-#: actions/remotesubscribe.php:51
-#, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr ""
+#: lib/util.php:1718 lib/util.php:2145
+msgid "To"
+msgstr "До"
 
-#: actions/showfavorites.php:61
-#, php-format
-msgid "Feed for favorites of %s"
-msgstr "Емисия с любимите бележки на %s"
+#: scripts/maildaemon.php:45
+msgid "Could not parse message."
+msgstr "Грешка при обработка на съобщението"
 
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-msgid "Could not retrieve favorite notices."
-msgstr "Грешка при изтегляне на любимите бележки"
+#: actions/block.php:45 actions/subedit.php:45 actions/unblock.php:45
+#, fuzzy
+msgid "No profile specified."
+msgstr "Не е указан получател."
 
-#: actions/showmessage.php:33
-msgid "No such message."
-msgstr "Няма такова съобщение"
+#: actions/block.php:52 actions/subedit.php:52 actions/tagother.php:45
+#: actions/unblock.php:52
+#, fuzzy
+msgid "No profile with that ID."
+msgstr "Не е открита бележка с такъв идентификатор."
 
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
-msgstr "Само подателят и получателят могат да четат това съобщение."
+#: actions/block.php:78
+#, fuzzy
+msgid "Block user"
+msgstr "Няма такъв потребител"
 
-#: actions/showmessage.php:61
-#, php-format
-msgid "Message to %1$s on %2$s"
-msgstr "Съобщение до %1$s в %2$s"
+#: actions/block.php:81
+#, fuzzy
+msgid "Are you sure you want to block this user? "
+msgstr "Наистина ли искате да изтриете тази бележка?"
 
-#: actions/showmessage.php:66
-#, php-format
-msgid "Message from %1$s on %2$s"
-msgstr "Съобщение от %1$s в %2$s"
+#: actions/block.php:117
+#, fuzzy
+msgid "You have already blocked this user."
+msgstr "Вече сте абонирани за следните потребители:"
 
-#: actions/showstream.php:154
-msgid "Send a message"
-msgstr "Изпращане на съобщение"
+#: actions/block.php:124
+msgid "Failed to save block information."
+msgstr ""
 
-#: actions/smssettings.php:312
-#, php-format
-msgid "Mobile carrier for your phone. "
-msgstr "Мобилен оператор на телефона ви."
+#: actions/deleteprofile.php:25
+#, fuzzy
+msgid "Code not yet ready."
+msgstr "Командата все още не се поддържа."
 
-#: actions/twitapidirect_messages.php:76
-#, php-format
-msgid "Direct messages to %s"
-msgstr "Преки съобщения до %s"
+#: actions/deleteprofile.php:36
+msgid "Export and delete your user information."
+msgstr ""
 
-#: actions/twitapidirect_messages.php:77
-#, php-format
-msgid "All the direct messages sent to %s"
-msgstr "Всички преки съобщения, изпратени до %s"
+#: actions/deleteprofile.php:88 actions/deleteprofile.php:119
+#, fuzzy
+msgid "Delete my account"
+msgstr "Създаване на нова сметка"
 
-#: actions/twitapidirect_messages.php:81
-msgid "Direct Messages You've Sent"
-msgstr "Изпратени от вас преки съобщения"
+#: actions/deleteprofile.php:89
+#, fuzzy
+msgid "Delete my account confirmation"
+msgstr "Грешка при изтриване потвърждението по е-поща."
 
-#: actions/twitapidirect_messages.php:82
-#, php-format
-msgid "All the direct messages sent from %s"
-msgstr "Всички преки съобщения, изпратени от %s"
+#: actions/deleteprofile.php:117
+#, fuzzy
+msgid "Check if you are sure you want to delete your account."
+msgstr "Наистина ли искате да изтриете тази бележка?"
 
-#: actions/twitapidirect_messages.php:128
-msgid "No message text!"
-msgstr "Липсва текст на съобщението"
+#: actions/deleteprofile.php:259 lib/settingsaction.php:102
+msgid "Other"
+msgstr ""
 
-#: actions/twitapidirect_messages.php:138
-msgid "Recipient user not found."
-msgstr "Получателят не е открит"
+#: actions/deleteprofile.php:260 lib/settingsaction.php:103
+msgid "Other options"
+msgstr ""
 
-#: actions/twitapidirect_messages.php:141
-msgid "Can't send direct messages to users who aren't your friend."
+#: actions/disfavor.php:72
+#, fuzzy
+msgid "Add to favorites"
+msgstr "Емисия с любимите бележки на %s"
+
+#: actions/emailsettings.php:98
+msgid "Allow friends to nudge me and send me an email."
 msgstr ""
-"Не може да изпращате преки съобщения до "
-"хора, които не са в списъка ви с приятели."
 
-#: actions/twitapifavorites.php:92
-#, php-format
-msgid "%s / Favorites from %s"
-msgstr "%s / Отбелязани като любими от %s"
+#: actions/facebookremove.php:54
+#, fuzzy
+msgid "Couldn't remove Facebook user."
+msgstr "Грешка при премахване на профила от Twitter"
 
-#: actions/twitapifavorites.php:95
-#, php-format
-msgid "%s updates favorited by %s / %s."
-msgstr "%s бележки отбелязани като любими от %s / %s."
+#: actions/favor.php:71
+#, fuzzy
+msgid "Disfavor favorite"
+msgstr "Нелюбимо"
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
-#, php-format
-msgid "%s added your notice as a favorite"
-msgstr "%s отбеляза бележката ви като любима"
+#: actions/favorited.php:31 lib/stream.php:45
+#, fuzzy
+msgid "Popular notices"
+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"
-msgstr "%1$s току-що отбеляза като любима бележката ви от %2$s.\n\n"
+#: actions/favorited.php:54
+#, fuzzy
+msgid "Showing recently popular notices"
+msgstr "Търсене в съдържанието на бележките"
 
-#: actions/twittersettings.php:27
-msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
+#: actions/featured.php:32 actions/featured.php:54 lib/stream.php:41
+msgid "Featured users"
 msgstr ""
-"Добавяне на профила ви в Twitter за "
-"автоматично препращане на бележките ви и там."
 
-#: actions/twittersettings.php:41
-msgid "Twitter settings"
-msgstr "Настройки за Twitter"
+#: actions/finishremotesubscribe.php:186
+msgid "That user has blocked you from subscribing."
+msgstr ""
 
-#: actions/twittersettings.php:48
-msgid "Twitter Account"
-msgstr "Профил в Twitter"
+#: actions/microsummary.php:39
+msgid "No current status"
+msgstr ""
 
-#: actions/twittersettings.php:56
-msgid "Current verified Twitter account."
-msgstr "Текущ проверен профил в Twitter"
+#: actions/newnotice.php:93
+#, fuzzy
+msgid "Notice posted"
+msgstr "Бележки"
 
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
-msgstr "Име в Twitter"
+#: actions/newnotice.php:116 classes/Channel.php:140
+msgid "Ajax Error"
+msgstr ""
 
-#: actions/twittersettings.php:65
-msgid "No spaces, please."
-msgstr "Без интервали, моля!"
+#: actions/nudge.php:52
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
-msgstr "Парола за Twitter"
+#: actions/nudge.php:61
+msgid "Nudge sent"
+msgstr ""
 
-#: actions/twittersettings.php:72
-msgid "Automatically send my notices to Twitter."
-msgstr "Автоматично препращане на бележките ми към Twitter"
+#: actions/othersettings.php:27
+msgid "Manage various other options."
+msgstr ""
 
-#: actions/twittersettings.php:75
-msgid "Send local \"@\" replies to Twitter."
-msgstr "Препращане на локалните отговори с \"@\" и към Twitter"
+#: actions/othersettings.php:33
+#, fuzzy
+msgid "Other Settings"
+msgstr "Настройки за Twitter"
 
-#: actions/twittersettings.php:78
-msgid "Subscribe to my Twitter friends here."
-msgstr "Абониране за приятелите ми от Twitter тук"
+#: actions/othersettings.php:35
+msgid "URL Auto-shortening"
+msgstr ""
 
-#: actions/twittersettings.php:122
-msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
+#: actions/othersettings.php:54
+#, fuzzy
+msgid "Service"
+msgstr "Търсене"
+
+#: actions/othersettings.php:54
+msgid "Automatic shortening service to use."
 msgstr ""
-"Потребителското име може да съдържа само "
-"цифри, малки и главни букви и добна черта. Може да е най-много 15 знака."
 
-#: actions/twittersettings.php:128
-msgid "Could not verify your Twitter credentials!"
-msgstr "Грешка при сверяване на данните ви с Twitter"
+#: actions/othersettings.php:155
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Името на езика е твърде дълго (може да е до 50 знака)."
 
-#: actions/twittersettings.php:137
-#, php-format
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
-msgstr "Грешка при извличане данните на профила \"%s\" от Twitter."
+#: actions/peopletag.php:33
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "Това не е правилен адрес на е-поща."
 
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-msgid "Unable to save your Twitter settings!"
-msgstr "Грешка при записване настройките за Twitter"
+#: actions/peopletag.php:45
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr ""
 
-#: actions/twittersettings.php:174
-msgid "Twitter settings saved."
-msgstr "Настройките за Twitter са запазени."
+#: actions/peopletag.php:87
+#, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+msgstr ""
 
-#: actions/twittersettings.php:192
-msgid "That is not your Twitter account."
-msgstr "Това не е вашият профил в Twitter."
+#: actions/profilesettings.php:92
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
 
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-msgid "Couldn't remove Twitter user."
-msgstr "Грешка при премахване на профила от Twitter"
+#: actions/profilesettings.php:246 actions/tagother.php:131
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Неправилен адрес на домашна страница '%s'"
 
-#: actions/twittersettings.php:212
-msgid "Twitter account removed."
-msgstr "Профилът от Twitter е премахнат."
+#: actions/profilesettings.php:328
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "Грешка при запазване на профила."
 
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-msgid "Couldn't save Twitter preferences."
-msgstr "Грешка при записване настройките за Twitter"
+#: actions/public.php:68
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
+msgstr ""
 
-#: actions/twittersettings.php:245
-msgid "Twitter preferences saved."
-msgstr "Настройките за Twitter са запазени."
+#: actions/public.php:90
+#, fuzzy
+msgid "Could not retrieve public stream."
+msgstr "Грешка при изтегляне на любимите бележки"
 
-#: actions/userauthorization.php:84
-msgid "Please check these details to make sure "
+#: actions/register.php:67 actions/register.php:177
+msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/userauthorization.php:324
-msgid "The subscription has been authorized, but no "
+#: actions/register.php:156
+msgid "With this form you can create a new account. "
 msgstr ""
 
-#: actions/userauthorization.php:334
-msgid "The subscription has been rejected, but no "
+#: actions/remotesubscribe.php:136 actions/remotesubscribe.php:141
+msgid "That's a local profile! Login to subscribe."
 msgstr ""
 
-#: classes/Channel.php:113
-msgid "Command results"
-msgstr "Резултат от командата"
+#: actions/subedit.php:68
+#, fuzzy
+msgid "You are not subscribed to that profile."
+msgstr "Не сте ни изпратили този профил"
 
-#: classes/Channel.php:148
-msgid "Command complete"
-msgstr "Командата е изпълнена"
+#: actions/subedit.php:81
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "Грешка при създаване на нов абонамент."
 
-#: classes/Channel.php:158
-msgid "Command failed"
-msgstr "Грешка при изпълнение на командата"
+#: actions/subscribe.php:53
+#, fuzzy
+msgid "Not a local user."
+msgstr "Няма такъв потребител"
 
-#: classes/Command.php:39
-msgid "Sorry, this command is not yet implemented."
-msgstr "За съжаление тази команда все още не се поддържа."
+#: actions/subscribe.php:67
+#, fuzzy
+msgid "Subscribed"
+msgstr "Абониране"
 
-#: classes/Command.php:96
-#, php-format
-msgid "Subscriptions: %1$s\n"
-msgstr "Абонаменти: %1$s\n"
+#: actions/subscriptions.php:72
+#, fuzzy
+msgid "Jabber"
+msgstr "Няма Jabber ID."
 
-#: classes/Command.php:125 classes/Command.php:242
-msgid "User has no last notice"
-msgstr "Потребителят няма последна бележка"
+#: actions/tagother.php:31
+#, fuzzy
+msgid "Not logged in"
+msgstr "Не сте влезли в системата."
 
-#: classes/Command.php:146
-msgid "Notice marked as fave."
-msgstr "Бележката е отбелязана като любима."
+#: actions/tagother.php:40
+#, fuzzy
+msgid "No id argument."
+msgstr "Няма такъв документ."
 
-#: classes/Command.php:166
-#, php-format
+#: actions/tagother.php:56
+msgid "Tag a person"
+msgstr ""
+
+#: actions/tagother.php:98
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
+msgstr ""
+
+#: actions/tagother.php:120
 #, fuzzy
-msgid "%1$s (%2$s)"
-msgstr "%1$s (%2$s)"
+msgid "No such profile."
+msgstr "Няма такава бележка."
 
-#: classes/Command.php:169
-#, php-format
-msgid "Fullname: %s"
-msgstr "Пълно име: %s"
+#: actions/tagother.php:146
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
 
-#: classes/Command.php:172
-#, php-format
-msgid "Location: %s"
-msgstr "Местоположение: %s"
+#: actions/tagother.php:153
+#, fuzzy
+msgid "Could not save tags."
+msgstr "Грешка при запазване данните на аватара"
 
-#: classes/Command.php:175
-#, php-format
-msgid "Homepage: %s"
-msgstr "Домашна страница: %s"
+#: actions/tagother.php:188
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
 
-#: classes/Command.php:178
-#, php-format
-msgid "About: %s"
-msgstr "Относно: %s"
+#: actions/tagrss.php:33
+#, fuzzy
+msgid "No such tag."
+msgstr "Няма такова съобщение"
 
-#: classes/Command.php:200
-#, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
+#: actions/tagrss.php:62
+#, fuzzy, php-format
+msgid "Microblog tagged with %s"
+msgstr "Бележки с етикет %s"
+
+#: actions/twitapiblocks.php:45
+msgid "Block user failed."
 msgstr ""
-"Съобщението е твърде дълго. Най-много "
-"може да е 140 знака, а сте въвели %d."
 
-#: classes/Command.php:214
-#, php-format
-msgid "Direct message to %s sent"
-msgstr "Прякото съобщение до %s е изпратено."
+#: actions/twitapiblocks.php:66
+msgid "Unblock user failed."
+msgstr ""
 
-#: classes/Command.php:216
-msgid "Error sending direct message."
-msgstr "Грешка при изпращане на прякото съобщение"
+#: actions/twitapiusers.php:45
+#, fuzzy
+msgid "Not found."
+msgstr "Не е открито."
 
-#: classes/Command.php:263
-msgid "Specify the name of the user to subscribe to"
-msgstr "Уточнете името на потребителя, за когото се абонирате."
+#: actions/twittersettings.php:63
+#, fuzzy
+msgid "Twitter user name"
+msgstr "Име в Twitter"
 
-#: classes/Command.php:270
-#, php-format
-msgid "Subscribed to %s"
-msgstr "Абонирани сте за %s."
+#: actions/twittersettings.php:67
+#, fuzzy
+msgid "Twitter password"
+msgstr "Парола за Twitter"
 
-#: classes/Command.php:288
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "Уточнете името на потребителя, от когото се отписвате."
+#: actions/twittersettings.php:129
+#, fuzzy
+msgid "Twitter Friends"
+msgstr "Настройки за Twitter"
 
-#: classes/Command.php:295
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr "Отписани сте от %s."
+#: actions/unblock.php:73
+#, fuzzy
+msgid "Error removing the block."
+msgstr "Грешка при запазване на потребител."
 
-#: classes/Command.php:310 classes/Command.php:330
-msgid "Command not yet implemented."
-msgstr "Командата все още не се поддържа."
+#: actions/unsubscribe.php:48
+#, fuzzy
+msgid "No profile id in request."
+msgstr "Сървърът не е върнал адрес на профила."
 
-#: classes/Command.php:313
-msgid "Notification off."
-msgstr "Уведомлението е изключено."
+#: actions/unsubscribe.php:55
+#, fuzzy
+msgid "No profile with that id."
+msgstr "Не е открита бележка с такъв идентификатор."
 
-#: classes/Command.php:315
-msgid "Can't turn off notification."
-msgstr "Грешка при изключване на уведомлението."
+#: actions/unsubscribe.php:69
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Отписване"
 
-#: classes/Command.php:333
-msgid "Notification on."
-msgstr "Уведомлението е включено."
+#: classes/Notice.php:100
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "Проблем при записване на бележката."
 
-#: classes/Command.php:335
-msgid "Can't turn on notification."
-msgstr "Грешка при включване на уведомлението."
+#: classes/Notice.php:105
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
 
-#: classes/Command.php:344
-msgid "Commands:\n"
-msgstr "Команди:\n"
+#: classes/Notice.php:112
+msgid "You are banned from posting notices on this site."
+msgstr ""
 
-#: classes/Message.php:53
-msgid "Could not insert message."
-msgstr "Грешка при вмъкване на съобщението."
+#: lib/gallery.php:98
+#, fuzzy
+msgid "Filter tags"
+msgstr "Емисия за етикета %s"
 
-#: classes/Message.php:63
-msgid "Could not update message with new URI."
-msgstr "Грешка при обновяване на бележката с нов URL-адрес."
+#: lib/gallery.php:104
+msgid "All"
+msgstr ""
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
-msgstr "Потребител без съответстващ профил в системата."
+#: lib/gallery.php:108
+#, fuzzy
+msgid "Tag"
+msgstr "Етикети"
+
+#: lib/gallery.php:109
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/gallery.php:110
+msgid "Go"
+msgstr ""
+
+#: lib/gallery.php:264
+#, fuzzy
+msgid "Subscriptions navigation"
+msgstr "Абонаменти"
 
-#: lib/mail.php:147
+#: lib/gallery.php:270 lib/gallery.php:292
+msgid "List"
+msgstr ""
+
+#: lib/gallery.php:280 lib/gallery.php:294
+msgid "Icons"
+msgstr ""
+
+#: lib/mail.php:92
 #, php-format
 msgid ""
-"You have a new posting address on %1$s.\n"
+"Hey, %s.\n"
+"\n"
+"Someone just entered this email address on %s.\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:249
+#: lib/mail.php:242
 #, php-format
-msgid "New private message from %s"
-msgstr "Ново лично съобщение от %s"
+msgid "You've been nudged by %s"
+msgstr ""
 
-#: lib/mail.php:253
+#: lib/mail.php:246
 #, php-format
 msgid ""
-"%1$s (%2$s) sent you a private message:\n"
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
 "\n"
-msgstr "%1$s (%2$s) ви изпрати лично съобщение:\n\n"
+msgstr ""
 
-#: lib/mailbox.php:43
-msgid "Only the user can read their own mailboxes."
-msgstr "Само потребителят може да отваря собствената си кутия."
+#: lib/profilelist.php:146
+msgid "(none)"
+msgstr ""
 
-#: lib/openid.php:195
-msgid "This form should automatically submit itself. "
-msgstr "Тази форма сама ще се изпрати автоматично."
+#: lib/stream.php:33
+msgid "Public"
+msgstr "Общ поток"
 
-#: lib/personal.php:65
-msgid "Favorites"
-msgstr "Любими"
+#: lib/stream.php:36 lib/stream.php:37
+#, fuzzy
+msgid "Recent tags"
+msgstr "Скорошни етикети"
 
-#: lib/personal.php:66
-#, php-format
-msgid "%s's favorite notices"
-msgstr "Любими бележки на %s"
+#: lib/stream.php:40
+msgid "Featured"
+msgstr ""
 
-#: lib/personal.php:66
-msgid "User"
-msgstr "Потребител"
+#: lib/stream.php:44
+#, fuzzy
+msgid "Popular"
+msgstr "Хора"
 
-#: lib/personal.php:75
-msgid "Inbox"
-msgstr "Входящи"
+#: lib/subs.php:51
+#, fuzzy
+msgid "User has blocked you."
+msgstr "Потребителят няма профил."
 
-#: lib/personal.php:76
-msgid "Your incoming messages"
-msgstr "Получените от вас съобщения"
+#: lib/util.php:2059
+#, fuzzy
+msgid "Send a nudge"
+msgstr "Изпращане на съобщение"
 
-#: lib/personal.php:80
-msgid "Outbox"
-msgstr "Изходящи"
+#: lib/util.php:2063
+msgid "Nudge sent!"
+msgstr ""
 
-#: lib/personal.php:81
-msgid "Your sent messages"
-msgstr "Изпратените от вас съобщения"
+#: lib/util.php:2194
+msgid "Block"
+msgstr ""
 
-#: lib/settingsaction.php:99
-msgid "Twitter"
-msgstr "Twitter"
+#: lib/util.php:2198
+msgid "Unblock"
+msgstr ""
 
-#: lib/settingsaction.php:100
-msgid "Twitter integration options"
-msgstr "Настройки за интеграция с Twitter"
+#~ msgid "Couldn't confirm email."
+#~ msgstr "Не може да се потвърди електронната поща."
 
-#: lib/util.php:1718
-msgid "To"
-msgstr "До"
+#~ msgid "Email address"
+#~ msgstr "Адрес на е-поща"
 
-#: scripts/maildaemon.php:45
-msgid "Could not parse message."
-msgstr "Грешка при обработка на съобщението"
+#~ msgid "Error inserting notice"
+#~ msgstr "Грешка при вмъкване на бележка"
+
+#~ msgid ""
+#~ "If you've forgotten or lost your password, you can get a new one sent  "
+#~ "the email address you have stored  in your account."
+#~ msgstr ""
+#~ "Ако сте забравили или изгубили паролата си, може да ви бъде изпратена "
+#~ "нова на е-пощата, записана в сметката ви."
diff --git a/ca_ES/LC_MESSAGES/laconica.po b/ca_ES/LC_MESSAGES/laconica.po
index 7de9466c6f..8588f0730e 100644
--- a/ca_ES/LC_MESSAGES/laconica.po
+++ b/ca_ES/LC_MESSAGES/laconica.po
@@ -6,46 +6,88 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-14 21:07+1200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Oscar Ciutat <oscarciutat@gmail.com>\n"
-"Language-Team: Catalan <LL@li.org>\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"
-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"POT-Creation-Date: 2009-01-12 12:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/noticesearchrss.php:64
+#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:61
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr "Cerca \"%s\" al flux"
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: actions/finishopenidlogin.php:88 actions/register.php:205
+#: actions/register.php:232
 msgid ""
-" except this private data: password, email address, IM address, phone "
-"number."
+" except this private data: password, email address, IM address, phone number."
 msgstr ""
 "excepte les següents dades privades: contrasenya, adreça de correu "
 "electrònic, adreça de missatgeria instantània, número de telèfon."
 
-#: ../actions/subscribe.php:84
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+#: lib/facebookaction.php:195 lib/noticelist.php:160
+msgid " from "
+msgstr ""
+
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: actions/twitapistatuses.php:341
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr ""
+
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
+
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:115
+#: lib/mail.php:117
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s ara està escoltant els teus avisos a %2$s."
 
-#: ../actions/subscribe.php:86
+#: ../lib/mail.php:126
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -62,126 +104,269 @@ msgstr ""
 "Atentament,\n"
 "%4$s.\n"
 
-#: ../actions/shownotice.php:45
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#: actions/twitapistatuses.php:344
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
+
+#: ../actions/shownotice.php:45 actions/shownotice.php:45
+#: actions/shownotice.php:73
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "estat de %1$s a %2$s"
 
-#: ../actions/publicrss.php:60
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../actions/publicrss.php:62 actions/publicrss.php:48
 #, php-format
 msgid "%s Public Stream"
 msgstr "Flux públic de %s"
 
-#: ../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/twitapistatuses.php:123
 #, php-format
 msgid "%s and friends"
 msgstr "%s i amics"
 
-#: ../lib/util.php:233
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:31
+#, php-format
+msgid "%s public timeline"
+msgstr ""
+
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:217
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:195
+#, php-format
+msgid "%s timeline"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:34
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+
+#: ../lib/util.php:257 lib/util.php:273 lib/util.php:284
 #, 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%%** és un servei de microblogging de "
-"[%%site.broughtby%%**](%%site.broughtbyurl%%)."
+"**%%site.name%%** és un servei de microblogging de [%%site.broughtby%%**](%%"
+"site.broughtbyurl%%)."
 
-#: ../lib/util.php:235
+#: ../lib/util.php:259 lib/util.php:275 lib/util.php:286
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** és un servei de microblogging."
 
-#: ../lib/util.php:250
+#: ../lib/util.php:274 lib/util.php:290 lib/util.php:301
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ""
 ". Els col·laboradors han de ser citats pel seu nom complet o sobrenom. "
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: ../actions/register.php:176
+#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
+#: actions/profilesettings.php:78
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
-"1-64 lletres en minúscula o números, sense signes de puntuació o "
-"espais"
+"1-64 lletres en minúscula o números, sense signes de puntuació o espais"
+
+#: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:193
+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/profilesettings.php:186
 msgid "6 or more characters"
 msgstr "6 o més caràcters"
 
-#: ../actions/recoverpassword.php:165
+#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 o més caràcters, i no te n'oblidis!"
 
-#: ../actions/imsettings.php:188
+#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:195
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, 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 ""
+"S'ha enviat un codi de confirmació a l'adreça de missatgeria instantània que "
+"has afegit. Has d'acceptar que %s et pugui enviar missatges."
+
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:234
+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 ""
+
+#: ../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/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:30
+#: actions/twitapidirect_messages.php:107 actions/twitapifavorites.php:83
+#: actions/twitapifavorites.php:99 actions/twitapifriendships.php:117
+#: actions/twitapihelp.php:42 actions/twitapistatuses.php:77
+#: actions/twitapistatuses.php:144 actions/twitapistatuses.php:224
+#: actions/twitapistatuses.php:234 actions/twitapistatuses.php:386
+#: actions/twitapistatuses.php:395 actions/twitapistatuses.php:421
+#: actions/twitapiusers.php:30
+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:39
+#: actions/twitapiaccount.php:89 actions/twitapiaccount.php:94
+#: actions/twitapidirect_messages.php:178 actions/twitapifavorites.php:139
+#: actions/twitapihelp.php:49 actions/twitapistatuses.php:549
+msgid "API method under construction."
 msgstr ""
-"S'ha enviat un codi de confirmació a l'adreça de missatgeria instantània "
-"que has afegit. Has d'acceptar que %s et pugui enviar missatges."
 
-#: ../lib/util.php:296
+#: ../lib/util.php:324 lib/util.php:340 lib/util.php:352
 msgid "About"
 msgstr "Sobre"
 
-#: ../actions/userauthorization.php:118
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
 msgid "Accept"
 msgstr "Acceptar"
 
-#: ../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/twittersettings.php:84
 msgid "Add"
 msgstr "Afegir"
 
-#: ../actions/openidsettings.php:43
+#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
 msgid "Add OpenID"
 msgstr "Afegir OpenID"
 
-#: ../actions/imsettings.php:39
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: actions/deleteprofile.php:248
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
 msgid "Address"
 msgstr "Adreça"
 
-#: ../actions/showstream.php:254
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
+
+#: ../actions/showstream.php:273 actions/showstream.php:288
+#: actions/showstream.php:336
 msgid "All subscriptions"
 msgstr "Totes les subscripcions"
 
-#: ../actions/publicrss.php:62
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
 #, php-format
 msgid "All updates for %s"
 msgstr "Totes les actualitzacions per a %s"
 
-#: ../actions/noticesearchrss.php:66
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:63
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "Totes les actualitzacions que corresponen a la frase a cercar \"%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
 msgid "Already logged in."
 msgstr "Ja estàs connectat."
 
-#: ../actions/subscribe.php:48
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:47
 msgid "Already subscribed!."
 msgstr "Ja estàs subscrit!"
 
-#: ../actions/userauthorization.php:76
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+msgid "Are you sure you want to delete this notice?"
+msgstr ""
+
+#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
 msgid "Authorize subscription"
 msgstr "Autoritzar subscripció"
 
-#: ../actions/login.php:100 ../actions/register.php:184
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192 actions/register.php:219
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Iniciar sessió automàticament en el futur; no utilitzar en ordinadors "
 "compartits!"
 
-#: ../actions/avatar.php:32
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:103
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
+
+#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: actions/profilesettings.php:34
 msgid "Avatar"
 msgstr "Avatar"
 
-#: ../actions/avatar.php:113
+#: ../actions/avatar.php:113 actions/profilesettings.php:350
+#: actions/profilesettings.php:379
 msgid "Avatar updated."
 msgstr "Avatar actualitzat."
 
-#: ../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 "
@@ -191,276 +376,464 @@ msgstr ""
 "Jabber/GTalk un missatge amb més instruccions. (Has afegit a %s a la teva "
 "llista d'amics?)"
 
-#: ../lib/util.php:1136
-msgid "Before »"
+#: ../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 ""
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+msgid "Awaiting confirmation on this phone number."
+msgstr ""
+
+#: ../lib/util.php:1318 lib/util.php:1452 lib/facebookaction.php:259
+#: lib/util.php:1792
+#, fuzzy
+msgid "Before »"
 msgstr "Anterior »"
 
-#: ../actions/profilesettings.php:52
+#: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: actions/profilesettings.php:82 actions/register.php:184
+#: actions/profilesettings.php:84 actions/register.php:211
 msgid "Bio"
 msgstr "Biografia"
 
-#: ../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:222 actions/register.php:98
 msgid "Bio is too long (max 140 chars)."
 msgstr "La biografia és massa llarga (màx. 140 caràcters)."
 
-#: ../actions/updateprofile.php:118
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+msgid "Can't delete this notice."
+msgstr ""
+
+#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "No es pot llegir l'URL de l'avatar '%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/profilesettings.php:433
 msgid "Can't save new password."
 msgstr "No es pot guardar la nova contrasenya."
 
-#: ../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
 msgid "Cancel"
 msgstr "Cancel·lar"
 
-#: ../lib/openid.php:121
+#: ../lib/openid.php:121 lib/openid.php:121
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Impossible crear una instància de l'objecte OpenID"
 
-#: ../actions/imsettings.php:154
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
 msgid "Cannot normalize that Jabber ID"
 msgstr "Impossible normalitzar aquest Jabber ID"
 
-#: ../actions/password.php:45
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:204
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/profilesettings.php:189
 msgid "Change"
 msgstr "Canviar"
 
-#: ../actions/password.php:32
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: actions/deleteprofile.php:245
+msgid "Change email handling"
+msgstr ""
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
 msgid "Change password"
 msgstr "Canviar contrasenya"
 
-#: ../actions/password.php:43 ../actions/recoverpassword.php:166
-#: ../actions/register.php:179
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr ""
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#: actions/deleteprofile.php:242
+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/profilesettings.php:187 actions/register.php:196
 msgid "Confirm"
 msgstr "Confirmar"
 
-#: ../actions/confirmaddress.php:84
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
 msgid "Confirm Address"
 msgstr "Confirmar adreça"
 
-#: ../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:259
 msgid "Confirmation cancelled."
 msgstr "Confirmació cancel·lada."
 
-#: ../actions/confirmaddress.php:38
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+msgid "Confirmation code"
+msgstr ""
+
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
 msgid "Confirmation code not found."
 msgstr "Codi de confirmació no trobat. "
 
-#: ../actions/finishopenidlogin.php:91
+#: ../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:97
 msgid "Connect"
 msgstr "Connectar-se"
 
-#: ../actions/finishopenidlogin.php:86
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
 msgid "Connect existing account"
 msgstr "Connectar-se a un compte existent"
 
-#: ../lib/util.php:304
+#: ../lib/util.php:332 lib/util.php:348 lib/util.php:360
 msgid "Contact"
 msgstr "Posar-se en contacte"
 
-#: ../lib/openid.php:178
+#: ../lib/openid.php:178 lib/openid.php:178
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "No s'ha pogut crear el formulari OpenID: %s"
 
-#: ../lib/openid.php:160
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:46 actions/twitapifriendships.php:62
+#, 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:39
+msgid "Could not follow user: User not found."
+msgstr ""
+
+#: ../lib/openid.php:160 lib/openid.php:160
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "No s'ha pogut redirigir al servidor: %s"
 
-#: ../actions/updateprofile.php:161
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
 msgid "Could not save avatar info"
 msgstr "No s'ha pogut guardar la informació de l'avatar"
 
-#: ../actions/updateprofile.php:154
+#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
 msgid "Could not save new profile info"
 msgstr "No s'ha pogut guardar la informació del nou perfil"
 
-#: ../actions/profilesettings.php:146
-msgid "Couldn't confirm email."
-msgstr "No s'ha pogut confirmar el correu electrònic."
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:70
+msgid "Could not subscribe other to you."
+msgstr ""
+
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:55
+msgid "Could not subscribe."
+msgstr ""
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr ""
 
 #: ../actions/finishremotesubscribe.php:99
+#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:112
 msgid "Couldn't convert request tokens to access tokens."
 msgstr "No s'han pogut convertir els senyals de petició a senyals d'accés."
 
-#: ../actions/subscribe.php:59
-msgid "Couldn't create subscription."
-msgstr "No s'ha pogut crear la subscripció."
-
-#: ../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/emailsettings.php:255
 msgid "Couldn't delete email confirmation."
 msgstr "No s'ha pogut eliminar la confirmació de correu electrònic."
 
-#: ../actions/unsubscribe.php:56
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:129
 msgid "Couldn't delete subscription."
 msgstr "No s'ha pogut eliminar la subscripció."
 
-#: ../actions/remotesubscribe.php:125
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+#: actions/twitapistatuses.php:82
+msgid "Couldn't find any statuses."
+msgstr ""
+
+#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
+#: actions/remotesubscribe.php:148
 msgid "Couldn't get a request token."
 msgstr "No s'ha pogut obtenir un senyal de petició."
 
-#: ../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:228
 msgid "Couldn't insert confirmation code."
 msgstr "No s'ha pogut inserir el codi de confirmació."
 
 #: ../actions/finishremotesubscribe.php:180
+#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:216
 msgid "Couldn't insert new subscription."
 msgstr "No s'ha pogut inserir una nova subscripció."
 
-#: ../actions/profilesettings.php:175
+#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
+#: actions/profilesettings.php:319 actions/twitapiaccount.php:74
 msgid "Couldn't save profile."
 msgstr "No s'ha pogut guardar el perfil."
 
-#: ../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:296
+msgid "Couldn't update user for autosubscribe."
+msgstr ""
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+#: actions/emailsettings.php:301 actions/emailsettings.php:315
+msgid "Couldn't update user record."
+msgstr ""
+
+#: ../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/emailsettings.php:179 actions/emailsettings.php:280
+#: actions/othersettings.php:173 actions/profilesettings.php:276
 msgid "Couldn't update user."
 msgstr "No s'ha pogut actualitzar l'usuari."
 
-#: ../actions/finishopenidlogin.php:84
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
 msgid "Create"
 msgstr "Crear"
 
-#: ../actions/finishopenidlogin.php:70
+#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
 msgid "Create a new user with this nickname."
 msgstr "Crear un nou usuari amb aquest sobrenom."
 
-#: ../actions/finishopenidlogin.php:68
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
 msgid "Create new account"
 msgstr "Crear nou compte"
 
-#: ../actions/finishopenidlogin.php:191
+#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+#: actions/finishopenidlogin.php:208
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Crear nou compte per a un OpenID que ja té un usuari."
 
-#: ../actions/imsettings.php:45
+#: ../actions/imsettings.php:45 actions/imsettings.php:46
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Adreça actual Jabber/Gtalk confirmada."
 
-#: ../actions/showstream.php:337
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+msgid "Current confirmed email address."
+msgstr ""
+
+#: ../actions/showstream.php:356 actions/showstream.php:367
+#: actions/showstream.php:418
 msgid "Currently"
 msgstr "Actualment"
 
-#: ../lib/util.php:893
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:87
 #, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Error de BD en inserir resposta: %s"
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: ../lib/util.php:1061 lib/util.php:1110 lib/util.php:1417
+#, php-format
+msgid "DB error inserting reply: %s"
+msgstr "Error de BD en inserir resposta: %s"
+
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+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:86 actions/register.php:213
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Explica'ns alguna cosa sobre tu i els teus interessos en 140 caràcters"
 
-#: ../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/deleteprofile.php:244 actions/register.php:199
+#: actions/register.php:202
 msgid "Email"
 msgstr "Correu electrònic"
 
-#: ../actions/profilesettings.php:46
-msgid "Email address"
-msgstr "Adreça de correu electrònic"
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+msgid "Email Address"
+msgstr ""
+
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+msgid "Email Settings"
+msgstr ""
 
-#: ../actions/profilesettings.php:102 ../actions/register.php:63
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:89
 msgid "Email address already exists."
 msgstr "L'adreça de correu electrònic ja existeix."
 
-#: ../lib/mail.php:82
+#: ../lib/mail.php:90 lib/mail.php:90
 msgid "Email address confirmation"
 msgstr "Confirmació de l'adreça de correu electrònic"
 
-#: ../actions/recoverpassword.php:176
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
+
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr ""
+
+#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
 msgid "Enter a nickname or email address."
 msgstr "Escriu un sobrenom o una adreça de correu electrònic."
 
-#: ../actions/userauthorization.php:136
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+msgid "Enter the code you received on your phone."
+msgstr ""
+
+#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
 msgid "Error authorizing token"
 msgstr "Error en autoritzar senyal"
 
-#: ../actions/finishopenidlogin.php:282
+#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
+#: actions/finishopenidlogin.php:274
 msgid "Error connecting user to OpenID."
 msgstr "Error en connectar usuari a OpenID."
 
-#: ../actions/finishaddopenid.php:78
+#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
 msgid "Error connecting user."
 msgstr "Error en connectar usuari."
 
 #: ../actions/finishremotesubscribe.php:151
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:164
 msgid "Error inserting avatar"
 msgstr "Error en inserir avatar"
 
 #: ../actions/finishremotesubscribe.php:143
+#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:156
 msgid "Error inserting new profile"
 msgstr "Error en inserir el nou perfil"
 
-#: ../actions/postnotice.php:88
-msgid "Error inserting notice"
-msgstr "Error en inserir avís"
-
 #: ../actions/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:180
 msgid "Error inserting remote profile"
 msgstr "Error en inserir perfil remot"
 
-#: ../actions/recoverpassword.php:201
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
 msgid "Error saving address confirmation."
 msgstr "Error en guardar confirmació de l'adreça."
 
-#: ../actions/userauthorization.php:139
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
 msgid "Error saving remote profile"
 msgstr "Error en guardar perfil remot"
 
-#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
+#: ../lib/openid.php:226 lib/openid.php:226
 msgid "Error saving the profile."
 msgstr "Error en guardar perfil."
 
-#: ../lib/openid.php:237
+#: ../lib/openid.php:237 lib/openid.php:237
 msgid "Error saving the user."
 msgstr "Error en guardar l'usuari."
 
-#: ../actions/password.php:80
+#: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/profilesettings.php:428
 msgid "Error saving user; invalid."
 msgstr "Error en guardar usuari; invàlid."
 
-#: ../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:54 actions/login.php:80
+#: actions/register.php:117
 msgid "Error setting user."
 msgstr "Error en configurar l'usuari."
 
-#: ../actions/finishaddopenid.php:83
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
 msgid "Error updating profile"
 msgstr "Error en actualitzar el perfil"
 
 #: ../actions/finishremotesubscribe.php:161
+#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:174
 msgid "Error updating remote profile"
 msgstr "Error en actualitzar el perfil remot"
 
-#: ../actions/recoverpassword.php:79
+#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
 msgid "Error with confirmation code."
 msgstr "Error amb el codi de confirmació."
 
-#: ../actions/finishopenidlogin.php:89
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
 msgid "Existing nickname"
 msgstr "Sobrenom ja existent."
 
-#: ../lib/util.php:298
+#: ../lib/util.php:326 lib/util.php:342 lib/util.php:354
 msgid "FAQ"
 msgstr "Preguntes freqüents"
 
-#: ../actions/avatar.php:115
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/profilesettings.php:381
 msgid "Failed updating avatar."
 msgstr "Error en actualitzar 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
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Feed per a amics de %s"
 
-#: ../actions/replies.php:61 ../actions/repliesrss.php:80
+#: ../actions/replies.php:65 ../actions/repliesrss.php:80
+#: actions/replies.php:65 actions/repliesrss.php:66
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Feed per a respostes a %s"
 
-#: ../actions/login.php:118
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:54
+#, php-format
+msgid "Feed for tag %s"
+msgstr ""
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+msgid "Find content of notices"
+msgstr ""
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+msgid "Find people on this site"
+msgstr ""
+
+#: ../actions/login.php:122
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -468,39 +841,58 @@ msgstr ""
 "Per raons de seguretat, si us plau torna a escriure el teu nom d'usuari i "
 "contrasenya abans de canviar la teva configuració."
 
-#: ../actions/profilesettings.php:44
+#: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: actions/profilesettings.php:77 actions/register.php:178
+#: actions/profilesettings.php:79 actions/register.php:205
 msgid "Full name"
 msgstr "Nom complet"
 
-#: ../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/profilesettings.php:219 actions/register.php:95
 msgid "Full name is too long (max 255 chars)."
 msgstr "El teu nom és massa llarg (màx. 255 caràcters)."
 
-#: ../lib/util.php:279
+#: ../lib/util.php:322 lib/util.php:338 lib/util.php:343 lib/util.php:350
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../lib/util.php:274
+#: ../lib/util.php:298 lib/util.php:314 lib/util.php:325
 msgid "Home"
 msgstr "Inici"
 
-#: ../actions/profilesettings.php:49
+#: ../actions/profilesettings.php:46 ../actions/register.php:167
+#: actions/profilesettings.php:79 actions/register.php:181
+#: actions/profilesettings.php:81 actions/register.php:208
 msgid "Homepage"
 msgstr "Pàgina personal"
 
-#: ../actions/profilesettings.php:87
+#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: actions/profilesettings.php:210 actions/register.php:83
+#: actions/profilesettings.php:216 actions/register.php:92
 msgid "Homepage is not a valid URL."
 msgstr "La pàgina personal no és un URL vàlid."
 
-#: ../actions/imsettings.php:61
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+#: actions/emailsettings.php:101
+msgid "I want to post notices by email."
+msgstr ""
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+#: actions/deleteprofile.php:253
+msgid "IM"
+msgstr ""
+
+#: ../actions/imsettings.php:60 actions/imsettings.php:61
 msgid "IM Address"
 msgstr "Adreça de missatgeria instantània"
 
-#: ../actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
 msgid "IM Settings"
 msgstr "Configuració de missatgeria instantània"
 
-#: ../actions/finishopenidlogin.php:88
+#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -516,24 +908,32 @@ msgstr ""
 "Si vols afegir un compte OpenID, introdueix-lo en el camp de sota i clica "
 "\"Afegir\"."
 
-#: ../actions/recoverpassword.php:122
+#: ../actions/recoverpassword.php:137
 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 ""
-"Si has oblidat o has perdut la teva contrasenya, pots rebre una de nova a "
-"l'adreça de correu electrònic que vas utilitzar per a registrar el teu "
-"compte."
 
-#: ../actions/password.php:69
+#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
+#: actions/emailsettings.php:68 actions/smssettings.php:76
+msgid "Incoming email"
+msgstr ""
+
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+#: actions/emailsettings.php:304
+msgid "Incoming email address removed."
+msgstr ""
+
+#: ../actions/password.php:69 actions/profilesettings.php:388
+#: actions/profilesettings.php:417
 msgid "Incorrect old password"
 msgstr "Contrasenya antiga incorrecta"
 
-#: ../actions/login.php:63
+#: ../actions/login.php:67 actions/login.php:67 actions/login.php:74
 msgid "Incorrect username or password."
 msgstr "Nom d'usuari o contrasenya incorrectes."
 
-#: ../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."
@@ -541,71 +941,99 @@ msgstr ""
 "S'han enviat instruccions per a recuperar la teva contrasenya a l'adreça de "
 "correu electrònic registrada."
 
-#: ../actions/updateprofile.php:113
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "L'URL de l'avatar '%s' és invàlid"
 
-#: ../actions/updateprofile.php:97
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "La pàgina personal '%s' és invàlida"
 
-#: ../actions/updateprofile.php:81
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "L'URL de la llicència '%s' és invàlid"
 
-#: ../actions/postnotice.php:61
+#: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:63
 msgid "Invalid notice content"
 msgstr "El contingut de l'avís és invàlid"
 
-#: ../actions/postnotice.php:67
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:69
 msgid "Invalid notice uri"
 msgstr "L'URI de l'avís '%s' és invàlid"
 
-#: ../actions/postnotice.php:72
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:74
 msgid "Invalid notice url"
 msgstr "L'URL de l'avís '%s' és invàlid"
 
-#: ../actions/updateprofile.php:86
+#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "L'URL del perfil '%s' és invàlid."
 
-#: ../actions/remotesubscribe.php:96
+#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
 msgid "Invalid profile URL (bad format)"
 msgstr "L'URL del perfil és invàlid (format incorrecte)"
 
 #: ../actions/finishremotesubscribe.php:77
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:78
 msgid "Invalid profile URL returned by server."
 msgstr "URL del perfil retornat pel servidor invàlid."
 
-#: ../actions/avatarbynickname.php:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
 msgid "Invalid size."
 msgstr "Mida invàlida."
 
-#: ../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:256 actions/register.php:112
+#: actions/register.php:130
 msgid "Invalid username or password."
 msgstr "Nom d'usuari o contrasenya invàlids."
 
-#: ../lib/util.php:237
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr ""
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
+
+#: ../lib/util.php:306 lib/util.php:322 lib/util.php:332
+msgid "Invite"
+msgstr ""
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr ""
+
+#: ../lib/util.php:261 lib/util.php:277 lib/util.php:288
 #, 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 ""
-"Utilitza el software de microblogging [Laconica](http://laconi.ca), versió "
-"%s, disponible sota la [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"Utilitza el software de microblogging [Laconica](http://laconi.ca), versió %"
+"s, disponible sota la [GNU Affero General Public License](http://www.fsf.org/"
+"licensing/licenses/agpl-3.0.html)."
 
-#: ../actions/imsettings.php:164
+#: ../actions/imsettings.php:173 actions/imsettings.php:181
 msgid "Jabber ID already belongs to another user."
 msgstr "Aquest Jabber ID ja està sent utilitzat per un altre usuari."
 
-#: ../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 "
@@ -615,339 +1043,559 @@ msgstr ""
 "assegura't d'afegir a %s a la teva llista d'amics en el teu client de "
 "missatgeria instantània o a GTalk."
 
-#: ../actions/profilesettings.php:55
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
+msgid "Language"
+msgstr ""
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr ""
+
+#: ../actions/profilesettings.php:52 ../actions/register.php:173
+#: actions/profilesettings.php:85 actions/register.php:187
+#: actions/profilesettings.php:87 actions/register.php:214
 msgid "Location"
 msgstr "Ubicació"
 
-#: ../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/profilesettings.php:225 actions/register.php:101
 msgid "Location is too long (max 255 chars)."
 msgstr "La ubicació és massa llarga (màx. 255 caràcters)."
 
-#: ../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/login.php:104 actions/login.php:113 actions/openidlogin.php:88
+#: lib/util.php:336
 msgid "Login"
 msgstr "Inici de sessió"
 
-#: ../actions/openidlogin.php:44
+#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:60
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Inici de sessió amb un compte [OpenID](%%doc.openid%%)."
 
-#: ../actions/login.php:122
+#: ../actions/login.php:126
 #, 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 ""
 "Inicia una sessió amb el teu nom d'usuari i la teva contrasenya. Encara no "
 "tens un nom d'usuari? [Crea](%%action.register%%) un nou compte o prova "
 "[OpenID] (%%action.openidlogin%%)."
 
-#: ../lib/util.php:284
+#: ../lib/util.php:308 lib/util.php:324 lib/util.php:334
 msgid "Logout"
 msgstr "Sortir"
 
-#: ../actions/login.php:106
+#: ../actions/register.php:166 actions/register.php:180
+#: actions/register.php:207
+msgid "Longer name, preferably your \"real\" name"
+msgstr ""
+
+#: ../actions/login.php:110 actions/login.php:110 actions/login.php:118
 msgid "Lost or forgotten password?"
 msgstr "Contrasenya oblidada o perduda?"
 
-#: ../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 ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr ""
+
+#: ../actions/showstream.php:300 actions/showstream.php:315
+#: actions/showstream.php:363
 msgid "Member since"
 msgstr "Membre des de"
 
-#: ../actions/userrss.php:70
+#: ../actions/userrss.php:70 actions/userrss.php:67
 #, php-format
 msgid "Microblog by %s"
 msgstr "Microblog de %s"
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
+#: ../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 ""
+
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php:85 actions/register.php:202
+#: actions/register.php:229
 msgid "My text and files are available under "
 msgstr "El meu text i els meus fitxers estan disponibles sota "
 
-#: ../actions/finishopenidlogin.php:71
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+msgid "New"
+msgstr ""
+
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:138
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+#: actions/emailsettings.php:318
+msgid "New incoming email address added."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
 msgid "New nickname"
 msgstr "Nou sobrenom"
 
-#: ../actions/newnotice.php:100
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:141
 msgid "New notice"
 msgstr "Nou avís"
 
-#: ../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/profilesettings.php:185
 msgid "New password"
 msgstr "Nova contrasenya"
 
-#: ../actions/recoverpassword.php:275
+#: ../actions/recoverpassword.php:314
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nova contrasenya guardada correctament. Has iniciat una sessió."
 
-#: ../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:108 actions/profilesettings.php:76
+#: actions/register.php:192
 msgid "Nickname"
 msgstr "Sobrenom"
 
-#: ../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/finishopenidlogin.php:192 actions/profilesettings.php:231
+#: actions/register.php:85
 msgid "Nickname already in use. Try another one."
 msgstr "Aquest sobrenom ja existeix. Prova un altre. "
 
-#: ../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:182 actions/profilesettings.php:209
+#: actions/register.php:83
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "El sobrenom ha de tenir només lletres minúscules i números i no pot tenir "
 "espais."
 
-#: ../actions/finishopenidlogin.php:170
+#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:187
 msgid "Nickname not allowed."
 msgstr "Sobrenom no permès."
 
-#: ../actions/remotesubscribe.php:72
+#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
 msgid "Nickname of the user you want to follow"
 msgstr "Sobrenom de l'usuari que vols seguir"
 
-#: ../actions/recoverpassword.php:147
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
 msgid "Nickname or email"
 msgstr "Sobrenom o correu electrònic"
 
-#: ../actions/imsettings.php:147
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:104
+msgid "No"
+msgstr ""
+
+#: ../actions/imsettings.php:156 actions/imsettings.php:164
 msgid "No Jabber ID."
 msgstr "Cap Jabber ID."
 
-#: ../actions/userauthorization.php:128
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
 msgid "No authorization request!"
 msgstr "Cap petició d'autorització!"
 
-#: ../actions/confirmaddress.php:33
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+msgid "No carrier selected."
+msgstr ""
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+msgid "No code entered"
+msgstr ""
+
+#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
 msgid "No confirmation code."
 msgstr "Cap codi de confirmació."
 
-#: ../actions/newnotice.php:49
+#: ../actions/newnotice.php:44 actions/newmessage.php:53
+#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:52
+#: actions/newnotice.php:53
 msgid "No content!"
 msgstr "Cap contingut!"
 
-#: ../actions/userbyid.php:27
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+#: actions/emailsettings.php:197
+msgid "No email address."
+msgstr ""
+
+#: ../actions/userbyid.php:32 actions/userbyid.php:32
 msgid "No id."
 msgstr "Cap identificador."
 
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+#: actions/emailsettings.php:292
+msgid "No incoming email address."
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:65
+#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:66
 msgid "No nickname provided by remote server."
 msgstr "Cap sobrenom retornat pel servidor remot."
 
-#: ../actions/avatarbynickname.php:27
+#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 msgid "No nickname."
 msgstr "Cap sobrenom."
 
-#: ../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:243
 msgid "No pending confirmation to cancel."
 msgstr "Cap confirmació pendent per a cancel·lar."
 
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+msgid "No phone number."
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:72
+#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:73
 msgid "No profile URL returned by server."
 msgstr "Cap URL de perfil retornar pel servidor."
 
-#: ../actions/recoverpassword.php:189
+#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
 msgid "No registered email address for that user."
 msgstr "Cap adreça de correu electrònic registrada per aquest usuari."
 
-#: ../actions/userauthorization.php:48
+#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
 msgid "No request found!"
 msgstr "Cap petició trobada!"
 
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
+#: actions/noticesearch.php:69 actions/peoplesearch.php:69
+#: actions/noticesearch.php:68 actions/peoplesearch.php:59
 msgid "No results"
 msgstr "Cap resultat"
 
-#: ../actions/avatarbynickname.php:32
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
 msgid "No size."
 msgstr "Cap mida."
 
-#: ../actions/openidsettings.php:135
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:109
+#: actions/twitapistatuses.php:438
+msgid "No status found with that ID."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:411
+msgid "No status with that ID found."
+msgstr ""
+
+#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
 msgid "No such OpenID."
 msgstr "No existeix aquest compte OpenID."
 
-#: ../actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29
 msgid "No such document."
 msgstr "No existeix aquest document."
 
-#: ../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:38
+#: actions/shownotice.php:114
 msgid "No such notice."
 msgstr "No existeix aquest avís."
 
-#: ../actions/recoverpassword.php:56
+#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
 msgid "No such recovery code."
 msgstr "No existeix aquest codi de recuperació."
 
-#: ../actions/postnotice.php:56
+#: ../actions/postnotice.php:56 actions/postnotice.php:57
 msgid "No such subscription"
 msgstr "No existeix aquesta subscripció"
 
 #: ../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/showstream.php:157
+#: classes/Command.php:208 classes/Command.php:242 lib/gallery.php:85
+#: lib/subs.php:105
 msgid "No such user."
 msgstr "No existeix aquest usuari."
 
-#: ../lib/gallery.php:76
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr ""
+
+#: ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
 msgstr "Ningú a mostrar!"
 
-#: ../actions/recoverpassword.php:60
+#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
 msgid "Not a recovery code."
 msgstr "No és un codi de recuperació."
 
-#: ../actions/imsettings.php:158
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+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:423 lib/twitterapi.php:450
+#: lib/twitterapi.php:534
+msgid "Not a supported data format."
+msgstr ""
+
+#: ../actions/imsettings.php:167 actions/imsettings.php:175
 msgid "Not a valid Jabber ID"
 msgstr "Jabber ID no vàlid"
 
-#: ../lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131
 msgid "Not a valid OpenID."
 msgstr "OpenID no vàlid."
 
-#: ../actions/profilesettings.php:75 ../actions/register.php:53
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+#: actions/emailsettings.php:208
+msgid "Not a valid email address"
+msgstr ""
+
+#: ../actions/register.php:63 actions/register.php:70 actions/register.php:79
 msgid "Not a valid email address."
 msgstr "Adreça de correu electrònic no vàlida."
 
-#: ../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/profilesettings.php:212 actions/register.php:87
 msgid "Not a valid nickname."
 msgstr "Sobrenom no vàlid."
 
-#: ../actions/remotesubscribe.php:118
+#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
 msgid "Not a valid profile URL (incorrect services)."
 msgstr "URL de perfil no vàlid (serveis incorrectes)."
 
-#: ../actions/remotesubscribe.php:111
+#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr "URL de perfil no vàlid (XRDS no definit)."
 
-#: ../actions/remotesubscribe.php:104
+#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
 msgid "Not a valid profile URL (no YADIS document)."
 msgstr "URL de perfil no vàlid (cap document YADIS)."
 
-#: ../actions/avatar.php:95
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: actions/profilesettings.php:361
 msgid "Not an image or corrupt file."
 msgstr "No és una imatge o és un fitxer corrupte."
 
 #: ../actions/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:52
 msgid "Not authorized."
 msgstr "No autoritzat."
 
 #: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38
 msgid "Not expecting this response!"
 msgstr "Resposta inesperada!"
 
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
-#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+#: actions/twitapistatuses.php:304
+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:31 actions/newnotice.php:30
+#: actions/nudge.php:30 actions/subedit.php:31 actions/unblock.php:31
 msgid "Not logged in."
 msgstr "No connectat."
 
-#: ../actions/unsubscribe.php:43
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:117
 msgid "Not subscribed!."
 msgstr "No estàs subscrit!"
 
-#: ../actions/showstream.php:82
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+msgid "Notice Search"
+msgstr ""
+
+#: ../actions/showstream.php:82 actions/showstream.php:82
+#: actions/showstream.php:111 actions/showstream.php:118
+#: actions/showstream.php:123
 #, php-format
 msgid "Notice feed for %s"
 msgstr "Feed d'avisos de %s"
 
-#: ../actions/shownotice.php:39
+#: ../actions/shownotice.php:39 actions/shownotice.php:39
+#: actions/shownotice.php:45
 msgid "Notice has no profile"
 msgstr "Avís sense perfil"
 
-#: ../actions/showstream.php:297
+#: ../actions/showstream.php:316 actions/showstream.php:331
+#: actions/showstream.php:379
 msgid "Notices"
 msgstr "Avisos"
 
-#: ../actions/password.php:39
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
+#, php-format
+msgid "Notices tagged with %s"
+msgstr ""
+
+#: ../actions/password.php:39 actions/profilesettings.php:178
+#: actions/profilesettings.php:183
 msgid "Old password"
 msgstr "Antiga contrasenya"
 
-#: ../lib/util.php:288
+#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
+#: lib/util.php:330 actions/deleteprofile.php:247 lib/util.php:340
 msgid "OpenID"
 msgstr "OpenID"
 
-#: ../actions/finishopenidlogin.php:61
+#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
 msgid "OpenID Account Setup"
 msgstr "Configuració del compte OpenID"
 
-#: ../lib/openid.php:180
+#: ../lib/openid.php:180 lib/openid.php:180
 msgid "OpenID Auto-Submit"
 msgstr "Auto-enviament d'OpenID"
 
 #: ../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/finishopenidlogin.php:150 actions/openidlogin.php:76
 msgid "OpenID Login"
 msgstr "Accés OpenID"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
+#: actions/openidlogin.php:74 actions/openidsettings.php:50
+#: actions/openidlogin.php:82
 msgid "OpenID URL"
 msgstr "URL OpenID"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
+#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 msgid "OpenID authentication cancelled."
 msgstr "Autenticació OpenID cancel·lada."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
+#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "Autenticació OpenID fallida: %s."
 
-#: ../lib/openid.php:133
+#: ../lib/openid.php:133 lib/openid.php:133
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "Error OpenID: %s"
 
-#: ../actions/openidsettings.php:144
+#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
 msgid "OpenID removed."
 msgstr "OpenID eliminat."
 
-#: ../actions/openidsettings.php:37
+#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
 msgid "OpenID settings"
 msgstr "Configuració OpenID"
 
-#: ../actions/avatar.php:84
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: actions/profilesettings.php:350
 msgid "Partial upload."
 msgstr "Càrrega parcial."
 
-#: ../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/login.php:109 actions/register.php:194
 msgid "Password"
 msgstr "Contrasenya"
 
-#: ../actions/recoverpassword.php:249
+#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
 msgid "Password and confirmation do not match."
 msgstr "La contrasenya i la confirmació no coincideixen."
 
-#: ../actions/recoverpassword.php:245
+#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
 msgid "Password must be 6 chars or more."
 msgstr "La contrasenya ha de tenir 6 o més caràcters."
 
-#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
+#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 msgid "Password recovery requested"
 msgstr "Recuperació de contrasenya sol·licitada"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:274
+#: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: actions/profilesettings.php:408 actions/recoverpassword.php:326
+#: actions/profilesettings.php:437
 msgid "Password saved."
 msgstr "Contrasenya guardada."
 
-#: ../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/profilesettings.php:409 actions/register.php:107
 msgid "Passwords don't match."
 msgstr "Les contrasenyes no coincideixen."
 
-#: ../actions/peoplesearch.php:33
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+msgid "People"
+msgstr ""
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+msgid "People Search"
+msgstr ""
+
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
 msgid "People search"
 msgstr "Cerca de gent"
 
-#: ../lib/stream.php:44
+#: ../lib/stream.php:50 lib/personal.php:50
 msgid "Personal"
 msgstr "Personal"
 
-#: ../actions/userauthorization.php:77
+#: ../actions/invite.php:133 actions/invite.php:141
+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, "
@@ -957,91 +1605,135 @@ msgstr ""
 "subscriure't als avisos d'aquest usuari. Si no has demanat subscriure't als "
 "avisos de ningú, clica \"Cancel·lar\"."
 
-#: ../actions/imsettings.php:74
+#: ../actions/imsettings.php:73 actions/imsettings.php:74
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Enviar un avís quan el meu estat Jabber/GTalk canvii."
 
-#: ../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
 msgid "Preferences"
 msgstr "Preferències"
 
-#: ../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:185 actions/othersettings.php:179
 msgid "Preferences saved."
 msgstr "Preferències guardades."
 
-#: ../lib/util.php:300
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
+msgid "Preferred language"
+msgstr ""
+
+#: ../lib/util.php:328 lib/util.php:344 lib/util.php:356
 msgid "Privacy"
 msgstr "Privacitat"
 
-#: ../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:139 classes/Notice.php:149
 msgid "Problem saving notice."
 msgstr "Problema en guardar l'avís."
 
-#: ../lib/stream.php:54
+#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
+#: lib/settingsaction.php:84 actions/deleteprofile.php:241
 msgid "Profile"
 msgstr "Perfil"
 
-#: ../actions/remotesubscribe.php:73
+#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
 msgid "Profile URL"
 msgstr "URL del perfil"
 
-#: ../actions/profilesettings.php:34
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
 msgid "Profile settings"
 msgstr "Configuració del perfil"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
+#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
+#: actions/postnotice.php:52 actions/updateprofile.php:53
 msgid "Profile unknown"
 msgstr "Perfil desconegut"
 
-#: ../lib/util.php:276
-msgid "Public"
-msgstr "Públic"
-
-#: ../actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:77
 msgid "Public Stream Feed"
 msgstr "Feed del flux públic"
 
-#: ../actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 lib/stream.php:34
 msgid "Public timeline"
 msgstr "Línia temporal pública"
 
-#: ../actions/recoverpassword.php:151
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:104
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
 msgid "Recover"
 msgstr "Recuperar"
 
-#: ../actions/recoverpassword.php:141
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
 msgid "Recover password"
 msgstr "Recuperar contrasenya"
 
-#: ../actions/recoverpassword.php:67
+#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
 msgid "Recovery code for unknown user."
 msgstr "Codi de recuperació d'un usuari desconegut."
 
-#: ../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:181 actions/register.php:234 lib/util.php:338
 msgid "Register"
 msgstr "Registrar-se"
 
-#: ../actions/userauthorization.php:119
+#: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:173
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:241
+msgid "Registration successful"
+msgstr ""
+
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
 msgid "Reject"
 msgstr "Rebutjar"
 
-#: ../actions/login.php:99 ../actions/register.php:183
+#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
+#: actions/register.php:190 actions/login.php:110 actions/openidlogin.php:85
+#: actions/register.php:217
 msgid "Remember me"
 msgstr "Recorda'm"
 
-#: ../actions/updateprofile.php:69
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
 msgid "Remote profile with no matching profile"
 msgstr "Perfil remot sense perfil corresponent"
 
-#: ../actions/remotesubscribe.php:65
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
 msgid "Remote subscribe"
 msgstr "Subscripció remota"
 
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php:48 actions/emailsettings.php:76
+#: actions/imsettings.php:49 actions/openidsettings.php:108
+#: actions/smssettings.php:50 actions/smssettings.php:84
+#: actions/twittersettings.php:59 actions/twittersettings.php:61
 msgid "Remove"
 msgstr "Eliminar"
 
-#: ../actions/openidsettings.php:68
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
 msgid "Remove OpenID"
 msgstr "Eliminar OpenID"
 
@@ -1053,40 +1745,73 @@ msgstr ""
 "Si elimines el teu únic OpenID no podràs tornar a entrar! Si necessites "
 "eliminar-lo, afegeix un altre abans."
 
-#: ../lib/stream.php:49
+#: ../lib/stream.php:55 lib/personal.php:55
 msgid "Replies"
 msgstr "Respostes"
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:50
+#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
+#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #, php-format
 msgid "Replies to %s"
 msgstr "Respostes a %s"
 
-#: ../actions/recoverpassword.php:168
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
 msgid "Reset"
 msgstr "Restablir"
 
-#: ../actions/recoverpassword.php:158
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
 msgid "Reset password"
 msgstr "Restablir contrasenya"
 
-#: ../actions/recoverpassword.php:167 ../actions/register.php:180
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/deleteprofile.php:250 actions/subscriptions.php:73
+msgid "SMS"
+msgstr ""
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+msgid "SMS Phone number"
+msgstr ""
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:230
+msgid "SMS confirmation"
+msgstr ""
+
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
 msgid "Same as password above"
 msgstr "Igual a la contrasenya de dalt"
 
-#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
+#: ../actions/register.php:156 actions/register.php:170
+#: actions/register.php:197
+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/twittersettings.php:83 actions/emailsettings.php:107
+#: actions/othersettings.php:56 actions/profilesettings.php:106
+#: actions/subscriptions.php:74 actions/tagother.php:100
+#: actions/twittersettings.php:82
 msgid "Save"
 msgstr "Guardar"
 
-#: ../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/util.php:327
 msgid "Search"
 msgstr "Cercar"
 
-#: ../actions/noticesearch.php:80
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:84
 msgid "Search Stream Feed"
 msgstr "Feed del flux de cerca"
 
-#: ../actions/noticesearch.php:30
+#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
+#: actions/noticesearch.php:29
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -1101,117 +1826,222 @@ 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 ""
-"Troba gent a %%site.name%% per nom, ubicació o interessos. Separa els "
-"termes de cerca amb espais; han de ser majors a 3 caràcters."
+"Troba gent a %%site.name%% per nom, ubicació o interessos. Separa els termes "
+"de cerca amb espais; han de ser majors a 3 caràcters."
 
-#: ../lib/util.php:982
-msgid "Send"
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+msgid "Select a carrier"
+msgstr ""
+
+#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
+#: lib/util.php:1306 lib/util.php:1731 lib/util.php:1646 lib/util.php:2158
+msgid "Send"
 msgstr "Enviar"
 
-#: ../actions/imsettings.php:71
+#: ../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."
+msgstr ""
+
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+msgid "Send me notices of new subscriptions through email."
+msgstr ""
+
+#: ../actions/imsettings.php:70 actions/imsettings.php:71
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Enviar-me avisos per Jabber/GTalk."
 
-#: ../lib/util.php:282
+#: ../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 ""
+
+#: ../lib/util.php:304 lib/util.php:320 lib/util.php:330
 msgid "Settings"
 msgstr "Configuració"
 
-#: ../actions/profilesettings.php:183
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:336
 msgid "Settings saved."
 msgstr "Configuració guardada."
 
-#: ../actions/finishaddopenid.php:66
+#: ../actions/tag.php:60 actions/tag.php:60 actions/tag.php:59
+msgid "Showing most popular tags from the last week"
+msgstr ""
+
+#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
 msgid "Someone else already has this OpenID."
 msgstr "Algú ja té aquest OpenID."
 
 #: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
+#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
 msgid "Something weird happened."
 msgstr "Alguna cosa estranya ha passat."
 
-#: ../lib/util.php:302
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr ""
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: ../lib/util.php:330 lib/util.php:346 lib/util.php:358
 msgid "Source"
 msgstr "Font"
 
-#: ../actions/showstream.php:277
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:359
 msgid "Statistics"
 msgstr "Estadístiques"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
+#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
+#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
+#: actions/finishopenidlogin.php:199 actions/finishopenidlogin.php:267
 msgid "Stored OpenID not found."
 msgstr "No s'ha trobat l'OpenID emmagatzemat."
 
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:172
-#: ../actions/showstream.php:181
+#: ../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:254 lib/util.php:2078
 msgid "Subscribe"
 msgstr "Subscriure's"
 
-#: ../actions/showstream.php:294 ../actions/subscribers.php:27
+#: ../actions/showstream.php:313 ../actions/subscribers.php:27
+#: actions/showstream.php:328 actions/subscribers.php:27
+#: actions/showstream.php:376 lib/gallery.php:136 lib/gallery.php:137
 msgid "Subscribers"
 msgstr "Subscriptors"
 
-#: ../actions/userauthorization.php:309
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
 msgid "Subscription authorized"
 msgstr "Subscripció autoritzada"
 
-#: ../actions/userauthorization.php:319
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
 msgid "Subscription rejected"
 msgstr "Subscripció rebutjada"
 
-#: ../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:288 actions/showstream.php:370 lib/gallery.php:131
+#: lib/gallery.php:132
 msgid "Subscriptions"
 msgstr "Subscripcions"
 
-#: ../actions/avatar.php:87
+#: ../actions/avatar.php:87 actions/profilesettings.php:324
+#: actions/profilesettings.php:353
 msgid "System error uploading file."
 msgstr "Error del sistema en pujar el fitxer."
 
-#: ../actions/noticesearch.php:34
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317 actions/profilesettings.php:90 actions/showstream.php:382
+#: actions/tag.php:40 actions/tagother.php:96 actions/tagother.php:162
+#: lib/profilelist.php:126 lib/profilelist.php:128
+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:33
 msgid "Text search"
 msgstr "Cerca de text"
 
-#: ../actions/openidsettings.php:140
+#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
 msgid "That OpenID does not belong to you."
 msgstr "Aquest OpenID no és teu."
 
-#: ../actions/confirmaddress.php:52
+#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
 msgid "That address has already been confirmed."
 msgstr "Aquesta adreça ja ha estat confirmada."
 
-#: ../actions/confirmaddress.php:43
+#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
 msgid "That confirmation code is not for you!"
 msgstr "Aquest codi de confirmació no és per a tu!"
 
-#: ../actions/avatar.php:80
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:214
+msgid "That email address already belongs to another user."
+msgstr ""
+
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: actions/profilesettings.php:346
 msgid "That file is too big."
 msgstr "Aquest fitxer és massa gran."
 
-#: ../actions/imsettings.php:161
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
 msgid "That is already your Jabber ID."
 msgstr "Aquest ja és el teu Jabber ID."
 
-#: ../actions/imsettings.php:224
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:211
+msgid "That is already your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+msgid "That is already your phone number."
+msgstr ""
+
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
 msgid "That is not your Jabber ID."
 msgstr "Aquest no és el teu Jabber ID."
 
-#: ../actions/imsettings.php:201
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+#: actions/emailsettings.php:270
+msgid "That is not your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+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:247
 msgid "That is the wrong IM address."
 msgstr "Aquesta adreça de missatgeria instantània és incorrecta."
 
-#: ../actions/newnotice.php:52
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+msgid "That is the wrong confirmation number."
+msgstr ""
+
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+msgid "That phone number already belongs to another user."
+msgstr ""
+
+#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: actions/newnotice.php:49 actions/twitapistatuses.php:330
+#: actions/newnotice.php:61 actions/twitapistatuses.php:271
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "Massa llarg. La longitud màxima és de 140 caràcters."
 
-#: ../actions/confirmaddress.php:86
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+#: actions/twitapiaccount.php:55
+msgid "That's too long. Max notice size is 255 chars."
+msgstr ""
+
+#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "L'adreça \"%s\" ha estat confirmada per al teu compte."
 
-#: ../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:285
 msgid "The address was removed."
 msgstr "L'adreça ha estat eliminada."
 
-#: ../actions/userauthorization.php:311
+#: ../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 "
@@ -1221,35 +2051,39 @@ msgstr ""
 "Llegeix de nou les instruccions per a saber com autoritzar la subscripció. "
 "El teu identificador de subscripció és:"
 
-#: ../actions/userauthorization.php:321
+#: ../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 ""
-"S'ha rebutjat la subscripció, però no s'ha enviat un URL de retorn. "
-"Llegeix de nou les instruccions per a saber com rebutjar la subscripció "
-"completament."
+"S'ha rebutjat la subscripció, però no s'ha enviat un URL de retorn. Llegeix "
+"de nou les instruccions per a saber com rebutjar la subscripció completament."
 
-#: ../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 "Aquestes són les persones que escolten els avisos de %s."
 
-#: ../actions/subscribers.php:33
+#: ../actions/subscribers.php:33 actions/subscribers.php:33
 msgid "These are the people who listen to your notices."
 msgstr "Aquestes són les persones que escolten els teus avisos."
 
-#: ../actions/subscriptions.php:35
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Aquestes són les persones que %s escolta."
 
-#: ../actions/subscriptions.php:33
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
 msgid "These are the people whose notices you listen to."
 msgstr "Aquestes són les persones que escoltes."
 
-#: ../actions/recoverpassword.php:87
+#: ../actions/invite.php:89 actions/invite.php:96
+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 "Aquest codi de confirmació és massa vell. Si us plau comença de nou."
 
@@ -1258,58 +2092,100 @@ msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
 msgstr ""
-"Aquest formulari s'hauria d'enviar automàticament. En cas contrari, clica "
-"el botó d'enviament per a anar al teu proveïdor d'OpenID."
+"Aquest formulari s'hauria d'enviar automàticament. En cas contrari, clica el "
+"botó d'enviament per a anar al teu proveïdor d'OpenID."
 
-#: ../actions/finishopenidlogin.php:56
+#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
 #, 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 ""
-"Aquesta és la primera vegada que accedeixes a %s. Per tant, hem de "
-"connectar el teu OpenID a un compte local. Pots crear-ne un de nou o "
-"connectar-te amb el teu, si el tens."
+"Aquesta és la primera vegada que accedeixes a %s. Per tant, hem de connectar "
+"el teu OpenID a un compte local. Pots crear-ne un de nou o connectar-te amb "
+"el teu, si el tens."
+
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:94
+#: actions/twitapifriendships.php:82 actions/twitapistatuses.php:428
+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:46
+#: actions/twitapidirect_messages.php:117 actions/twitapifriendships.php:30
+#: actions/twitapistatuses.php:239
+msgid "This method requires a POST."
+msgstr ""
 
-#: ../lib/util.php:147
+#: ../lib/util.php:164 lib/util.php:246 lib/util.php:257
 msgid "This page is not available in a media type you accept"
 msgstr "Aquesta pàgina no està disponible en un tipus de mèdia que acceptis."
 
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
+msgid "Timezone"
+msgstr ""
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr ""
+
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"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 ""
 "Per a subscriure't, pots [iniciar una sessió](%%action.login%%), o "
 "[registrar](%%action.register%%) un nou compte. Si ja tens un en un [servei "
 "de microblogging compatible](%%doc.openmublog%%), escriu l'URL del teu "
 "perfil a sota."
 
-#: ../actions/profilesettings.php:51
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: actions/twitapifriendships.php:128
+msgid "Two user ids or screen_names must be supplied."
+msgstr ""
+
+#: ../actions/profilesettings.php:48 ../actions/register.php:169
+#: actions/profilesettings.php:81 actions/register.php:183
+#: actions/profilesettings.php:83 actions/register.php:210
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL del teu web, blog o perfil en un altre lloc"
 
-#: ../actions/remotesubscribe.php:74
+#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL del teu perfil en un altre servei de microblogging compatible"
 
-#: ../actions/imsettings.php:105 ../actions/recoverpassword.php:39
+#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
+#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
+#: actions/emailsettings.php:144 actions/imsettings.php:118
+#: actions/recoverpassword.php:39 actions/smssettings.php:143
+#: actions/twittersettings.php:108 actions/emailsettings.php:147
+#: actions/othersettings.php:146 actions/twittersettings.php:199
 msgid "Unexpected form submission."
 msgstr "Enviament de formulari inesperat."
 
-#: ../actions/recoverpassword.php:237
+#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
 msgid "Unexpected password reset."
 msgstr "Restabliment de contrasenya inesperat."
 
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:58
+#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:59
 msgid "Unknown version of OMB protocol."
 msgstr "Versió desconeguda del protocol OMB."
 
-#: ../lib/util.php:245
+#: ../lib/util.php:269 lib/util.php:285 lib/util.php:296
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
@@ -1317,24 +2193,50 @@ msgstr ""
 "Tret que s'especifiqui el contrari, el contingut d'aquest web és propietat "
 "dels seus col·laboradors i està disponible sota la"
 
-#: ../actions/confirmaddress.php:48
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr "Tipus d'adreça %s desconeguda"
 
-#: ../actions/showstream.php:193
+#: ../actions/showstream.php:209 actions/showstream.php:219
+#: actions/showstream.php:267 lib/util.php:2094
 msgid "Unsubscribe"
 msgstr "Cancel·lar subscripció"
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
+#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
+#: actions/postnotice.php:45 actions/updateprofile.php:46
 msgid "Unsupported OMB version"
 msgstr "Versió OMB no suportada"
 
-#: ../actions/avatar.php:105
+#: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: actions/profilesettings.php:371
 msgid "Unsupported image file format."
 msgstr "Format d'imatge no suportat."
 
-#: ../actions/avatar.php:68
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: actions/deleteprofile.php:251
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: actions/deleteprofile.php:254
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/twitapistatuses.php:126
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:198
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
+
+#: ../actions/avatar.php:68 actions/profilesettings.php:161
+#: actions/profilesettings.php:166
 msgid "Upload"
 msgstr "Pujar"
 
@@ -1346,109 +2248,200 @@ msgid ""
 "share."
 msgstr ""
 "Puja un nou \"avatar\" (imatge d'usuari) aquí. No pots editar la imatge una "
-"vegada carregada, per tant assegura't que sigui més o menys quadrada. A "
-"més, ha d'estar sota la llicència del lloc web. Utilitza una foto que "
-"sigui teva i que vulguis compartir."
+"vegada carregada, per tant assegura't que sigui més o menys quadrada. A més, "
+"ha d'estar sota la llicència del lloc web. Utilitza una foto que sigui teva "
+"i que vulguis compartir."
+
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr ""
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:182
+#: ../actions/invite.php:114 actions/invite.php:121
+msgid ""
+"Use this form to invite your friends and colleagues to use this service."
+msgstr ""
+
+#: ../actions/register.php:159 ../actions/register.php:162
+#: actions/register.php:173 actions/register.php:176 actions/register.php:200
+#: actions/register.php:203
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
-"Utilitzat només per a actualitzacions, anuncis i recuperació de "
-"contrasenyes"
+"Utilitzat només per a actualitzacions, anuncis i recuperació de contrasenyes"
 
 #: ../actions/finishremotesubscribe.php:86
+#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:92
 msgid "User being listened to doesn't exist."
 msgstr "L'usuari que vols seguir no existeix."
 
 #: ../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/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/showstream.php:57
+#: actions/twitapiaccount.php:63 actions/twitapifavorites.php:40
+#: actions/twitapistatuses.php:163 actions/twitapistatuses.php:492
+#: lib/twitterapi.php:590
 msgid "User has no profile."
 msgstr "L'usuari no té perfil."
 
-#: ../actions/remotesubscribe.php:71
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
 msgid "User nickname"
 msgstr "Sobrenom de l'usuari"
 
-#: ../lib/util.php:969
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../lib/util.php:1159 lib/util.php:1293 lib/util.php:1630
 #, php-format
 msgid "What's up, %s?"
 msgstr "Què tal, %s?"
 
-#: ../actions/profilesettings.php:57
+#: ../actions/profilesettings.php:54 ../actions/register.php:175
+#: actions/profilesettings.php:87 actions/register.php:189
+#: actions/profilesettings.php:89 actions/register.php:216
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "On ets, per exemple \"Ciutat, Estat (o Regió), País\""
 
-#: ../actions/updateprofile.php:127
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Tipus d'imatge incorrecte per a '%s'"
 
-#: ../actions/updateprofile.php:122
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Mida d'imatge incorrecta per a '%s'"
 
-#: ../actions/finishaddopenid.php:64
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+#: actions/block.php:105
+msgid "Yes"
+msgstr ""
+
+#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
 msgid "You already have this OpenID!"
 msgstr "Ja tens aquest OpenID!"
 
-#: ../actions/recoverpassword.php:31
+#: ../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
 msgid "You are already logged in!"
 msgstr "Ja t'has connectat!"
 
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:102
+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 "Pots canviar la teva contrasenya aquí. Tria una de bona!"
 
-#: ../actions/register.php:164
+#: ../actions/register.php:135 actions/register.php:145
 msgid "You can create a new account to start posting notices."
 msgstr "Pots crear un nou compte i començar a enviar avisos."
 
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
 #: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr "Pots eliminar un OpenID del teu compte clicant el botó \"Eliminar\"."
 
-#: ../actions/imsettings.php:28
+#: ../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 ""
-"Pots enviar i rebre avisos via [missatges instantanis](%%doc.im%%) de "
-"Jabber/GTalk. Configura la teva adreça i opcions a sota."
+"Pots enviar i rebre avisos via [missatges instantanis](%%doc.im%%) de Jabber/"
+"GTalk. Configura la teva adreça i opcions a sota."
 
 #: ../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 ""
 "Pots actualitzar la informació del teu perfil personal per a que la gent "
 "sàpiga més sobre tu."
 
 #: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
+#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
+#: actions/finishremotesubscribe.php:83 actions/finishremotesubscribe.php:99
 msgid "You can use the local subscription!"
 msgstr "Pots utilitzar la subscripció local!"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:51
+#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
+#: actions/finishopenidlogin.php:38 actions/register.php:68
+#: actions/register.php:77
 msgid "You can't register if you don't agree to the license."
 msgstr "No pots registrar-te si no estàs d'acord amb la llicència."
 
-#: ../actions/updateprofile.php:62
+#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
 msgid "You did not send us that profile"
 msgstr "No ens vas enviar aquest perfil"
 
-#: ../actions/recoverpassword.php:134
+#: ../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 ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: actions/twitapistatuses.php:455
+msgid "You may not delete another user's status."
+msgstr ""
+
+#: ../actions/invite.php:31 actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+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!"
+msgstr ""
+
+#: ../actions/recoverpassword.php:149
 msgid "You've been identified. Enter a  new password below. "
 msgstr "T'has identificat. Escriu una nova contrasenya a continuació."
 
-#: ../actions/openidlogin.php:67
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:84
 msgid "Your OpenID URL"
 msgstr "El teu URL OpenID"
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:164
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 "El teu nom d'usuari en aquest servidor, o la teva adreça de correu "
@@ -1463,784 +2456,85 @@ msgstr ""
 "[OpenID](%%doc.openid%%) et permet accedir a molts llocs amb un mateix "
 "compte d'usuari. Administra els teus OpenID associats aquí."
 
-#: ../lib/util.php:814
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:1287
 msgid "a few seconds ago"
 msgstr "fa pocs segons"
 
-#: ../lib/util.php:826
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:1299
 #, php-format
 msgid "about %d days ago"
 msgstr "fa %d dies"
 
-#: ../lib/util.php:822
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:1295
 #, php-format
 msgid "about %d hours ago"
 msgstr "fa %d hores"
 
-#: ../lib/util.php:818
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:1291
 #, php-format
 msgid "about %d minutes ago"
 msgstr "fa %d minuts"
 
-#: ../lib/util.php:830
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:1303
 #, php-format
 msgid "about %d months ago"
 msgstr "fa %d mesos"
 
-#: ../lib/util.php:824
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:1297
 msgid "about a day ago"
 msgstr "fa un dia"
 
-#: ../lib/util.php:816
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:1289
 msgid "about a minute ago"
 msgstr "fa un minut"
 
-#: ../lib/util.php:828
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:1301
 msgid "about a month ago"
 msgstr "fa un mes"
 
-#: ../lib/util.php:832
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:1305
 msgid "about a year ago"
 msgstr "fa un any"
 
-#: ../lib/util.php:820
-msgid "about an hour ago"
-msgstr "fa una hora"
-
-#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
-#: ../lib/stream.php:101
-msgid "in reply to..."
-msgstr "en resposta a..."
-
-#: ../actions/noticesearch.php:133 ../actions/showstream.php:390
-#: ../lib/stream.php:108
-msgid "reply"
-msgstr "resposta"
-
-#: ../actions/password.php:44
-msgid "same as password above"
-msgstr "repeteix la contrasenya anterior"
-
-#: ../lib/util.php:1127
-msgid "« After"
-msgstr "« Següent"
-
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr ""
-
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
-
-#: ../actions/invite.php:168 actions/invite.php:176
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
-
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
-
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
-#, php-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#, php-format
-msgid "%s public timeline"
-msgstr ""
-
-#: ../lib/mail.php:206 lib/mail.php:212
-#, php-format
-msgid "%s status"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#, php-format
-msgid "%s timeline"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
-msgstr ""
-
-#: ../actions/register.php:213
-msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
-msgstr ""
-
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-
-#: ../actions/register.php:154 actions/register.php:168
-msgid "6 or more characters. Required."
-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 ""
-
-#: ../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/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!"
-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 ""
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-msgid "Add or remove OpenIDs"
-msgstr ""
-
-#: ../actions/invite.php:131 actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
-msgstr ""
-
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-msgid "Are you sure you want to delete this notice?"
-msgstr ""
-
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr ""
-
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
-msgid "Can't delete this notice."
-msgstr ""
-
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-msgid "Cannot normalize that email address"
-msgstr ""
-
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr ""
-
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
-msgstr ""
-
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-msgid "Change your profile settings"
-msgstr ""
-
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-msgid "Confirmation code"
-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/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
-msgstr ""
-
-#: ../lib/subs.php:54 lib/subs.php:61
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: ../lib/subs.php:46 lib/subs.php:46
-msgid "Could not subscribe."
-msgstr ""
-
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-msgid "Could not update user with confirmed email address."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-msgid "Couldn't find any statuses."
-msgstr ""
-
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-msgid "Couldn't update user for autosubscribe."
-msgstr ""
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-msgid "Couldn't update user record."
-msgstr ""
-
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-msgid "Current confirmed email address."
-msgstr ""
-
-#: ../classes/Notice.php:72 classes/Notice.php:86
-#, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr ""
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-msgid "Delete notice"
-msgstr ""
-
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-msgid "Email Address"
-msgstr ""
-
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-msgid "Email Settings"
-msgstr ""
-
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-msgid "Email address, like \"UserName@example.org\""
-msgstr ""
-
-#: ../actions/invite.php:129 actions/invite.php:137
-msgid "Email addresses"
-msgstr ""
-
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
-msgstr ""
-
-#: ../actions/tag.php:55 actions/tag.php:55
-#, php-format
-msgid "Feed for tag %s"
-msgstr ""
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr ""
-
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr ""
-
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-msgid "I want to post notices by email."
-msgstr ""
-
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
-msgstr ""
-
-#: ../actions/recoverpassword.php:137
-msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
-"email address you have stored  in your account."
-msgstr ""
-
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-msgid "Incoming email"
-msgstr ""
-
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-msgid "Incoming email address removed."
-msgstr ""
-
-#: ../actions/invite.php:55 actions/invite.php:62
-#, php-format
-msgid "Invalid email address: %s"
-msgstr ""
-
-#: ../actions/invite.php:79 actions/invite.php:86
-msgid "Invitation(s) sent"
-msgstr ""
-
-#: ../actions/invite.php:97 actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
-msgstr ""
-
-#: ../lib/util.php:306 lib/util.php:322
-msgid "Invite"
-msgstr ""
-
-#: ../actions/invite.php:123 actions/invite.php:130
-msgid "Invite new users"
-msgstr ""
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Language"
-msgstr ""
-
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-msgid "Language is too long (max 50 chars)."
-msgstr ""
-
-#: ../actions/register.php:166 actions/register.php:180
-msgid "Longer name, preferably your \"real\" name"
-msgstr ""
-
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-#: actions/emailsettings.php:81 actions/smssettings.php:89
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
-
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-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 ""
-
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-msgid "New"
-msgstr ""
-
-#: ../lib/mail.php:144 lib/mail.php:144
-#, php-format
-msgid "New email address for posting to %s"
-msgstr ""
-
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-msgid "New incoming email address added."
-msgstr ""
-
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-msgid "No"
-msgstr ""
-
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-msgid "No carrier selected."
-msgstr ""
-
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-msgid "No code entered"
-msgstr ""
-
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-msgid "No email address."
-msgstr ""
-
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-msgid "No incoming email address."
-msgstr ""
-
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-msgid "No phone number."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-msgid "No status found with that ID."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-msgid "No status with that ID found."
-msgstr ""
-
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-msgid "No user with that email address or username."
-msgstr ""
-
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-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
-msgid "Not a supported data format."
-msgstr ""
-
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-msgid "Not a valid email address"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-msgid "Not found"
-msgstr ""
-
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-msgid "Notice Search"
-msgstr ""
-
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81
-#, php-format
-msgid "Notices tagged with %s"
-msgstr ""
-
-#: ../actions/invite.php:135 actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-msgid "People"
-msgstr ""
-
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-msgid "People Search"
-msgstr ""
-
-#: ../actions/invite.php:133 actions/invite.php:141
-msgid "Personal message"
-msgstr ""
-
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Preferred language"
-msgstr ""
-
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
-
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-msgid "Publish a MicroID for my email address."
-msgstr ""
-
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr ""
-
-#: ../actions/register.php:28 actions/register.php:28
-msgid "Registration not allowed."
-msgstr ""
-
-#: ../actions/register.php:200 actions/register.php:214
-msgid "Registration successful"
-msgstr ""
-
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
-msgstr ""
-
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-msgid "SMS Phone number"
-msgstr ""
-
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-msgid "SMS Settings"
-msgstr ""
-
-#: ../lib/mail.php:219 lib/mail.php:225
-msgid "SMS confirmation"
-msgstr ""
-
-#: ../actions/register.php:156 actions/register.php:170
-msgid "Same as password above. Required."
-msgstr ""
-
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-msgid "Select a carrier"
-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."
-msgstr ""
-
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-msgid "Send me notices of new subscriptions through email."
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr ""
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
-msgstr ""
-
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317
-msgid "Tags"
-msgstr ""
-
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr ""
-
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr ""
-
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-msgid "That is already your email address."
-msgstr ""
-
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-msgid "That is already your phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-msgid "That is not your email address."
-msgstr ""
-
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-msgid "That is not your phone number."
-msgstr ""
-
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-msgid "That is the wrong confirmation number."
-msgstr ""
-
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-msgid "That phone number already belongs to another user."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-msgid "That's too long. Max notice size is 255 chars."
-msgstr ""
-
-#: ../actions/invite.php:89 actions/invite.php:96
-msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
-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."
-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."
-msgstr ""
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "Timezone"
-msgstr ""
-
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-msgid "Timezone not selected."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-msgid "Two user ids or screen_names must be supplied."
-msgstr ""
-
-#: ../index.php:57 index.php:57
-msgid "Unknown action"
-msgstr ""
-
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-msgid "Updates by SMS"
-msgstr ""
-
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr ""
-
-#: ../actions/invite.php:114 actions/invite.php:121
-msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
-msgstr ""
-
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr ""
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "What timezone are you normally in?"
-msgstr ""
-
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-msgid "Yes"
-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/invite.php:81 actions/invite.php:88
-msgid "You are already subscribed to these users:"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
-msgstr ""
-
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-msgid "You may not delete another user's status."
-msgstr ""
-
-#: ../actions/invite.php:31 actions/invite.php:31
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-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!"
-msgstr ""
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:1293
+msgid "about an hour ago"
+msgstr "fa una hora"
 
 #: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
+#: actions/showstream.php:441 lib/stream.php:99 lib/noticelist.php:211
 msgid "delete"
 msgstr ""
 
+#: ../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:135
+#: lib/facebookaction.php:202 lib/noticelist.php:189
+msgid "in reply to..."
+msgstr "en resposta a..."
+
+#: ../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:142
+#: lib/noticelist.php:199
+msgid "reply"
+msgstr "resposta"
+
+#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/profilesettings.php:188
+msgid "same as password above"
+msgstr "repeteix la contrasenya anterior"
+
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+#: actions/twitapistatuses.php:543
 msgid "unsupported file type"
 msgstr ""
 
+#: ../lib/util.php:1309 lib/util.php:1443 lib/facebookaction.php:251
+#: lib/util.php:1783
+#, fuzzy
+msgid "« After"
+msgstr "« Següent"
+
 #: actions/deletenotice.php:74 actions/disfavor.php:43
 #: actions/emailsettings.php:127 actions/favor.php:45
 #: actions/finishopenidlogin.php:33 actions/imsettings.php:105
@@ -2250,6 +2544,12 @@ msgstr ""
 #: 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:38 actions/deleteprofile.php:127 actions/disfavor.php:47
+#: actions/emailsettings.php:130 actions/favor.php:49 actions/login.php:45
+#: actions/newmessage.php:44 actions/newnotice.php:36 actions/nudge.php:47
+#: actions/othersettings.php:139 actions/profilesettings.php:49
+#: actions/subedit.php:38 actions/tagother.php:113
+#: actions/twittersettings.php:188 actions/unblock.php:38
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -2273,12 +2573,14 @@ msgstr ""
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142
+#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:54
+#: actions/twitapifavorites.php:115
 msgid "This notice is already a favorite!"
 msgstr ""
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
+#: classes/Command.php:132 actions/favor.php:61
+#: actions/twitapifavorites.php:122
 msgid "Could not create favorite."
 msgstr ""
 
@@ -2287,11 +2589,12 @@ msgid "Disfavor"
 msgstr ""
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:62
 #, php-format
 msgid "%s favorite notices"
 msgstr ""
 
-#: actions/favoritesrss.php:64
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:66
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr ""
@@ -2317,47 +2620,50 @@ msgid ""
 "\n"
 msgstr ""
 
-#: actions/login.php:104
+#: actions/login.php:104 actions/login.php:111 actions/openidlogin.php:86
 msgid "Automatically login in the future; "
 msgstr ""
 
-#: actions/login.php:122
+#: actions/login.php:122 actions/login.php:130
 msgid "For security reasons, please re-enter your "
 msgstr ""
 
-#: actions/login.php:126
+#: actions/login.php:126 actions/login.php:134
 msgid "Login with your username and password. "
 msgstr ""
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+#: actions/newmessage.php:60 actions/twitapidirect_messages.php:136
 msgid "That's too long. Max message size is 140 chars."
 msgstr ""
 
-#: actions/newmessage.php:65
+#: actions/newmessage.php:65 actions/newmessage.php:68
 msgid "No recipient specified."
 msgstr ""
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
+#: classes/Command.php:206 actions/newmessage.php:71
+#: actions/newmessage.php:116 classes/Command.php:211
 msgid "You can't send a message to this user."
 msgstr ""
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
+#: classes/Command.php:209 actions/newmessage.php:74
+#: actions/twitapidirect_messages.php:153 classes/Command.php:214
 msgid ""
-"Don't send a message to yourself; just say it to yourself quietly "
-"instead."
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: actions/newmessage.php:108
+#: actions/newmessage.php:108 actions/microsummary.php:32
+#: actions/newmessage.php:111
 msgid "No such user"
 msgstr ""
 
-#: actions/newmessage.php:117
+#: actions/newmessage.php:117 actions/newmessage.php:120
 msgid "New message"
 msgstr ""
 
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:95 actions/noticesearch.php:94
 msgid "Notice without matching profile"
 msgstr ""
 
@@ -2404,6 +2710,7 @@ msgstr ""
 
 #: actions/profilesettings.php:115 actions/remotesubscribe.php:320
 #: actions/userauthorization.php:159 actions/userrss.php:76
+#: actions/profilesettings.php:120 actions/remotesubscribe.php:333
 msgid "User without matching profile"
 msgstr ""
 
@@ -2431,18 +2738,18 @@ msgstr ""
 msgid "New password successfully saved. "
 msgstr ""
 
-#: actions/register.php:95
+#: actions/register.php:95 actions/register.php:104
 msgid "Password must be 6 or more characters."
 msgstr ""
 
-#: actions/register.php:216
+#: actions/register.php:216 actions/register.php:243
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to..."
 msgstr ""
 
-#: actions/register.php:227
+#: actions/register.php:227 actions/register.php:254
 msgid "(You should receive a message by email momentarily, with "
 msgstr ""
 
@@ -2457,6 +2764,7 @@ msgid "Feed for favorites of %s"
 msgstr ""
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:88 actions/twitapifavorites.php:57
 msgid "Could not retrieve favorite notices."
 msgstr ""
 
@@ -2478,7 +2786,7 @@ msgstr ""
 msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: actions/showstream.php:154
+#: actions/showstream.php:154 lib/util.php:2105
 msgid "Send a message"
 msgstr ""
 
@@ -2487,73 +2795,78 @@ msgstr ""
 msgid "Mobile carrier for your phone. "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:64
 #, php-format
 msgid "Direct messages to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:65
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:69
 msgid "Direct Messages You've Sent"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:70
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:132
 msgid "No message text!"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:145
 msgid "Recipient user not found."
 msgstr ""
 
 #: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:148
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
-#: actions/twitapifavorites.php:92
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:64
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
-#: actions/twitapifavorites.php:95
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:67
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
+#: actions/twitapifavorites.php:158 lib/mail.php:303
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr ""
 
 #: actions/twitapifavorites.php:188 lib/mail.php:276
+#: actions/twitapifavorites.php:159 lib/mail.php:304
 #, php-format
 msgid ""
 "%1$s just added your notice from %2$s as one of their favorites.\n"
 "\n"
 msgstr ""
 
-#: actions/twittersettings.php:27
+#: actions/twittersettings.php:27 actions/twittersettings.php:29
 msgid ""
 "Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 
-#: actions/twittersettings.php:41
+#: actions/twittersettings.php:41 actions/twittersettings.php:43
 msgid "Twitter settings"
 msgstr ""
 
-#: actions/twittersettings.php:48
+#: actions/twittersettings.php:48 actions/twittersettings.php:50
 msgid "Twitter Account"
 msgstr ""
 
-#: actions/twittersettings.php:56
+#: actions/twittersettings.php:56 actions/twittersettings.php:58
 msgid "Current verified Twitter account."
 msgstr ""
 
@@ -2581,46 +2894,50 @@ msgstr ""
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:216
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr ""
 
-#: actions/twittersettings.php:128
+#: actions/twittersettings.php:128 actions/twittersettings.php:221
 msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: actions/twittersettings.php:137 actions/twittersettings.php:228
 #, php-format
 msgid "Unable to retrieve account information for \"%s\" from Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:234 actions/twittersettings.php:253
 msgid "Unable to save your Twitter settings!"
 msgstr ""
 
-#: actions/twittersettings.php:174
+#: actions/twittersettings.php:174 actions/twittersettings.php:261
 msgid "Twitter settings saved."
 msgstr ""
 
-#: actions/twittersettings.php:192
+#: actions/twittersettings.php:192 actions/twittersettings.php:272
 msgid "That is not your Twitter account."
 msgstr ""
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:280
 msgid "Couldn't remove Twitter user."
 msgstr ""
 
-#: actions/twittersettings.php:212
+#: actions/twittersettings.php:212 actions/twittersettings.php:284
 msgid "Twitter account removed."
 msgstr ""
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
+#: actions/twittersettings.php:299 actions/twittersettings.php:310
+#: actions/twittersettings.php:322
 msgid "Couldn't save Twitter preferences."
 msgstr ""
 
-#: actions/twittersettings.php:245
+#: actions/twittersettings.php:245 actions/twittersettings.php:330
 msgid "Twitter preferences saved."
 msgstr ""
 
@@ -2636,15 +2953,15 @@ msgstr ""
 msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#: classes/Channel.php:113
+#: classes/Channel.php:113 classes/Channel.php:129
 msgid "Command results"
 msgstr ""
 
-#: classes/Channel.php:148
+#: classes/Channel.php:148 classes/Channel.php:175
 msgid "Command complete"
 msgstr ""
 
-#: classes/Channel.php:158
+#: classes/Channel.php:158 classes/Channel.php:185
 msgid "Command failed"
 msgstr ""
 
@@ -2657,7 +2974,7 @@ msgstr ""
 msgid "Subscriptions: %1$s\n"
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:247
 msgid "User has no last notice"
 msgstr ""
 
@@ -2690,59 +3007,60 @@ msgstr ""
 msgid "About: %s"
 msgstr ""
 
-#: classes/Command.php:200
+#: classes/Command.php:200 classes/Command.php:202
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: classes/Command.php:214
+#: classes/Command.php:214 classes/Command.php:219
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: classes/Command.php:216
+#: classes/Command.php:216 classes/Command.php:221
 msgid "Error sending direct message."
 msgstr ""
 
-#: classes/Command.php:263
+#: classes/Command.php:263 classes/Command.php:268
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: classes/Command.php:270
+#: classes/Command.php:270 classes/Command.php:275
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: classes/Command.php:288
+#: classes/Command.php:288 classes/Command.php:293
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: classes/Command.php:295
+#: classes/Command.php:295 classes/Command.php:300
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330
+#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:315
+#: classes/Command.php:335
 msgid "Command not yet implemented."
 msgstr ""
 
-#: classes/Command.php:313
+#: classes/Command.php:313 classes/Command.php:318
 msgid "Notification off."
 msgstr ""
 
-#: classes/Command.php:315
+#: classes/Command.php:315 classes/Command.php:320
 msgid "Can't turn off notification."
 msgstr ""
 
-#: classes/Command.php:333
+#: classes/Command.php:333 classes/Command.php:338
 msgid "Notification on."
 msgstr ""
 
-#: classes/Command.php:335
+#: classes/Command.php:335 classes/Command.php:340
 msgid "Can't turn on notification."
 msgstr ""
 
-#: classes/Command.php:344
+#: classes/Command.php:344 classes/Command.php:349
 msgid "Commands:\n"
 msgstr ""
 
@@ -2754,23 +3072,23 @@ msgstr ""
 msgid "Could not update message with new URI."
 msgstr ""
 
-#: lib/gallery.php:46
+#: lib/gallery.php:46 lib/gallery.php:55
 msgid "User without matching profile in system."
 msgstr ""
 
-#: lib/mail.php:147
+#: lib/mail.php:147 lib/mail.php:141
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:249
+#: lib/mail.php:249 lib/mail.php:275
 #, php-format
 msgid "New private message from %s"
 msgstr ""
 
-#: lib/mail.php:253
+#: lib/mail.php:253 lib/mail.php:279
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -2814,18 +3132,459 @@ msgstr ""
 msgid "Your sent messages"
 msgstr ""
 
-#: lib/settingsaction.php:99
+#: lib/settingsaction.php:99 actions/deleteprofile.php:256
 msgid "Twitter"
 msgstr ""
 
-#: lib/settingsaction.php:100
+#: lib/settingsaction.php:100 actions/deleteprofile.php:257
 msgid "Twitter integration options"
 msgstr ""
 
-#: lib/util.php:1718
+#: lib/util.php:1718 lib/util.php:2145
 msgid "To"
 msgstr ""
 
 #: scripts/maildaemon.php:45
 msgid "Could not parse message."
 msgstr ""
+
+#: actions/block.php:45 actions/subedit.php:45 actions/unblock.php:45
+msgid "No profile specified."
+msgstr ""
+
+#: actions/block.php:52 actions/subedit.php:52 actions/tagother.php:45
+#: actions/unblock.php:52
+msgid "No profile with that ID."
+msgstr ""
+
+#: actions/block.php:78
+#, fuzzy
+msgid "Block user"
+msgstr "No existeix aquest usuari."
+
+#: actions/block.php:81
+msgid "Are you sure you want to block this user? "
+msgstr ""
+
+#: actions/block.php:117
+#, fuzzy
+msgid "You have already blocked this user."
+msgstr "Ja t'has connectat!"
+
+#: actions/block.php:124
+msgid "Failed to save block information."
+msgstr ""
+
+#: actions/deleteprofile.php:25
+msgid "Code not yet ready."
+msgstr ""
+
+#: actions/deleteprofile.php:36
+msgid "Export and delete your user information."
+msgstr ""
+
+#: actions/deleteprofile.php:88 actions/deleteprofile.php:119
+#, fuzzy
+msgid "Delete my account"
+msgstr "Crear nou compte"
+
+#: actions/deleteprofile.php:89
+#, fuzzy
+msgid "Delete my account confirmation"
+msgstr "No s'ha pogut eliminar la confirmació de correu electrònic."
+
+#: actions/deleteprofile.php:117
+msgid "Check if you are sure you want to delete your account."
+msgstr ""
+
+#: actions/deleteprofile.php:259 lib/settingsaction.php:102
+msgid "Other"
+msgstr ""
+
+#: actions/deleteprofile.php:260 lib/settingsaction.php:103
+msgid "Other options"
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Add to favorites"
+msgstr ""
+
+#: actions/emailsettings.php:98
+msgid "Allow friends to nudge me and send me an email."
+msgstr ""
+
+#: actions/facebookremove.php:54
+#, fuzzy
+msgid "Couldn't remove Facebook user."
+msgstr "No s'ha pogut actualitzar l'usuari."
+
+#: actions/favor.php:71
+msgid "Disfavor favorite"
+msgstr ""
+
+#: actions/favorited.php:31 lib/stream.php:45
+#, fuzzy
+msgid "Popular notices"
+msgstr "No existeix aquest avís."
+
+#: actions/favorited.php:54
+msgid "Showing recently popular notices"
+msgstr ""
+
+#: actions/featured.php:32 actions/featured.php:54 lib/stream.php:41
+msgid "Featured users"
+msgstr ""
+
+#: actions/finishremotesubscribe.php:186
+msgid "That user has blocked you from subscribing."
+msgstr ""
+
+#: actions/microsummary.php:39
+msgid "No current status"
+msgstr ""
+
+#: actions/newnotice.php:93
+#, fuzzy
+msgid "Notice posted"
+msgstr "Avisos"
+
+#: actions/newnotice.php:116 classes/Channel.php:140
+msgid "Ajax Error"
+msgstr ""
+
+#: actions/nudge.php:52
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
+
+#: actions/nudge.php:61
+msgid "Nudge sent"
+msgstr ""
+
+#: actions/othersettings.php:27
+msgid "Manage various other options."
+msgstr ""
+
+#: actions/othersettings.php:33
+#, fuzzy
+msgid "Other Settings"
+msgstr "Configuració"
+
+#: actions/othersettings.php:35
+msgid "URL Auto-shortening"
+msgstr ""
+
+#: actions/othersettings.php:54
+#, fuzzy
+msgid "Service"
+msgstr "Cercar"
+
+#: actions/othersettings.php:54
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/othersettings.php:155
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "La ubicació és massa llarga (màx. 255 caràcters)."
+
+#: actions/peopletag.php:33
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "Adreça de correu electrònic no vàlida."
+
+#: actions/peopletag.php:45
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr ""
+
+#: actions/peopletag.php:87
+#, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+msgstr ""
+
+#: actions/profilesettings.php:92
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+
+#: actions/profilesettings.php:246 actions/tagother.php:131
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "La pàgina personal '%s' és invàlida"
+
+#: actions/profilesettings.php:328
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "No s'ha pogut guardar el perfil."
+
+#: actions/public.php:68
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
+msgstr ""
+
+#: actions/public.php:90
+msgid "Could not retrieve public stream."
+msgstr ""
+
+#: actions/register.php:67 actions/register.php:177
+msgid "Sorry, only invited people can register."
+msgstr ""
+
+#: actions/register.php:156
+msgid "With this form you can create a new account. "
+msgstr ""
+
+#: actions/remotesubscribe.php:136 actions/remotesubscribe.php:141
+msgid "That's a local profile! Login to subscribe."
+msgstr ""
+
+#: actions/subedit.php:68
+#, fuzzy
+msgid "You are not subscribed to that profile."
+msgstr "No ens vas enviar aquest perfil"
+
+#: actions/subedit.php:81
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "No s'ha pogut crear la subscripció."
+
+#: actions/subscribe.php:53
+#, fuzzy
+msgid "Not a local user."
+msgstr "No existeix aquest usuari."
+
+#: actions/subscribe.php:67
+#, fuzzy
+msgid "Subscribed"
+msgstr "Subscriure's"
+
+#: actions/subscriptions.php:72
+#, fuzzy
+msgid "Jabber"
+msgstr "Cap Jabber ID."
+
+#: actions/tagother.php:31
+#, fuzzy
+msgid "Not logged in"
+msgstr "No connectat."
+
+#: actions/tagother.php:40
+#, fuzzy
+msgid "No id argument."
+msgstr "No existeix aquest document."
+
+#: actions/tagother.php:56
+msgid "Tag a person"
+msgstr ""
+
+#: actions/tagother.php:98
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
+msgstr ""
+
+#: actions/tagother.php:120
+#, fuzzy
+msgid "No such profile."
+msgstr "No existeix aquest avís."
+
+#: actions/tagother.php:146
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+
+#: actions/tagother.php:153
+#, fuzzy
+msgid "Could not save tags."
+msgstr "No s'ha pogut guardar la informació de l'avatar"
+
+#: actions/tagother.php:188
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
+
+#: actions/tagrss.php:33
+#, fuzzy
+msgid "No such tag."
+msgstr "No existeix aquest avís."
+
+#: actions/tagrss.php:62
+#, fuzzy, php-format
+msgid "Microblog tagged with %s"
+msgstr "Microblog de %s"
+
+#: actions/twitapiblocks.php:45
+msgid "Block user failed."
+msgstr ""
+
+#: actions/twitapiblocks.php:66
+msgid "Unblock user failed."
+msgstr ""
+
+#: actions/twitapiusers.php:45
+#, fuzzy
+msgid "Not found."
+msgstr "Cap petició trobada!"
+
+#: actions/twittersettings.php:63
+msgid "Twitter user name"
+msgstr ""
+
+#: actions/twittersettings.php:67
+#, fuzzy
+msgid "Twitter password"
+msgstr "Nova contrasenya"
+
+#: actions/twittersettings.php:129
+msgid "Twitter Friends"
+msgstr ""
+
+#: actions/unblock.php:73
+#, fuzzy
+msgid "Error removing the block."
+msgstr "Error en guardar l'usuari."
+
+#: actions/unsubscribe.php:48
+#, fuzzy
+msgid "No profile id in request."
+msgstr "Cap URL de perfil retornar pel servidor."
+
+#: actions/unsubscribe.php:55
+#, fuzzy
+msgid "No profile with that id."
+msgstr "Perfil remot sense perfil corresponent"
+
+#: actions/unsubscribe.php:69
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Cancel·lar subscripció"
+
+#: classes/Notice.php:100
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "Problema en guardar l'avís."
+
+#: classes/Notice.php:105
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+
+#: classes/Notice.php:112
+msgid "You are banned from posting notices on this site."
+msgstr ""
+
+#: lib/gallery.php:98
+msgid "Filter tags"
+msgstr ""
+
+#: lib/gallery.php:104
+msgid "All"
+msgstr ""
+
+#: lib/gallery.php:108
+msgid "Tag"
+msgstr ""
+
+#: lib/gallery.php:109
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/gallery.php:110
+msgid "Go"
+msgstr ""
+
+#: lib/gallery.php:264
+#, fuzzy
+msgid "Subscriptions navigation"
+msgstr "Subscripcions"
+
+#: lib/gallery.php:270 lib/gallery.php:292
+msgid "List"
+msgstr ""
+
+#: lib/gallery.php:280 lib/gallery.php:294
+msgid "Icons"
+msgstr ""
+
+#: lib/mail.php:92
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:242
+#, php-format
+msgid "You've been nudged by %s"
+msgstr ""
+
+#: lib/mail.php:246
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+msgstr ""
+
+#: lib/profilelist.php:146
+msgid "(none)"
+msgstr ""
+
+#: lib/stream.php:33
+msgid "Public"
+msgstr "Públic"
+
+#: lib/stream.php:36 lib/stream.php:37
+msgid "Recent tags"
+msgstr ""
+
+#: lib/stream.php:40
+msgid "Featured"
+msgstr ""
+
+#: lib/stream.php:44
+#, fuzzy
+msgid "Popular"
+msgstr "Cerca de gent"
+
+#: lib/subs.php:51
+#, fuzzy
+msgid "User has blocked you."
+msgstr "L'usuari no té perfil."
+
+#: lib/util.php:2059
+msgid "Send a nudge"
+msgstr ""
+
+#: lib/util.php:2063
+msgid "Nudge sent!"
+msgstr ""
+
+#: lib/util.php:2194
+msgid "Block"
+msgstr ""
+
+#: lib/util.php:2198
+msgid "Unblock"
+msgstr ""
+
+#~ msgid "Couldn't confirm email."
+#~ msgstr "No s'ha pogut confirmar el correu electrònic."
+
+#~ msgid "Email address"
+#~ msgstr "Adreça de correu electrònic"
+
+#~ msgid "Error inserting notice"
+#~ msgstr "Error en inserir avís"
+
+#~ 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 ""
+#~ "Si has oblidat o has perdut la teva contrasenya, pots rebre una de nova a "
+#~ "l'adreça de correu electrònic que vas utilitzar per a registrar el teu "
+#~ "compte."
diff --git a/cs_CZ/LC_MESSAGES/laconica.po b/cs_CZ/LC_MESSAGES/laconica.po
index 002d9c0ab7..f92d14b783 100644
--- a/cs_CZ/LC_MESSAGES/laconica.po
+++ b/cs_CZ/LC_MESSAGES/laconica.po
@@ -6,50 +6,90 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-14 21:07+1200\n"
+"POT-Creation-Date: 2009-01-12 12:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\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"
-"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"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#, php-format
-#, fuzzy
+#: actions/noticesearchrss.php:61
+#, fuzzy, php-format
 msgid " Search Stream for \"%s\""
 msgstr ""
 "#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Hledej ve Streamu \"%s\"\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: actions/finishopenidlogin.php:88 actions/register.php:205
+#: actions/register.php:232
+msgid ""
+" except this private data: password, email address, IM address, phone number."
+msgstr ""
+"až na tyto privátní data: heslo, emailová adresa, IM adresa, telefonní číslo."
+
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+#: lib/facebookaction.php:195 lib/noticelist.php:160
+msgid " from "
+msgstr ""
+
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: actions/twitapistatuses.php:341
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr ""
+
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
+
+#: ../actions/invite.php:170
+#, php-format
 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 ""
-"až na tyto privátní data: heslo, emailová adresa, IM adresa, telefonní "
-"číslo."
 
-#: ../actions/subscribe.php:84
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:115
+#: lib/mail.php:117
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1 od teď naslouchá tvým sdělením v %2"
 
-#: ../actions/subscribe.php:86
+#: ../lib/mail.php:126
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -63,946 +103,1560 @@ msgstr ""
 "\n"
 "\t%3\n"
 "\n"
-"S úctou váš,\n%4$s.\n"
+"S úctou váš,\n"
+"%4$s.\n"
+
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#: actions/twitapistatuses.php:344
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
 
-#: ../actions/shownotice.php:45
+#: ../actions/shownotice.php:45 actions/shownotice.php:45
+#: actions/shownotice.php:73
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1 statusů na %2"
 
-#: ../actions/publicrss.php:60
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../actions/publicrss.php:62 actions/publicrss.php:48
 #, php-format
 msgid "%s Public Stream"
 msgstr "Veřejný \"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/twitapistatuses.php:123
 #, php-format
 msgid "%s and friends"
 msgstr "%s a přátelé"
 
-#: ../lib/util.php:233
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:31
+#, php-format
+msgid "%s public timeline"
+msgstr ""
+
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:217
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:195
+#, php-format
+msgid "%s timeline"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:34
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+
+#: ../lib/util.php:257 lib/util.php:273 lib/util.php:284
 #, 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%%** je služba microblogů, kterou pro vás poskytuje "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+"**%%site.name%%** je služba microblogů, kterou pro vás poskytuje [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
 
-#: ../lib/util.php:235
+#: ../lib/util.php:259 lib/util.php:275 lib/util.php:286
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** je služba mikroblogů."
 
-#: ../lib/util.php:250
+#: ../lib/util.php:274 lib/util.php:290 lib/util.php:301
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr "Přispěvatelá by měly být zmíněny přezdívkou nebo celým jménem"
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: ../actions/register.php:176
+#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
+#: actions/profilesettings.php:78
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 znaků nebo čísel, bez teček, čárek a mezer"
 
-#: ../actions/password.php:42 ../actions/register.php:178
+#: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:193
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/profilesettings.php:186
 msgid "6 or more characters"
 msgstr "6 a více znaků"
 
-#: ../actions/recoverpassword.php:165
+#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 a více znaků, a nezapomeňte"
 
-#: ../actions/imsettings.php:188
+#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:195
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, 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 ""
+"Ověřující kód byl poslán na vloženou IM adresu. Musíte prokázat %s pro "
+"posílání zpráv."
+
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:234
+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 ""
+
+#: ../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/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:30
+#: actions/twitapidirect_messages.php:107 actions/twitapifavorites.php:83
+#: actions/twitapifavorites.php:99 actions/twitapifriendships.php:117
+#: actions/twitapihelp.php:42 actions/twitapistatuses.php:77
+#: actions/twitapistatuses.php:144 actions/twitapistatuses.php:224
+#: actions/twitapistatuses.php:234 actions/twitapistatuses.php:386
+#: actions/twitapistatuses.php:395 actions/twitapistatuses.php:421
+#: actions/twitapiusers.php:30
+msgid "API method not found!"
 msgstr ""
-"Ověřující kód byl poslán na vloženou IM adresu. Musíte prokázat %s "
-"pro posílání zpráv."
 
-#: ../lib/util.php:296
+#: ../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:39
+#: actions/twitapiaccount.php:89 actions/twitapiaccount.php:94
+#: actions/twitapidirect_messages.php:178 actions/twitapifavorites.php:139
+#: actions/twitapihelp.php:49 actions/twitapistatuses.php:549
+msgid "API method under construction."
+msgstr ""
+
+#: ../lib/util.php:324 lib/util.php:340 lib/util.php:352
 msgid "About"
 msgstr "O nás"
 
-#: ../actions/userauthorization.php:118
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
 msgid "Accept"
 msgstr "Přijmout"
 
-#: ../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/twittersettings.php:84
 msgid "Add"
 msgstr "Přidat"
 
-#: ../actions/openidsettings.php:43
+#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
 msgid "Add OpenID"
 msgstr "Přidej OpenID"
 
-#: ../actions/imsettings.php:39
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: actions/deleteprofile.php:248
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
 msgid "Address"
 msgstr "Adresa"
 
-#: ../actions/showstream.php:254
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
+
+#: ../actions/showstream.php:273 actions/showstream.php:288
+#: actions/showstream.php:336
 msgid "All subscriptions"
 msgstr "Všechny odběry"
 
-#: ../actions/publicrss.php:62
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
 #, php-format
 msgid "All updates for %s"
 msgstr "VÅ¡echny aktualizace pro %s"
 
-#: ../actions/noticesearchrss.php:66
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:63
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "Všechny položky obsahující \"%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
 msgid "Already logged in."
 msgstr "Již přihlášen"
 
-#: ../actions/subscribe.php:48
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:47
 msgid "Already subscribed!."
 msgstr "Již přihlášeno"
 
-#: ../actions/userauthorization.php:76
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+msgid "Are you sure you want to delete this notice?"
+msgstr ""
+
+#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
 msgid "Authorize subscription"
 msgstr "Autorizovaný odběr"
 
-#: ../actions/login.php:100 ../actions/register.php:184
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192 actions/register.php:219
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Příště automaticky přihlásit; ne pro počítače, které používá "
 
-#: ../actions/avatar.php:32
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:103
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
+
+#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: actions/profilesettings.php:34
 msgid "Avatar"
 msgstr "Obrázek"
 
-#: ../actions/avatar.php:113
+#: ../actions/avatar.php:113 actions/profilesettings.php:350
+#: actions/profilesettings.php:379
 msgid "Avatar updated."
 msgstr "Obrázek nahrán"
 
-#: ../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 ""
-"Čakám na potvrzení této adresy. Zkontrolujte zprávy na vašem "
-"Jabber/GTalk účtu. (Přidal jste si %s do vašich kontaktů?)"
+"Čakám na potvrzení této adresy. Zkontrolujte zprávy na vašem Jabber/GTalk "
+"účtu. (Přidal jste si %s do vašich kontaktů?)"
+
+#: ../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 ""
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+msgid "Awaiting confirmation on this phone number."
+msgstr ""
 
-#: ../lib/util.php:1136
-msgid "Before »"
+#: ../lib/util.php:1318 lib/util.php:1452 lib/facebookaction.php:259
+#: lib/util.php:1792
+#, fuzzy
+msgid "Before »"
 msgstr "Starší »"
 
-#: ../actions/profilesettings.php:52
+#: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: actions/profilesettings.php:82 actions/register.php:184
+#: actions/profilesettings.php:84 actions/register.php:211
 msgid "Bio"
 msgstr "O mě"
 
-#: ../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:222 actions/register.php:98
 msgid "Bio is too long (max 140 chars)."
 msgstr "Text je příliš dlouhý (maximální délka je 140 zanků)"
 
-#: ../actions/updateprofile.php:118
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+msgid "Can't delete this notice."
+msgstr ""
+
+#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "Nelze přečíst adresu obrázku '%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/profilesettings.php:433
 msgid "Can't save new password."
 msgstr "Nelze uložit nové heslo"
 
-#: ../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
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: ../lib/openid.php:121
+#: ../lib/openid.php:121 lib/openid.php:121
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Nelze dolozit zákaznický objekt OpenID"
 
-#: ../actions/imsettings.php:154
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
 msgid "Cannot normalize that Jabber ID"
 msgstr "Nelze normalizovat JabberID"
 
-#: ../actions/password.php:45
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:204
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/profilesettings.php:189
 msgid "Change"
 msgstr "Změnit"
 
-#: ../actions/password.php:32
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: actions/deleteprofile.php:245
+msgid "Change email handling"
+msgstr ""
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
 msgid "Change password"
 msgstr "Změnit heslo"
 
-#: ../actions/password.php:43 ../actions/recoverpassword.php:166
-#: ../actions/register.php:179
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr ""
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#: actions/deleteprofile.php:242
+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/profilesettings.php:187 actions/register.php:196
 msgid "Confirm"
 msgstr "Heslo znovu"
 
-#: ../actions/confirmaddress.php:84
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
 msgid "Confirm Address"
 msgstr "Potvrď adresu"
 
-#: ../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:259
 msgid "Confirmation cancelled."
 msgstr "Potvrď zrušení"
 
-#: ../actions/confirmaddress.php:38
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+msgid "Confirmation code"
+msgstr ""
+
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
 msgid "Confirmation code not found."
 msgstr "Potvrzující kód nebyl nalezen"
 
-#: ../actions/finishopenidlogin.php:91
+#: ../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:97
 msgid "Connect"
 msgstr "Připojit"
 
-#: ../actions/finishopenidlogin.php:86
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
 msgid "Connect existing account"
 msgstr "Zruš existující účet"
 
-#: ../lib/util.php:304
+#: ../lib/util.php:332 lib/util.php:348 lib/util.php:360
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../lib/openid.php:178
+#: ../lib/openid.php:178 lib/openid.php:178
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "Nelze vytvořit OpenID z: %s"
 
-#: ../lib/openid.php:160
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:46 actions/twitapifriendships.php:62
+#, 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:39
+msgid "Could not follow user: User not found."
+msgstr ""
+
+#: ../lib/openid.php:160 lib/openid.php:160
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "Nelze přesměrovat na server: %s"
 
-#: ../actions/updateprofile.php:161
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
 msgid "Could not save avatar info"
 msgstr "Nelze uložin informace o obrázku"
 
-#: ../actions/updateprofile.php:154
+#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
 msgid "Could not save new profile info"
 msgstr "Nelze uložit nové informace do profilu"
 
-#: ../actions/profilesettings.php:146
-msgid "Couldn't confirm email."
-msgstr "Nelze potvrdit email"
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:70
+msgid "Could not subscribe other to you."
+msgstr ""
+
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:55
+msgid "Could not subscribe."
+msgstr ""
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr ""
 
 #: ../actions/finishremotesubscribe.php:99
+#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:112
 msgid "Couldn't convert request tokens to access tokens."
 msgstr "Nelze konvertovat řetězec požadavku na přístupový řetězec."
 
-#: ../actions/subscribe.php:59
-msgid "Couldn't create subscription."
-msgstr "Nelze vytvořit odebírat"
-
-#: ../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/emailsettings.php:255
 msgid "Couldn't delete email confirmation."
 msgstr "Nelze smazat potvrzení emailu"
 
-#: ../actions/unsubscribe.php:56
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:129
 msgid "Couldn't delete subscription."
 msgstr "Nelze smazat odebírání"
 
-#: ../actions/remotesubscribe.php:125
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+#: actions/twitapistatuses.php:82
+msgid "Couldn't find any statuses."
+msgstr ""
+
+#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
+#: actions/remotesubscribe.php:148
 msgid "Couldn't get a request token."
 msgstr "Nelze získat řetězec požadavku."
 
-#: ../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:228
 msgid "Couldn't insert confirmation code."
 msgstr "Nelze vložit potvrzující kód"
 
 #: ../actions/finishremotesubscribe.php:180
+#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:216
 msgid "Couldn't insert new subscription."
 msgstr "Nelze vložit odebírání"
 
-#: ../actions/profilesettings.php:175
+#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
+#: actions/profilesettings.php:319 actions/twitapiaccount.php:74
 msgid "Couldn't save profile."
 msgstr "Nelze uložit profil"
 
-#: ../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:296
+msgid "Couldn't update user for autosubscribe."
+msgstr ""
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+#: actions/emailsettings.php:301 actions/emailsettings.php:315
+msgid "Couldn't update user record."
+msgstr ""
+
+#: ../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/emailsettings.php:179 actions/emailsettings.php:280
+#: actions/othersettings.php:173 actions/profilesettings.php:276
 msgid "Couldn't update user."
 msgstr "Nelze aktualizovat uživatele"
 
-#: ../actions/finishopenidlogin.php:84
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
 msgid "Create"
 msgstr "Vytvořit"
 
-#: ../actions/finishopenidlogin.php:70
+#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
 msgid "Create a new user with this nickname."
 msgstr "Vytvořit nového uživatele s touto přezdívkou"
 
-#: ../actions/finishopenidlogin.php:68
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
 msgid "Create new account"
 msgstr "Vytvořit nový účet"
 
-#: ../actions/finishopenidlogin.php:191
+#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+#: actions/finishopenidlogin.php:208
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Pro toto OpenID již uživatel existuje"
 
-#: ../actions/imsettings.php:45
+#: ../actions/imsettings.php:45 actions/imsettings.php:46
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Potvrzené Jabber/GTalk adresy"
 
-#: ../actions/showstream.php:337
-msgid "Currently"
-msgstr "Nyní"
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
 
-#: ../lib/util.php:893
-#, php-format
-msgid "DB error inserting reply: %s"
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+msgid "Current confirmed email address."
+msgstr ""
+
+#: ../actions/showstream.php:356 actions/showstream.php:367
+#: actions/showstream.php:418
+msgid "Currently"
+msgstr "Nyní"
+
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:87
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: ../lib/util.php:1061 lib/util.php:1110 lib/util.php:1417
+#, php-format
+msgid "DB error inserting reply: %s"
 msgstr "Chyba v DB při vkládání odpovědi: %s"
 
-#: ../actions/profilesettings.php:54
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+msgid "Delete notice"
+msgstr ""
+
+#: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: actions/profilesettings.php:84 actions/register.php:186
+#: actions/profilesettings.php:86 actions/register.php:213
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Popiš sebe a své zájmy ve 140 znacích"
 
-#: ../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/deleteprofile.php:244 actions/register.php:199
+#: actions/register.php:202
 msgid "Email"
 msgstr "Email"
 
-#: ../actions/profilesettings.php:46
-msgid "Email address"
-msgstr "Emailová adresa"
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+msgid "Email Address"
+msgstr ""
+
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+msgid "Email Settings"
+msgstr ""
 
-#: ../actions/profilesettings.php:102 ../actions/register.php:63
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:89
 msgid "Email address already exists."
 msgstr "Emailová adresa již existuje"
 
-#: ../lib/mail.php:82
+#: ../lib/mail.php:90 lib/mail.php:90
 msgid "Email address confirmation"
 msgstr "Potvrzení emailové adresy"
 
-#: ../actions/recoverpassword.php:176
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
+
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr ""
+
+#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
 msgid "Enter a nickname or email address."
 msgstr "Zadej přezdívku nebo emailovou adresu"
 
-#: ../actions/userauthorization.php:136
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+msgid "Enter the code you received on your phone."
+msgstr ""
+
+#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
 msgid "Error authorizing token"
 msgstr "Chyba potvrujícího řetězce"
 
-#: ../actions/finishopenidlogin.php:282
+#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
+#: actions/finishopenidlogin.php:274
 msgid "Error connecting user to OpenID."
 msgstr "Chyba při propojení uživatele na OpenID"
 
-#: ../actions/finishaddopenid.php:78
+#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
 msgid "Error connecting user."
 msgstr "Chyba přihlašování uživatele"
 
 #: ../actions/finishremotesubscribe.php:151
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:164
 msgid "Error inserting avatar"
 msgstr "Chyba při kládání obrázku"
 
 #: ../actions/finishremotesubscribe.php:143
+#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:156
 msgid "Error inserting new profile"
 msgstr "Chyba při vkládání nového profilu"
 
-#: ../actions/postnotice.php:88
-msgid "Error inserting notice"
-msgstr "Chyba při vkládání nového sdělení"
-
 #: ../actions/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:180
 msgid "Error inserting remote profile"
 msgstr "Chyba při vkládaní vzdáleného profilu"
 
-#: ../actions/recoverpassword.php:201
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
 msgid "Error saving address confirmation."
 msgstr "Chyba při ukládání potvrzení adresy"
 
-#: ../actions/userauthorization.php:139
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
 msgid "Error saving remote profile"
 msgstr "Chyba při ukládnání vzdáleného profilu"
 
-#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
+#: ../lib/openid.php:226 lib/openid.php:226
 msgid "Error saving the profile."
 msgstr "Chyba při ukládaní profilu"
 
-#: ../lib/openid.php:237
+#: ../lib/openid.php:237 lib/openid.php:237
 msgid "Error saving the user."
 msgstr "Chyba při ukládaní uživatele"
 
-#: ../actions/password.php:80
+#: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/profilesettings.php:428
 msgid "Error saving user; invalid."
 msgstr "Chyba při ukládaní uživatele; neplatný"
 
-#: ../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:54 actions/login.php:80
+#: actions/register.php:117
 msgid "Error setting user."
 msgstr "Chyba nastavení uživatele"
 
-#: ../actions/finishaddopenid.php:83
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
 msgid "Error updating profile"
 msgstr "Chyba při aktualizaci profilu"
 
 #: ../actions/finishremotesubscribe.php:161
+#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:174
 msgid "Error updating remote profile"
 msgstr "Chyba při aktualizaci vzdáleného profilu"
 
-#: ../actions/recoverpassword.php:79
+#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
 msgid "Error with confirmation code."
 msgstr "Chyba v ověřovacím kódu"
 
-#: ../actions/finishopenidlogin.php:89
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
 msgid "Existing nickname"
 msgstr "Existující jméno"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:326 lib/util.php:342 lib/util.php:354
 msgid "FAQ"
 msgstr "FAQ"
 
-#: ../actions/avatar.php:115
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/profilesettings.php:381
 msgid "Failed updating avatar."
 msgstr "Nahrávání obrázku selhalo."
 
-#: ../actions/all.php:61 ../actions/allrss.php:74 ../actions/allrss.php:64
-#: actions/all.php:61 actions/allrss.php:64
-#, php-format
-#, fuzzy
+#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
+#: actions/allrss.php:64
+#, fuzzy, php-format
 msgid "Feed for friends of %s"
 msgstr ""
 "#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Feed přítel uživatele: %s\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/replies.php:61 ../actions/repliesrss.php:80
-#: ../actions/replies.php:65 actions/replies.php:65 actions/repliesrss.php:66
-#, php-format
-#, fuzzy
+#: ../actions/replies.php:65 ../actions/repliesrss.php:80
+#: actions/replies.php:65 actions/repliesrss.php:66
+#, fuzzy, php-format
 msgid "Feed for replies to %s"
 msgstr ""
 "#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Feed odpovědí na %s\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/login.php:118
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:54
+#, php-format
+msgid "Feed for tag %s"
+msgstr ""
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+msgid "Find content of notices"
+msgstr ""
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+msgid "Find people on this site"
+msgstr ""
+
+#: ../actions/login.php:122
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr "Z bezpečnostních důvodů, prosím zadejte znovu své jméno a heslo."
 
-#: ../actions/profilesettings.php:44
+#: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: actions/profilesettings.php:77 actions/register.php:178
+#: actions/profilesettings.php:79 actions/register.php:205
 msgid "Full name"
 msgstr "Celé jméno"
 
-#: ../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/profilesettings.php:219 actions/register.php:95
 msgid "Full name is too long (max 255 chars)."
 msgstr "Jméno je moc dlouhé (maximální délka je 255 znaků)"
 
-#: ../lib/util.php:279
+#: ../lib/util.php:322 lib/util.php:338 lib/util.php:343 lib/util.php:350
 msgid "Help"
 msgstr "Nápověda"
 
-#: ../lib/util.php:274
+#: ../lib/util.php:298 lib/util.php:314 lib/util.php:325
 msgid "Home"
 msgstr "Domů"
 
-#: ../actions/profilesettings.php:49
+#: ../actions/profilesettings.php:46 ../actions/register.php:167
+#: actions/profilesettings.php:79 actions/register.php:181
+#: actions/profilesettings.php:81 actions/register.php:208
 msgid "Homepage"
 msgstr "Moje stránky"
 
-#: ../actions/profilesettings.php:87
+#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: actions/profilesettings.php:210 actions/register.php:83
+#: actions/profilesettings.php:216 actions/register.php:92
 msgid "Homepage is not a valid URL."
 msgstr "Stránka není platnou URL."
 
-#: ../actions/imsettings.php:61
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+#: actions/emailsettings.php:101
+msgid "I want to post notices by email."
+msgstr ""
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+#: actions/deleteprofile.php:253
+msgid "IM"
+msgstr ""
+
+#: ../actions/imsettings.php:60 actions/imsettings.php:61
 msgid "IM Address"
 msgstr "IM adresa"
 
-#: ../actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
 msgid "IM Settings"
 msgstr "IM nastavení"
 
-#: ../actions/finishopenidlogin.php:88
+#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
 msgstr ""
-"Pokud již máte účet, přihlašte se pomocí přezdívky a hesla. A poté "
-"propojte účet s OpenID."
+"Pokud již máte účet, přihlašte se pomocí přezdívky a hesla. A poté propojte "
+"účet s OpenID."
 
 #: ../actions/openidsettings.php:45
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
 msgstr ""
-"Pokud chcete přidat OpenID k vašemu účtu, zadejte OpenID do pole níže "
-"a klikněte na \"Přidat\"."
+"Pokud chcete přidat OpenID k vašemu účtu, zadejte OpenID do pole níže a "
+"klikněte na \"Přidat\"."
 
-#: ../actions/recoverpassword.php:122
+#: ../actions/recoverpassword.php:137
 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 ""
-"Pokud jste zapomněl nebo stratil heslo, můžete si nechat zaslat nové na "
-"vaší emailovou adresu uloženou u vašeho účtu."
 
-#: ../actions/password.php:69
+#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
+#: actions/emailsettings.php:68 actions/smssettings.php:76
+msgid "Incoming email"
+msgstr ""
+
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+#: actions/emailsettings.php:304
+msgid "Incoming email address removed."
+msgstr ""
+
+#: ../actions/password.php:69 actions/profilesettings.php:388
+#: actions/profilesettings.php:417
 msgid "Incorrect old password"
 msgstr "Neplatné heslo"
 
-#: ../actions/login.php:63
+#: ../actions/login.php:67 actions/login.php:67 actions/login.php:74
 msgid "Incorrect username or password."
 msgstr "Neplatné jméno nebo heslo"
 
-#: ../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."
 msgstr ""
-"Návod jak obnovit heslo byl odeslát na vaší emailovou adresu "
-"zaregistrovanou u vašeho účtu."
+"Návod jak obnovit heslo byl odeslát na vaší emailovou adresu zaregistrovanou "
+"u vašeho účtu."
 
-#: ../actions/updateprofile.php:113
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "Neplatná adresa obrázku '%s'"
 
-#: ../actions/updateprofile.php:97
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "Neplatná adresa '%s'"
 
-#: ../actions/updateprofile.php:81
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "Neplatná adresa licence '%s'"
 
-#: ../actions/postnotice.php:61
+#: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:63
 msgid "Invalid notice content"
 msgstr "Neplatný obsah sdělení"
 
-#: ../actions/postnotice.php:67
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:69
 msgid "Invalid notice uri"
 msgstr "Neplatná uri sdělení"
 
-#: ../actions/postnotice.php:72
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:74
 msgid "Invalid notice url"
 msgstr "Neplatná url sdělení"
 
-#: ../actions/updateprofile.php:86
+#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "Neplatná adresa profilu '%s'."
 
-#: ../actions/remotesubscribe.php:96
+#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
 msgid "Invalid profile URL (bad format)"
 msgstr "Neplatná adresa profilu (špatný formát)"
 
 #: ../actions/finishremotesubscribe.php:77
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:78
 msgid "Invalid profile URL returned by server."
 msgstr "Neplatná adresa profilu, vrácená serverem"
 
-#: ../actions/avatarbynickname.php:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
 msgid "Invalid size."
 msgstr "Neplatná velikost"
 
-#: ../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:256 actions/register.php:112
+#: actions/register.php:130
 msgid "Invalid username or password."
 msgstr "Neplatné jméno nebo heslo"
 
-#: ../lib/util.php:237
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr ""
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
+
+#: ../lib/util.php:306 lib/util.php:322 lib/util.php:332
+msgid "Invite"
+msgstr ""
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr ""
+
+#: ../lib/util.php:261 lib/util.php:277 lib/util.php:288
 #, 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 ""
 "Běží na [Laconica](http://laconi.ca/) mikroblogovací program, verze %s, "
-"dostupná pod [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"dostupná pod [GNU Affero General Public License](http://www.fsf.org/"
+"licensing/licenses/agpl-3.0.html)."
 
-#: ../actions/imsettings.php:164
+#: ../actions/imsettings.php:173 actions/imsettings.php:181
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID již patří jinému uživateli"
 
-#: ../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 ""
-"Jabber nebo GTalk adresy, například \"jmeno@neco.cz\". Neprve se ujistěte "
-"že jste přidal %s do vašeho seznamu kontaktů."
+"Jabber nebo GTalk adresy, například \"jmeno@neco.cz\". Neprve se ujistěte že "
+"jste přidal %s do vašeho seznamu kontaktů."
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
+msgid "Language"
+msgstr ""
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+#: actions/profilesettings.php:234
+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:87 actions/register.php:214
 msgid "Location"
 msgstr "Umístění"
 
-#: ../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/profilesettings.php:225 actions/register.php:101
 msgid "Location is too long (max 255 chars)."
 msgstr "Umístění příliš dlouhé (maximálně 255 znaků)"
 
-#: ../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/login.php:104 actions/login.php:113 actions/openidlogin.php:88
+#: lib/util.php:336
 msgid "Login"
 msgstr "Přihlásit"
 
-#: ../actions/openidlogin.php:44
+#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:60
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Přihlaste se pomocí [OpenID](%%doc.openid%%) účtu."
 
-#: ../actions/login.php:122
+#: ../actions/login.php:126
 #, 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 ""
-"Přihlaste se pomocí vaší prezdívky a hesla. Zatím nejste "
-"zaregistrován? [Registrovat](%%action.register%%) nový účet, nebo "
-"vyzkoušejte [OpenID](%%action.openidlogin%%)."
+"Přihlaste se pomocí vaší prezdívky a hesla. Zatím nejste zaregistrován? "
+"[Registrovat](%%action.register%%) nový účet, nebo vyzkoušejte [OpenID](%%"
+"action.openidlogin%%)."
 
-#: ../lib/util.php:284
+#: ../lib/util.php:308 lib/util.php:324 lib/util.php:334
 msgid "Logout"
 msgstr "Odhlásit"
 
-#: ../actions/login.php:106
+#: ../actions/register.php:166 actions/register.php:180
+#: actions/register.php:207
+msgid "Longer name, preferably your \"real\" name"
+msgstr ""
+
+#: ../actions/login.php:110 actions/login.php:110 actions/login.php:118
 msgid "Lost or forgotten password?"
 msgstr "Ztracené nebo zapomenuté heslo?"
 
-#: ../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 ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr ""
+
+#: ../actions/showstream.php:300 actions/showstream.php:315
+#: actions/showstream.php:363
 msgid "Member since"
 msgstr "Členem od"
 
-#: ../actions/userrss.php:70
+#: ../actions/userrss.php:70 actions/userrss.php:67
 #, php-format
 msgid "Microblog by %s"
 msgstr "Mikroblog od %s"
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
+#: ../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 ""
+
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php:85 actions/register.php:202
+#: actions/register.php:229
 msgid "My text and files are available under "
 msgstr "Mé texty a soubory jsou k dispozici pod"
 
-#: ../actions/finishopenidlogin.php:71
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+msgid "New"
+msgstr ""
+
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:138
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+#: actions/emailsettings.php:318
+msgid "New incoming email address added."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
 msgid "New nickname"
 msgstr "Nová přezdívka"
 
-#: ../actions/newnotice.php:100
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:141
 msgid "New notice"
 msgstr "Nové sdělení"
 
-#: ../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/profilesettings.php:185
 msgid "New password"
 msgstr "Nové heslo"
 
-#: ../actions/recoverpassword.php:275
+#: ../actions/recoverpassword.php:314
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nové heslo bylo uloženo. Nyní jste přihlášen."
 
-#: ../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:108 actions/profilesettings.php:76
+#: actions/register.php:192
 msgid "Nickname"
 msgstr "Přezdívka"
 
-#: ../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/finishopenidlogin.php:192 actions/profilesettings.php:231
+#: actions/register.php:85
 msgid "Nickname already in use. Try another one."
 msgstr "Přezdívku již někdo používá. Zkuste jinou"
 
-#: ../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:182 actions/profilesettings.php:209
+#: actions/register.php:83
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Přezdívka může obsahovat pouze malá písmena a čísla bez mezer"
 
-#: ../actions/finishopenidlogin.php:170
+#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:187
 msgid "Nickname not allowed."
 msgstr "Přezdívka není povolena"
 
-#: ../actions/remotesubscribe.php:72
+#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
 msgid "Nickname of the user you want to follow"
 msgstr "Přezdívka uživatele, kterého chcete sledovat"
 
-#: ../actions/recoverpassword.php:147
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
 msgid "Nickname or email"
 msgstr "Přezdívka nebo email"
 
-#: ../actions/imsettings.php:147
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:104
+msgid "No"
+msgstr ""
+
+#: ../actions/imsettings.php:156 actions/imsettings.php:164
 msgid "No Jabber ID."
 msgstr "Žádné Jabber ID."
 
-#: ../actions/userauthorization.php:128
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
 msgid "No authorization request!"
 msgstr "Žádné potvrení!"
 
-#: ../actions/confirmaddress.php:33
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+msgid "No carrier selected."
+msgstr ""
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+msgid "No code entered"
+msgstr ""
+
+#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
 msgid "No confirmation code."
 msgstr "Žádný potvrzující kód."
 
-#: ../actions/newnotice.php:49
+#: ../actions/newnotice.php:44 actions/newmessage.php:53
+#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:52
+#: actions/newnotice.php:53
 msgid "No content!"
 msgstr "Žádný obsah!"
 
-#: ../actions/userbyid.php:27
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+#: actions/emailsettings.php:197
+msgid "No email address."
+msgstr ""
+
+#: ../actions/userbyid.php:32 actions/userbyid.php:32
 msgid "No id."
 msgstr "Žádné id"
 
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+#: actions/emailsettings.php:292
+msgid "No incoming email address."
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:65
+#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:66
 msgid "No nickname provided by remote server."
 msgstr "Nebyla poskytnuta žádná přezdívka od servru."
 
-#: ../actions/avatarbynickname.php:27
+#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 msgid "No nickname."
 msgstr "Žádná přezdívka."
 
-#: ../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:243
 msgid "No pending confirmation to cancel."
 msgstr "Nečeká žádné potvrzení na zrušení."
 
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+msgid "No phone number."
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:72
+#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:73
 msgid "No profile URL returned by server."
 msgstr "Nebylo vráceno žádné URL profilu od servu."
 
-#: ../actions/recoverpassword.php:189
+#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
 msgid "No registered email address for that user."
 msgstr "Žádný registrovaný email pro tohoto uživatele."
 
-#: ../actions/userauthorization.php:48
+#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
 msgid "No request found!"
 msgstr "Žádný požadavek nebyl nalezen!"
 
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
+#: actions/noticesearch.php:69 actions/peoplesearch.php:69
+#: actions/noticesearch.php:68 actions/peoplesearch.php:59
 msgid "No results"
 msgstr "Žádné výsledky."
 
-#: ../actions/avatarbynickname.php:32
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
 msgid "No size."
 msgstr "Žádná velikost"
 
-#: ../actions/openidsettings.php:135
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:109
+#: actions/twitapistatuses.php:438
+msgid "No status found with that ID."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:411
+msgid "No status with that ID found."
+msgstr ""
+
+#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
 msgid "No such OpenID."
 msgstr "Žádné takové OpenID"
 
-#: ../actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29
 msgid "No such document."
 msgstr "Žádný takový dokument."
 
-#: ../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:38
+#: actions/shownotice.php:114
 msgid "No such notice."
 msgstr "Žádné takové oznámení."
 
-#: ../actions/recoverpassword.php:56
+#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
 msgid "No such recovery code."
 msgstr "Žádný takový obnovující kód."
 
-#: ../actions/postnotice.php:56
+#: ../actions/postnotice.php:56 actions/postnotice.php:57
 msgid "No such subscription"
 msgstr "Žádné takové odebírání"
 
 #: ../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/showstream.php:157
+#: classes/Command.php:208 classes/Command.php:242 lib/gallery.php:85
+#: lib/subs.php:105
 msgid "No such user."
 msgstr "Žádný takový uživatel."
 
-#: ../lib/gallery.php:76
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr ""
+
+#: ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
 msgstr "Nikdo k zobrazení!"
 
-#: ../actions/recoverpassword.php:60
+#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
 msgid "Not a recovery code."
 msgstr "Není obnovujícím kódem"
 
-#: ../actions/imsettings.php:158
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+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:423 lib/twitterapi.php:450
+#: lib/twitterapi.php:534
+msgid "Not a supported data format."
+msgstr ""
+
+#: ../actions/imsettings.php:167 actions/imsettings.php:175
 msgid "Not a valid Jabber ID"
 msgstr "Není platným Jabber ID"
 
-#: ../lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131
 msgid "Not a valid OpenID."
 msgstr "Není platným OpenID."
 
-#: ../actions/profilesettings.php:75 ../actions/register.php:53
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+#: actions/emailsettings.php:208
+msgid "Not a valid email address"
+msgstr ""
+
+#: ../actions/register.php:63 actions/register.php:70 actions/register.php:79
 msgid "Not a valid email address."
 msgstr "Není platnou mailovou adresou."
 
-#: ../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/profilesettings.php:212 actions/register.php:87
 msgid "Not a valid nickname."
 msgstr "Není platnou přezdívkou."
 
-#: ../actions/remotesubscribe.php:118
+#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
 msgid "Not a valid profile URL (incorrect services)."
 msgstr "Neplatný adresa profilu (nesprává služba)"
 
-#: ../actions/remotesubscribe.php:111
+#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr "Není platnou adresou profulu (XRDS nedefinováno)."
 
-#: ../actions/remotesubscribe.php:104
+#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
 msgid "Not a valid profile URL (no YADIS document)."
 msgstr "Není platnou adresou profilu (není YADIS dokumentem)."
 
-#: ../actions/avatar.php:95
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: actions/profilesettings.php:361
 msgid "Not an image or corrupt file."
 msgstr "Není obrázkem, nebo jde o poškozený soubor."
 
 #: ../actions/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:52
 msgid "Not authorized."
 msgstr "Neautorizován."
 
 #: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38
 msgid "Not expecting this response!"
 msgstr "Nečekaná odpověď."
 
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
-#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+#: actions/twitapistatuses.php:304
+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:31 actions/newnotice.php:30
+#: actions/nudge.php:30 actions/subedit.php:31 actions/unblock.php:31
 msgid "Not logged in."
 msgstr "Nepřihlášen"
 
-#: ../actions/unsubscribe.php:43
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:117
 msgid "Not subscribed!."
 msgstr "Nepřihlášen!"
 
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+msgid "Notice Search"
+msgstr ""
+
 #: ../actions/showstream.php:82 actions/showstream.php:82
-#, php-format
-#, fuzzy
+#: actions/showstream.php:111 actions/showstream.php:118
+#: actions/showstream.php:123
+#, fuzzy, php-format
 msgid "Notice feed for %s"
 msgstr ""
 "#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Feed sdělení pro %s\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/shownotice.php:39
+#: ../actions/shownotice.php:39 actions/shownotice.php:39
+#: actions/shownotice.php:45
 msgid "Notice has no profile"
 msgstr "Sdělení nemá profil"
 
-#: ../actions/showstream.php:297
+#: ../actions/showstream.php:316 actions/showstream.php:331
+#: actions/showstream.php:379
 msgid "Notices"
 msgstr "Sdělení"
 
-#: ../actions/password.php:39
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
+#, php-format
+msgid "Notices tagged with %s"
+msgstr ""
+
+#: ../actions/password.php:39 actions/profilesettings.php:178
+#: actions/profilesettings.php:183
 msgid "Old password"
 msgstr "Staré heslo"
 
-#: ../lib/util.php:288
+#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
+#: lib/util.php:330 actions/deleteprofile.php:247 lib/util.php:340
 msgid "OpenID"
 msgstr "OpenID"
 
-#: ../actions/finishopenidlogin.php:61
+#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
 msgid "OpenID Account Setup"
 msgstr "Nastavení OpenID účtu"
 
-#: ../lib/openid.php:180
+#: ../lib/openid.php:180 lib/openid.php:180
 msgid "OpenID Auto-Submit"
 msgstr "Přihlásit automaticky pomocí OpenID"
 
 #: ../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/finishopenidlogin.php:150 actions/openidlogin.php:76
 msgid "OpenID Login"
 msgstr "OpenID přihlášení"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
+#: actions/openidlogin.php:74 actions/openidsettings.php:50
+#: actions/openidlogin.php:82
 msgid "OpenID URL"
 msgstr "OpenID adresa"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
+#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 msgid "OpenID authentication cancelled."
 msgstr "Přihlašovaní pomocí OpenID zrušeno"
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
+#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "Přihlašovaní pomocí OpenID selhalo: %s"
 
-#: ../lib/openid.php:133
+#: ../lib/openid.php:133 lib/openid.php:133
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "OpenID selhalo: %s"
 
-#: ../actions/openidsettings.php:144
+#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
 msgid "OpenID removed."
 msgstr "OpenID odstraněno"
 
-#: ../actions/openidsettings.php:37
+#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
 msgid "OpenID settings"
 msgstr "Nastavení OpenID"
 
-#: ../actions/avatar.php:84
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: actions/profilesettings.php:350
 msgid "Partial upload."
 msgstr "Částečné náhrání."
 
-#: ../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/login.php:109 actions/register.php:194
 msgid "Password"
 msgstr "Heslo"
 
-#: ../actions/recoverpassword.php:249
+#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
 msgid "Password and confirmation do not match."
 msgstr "Heslo a potvrzení nesouhlasí"
 
-#: ../actions/recoverpassword.php:245
+#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
 msgid "Password must be 6 chars or more."
 msgstr "Heslo musí být alespoň 6 znaků dlouhé"
 
-#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
+#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 msgid "Password recovery requested"
 msgstr "Žádost o obnovu hesla"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:274
+#: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: actions/profilesettings.php:408 actions/recoverpassword.php:326
+#: actions/profilesettings.php:437
 msgid "Password saved."
 msgstr "Heslo uloženo"
 
-#: ../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/profilesettings.php:409 actions/register.php:107
 msgid "Passwords don't match."
 msgstr "Hesla nesouhlasí"
 
-#: ../actions/peoplesearch.php:33
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+msgid "People"
+msgstr ""
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+msgid "People Search"
+msgstr ""
+
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
 msgid "People search"
 msgstr "Hledání lidí"
 
-#: ../lib/stream.php:44
+#: ../lib/stream.php:50 lib/personal.php:50
 msgid "Personal"
 msgstr "Osobní"
 
-#: ../actions/userauthorization.php:77
+#: ../actions/invite.php:133 actions/invite.php:141
+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 ""
-"Prosím zkontrolujte tyto detailu, a ujistěte se že opravdu chcete "
-"odebírat sdělení tohoto uživatele. Pokud ne, ask to subscribe to "
-"somone's notices, klikněte na \"Zrušit\""
+"Prosím zkontrolujte tyto detailu, a ujistěte se že opravdu chcete odebírat "
+"sdělení tohoto uživatele. Pokud ne, ask to subscribe to somone's notices, "
+"klikněte na \"Zrušit\""
 
-#: ../actions/imsettings.php:74
+#: ../actions/imsettings.php:73 actions/imsettings.php:74
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Poslat oznámení, když se změní můj Jabber/Gtalk status."
 
-#: ../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
 msgid "Preferences"
 msgstr "Nastavení"
 
-#: ../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:185 actions/othersettings.php:179
 msgid "Preferences saved."
 msgstr "Nastavení uloženo"
 
-#: ../lib/util.php:300
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
+msgid "Preferred language"
+msgstr ""
+
+#: ../lib/util.php:328 lib/util.php:344 lib/util.php:356
 msgid "Privacy"
 msgstr "Soukromí"
 
-#: ../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:139 classes/Notice.php:149
 msgid "Problem saving notice."
 msgstr "Problém při ukládání sdělení"
 
-#: ../lib/stream.php:54
+#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
+#: lib/settingsaction.php:84 actions/deleteprofile.php:241
 msgid "Profile"
 msgstr "Profil"
 
-#: ../actions/remotesubscribe.php:73
+#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
 msgid "Profile URL"
 msgstr "Adresa Profilu"
 
-#: ../actions/profilesettings.php:34
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
 msgid "Profile settings"
 msgstr "Nastavené Profilu"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
+#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
+#: actions/postnotice.php:52 actions/updateprofile.php:53
 msgid "Profile unknown"
 msgstr "Neznámý profil"
 
-#: ../lib/util.php:276
-msgid "Public"
-msgstr "Veřejné"
-
-#: ../actions/public.php:54 actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:77
 #, fuzzy
 msgid "Public Stream Feed"
 msgstr ""
@@ -1010,47 +1664,81 @@ msgstr ""
 "Veřejný Stream Feed\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 lib/stream.php:34
 msgid "Public timeline"
 msgstr "Veřejné zprávy"
 
-#: ../actions/recoverpassword.php:151
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:104
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
 msgid "Recover"
 msgstr "Obnovit"
 
-#: ../actions/recoverpassword.php:141
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
 msgid "Recover password"
 msgstr "Obnovit"
 
-#: ../actions/recoverpassword.php:67
+#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
 msgid "Recovery code for unknown user."
 msgstr "Obnovyt kód pro neznámého uživatele"
 
-#: ../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:181 actions/register.php:234 lib/util.php:338
 msgid "Register"
 msgstr "Registrovat"
 
-#: ../actions/userauthorization.php:119
+#: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:173
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:241
+msgid "Registration successful"
+msgstr ""
+
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
 msgid "Reject"
 msgstr "Odmítnout"
 
-#: ../actions/login.php:99 ../actions/register.php:183
+#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
+#: actions/register.php:190 actions/login.php:110 actions/openidlogin.php:85
+#: actions/register.php:217
 msgid "Remember me"
 msgstr "Zapamatuj si mě"
 
-#: ../actions/updateprofile.php:69
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
 msgid "Remote profile with no matching profile"
 msgstr "Vzdálený profil s nesouhlasícím profilem"
 
-#: ../actions/remotesubscribe.php:65
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
 msgid "Remote subscribe"
 msgstr "Vzdálený odběr"
 
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php:48 actions/emailsettings.php:76
+#: actions/imsettings.php:49 actions/openidsettings.php:108
+#: actions/smssettings.php:50 actions/smssettings.php:84
+#: actions/twittersettings.php:59 actions/twittersettings.php:61
 msgid "Remove"
 msgstr "Odstranit"
 
-#: ../actions/openidsettings.php:68
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
 msgid "Remove OpenID"
 msgstr "Odstranit OpenID"
 
@@ -1062,36 +1750,68 @@ msgstr ""
 "Odstranění jediného OpenID, bude mít za následek nemožnost dalšího "
 "přihlášení, nejprve přidejte jiné OpenID"
 
-#: ../lib/stream.php:49
+#: ../lib/stream.php:55 lib/personal.php:55
 msgid "Replies"
 msgstr "Odpovědi"
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:50
+#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
+#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #, php-format
 msgid "Replies to %s"
 msgstr "Odpovědi na %s"
 
-#: ../actions/recoverpassword.php:168
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
 msgid "Reset"
 msgstr "Reset"
 
-#: ../actions/recoverpassword.php:158
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
 msgid "Reset password"
 msgstr "Resetovat heslo"
 
-#: ../actions/recoverpassword.php:167 ../actions/register.php:180
-msgid "Same as password above"
-msgstr "Stejné jako heslo výše"
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/deleteprofile.php:250 actions/subscriptions.php:73
+msgid "SMS"
+msgstr ""
 
-#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
-msgid "Save"
-msgstr "Uložit"
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+msgid "SMS Phone number"
+msgstr ""
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:230
+msgid "SMS confirmation"
+msgstr ""
+
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
+msgid "Same as password above"
+msgstr "Stejné jako heslo výše"
+
+#: ../actions/register.php:156 actions/register.php:170
+#: actions/register.php:197
+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/twittersettings.php:83 actions/emailsettings.php:107
+#: actions/othersettings.php:56 actions/profilesettings.php:106
+#: actions/subscriptions.php:74 actions/tagother.php:100
+#: actions/twittersettings.php:82
+msgid "Save"
+msgstr "Uložit"
 
-#: ../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/util.php:327
 msgid "Search"
 msgstr "Hledat"
 
 #: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:84
 #, fuzzy
 msgid "Search Stream Feed"
 msgstr ""
@@ -1099,14 +1819,15 @@ msgstr ""
 "Hledat ve Stream Feed\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/noticesearch.php:30
+#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
+#: actions/noticesearch.php:29
 #, 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 ""
-"Hledej sdělení na %%site.name%% podle obsahu. Minimální délka musí "
-"být alespoň 3 znaky"
+"Hledej sdělení na %%site.name%% podle obsahu. Minimální délka musí být "
+"alespoň 3 znaky"
 
 #: ../actions/peoplesearch.php:28
 #, php-format
@@ -1114,154 +1835,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 ""
-"Hledej uživatele na %%site.name%% podle jejich jména, místa, nebo "
-"zájmů. Minimální délka musí být alespoň 3 znaky"
+"Hledej uživatele na %%site.name%% podle jejich jména, místa, nebo zájmů. "
+"Minimální délka musí být alespoň 3 znaky"
+
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+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 lib/util.php:1646 lib/util.php:2158
 msgid "Send"
 msgstr "Odeslat"
 
-#: ../actions/imsettings.php:71
+#: ../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."
+msgstr ""
+
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+msgid "Send me notices of new subscriptions through email."
+msgstr ""
+
+#: ../actions/imsettings.php:70 actions/imsettings.php:71
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Zasílat oznámení pomocí Jabber/GTalk"
 
-#: ../lib/util.php:282
+#: ../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 ""
+
+#: ../lib/util.php:304 lib/util.php:320 lib/util.php:330
 msgid "Settings"
 msgstr "Nastavení"
 
-#: ../actions/profilesettings.php:183
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:336
 msgid "Settings saved."
 msgstr "Nastavení uloženo"
 
-#: ../actions/finishaddopenid.php:66
+#: ../actions/tag.php:60 actions/tag.php:60 actions/tag.php:59
+msgid "Showing most popular tags from the last week"
+msgstr ""
+
+#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
 msgid "Someone else already has this OpenID."
 msgstr "Někdo jiný již má toto OpenID"
 
 #: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
+#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
 msgid "Something weird happened."
 msgstr "Něco zvláštního se stalo"
 
-#: ../lib/util.php:302
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr ""
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: ../lib/util.php:330 lib/util.php:346 lib/util.php:358
 msgid "Source"
 msgstr "Zdroj"
 
-#: ../actions/showstream.php:277
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:359
 msgid "Statistics"
 msgstr "Statistiky"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
+#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
+#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
+#: actions/finishopenidlogin.php:199 actions/finishopenidlogin.php:267
 msgid "Stored OpenID not found."
 msgstr "Uložené OpenID nebylo nalezeno."
 
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:172
-#: ../actions/showstream.php:181
+#: ../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:254 lib/util.php:2078
 msgid "Subscribe"
 msgstr "Odebírat"
 
-#: ../actions/showstream.php:294 ../actions/subscribers.php:27
+#: ../actions/showstream.php:313 ../actions/subscribers.php:27
+#: actions/showstream.php:328 actions/subscribers.php:27
+#: actions/showstream.php:376 lib/gallery.php:136 lib/gallery.php:137
 msgid "Subscribers"
 msgstr "Odběratelé"
 
-#: ../actions/userauthorization.php:309
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
 msgid "Subscription authorized"
 msgstr "Odběr autorizován"
 
-#: ../actions/userauthorization.php:319
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
 msgid "Subscription rejected"
 msgstr "Odběr odmítnut"
 
-#: ../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:288 actions/showstream.php:370 lib/gallery.php:131
+#: lib/gallery.php:132
 msgid "Subscriptions"
 msgstr "Odběry"
 
-#: ../actions/avatar.php:87
+#: ../actions/avatar.php:87 actions/profilesettings.php:324
+#: actions/profilesettings.php:353
 msgid "System error uploading file."
 msgstr "Chyba systému při nahrávání souboru"
 
-#: ../actions/noticesearch.php:34
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317 actions/profilesettings.php:90 actions/showstream.php:382
+#: actions/tag.php:40 actions/tagother.php:96 actions/tagother.php:162
+#: lib/profilelist.php:126 lib/profilelist.php:128
+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:33
 msgid "Text search"
 msgstr "Vyhledávání textu"
 
-#: ../actions/openidsettings.php:140
+#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
 msgid "That OpenID does not belong to you."
 msgstr "Toto OpenID vám nepatří"
 
-#: ../actions/confirmaddress.php:52
+#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
 msgid "That address has already been confirmed."
 msgstr "Adresa již byla potvrzena"
 
-#: ../actions/confirmaddress.php:43
+#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
 msgid "That confirmation code is not for you!"
 msgstr "Tento potvrzující kód vám nepatří!"
 
-#: ../actions/avatar.php:80
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:214
+msgid "That email address already belongs to another user."
+msgstr ""
+
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: actions/profilesettings.php:346
 msgid "That file is too big."
 msgstr "Soubor je příliš velký"
 
-#: ../actions/imsettings.php:161
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
 msgid "That is already your Jabber ID."
 msgstr "Toto je již vaše Jabber"
 
-#: ../actions/imsettings.php:224
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:211
+msgid "That is already your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+msgid "That is already your phone number."
+msgstr ""
+
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
 msgid "That is not your Jabber ID."
 msgstr "Toto není váš Jabber"
 
-#: ../actions/imsettings.php:201
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+#: actions/emailsettings.php:270
+msgid "That is not your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+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:247
 msgid "That is the wrong IM address."
 msgstr "Toto je špatná IM adresa"
 
-#: ../actions/newnotice.php:52
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+msgid "That is the wrong confirmation number."
+msgstr ""
+
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+msgid "That phone number already belongs to another user."
+msgstr ""
+
+#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: actions/newnotice.php:49 actions/twitapistatuses.php:330
+#: actions/newnotice.php:61 actions/twitapistatuses.php:271
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků"
 
-#: ../actions/confirmaddress.php:86
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+#: actions/twitapiaccount.php:55
+msgid "That's too long. Max notice size is 255 chars."
+msgstr ""
+
+#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Adresa \"%s\" byla potvrzena pro váš účet"
 
-#: ../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:285
 msgid "The address was removed."
 msgstr "Adresa byla odstraněna"
 
-#: ../actions/userauthorization.php:311
+#: ../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 ""
 "Odběr byl potvrzen, ale neprošla žádná callback adresa. Zkontrolujte v "
-"nápovědě jak správně postupovat při potvrzování odběru. Váš "
-"řetězec odběru je:"
+"nápovědě jak správně postupovat při potvrzování odběru. Váš řetězec odběru "
+"je:"
 
-#: ../actions/userauthorization.php:321
+#: ../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 ""
-"Odebírání bylo zamítnuto, ale neprošla žádná callback adresa. "
-"Zkontrolujte v nápovědě jak správně postupovat při zamítání odběru"
+"Odebírání bylo zamítnuto, ale neprošla žádná callback adresa. Zkontrolujte v "
+"nápovědě jak správně postupovat při zamítání odběru"
 
-#: ../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 "Toto jsou lidé, kteří naslouchají %s sdělením"
 
-#: ../actions/subscribers.php:33
+#: ../actions/subscribers.php:33 actions/subscribers.php:33
 msgid "These are the people who listen to your notices."
 msgstr "Toto jsou lidé, kteří naslouchají vašim sdělením "
 
-#: ../actions/subscriptions.php:35
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Toto jsou lidé, jejiž sdělením %s naslouchá"
 
-#: ../actions/subscriptions.php:33
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
 msgid "These are the people whose notices you listen to."
 msgstr "Toto jsou lidé, jejiž sdělením nasloucháte"
 
-#: ../actions/recoverpassword.php:87
+#: ../actions/invite.php:89 actions/invite.php:96
+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 "Tento potvrzující kód je příliš starý Prosím zkuste znovu"
 
@@ -1270,82 +2101,150 @@ msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
 msgstr ""
-"Tento formulář by se měl odeslat sám, pokud ne tak klikněte na "
-"tlašítko pro přechod k vašemu OpenID poskytovately."
+"Tento formulář by se měl odeslat sám, pokud ne tak klikněte na tlašítko pro "
+"přechod k vašemu OpenID poskytovately."
 
-#: ../actions/finishopenidlogin.php:56
+#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
 #, 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 ""
-"Toto je poprvé co jste se přihlásil na %s proto musíme propojit vaše "
-"OpenID k našemu účtu. Můžete buď vytvořit nový účet, nebo propojit "
-"OpenID k vašemu již existujícímu účtu, pokud již takový máte."
+"Toto je poprvé co jste se přihlásil na %s proto musíme propojit vaše OpenID "
+"k našemu účtu. Můžete buď vytvořit nový účet, nebo propojit OpenID k vašemu "
+"již existujícímu účtu, pokud již takový máte."
+
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:94
+#: actions/twitapifriendships.php:82 actions/twitapistatuses.php:428
+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:46
+#: actions/twitapidirect_messages.php:117 actions/twitapifriendships.php:30
+#: actions/twitapistatuses.php:239
+msgid "This method requires a POST."
+msgstr ""
 
-#: ../lib/util.php:147
+#: ../lib/util.php:164 lib/util.php:246 lib/util.php:257
 msgid "This page is not available in a media type you accept"
 msgstr "Tato stránka není k dispozici v typu média která přijímáte."
 
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
+msgid "Timezone"
+msgstr ""
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr ""
+
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"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 ""
+"Pro odebírání, se musíte [přihlásit](%%action.login%%), nebo [registrovat](%%"
+"action.register%%) nový účet. Pokud již máte účet na [kompatibilních "
+"mikroblozích](%%doc.openmublog%%), vložte níže asdresu "
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: actions/twitapifriendships.php:128
+msgid "Two user ids or screen_names must be supplied."
 msgstr ""
-"Pro odebírání, se musíte [přihlásit](%%action.login%%), nebo "
-"[registrovat](%%action.register%%) nový účet. Pokud již máte účet na "
-"[kompatibilních mikroblozích](%%doc.openmublog%%), vložte níže asdresu "
 
-#: ../actions/profilesettings.php:51
+#: ../actions/profilesettings.php:48 ../actions/register.php:169
+#: actions/profilesettings.php:81 actions/register.php:183
+#: actions/profilesettings.php:83 actions/register.php:210
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "Adresa vašich stránek, blogu nebo profilu na jiných stránkách."
 
-#: ../actions/remotesubscribe.php:74
+#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "Adresa profilu na jiných kompatibilních mikroblozích."
 
-#: ../actions/imsettings.php:105 ../actions/recoverpassword.php:39
+#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
+#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
+#: actions/emailsettings.php:144 actions/imsettings.php:118
+#: actions/recoverpassword.php:39 actions/smssettings.php:143
+#: actions/twittersettings.php:108 actions/emailsettings.php:147
+#: actions/othersettings.php:146 actions/twittersettings.php:199
 msgid "Unexpected form submission."
 msgstr "Nečekaná forma submission."
 
-#: ../actions/recoverpassword.php:237
+#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
 msgid "Unexpected password reset."
 msgstr "Nečekané resetování hesla."
 
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:58
+#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:59
 msgid "Unknown version of OMB protocol."
 msgstr "Neznámá verze OMB protokolu."
 
-#: ../lib/util.php:245
+#: ../lib/util.php:269 lib/util.php:285 lib/util.php:296
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
 msgstr ""
-"Pokud není uvedeno jinak, obsah těchto stránek chráněn autorským "
-"právem, patří přispěvatelů a je k dipozici pod"
+"Pokud není uvedeno jinak, obsah těchto stránek chráněn autorským právem, "
+"patří přispěvatelů a je k dipozici pod"
 
-#: ../actions/confirmaddress.php:48
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr "Neznámý typ adresy %s"
 
-#: ../actions/showstream.php:193
+#: ../actions/showstream.php:209 actions/showstream.php:219
+#: actions/showstream.php:267 lib/util.php:2094
 msgid "Unsubscribe"
 msgstr "Odhlásit"
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
+#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
+#: actions/postnotice.php:45 actions/updateprofile.php:46
 msgid "Unsupported OMB version"
 msgstr "Nepodporovaná verze OMB."
 
-#: ../actions/avatar.php:105
+#: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: actions/profilesettings.php:371
 msgid "Unsupported image file format."
 msgstr "Nepodporovaný formát obrázku."
 
-#: ../actions/avatar.php:68
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: actions/deleteprofile.php:251
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: actions/deleteprofile.php:254
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/twitapistatuses.php:126
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:198
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
+
+#: ../actions/avatar.php:68 actions/profilesettings.php:161
+#: actions/profilesettings.php:166
 msgid "Upload"
 msgstr "Upload"
 
@@ -1356,108 +2255,199 @@ msgid ""
 "site license, also. Use a picture that belongs to you and that you want to "
 "share."
 msgstr ""
-"Zde nahrajte nový obrázek k vašemu profilu. Po tom co nahrajete obrázek "
-"ho již nemůžete editovat, proto se ujistěte že jde víceméně o čtverec."
+"Zde nahrajte nový obrázek k vašemu profilu. Po tom co nahrajete obrázek ho "
+"již nemůžete editovat, proto se ujistěte že jde víceméně o čtverec."
+
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr ""
+
+#: ../actions/invite.php:114 actions/invite.php:121
+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 actions/register.php:200
+#: actions/register.php:203
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Použije se pouze pro aktualizace, oznámení a obnovu hesla."
 
 #: ../actions/finishremotesubscribe.php:86
+#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:92
 msgid "User being listened to doesn't exist."
 msgstr "Úživatel, kterému nasloucháte neexistuje."
 
 #: ../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/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/showstream.php:57
+#: actions/twitapiaccount.php:63 actions/twitapifavorites.php:40
+#: actions/twitapistatuses.php:163 actions/twitapistatuses.php:492
+#: lib/twitterapi.php:590
 msgid "User has no profile."
 msgstr "Uživatel nemá profil."
 
-#: ../actions/remotesubscribe.php:71
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
 msgid "User nickname"
 msgstr "Přezdívka"
 
-#: ../lib/util.php:969
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../lib/util.php:1159 lib/util.php:1293 lib/util.php:1630
 #, php-format
 msgid "What's up, %s?"
 msgstr "Co se děje %s?"
 
-#: ../actions/profilesettings.php:57
+#: ../actions/profilesettings.php:54 ../actions/register.php:175
+#: actions/profilesettings.php:87 actions/register.php:189
+#: actions/profilesettings.php:89 actions/register.php:216
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Místo. Město, stát."
 
-#: ../actions/updateprofile.php:127
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Neplatný typ obrázku pro '%s'"
 
-#: ../actions/updateprofile.php:122
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Neplatná velikost obrázku '%s'"
 
-#: ../actions/finishaddopenid.php:64
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+#: actions/block.php:105
+msgid "Yes"
+msgstr ""
+
+#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
 msgid "You already have this OpenID!"
 msgstr "Již máte toto OpenID!"
 
-#: ../actions/recoverpassword.php:31
+#: ../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
 msgid "You are already logged in!"
 msgstr "Již jste přihlášen"
 
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:102
+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 "Zde můžeze změnit heslo."
 
-#: ../actions/register.php:164
+#: ../actions/register.php:135 actions/register.php:145
 msgid "You can create a new account to start posting notices."
 msgstr "Můžete vytvožit nový účet a začít posílat oznámení."
 
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
 #: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr ""
-"Můžete odstranit OpenID z vašeho účtu, kliknutím na tlačítko "
-"\"Odebrat\"."
+"Můžete odstranit OpenID z vašeho účtu, kliknutím na tlačítko \"Odebrat\"."
 
-#: ../actions/imsettings.php:28
+#: ../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 ""
-"Můžete odesílat nebo přijámat sdělení pomocí Jabber/GTalk "
-"[zpráv](%%doc.im%%).Zadejte svou adresu níže."
+"Můžete odesílat nebo přijámat sdělení pomocí Jabber/GTalk [zpráv](%%doc.im%"
+"%).Zadejte svou adresu níže."
 
 #: ../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 ""
-"Zde můžete aktualizovat informace o vašem profilu, aby se lidé o vás "
-"mohli více dozvědět."
+"Zde můžete aktualizovat informace o vašem profilu, aby se lidé o vás mohli "
+"více dozvědět."
 
 #: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
+#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
+#: actions/finishremotesubscribe.php:83 actions/finishremotesubscribe.php:99
 msgid "You can use the local subscription!"
 msgstr "Můžete použít místní odebírání."
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:51
+#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
+#: actions/finishopenidlogin.php:38 actions/register.php:68
+#: actions/register.php:77
 msgid "You can't register if you don't agree to the license."
 msgstr "Nemůžete se registrovat, pokud nesouhlasíte s licencí."
 
-#: ../actions/updateprofile.php:62
+#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
 msgid "You did not send us that profile"
 msgstr "Neodeslal jste nám profil"
 
-#: ../actions/recoverpassword.php:134
+#: ../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 ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: actions/twitapistatuses.php:455
+msgid "You may not delete another user's status."
+msgstr ""
+
+#: ../actions/invite.php:31 actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+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!"
+msgstr ""
+
+#: ../actions/recoverpassword.php:149
 msgid "You've been identified. Enter a  new password below. "
 msgstr "Byl jste identifikován. Zadejte nové heslo"
 
-#: ../actions/openidlogin.php:67
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:84
 msgid "Your OpenID URL"
 msgstr "Vaše OpenID adresa"
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:164
 msgid "Your nickname on this server, or your registered email address."
 msgstr "Vaše přezdívka na tomto servu, nebo váš email zadaný při registraci"
 
@@ -1467,787 +2457,88 @@ 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%%) vám dovoluje použít stejný účet na více "
-"stránkách. Zde může spravovat vaše OpenID"
+"[OpenID](%%doc.openid%%) vám dovoluje použít stejný účet na více stránkách. "
+"Zde může spravovat vaše OpenID"
 
-#: ../lib/util.php:814
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:1287
 msgid "a few seconds ago"
 msgstr "před pár sekundami"
 
-#: ../lib/util.php:826
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:1299
 #, php-format
 msgid "about %d days ago"
 msgstr "před %d dny"
 
-#: ../lib/util.php:822
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:1295
 #, php-format
 msgid "about %d hours ago"
 msgstr "asi před %d hodinami"
 
-#: ../lib/util.php:818
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:1291
 #, php-format
 msgid "about %d minutes ago"
 msgstr "asi před %d minutami"
 
-#: ../lib/util.php:830
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:1303
 #, php-format
 msgid "about %d months ago"
 msgstr "asi před %d mesíci"
 
-#: ../lib/util.php:824
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:1297
 msgid "about a day ago"
 msgstr "asi přede dnem"
 
-#: ../lib/util.php:816
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:1289
 msgid "about a minute ago"
 msgstr "asi před minutou"
 
-#: ../lib/util.php:828
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:1301
 msgid "about a month ago"
 msgstr "asi před měsícem"
 
-#: ../lib/util.php:832
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:1305
 msgid "about a year ago"
 msgstr "asi před rokem"
 
-#: ../lib/util.php:820
-msgid "about an hour ago"
-msgstr "asi před hodinou"
-
-#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
-#: ../lib/stream.php:101
-msgid "in reply to..."
-msgstr "odpověd na ..."
-
-#: ../actions/noticesearch.php:133 ../actions/showstream.php:390
-#: ../lib/stream.php:108
-msgid "reply"
-msgstr "odpověď"
-
-#: ../actions/password.php:44
-msgid "same as password above"
-msgstr "stejné jako heslo výše"
-
-#: ../lib/util.php:1127
-msgid "« After"
-msgstr "« Novější"
-
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr ""
-
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
-
-#: ../actions/invite.php:168 actions/invite.php:176
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
-
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
-
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
-#, php-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#, php-format
-msgid "%s public timeline"
-msgstr ""
-
-#: ../lib/mail.php:206 lib/mail.php:212
-#, php-format
-msgid "%s status"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#, php-format
-msgid "%s timeline"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
-msgstr ""
-
-#: ../actions/register.php:213
-msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
-msgstr ""
-
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-
-#: ../actions/register.php:154 actions/register.php:168
-msgid "6 or more characters. Required."
-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 ""
-
-#: ../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/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!"
-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 ""
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-msgid "Add or remove OpenIDs"
-msgstr ""
-
-#: ../actions/invite.php:131 actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
-msgstr ""
-
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-msgid "Are you sure you want to delete this notice?"
-msgstr ""
-
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr ""
-
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
-msgid "Can't delete this notice."
-msgstr ""
-
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-msgid "Cannot normalize that email address"
-msgstr ""
-
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr ""
-
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
-msgstr ""
-
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-msgid "Change your profile settings"
-msgstr ""
-
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-msgid "Confirmation code"
-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/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
-msgstr ""
-
-#: ../lib/subs.php:54 lib/subs.php:61
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: ../lib/subs.php:46 lib/subs.php:46
-msgid "Could not subscribe."
-msgstr ""
-
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-msgid "Could not update user with confirmed email address."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-msgid "Couldn't find any statuses."
-msgstr ""
-
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-msgid "Couldn't update user for autosubscribe."
-msgstr ""
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-msgid "Couldn't update user record."
-msgstr ""
-
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-msgid "Current confirmed email address."
-msgstr ""
-
-#: ../classes/Notice.php:72 classes/Notice.php:86
-#, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr ""
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-msgid "Delete notice"
-msgstr ""
-
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-msgid "Email Address"
-msgstr ""
-
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-msgid "Email Settings"
-msgstr ""
-
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-msgid "Email address, like \"UserName@example.org\""
-msgstr ""
-
-#: ../actions/invite.php:129 actions/invite.php:137
-msgid "Email addresses"
-msgstr ""
-
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
-msgstr ""
-
-#: ../actions/tag.php:55 actions/tag.php:55
-#, php-format
-msgid "Feed for tag %s"
-msgstr ""
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr ""
-
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr ""
-
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-msgid "I want to post notices by email."
-msgstr ""
-
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
-msgstr ""
-
-#: ../actions/recoverpassword.php:137
-msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
-"email address you have stored  in your account."
-msgstr ""
-
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-msgid "Incoming email"
-msgstr ""
-
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-msgid "Incoming email address removed."
-msgstr ""
-
-#: ../actions/invite.php:55 actions/invite.php:62
-#, php-format
-msgid "Invalid email address: %s"
-msgstr ""
-
-#: ../actions/invite.php:79 actions/invite.php:86
-msgid "Invitation(s) sent"
-msgstr ""
-
-#: ../actions/invite.php:97 actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
-msgstr ""
-
-#: ../lib/util.php:306 lib/util.php:322
-msgid "Invite"
-msgstr ""
-
-#: ../actions/invite.php:123 actions/invite.php:130
-msgid "Invite new users"
-msgstr ""
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Language"
-msgstr ""
-
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-msgid "Language is too long (max 50 chars)."
-msgstr ""
-
-#: ../actions/register.php:166 actions/register.php:180
-msgid "Longer name, preferably your \"real\" name"
-msgstr ""
-
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-#: actions/emailsettings.php:81 actions/smssettings.php:89
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
-
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-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 ""
-
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-msgid "New"
-msgstr ""
-
-#: ../lib/mail.php:144 lib/mail.php:144
-#, php-format
-msgid "New email address for posting to %s"
-msgstr ""
-
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-msgid "New incoming email address added."
-msgstr ""
-
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-msgid "No"
-msgstr ""
-
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-msgid "No carrier selected."
-msgstr ""
-
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-msgid "No code entered"
-msgstr ""
-
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-msgid "No email address."
-msgstr ""
-
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-msgid "No incoming email address."
-msgstr ""
-
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-msgid "No phone number."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-msgid "No status found with that ID."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-msgid "No status with that ID found."
-msgstr ""
-
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-msgid "No user with that email address or username."
-msgstr ""
-
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-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
-msgid "Not a supported data format."
-msgstr ""
-
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-msgid "Not a valid email address"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-msgid "Not found"
-msgstr ""
-
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-msgid "Notice Search"
-msgstr ""
-
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81
-#, php-format
-msgid "Notices tagged with %s"
-msgstr ""
-
-#: ../actions/invite.php:135 actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-msgid "People"
-msgstr ""
-
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-msgid "People Search"
-msgstr ""
-
-#: ../actions/invite.php:133 actions/invite.php:141
-msgid "Personal message"
-msgstr ""
-
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Preferred language"
-msgstr ""
-
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
-
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-msgid "Publish a MicroID for my email address."
-msgstr ""
-
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr ""
-
-#: ../actions/register.php:28 actions/register.php:28
-msgid "Registration not allowed."
-msgstr ""
-
-#: ../actions/register.php:200 actions/register.php:214
-msgid "Registration successful"
-msgstr ""
-
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
-msgstr ""
-
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-msgid "SMS Phone number"
-msgstr ""
-
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-msgid "SMS Settings"
-msgstr ""
-
-#: ../lib/mail.php:219 lib/mail.php:225
-msgid "SMS confirmation"
-msgstr ""
-
-#: ../actions/register.php:156 actions/register.php:170
-msgid "Same as password above. Required."
-msgstr ""
-
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-msgid "Select a carrier"
-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."
-msgstr ""
-
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-msgid "Send me notices of new subscriptions through email."
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr ""
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
-msgstr ""
-
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317
-msgid "Tags"
-msgstr ""
-
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr ""
-
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr ""
-
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-msgid "That is already your email address."
-msgstr ""
-
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-msgid "That is already your phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-msgid "That is not your email address."
-msgstr ""
-
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-msgid "That is not your phone number."
-msgstr ""
-
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-msgid "That is the wrong confirmation number."
-msgstr ""
-
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-msgid "That phone number already belongs to another user."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-msgid "That's too long. Max notice size is 255 chars."
-msgstr ""
-
-#: ../actions/invite.php:89 actions/invite.php:96
-msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
-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."
-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."
-msgstr ""
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "Timezone"
-msgstr ""
-
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-msgid "Timezone not selected."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-msgid "Two user ids or screen_names must be supplied."
-msgstr ""
-
-#: ../index.php:57 index.php:57
-msgid "Unknown action"
-msgstr ""
-
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-msgid "Updates by SMS"
-msgstr ""
-
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr ""
-
-#: ../actions/invite.php:114 actions/invite.php:121
-msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
-msgstr ""
-
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr ""
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "What timezone are you normally in?"
-msgstr ""
-
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-msgid "Yes"
-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/invite.php:81 actions/invite.php:88
-msgid "You are already subscribed to these users:"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
-msgstr ""
-
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-msgid "You may not delete another user's status."
-msgstr ""
-
-#: ../actions/invite.php:31 actions/invite.php:31
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-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!"
-msgstr ""
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:1293
+msgid "about an hour ago"
+msgstr "asi před hodinou"
 
 #: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
+#: actions/showstream.php:441 lib/stream.php:99 lib/noticelist.php:211
 msgid "delete"
 msgstr ""
 
+#: ../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:135
+#: lib/facebookaction.php:202 lib/noticelist.php:189
+msgid "in reply to..."
+msgstr "odpověd na ..."
+
+#: ../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:142
+#: lib/noticelist.php:199
+msgid "reply"
+msgstr "odpověď"
+
+#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/profilesettings.php:188
+msgid "same as password above"
+msgstr "stejné jako heslo výše"
+
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+#: actions/twitapistatuses.php:543
 msgid "unsupported file type"
 msgstr ""
 
+#: ../lib/util.php:1309 lib/util.php:1443 lib/facebookaction.php:251
+#: lib/util.php:1783
+#, fuzzy
+msgid "« After"
+msgstr "« Novější"
+
 #: actions/deletenotice.php:74 actions/disfavor.php:43
 #: actions/emailsettings.php:127 actions/favor.php:45
 #: actions/finishopenidlogin.php:33 actions/imsettings.php:105
@@ -2257,6 +2548,12 @@ msgstr ""
 #: 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:38 actions/deleteprofile.php:127 actions/disfavor.php:47
+#: actions/emailsettings.php:130 actions/favor.php:49 actions/login.php:45
+#: actions/newmessage.php:44 actions/newnotice.php:36 actions/nudge.php:47
+#: actions/othersettings.php:139 actions/profilesettings.php:49
+#: actions/subedit.php:38 actions/tagother.php:113
+#: actions/twittersettings.php:188 actions/unblock.php:38
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -2280,12 +2577,14 @@ msgstr ""
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142
+#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:54
+#: actions/twitapifavorites.php:115
 msgid "This notice is already a favorite!"
 msgstr ""
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
+#: classes/Command.php:132 actions/favor.php:61
+#: actions/twitapifavorites.php:122
 msgid "Could not create favorite."
 msgstr ""
 
@@ -2294,11 +2593,12 @@ msgid "Disfavor"
 msgstr ""
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:62
 #, php-format
 msgid "%s favorite notices"
 msgstr ""
 
-#: actions/favoritesrss.php:64
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:66
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr ""
@@ -2324,47 +2624,50 @@ msgid ""
 "\n"
 msgstr ""
 
-#: actions/login.php:104
+#: actions/login.php:104 actions/login.php:111 actions/openidlogin.php:86
 msgid "Automatically login in the future; "
 msgstr ""
 
-#: actions/login.php:122
+#: actions/login.php:122 actions/login.php:130
 msgid "For security reasons, please re-enter your "
 msgstr ""
 
-#: actions/login.php:126
+#: actions/login.php:126 actions/login.php:134
 msgid "Login with your username and password. "
 msgstr ""
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+#: actions/newmessage.php:60 actions/twitapidirect_messages.php:136
 msgid "That's too long. Max message size is 140 chars."
 msgstr ""
 
-#: actions/newmessage.php:65
+#: actions/newmessage.php:65 actions/newmessage.php:68
 msgid "No recipient specified."
 msgstr ""
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
+#: classes/Command.php:206 actions/newmessage.php:71
+#: actions/newmessage.php:116 classes/Command.php:211
 msgid "You can't send a message to this user."
 msgstr ""
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
+#: classes/Command.php:209 actions/newmessage.php:74
+#: actions/twitapidirect_messages.php:153 classes/Command.php:214
 msgid ""
-"Don't send a message to yourself; just say it to yourself quietly "
-"instead."
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: actions/newmessage.php:108
+#: actions/newmessage.php:108 actions/microsummary.php:32
+#: actions/newmessage.php:111
 msgid "No such user"
 msgstr ""
 
-#: actions/newmessage.php:117
+#: actions/newmessage.php:117 actions/newmessage.php:120
 msgid "New message"
 msgstr ""
 
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:95 actions/noticesearch.php:94
 msgid "Notice without matching profile"
 msgstr ""
 
@@ -2411,6 +2714,7 @@ msgstr ""
 
 #: actions/profilesettings.php:115 actions/remotesubscribe.php:320
 #: actions/userauthorization.php:159 actions/userrss.php:76
+#: actions/profilesettings.php:120 actions/remotesubscribe.php:333
 msgid "User without matching profile"
 msgstr ""
 
@@ -2438,18 +2742,18 @@ msgstr ""
 msgid "New password successfully saved. "
 msgstr ""
 
-#: actions/register.php:95
+#: actions/register.php:95 actions/register.php:104
 msgid "Password must be 6 or more characters."
 msgstr ""
 
-#: actions/register.php:216
+#: actions/register.php:216 actions/register.php:243
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to..."
 msgstr ""
 
-#: actions/register.php:227
+#: actions/register.php:227 actions/register.php:254
 msgid "(You should receive a message by email momentarily, with "
 msgstr ""
 
@@ -2464,6 +2768,7 @@ msgid "Feed for favorites of %s"
 msgstr ""
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:88 actions/twitapifavorites.php:57
 msgid "Could not retrieve favorite notices."
 msgstr ""
 
@@ -2485,7 +2790,7 @@ msgstr ""
 msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: actions/showstream.php:154
+#: actions/showstream.php:154 lib/util.php:2105
 msgid "Send a message"
 msgstr ""
 
@@ -2494,73 +2799,78 @@ msgstr ""
 msgid "Mobile carrier for your phone. "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:64
 #, php-format
 msgid "Direct messages to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:65
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:69
 msgid "Direct Messages You've Sent"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:70
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:132
 msgid "No message text!"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:145
 msgid "Recipient user not found."
 msgstr ""
 
 #: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:148
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
-#: actions/twitapifavorites.php:92
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:64
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
-#: actions/twitapifavorites.php:95
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:67
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
+#: actions/twitapifavorites.php:158 lib/mail.php:303
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr ""
 
 #: actions/twitapifavorites.php:188 lib/mail.php:276
+#: actions/twitapifavorites.php:159 lib/mail.php:304
 #, php-format
 msgid ""
 "%1$s just added your notice from %2$s as one of their favorites.\n"
 "\n"
 msgstr ""
 
-#: actions/twittersettings.php:27
+#: actions/twittersettings.php:27 actions/twittersettings.php:29
 msgid ""
 "Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 
-#: actions/twittersettings.php:41
+#: actions/twittersettings.php:41 actions/twittersettings.php:43
 msgid "Twitter settings"
 msgstr ""
 
-#: actions/twittersettings.php:48
+#: actions/twittersettings.php:48 actions/twittersettings.php:50
 msgid "Twitter Account"
 msgstr ""
 
-#: actions/twittersettings.php:56
+#: actions/twittersettings.php:56 actions/twittersettings.php:58
 msgid "Current verified Twitter account."
 msgstr ""
 
@@ -2588,46 +2898,50 @@ msgstr ""
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:216
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr ""
 
-#: actions/twittersettings.php:128
+#: actions/twittersettings.php:128 actions/twittersettings.php:221
 msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: actions/twittersettings.php:137 actions/twittersettings.php:228
 #, php-format
 msgid "Unable to retrieve account information for \"%s\" from Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:234 actions/twittersettings.php:253
 msgid "Unable to save your Twitter settings!"
 msgstr ""
 
-#: actions/twittersettings.php:174
+#: actions/twittersettings.php:174 actions/twittersettings.php:261
 msgid "Twitter settings saved."
 msgstr ""
 
-#: actions/twittersettings.php:192
+#: actions/twittersettings.php:192 actions/twittersettings.php:272
 msgid "That is not your Twitter account."
 msgstr ""
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:280
 msgid "Couldn't remove Twitter user."
 msgstr ""
 
-#: actions/twittersettings.php:212
+#: actions/twittersettings.php:212 actions/twittersettings.php:284
 msgid "Twitter account removed."
 msgstr ""
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
+#: actions/twittersettings.php:299 actions/twittersettings.php:310
+#: actions/twittersettings.php:322
 msgid "Couldn't save Twitter preferences."
 msgstr ""
 
-#: actions/twittersettings.php:245
+#: actions/twittersettings.php:245 actions/twittersettings.php:330
 msgid "Twitter preferences saved."
 msgstr ""
 
@@ -2643,15 +2957,15 @@ msgstr ""
 msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#: classes/Channel.php:113
+#: classes/Channel.php:113 classes/Channel.php:129
 msgid "Command results"
 msgstr ""
 
-#: classes/Channel.php:148
+#: classes/Channel.php:148 classes/Channel.php:175
 msgid "Command complete"
 msgstr ""
 
-#: classes/Channel.php:158
+#: classes/Channel.php:158 classes/Channel.php:185
 msgid "Command failed"
 msgstr ""
 
@@ -2664,7 +2978,7 @@ msgstr ""
 msgid "Subscriptions: %1$s\n"
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:247
 msgid "User has no last notice"
 msgstr ""
 
@@ -2697,59 +3011,60 @@ msgstr ""
 msgid "About: %s"
 msgstr ""
 
-#: classes/Command.php:200
+#: classes/Command.php:200 classes/Command.php:202
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: classes/Command.php:214
+#: classes/Command.php:214 classes/Command.php:219
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: classes/Command.php:216
+#: classes/Command.php:216 classes/Command.php:221
 msgid "Error sending direct message."
 msgstr ""
 
-#: classes/Command.php:263
+#: classes/Command.php:263 classes/Command.php:268
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: classes/Command.php:270
+#: classes/Command.php:270 classes/Command.php:275
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: classes/Command.php:288
+#: classes/Command.php:288 classes/Command.php:293
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: classes/Command.php:295
+#: classes/Command.php:295 classes/Command.php:300
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330
+#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:315
+#: classes/Command.php:335
 msgid "Command not yet implemented."
 msgstr ""
 
-#: classes/Command.php:313
+#: classes/Command.php:313 classes/Command.php:318
 msgid "Notification off."
 msgstr ""
 
-#: classes/Command.php:315
+#: classes/Command.php:315 classes/Command.php:320
 msgid "Can't turn off notification."
 msgstr ""
 
-#: classes/Command.php:333
+#: classes/Command.php:333 classes/Command.php:338
 msgid "Notification on."
 msgstr ""
 
-#: classes/Command.php:335
+#: classes/Command.php:335 classes/Command.php:340
 msgid "Can't turn on notification."
 msgstr ""
 
-#: classes/Command.php:344
+#: classes/Command.php:344 classes/Command.php:349
 msgid "Commands:\n"
 msgstr ""
 
@@ -2761,23 +3076,23 @@ msgstr ""
 msgid "Could not update message with new URI."
 msgstr ""
 
-#: lib/gallery.php:46
+#: lib/gallery.php:46 lib/gallery.php:55
 msgid "User without matching profile in system."
 msgstr ""
 
-#: lib/mail.php:147
+#: lib/mail.php:147 lib/mail.php:141
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:249
+#: lib/mail.php:249 lib/mail.php:275
 #, php-format
 msgid "New private message from %s"
 msgstr ""
 
-#: lib/mail.php:253
+#: lib/mail.php:253 lib/mail.php:279
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -2821,18 +3136,458 @@ msgstr ""
 msgid "Your sent messages"
 msgstr ""
 
-#: lib/settingsaction.php:99
+#: lib/settingsaction.php:99 actions/deleteprofile.php:256
 msgid "Twitter"
 msgstr ""
 
-#: lib/settingsaction.php:100
+#: lib/settingsaction.php:100 actions/deleteprofile.php:257
 msgid "Twitter integration options"
 msgstr ""
 
-#: lib/util.php:1718
+#: lib/util.php:1718 lib/util.php:2145
 msgid "To"
 msgstr ""
 
 #: scripts/maildaemon.php:45
 msgid "Could not parse message."
 msgstr ""
+
+#: actions/block.php:45 actions/subedit.php:45 actions/unblock.php:45
+msgid "No profile specified."
+msgstr ""
+
+#: actions/block.php:52 actions/subedit.php:52 actions/tagother.php:45
+#: actions/unblock.php:52
+msgid "No profile with that ID."
+msgstr ""
+
+#: actions/block.php:78
+#, fuzzy
+msgid "Block user"
+msgstr "Žádný takový uživatel."
+
+#: actions/block.php:81
+msgid "Are you sure you want to block this user? "
+msgstr ""
+
+#: actions/block.php:117
+#, fuzzy
+msgid "You have already blocked this user."
+msgstr "Již jste přihlášen"
+
+#: actions/block.php:124
+msgid "Failed to save block information."
+msgstr ""
+
+#: actions/deleteprofile.php:25
+msgid "Code not yet ready."
+msgstr ""
+
+#: actions/deleteprofile.php:36
+msgid "Export and delete your user information."
+msgstr ""
+
+#: actions/deleteprofile.php:88 actions/deleteprofile.php:119
+#, fuzzy
+msgid "Delete my account"
+msgstr "Vytvořit nový účet"
+
+#: actions/deleteprofile.php:89
+#, fuzzy
+msgid "Delete my account confirmation"
+msgstr "Nelze smazat potvrzení emailu"
+
+#: actions/deleteprofile.php:117
+msgid "Check if you are sure you want to delete your account."
+msgstr ""
+
+#: actions/deleteprofile.php:259 lib/settingsaction.php:102
+msgid "Other"
+msgstr ""
+
+#: actions/deleteprofile.php:260 lib/settingsaction.php:103
+msgid "Other options"
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Add to favorites"
+msgstr ""
+
+#: actions/emailsettings.php:98
+msgid "Allow friends to nudge me and send me an email."
+msgstr ""
+
+#: actions/facebookremove.php:54
+#, fuzzy
+msgid "Couldn't remove Facebook user."
+msgstr "Nelze aktualizovat uživatele"
+
+#: actions/favor.php:71
+msgid "Disfavor favorite"
+msgstr ""
+
+#: actions/favorited.php:31 lib/stream.php:45
+#, fuzzy
+msgid "Popular notices"
+msgstr "Žádné takové oznámení."
+
+#: actions/favorited.php:54
+msgid "Showing recently popular notices"
+msgstr ""
+
+#: actions/featured.php:32 actions/featured.php:54 lib/stream.php:41
+msgid "Featured users"
+msgstr ""
+
+#: actions/finishremotesubscribe.php:186
+msgid "That user has blocked you from subscribing."
+msgstr ""
+
+#: actions/microsummary.php:39
+msgid "No current status"
+msgstr ""
+
+#: actions/newnotice.php:93
+#, fuzzy
+msgid "Notice posted"
+msgstr "Sdělení"
+
+#: actions/newnotice.php:116 classes/Channel.php:140
+msgid "Ajax Error"
+msgstr ""
+
+#: actions/nudge.php:52
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
+
+#: actions/nudge.php:61
+msgid "Nudge sent"
+msgstr ""
+
+#: actions/othersettings.php:27
+msgid "Manage various other options."
+msgstr ""
+
+#: actions/othersettings.php:33
+#, fuzzy
+msgid "Other Settings"
+msgstr "Nastavení"
+
+#: actions/othersettings.php:35
+msgid "URL Auto-shortening"
+msgstr ""
+
+#: actions/othersettings.php:54
+#, fuzzy
+msgid "Service"
+msgstr "Hledat"
+
+#: actions/othersettings.php:54
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/othersettings.php:155
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Umístění příliš dlouhé (maximálně 255 znaků)"
+
+#: actions/peopletag.php:33
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "Není platnou mailovou adresou."
+
+#: actions/peopletag.php:45
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr ""
+
+#: actions/peopletag.php:87
+#, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+msgstr ""
+
+#: actions/profilesettings.php:92
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+
+#: actions/profilesettings.php:246 actions/tagother.php:131
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Neplatná adresa '%s'"
+
+#: actions/profilesettings.php:328
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "Nelze uložit profil"
+
+#: actions/public.php:68
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
+msgstr ""
+
+#: actions/public.php:90
+msgid "Could not retrieve public stream."
+msgstr ""
+
+#: actions/register.php:67 actions/register.php:177
+msgid "Sorry, only invited people can register."
+msgstr ""
+
+#: actions/register.php:156
+msgid "With this form you can create a new account. "
+msgstr ""
+
+#: actions/remotesubscribe.php:136 actions/remotesubscribe.php:141
+msgid "That's a local profile! Login to subscribe."
+msgstr ""
+
+#: actions/subedit.php:68
+#, fuzzy
+msgid "You are not subscribed to that profile."
+msgstr "Neodeslal jste nám profil"
+
+#: actions/subedit.php:81
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "Nelze vytvořit odebírat"
+
+#: actions/subscribe.php:53
+#, fuzzy
+msgid "Not a local user."
+msgstr "Žádný takový uživatel."
+
+#: actions/subscribe.php:67
+#, fuzzy
+msgid "Subscribed"
+msgstr "Odebírat"
+
+#: actions/subscriptions.php:72
+#, fuzzy
+msgid "Jabber"
+msgstr "Žádné Jabber ID."
+
+#: actions/tagother.php:31
+#, fuzzy
+msgid "Not logged in"
+msgstr "Nepřihlášen"
+
+#: actions/tagother.php:40
+#, fuzzy
+msgid "No id argument."
+msgstr "Žádný takový dokument."
+
+#: actions/tagother.php:56
+msgid "Tag a person"
+msgstr ""
+
+#: actions/tagother.php:98
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
+msgstr ""
+
+#: actions/tagother.php:120
+#, fuzzy
+msgid "No such profile."
+msgstr "Žádné takové oznámení."
+
+#: actions/tagother.php:146
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+
+#: actions/tagother.php:153
+#, fuzzy
+msgid "Could not save tags."
+msgstr "Nelze uložin informace o obrázku"
+
+#: actions/tagother.php:188
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
+
+#: actions/tagrss.php:33
+#, fuzzy
+msgid "No such tag."
+msgstr "Žádné takové oznámení."
+
+#: actions/tagrss.php:62
+#, fuzzy, php-format
+msgid "Microblog tagged with %s"
+msgstr "Mikroblog od %s"
+
+#: actions/twitapiblocks.php:45
+msgid "Block user failed."
+msgstr ""
+
+#: actions/twitapiblocks.php:66
+msgid "Unblock user failed."
+msgstr ""
+
+#: actions/twitapiusers.php:45
+#, fuzzy
+msgid "Not found."
+msgstr "Žádný požadavek nebyl nalezen!"
+
+#: actions/twittersettings.php:63
+msgid "Twitter user name"
+msgstr ""
+
+#: actions/twittersettings.php:67
+#, fuzzy
+msgid "Twitter password"
+msgstr "Nové heslo"
+
+#: actions/twittersettings.php:129
+msgid "Twitter Friends"
+msgstr ""
+
+#: actions/unblock.php:73
+#, fuzzy
+msgid "Error removing the block."
+msgstr "Chyba při ukládaní uživatele"
+
+#: actions/unsubscribe.php:48
+#, fuzzy
+msgid "No profile id in request."
+msgstr "Nebylo vráceno žádné URL profilu od servu."
+
+#: actions/unsubscribe.php:55
+#, fuzzy
+msgid "No profile with that id."
+msgstr "Vzdálený profil s nesouhlasícím profilem"
+
+#: actions/unsubscribe.php:69
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Odhlásit"
+
+#: classes/Notice.php:100
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "Problém při ukládání sdělení"
+
+#: classes/Notice.php:105
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+
+#: classes/Notice.php:112
+msgid "You are banned from posting notices on this site."
+msgstr ""
+
+#: lib/gallery.php:98
+msgid "Filter tags"
+msgstr ""
+
+#: lib/gallery.php:104
+msgid "All"
+msgstr ""
+
+#: lib/gallery.php:108
+msgid "Tag"
+msgstr ""
+
+#: lib/gallery.php:109
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/gallery.php:110
+msgid "Go"
+msgstr ""
+
+#: lib/gallery.php:264
+#, fuzzy
+msgid "Subscriptions navigation"
+msgstr "Odběry"
+
+#: lib/gallery.php:270 lib/gallery.php:292
+msgid "List"
+msgstr ""
+
+#: lib/gallery.php:280 lib/gallery.php:294
+msgid "Icons"
+msgstr ""
+
+#: lib/mail.php:92
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:242
+#, php-format
+msgid "You've been nudged by %s"
+msgstr ""
+
+#: lib/mail.php:246
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+msgstr ""
+
+#: lib/profilelist.php:146
+msgid "(none)"
+msgstr ""
+
+#: lib/stream.php:33
+msgid "Public"
+msgstr "Veřejné"
+
+#: lib/stream.php:36 lib/stream.php:37
+msgid "Recent tags"
+msgstr ""
+
+#: lib/stream.php:40
+msgid "Featured"
+msgstr ""
+
+#: lib/stream.php:44
+#, fuzzy
+msgid "Popular"
+msgstr "Hledání lidí"
+
+#: lib/subs.php:51
+#, fuzzy
+msgid "User has blocked you."
+msgstr "Uživatel nemá profil."
+
+#: lib/util.php:2059
+msgid "Send a nudge"
+msgstr ""
+
+#: lib/util.php:2063
+msgid "Nudge sent!"
+msgstr ""
+
+#: lib/util.php:2194
+msgid "Block"
+msgstr ""
+
+#: lib/util.php:2198
+msgid "Unblock"
+msgstr ""
+
+#~ msgid "Couldn't confirm email."
+#~ msgstr "Nelze potvrdit email"
+
+#~ msgid "Email address"
+#~ msgstr "Emailová adresa"
+
+#~ msgid "Error inserting notice"
+#~ msgstr "Chyba při vkládání nového sdělení"
+
+#~ 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 ""
+#~ "Pokud jste zapomněl nebo stratil heslo, můžete si nechat zaslat nové na "
+#~ "vaší emailovou adresu uloženou u vašeho účtu."
diff --git a/de_DE/LC_MESSAGES/laconica.po b/de_DE/LC_MESSAGES/laconica.po
index 8ed32027b0..606128b555 100644
--- a/de_DE/LC_MESSAGES/laconica.po
+++ b/de_DE/LC_MESSAGES/laconica.po
@@ -6,46 +6,88 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-14 21:07+1200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Markus Heurung <muhh@byzero.de>\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"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"POT-Creation-Date: 2009-01-12 12:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/noticesearchrss.php:64
+#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:61
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr "Suche im Stream nach \"%s\""
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: actions/finishopenidlogin.php:88 actions/register.php:205
+#: actions/register.php:232
 msgid ""
-" except this private data: password, email address, IM address, phone "
-"number."
+" except this private data: password, email address, IM address, phone number."
 msgstr ""
 "außer folgenden privaten Daten: Passwort, E-Mail, Adresse, IM Adresse, "
 "Telefonnummer."
 
-#: ../actions/subscribe.php:84
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+#: lib/facebookaction.php:195 lib/noticelist.php:160
+msgid " from "
+msgstr "von"
+
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: actions/twitapistatuses.php:341
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr ""
+
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
+
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:115
+#: lib/mail.php:117
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s hat deine Nachrichten auf %2$s abonniert."
 
-#: ../actions/subscribe.php:86
+#: ../lib/mail.php:126
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -62,123 +104,279 @@ msgstr ""
 "Gruß,\n"
 "%4$s.\n"
 
-#: ../actions/shownotice.php:45
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#: actions/twitapistatuses.php:344
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
+
+#: ../actions/shownotice.php:45 actions/shownotice.php:45
+#: actions/shownotice.php:73
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1$s Status auf %2$s"
 
-#: ../actions/publicrss.php:60
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../actions/publicrss.php:62 actions/publicrss.php:48
 #, php-format
 msgid "%s Public Stream"
 msgstr "%s öffentlicher 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/twitapistatuses.php:123
 #, php-format
 msgid "%s and friends"
 msgstr "%s und Freunde"
 
-#: ../lib/util.php:233
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:31
+#, php-format
+msgid "%s public timeline"
+msgstr "%s öffentliche Zeitleiste"
+
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:217
+#, php-format
+msgid "%s status"
+msgstr "%s Status"
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:195
+#, php-format
+msgid "%s timeline"
+msgstr "%s Zeitleiste"
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:34
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+"(Sie sollten in Kürze eine E-Mail mit der Anleitung zur Überprüfung Ihrer "
+"Mailadresse erhalten.)"
+
+#: ../lib/util.php:257 lib/util.php:273 lib/util.php:284
 #, 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%%** ist ein Microbloggingdienst von "
-"[%%site.broughtby%%](%%site.broughtbyurl%%)."
+"**%%site.name%%** ist ein Microbloggingdienst von [%%site.broughtby%%](%%"
+"site.broughtbyurl%%)."
 
-#: ../lib/util.php:235
+#: ../lib/util.php:259 lib/util.php:275 lib/util.php:286
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** ist ein Microbloggingdienst."
 
-#: ../lib/util.php:250
+#: ../lib/util.php:274 lib/util.php:290 lib/util.php:301
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ""
 "Lizenz. Die ursprünglichen Autoren sollten mit ihrem vollen Namen oder "
 "Nutzernamen genannt werden."
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: ../actions/register.php:176
+#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
+#: actions/profilesettings.php:78
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 Kleinbuchstaben oder Ziffern, keine Sonder- oder Leerzeichen"
 
-#: ../actions/password.php:42 ../actions/register.php:178
+#: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:193
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+"1-64 kleingeschriebene Buchstaben oder Zahlen, keine Satz- oder Leerzeichen. "
+"Pflicht."
+
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/profilesettings.php:186
 msgid "6 or more characters"
 msgstr "6 oder mehr Zeichen"
 
-#: ../actions/recoverpassword.php:165
+#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 oder mehr Zeichen, und nicht vergessen!"
 
-#: ../actions/imsettings.php:188
+#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:195
+msgid "6 or more characters. Required."
+msgstr "6 oder mehr Buchstaben. Pflicht."
+
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, 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 ""
 "Ein Bestätigungscode wurde an die IM Adresse geschickt, die du hinzugefügt "
 "hast. Du musst zulassen, dass %s dir Nachrichten schicken darf."
 
-#: ../lib/util.php:296
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:234
+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 ""
+"Ein Bestätigungscode wurde an die angegebene E-Mail Adresse geschickt. "
+"Überprüfen Sie Ihren Posteingang (auch den Spamordner!) für den Code und "
+"Anweisungen, wie dieser benutzt wird."
+
+#: ../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 ""
+"Ein Bestätigungscode wurde an die von Ihnen angegebene Telefonnummer "
+"gesandt. Überprüfen Sie bitte Ihren Posteingang (auch den Spamordner!) auf "
+"den Code und die Anweisungen, um ihn zu benutzen."
+
+#: ../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:30
+#: actions/twitapidirect_messages.php:107 actions/twitapifavorites.php:83
+#: actions/twitapifavorites.php:99 actions/twitapifriendships.php:117
+#: actions/twitapihelp.php:42 actions/twitapistatuses.php:77
+#: actions/twitapistatuses.php:144 actions/twitapistatuses.php:224
+#: actions/twitapistatuses.php:234 actions/twitapistatuses.php:386
+#: actions/twitapistatuses.php:395 actions/twitapistatuses.php:421
+#: actions/twitapiusers.php:30
+msgid "API method not found!"
+msgstr "API-Methode nicht gefunden!"
+
+#: ../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:39
+#: actions/twitapiaccount.php:89 actions/twitapiaccount.php:94
+#: actions/twitapidirect_messages.php:178 actions/twitapifavorites.php:139
+#: actions/twitapihelp.php:49 actions/twitapistatuses.php:549
+msgid "API method under construction."
+msgstr "API-Methode im Aufbau."
+
+#: ../lib/util.php:324 lib/util.php:340 lib/util.php:352
 msgid "About"
 msgstr "Über"
 
-#: ../actions/userauthorization.php:118
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
 msgid "Accept"
 msgstr "Akzeptieren"
 
-#: ../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/twittersettings.php:84
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: ../actions/openidsettings.php:43
+#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
 msgid "Add OpenID"
 msgstr "OpenID hinzufügen"
 
-#: ../actions/imsettings.php:39
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: actions/deleteprofile.php:248
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
 msgid "Address"
 msgstr "Adresse"
 
-#: ../actions/showstream.php:254
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
+
+#: ../actions/showstream.php:273 actions/showstream.php:288
+#: actions/showstream.php:336
 msgid "All subscriptions"
 msgstr "Alle Abonnements"
 
-#: ../actions/publicrss.php:62
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
 #, php-format
 msgid "All updates for %s"
 msgstr "Alle Aktualisierungen für %s"
 
-#: ../actions/noticesearchrss.php:66
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:63
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "Alle Aktualisierungen, die den Suchbegriff \"%s\" enthalten"
 
-#: ../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
 msgid "Already logged in."
 msgstr "Bereits eingeloggt."
 
-#: ../actions/subscribe.php:48
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:47
 msgid "Already subscribed!."
 msgstr "Bereits abonniert!"
 
-#: ../actions/userauthorization.php:76
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+msgid "Are you sure you want to delete this notice?"
+msgstr "Sind sie sicher, dass sie diese Nachricht löschen wollen?"
+
+#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
 msgid "Authorize subscription"
 msgstr "Abonnement bestätigen"
 
-#: ../actions/login.php:100 ../actions/register.php:184
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192 actions/register.php:219
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Automatisch einloggen; Nicht bei gemeinsam genutzten PCs!"
 
-#: ../actions/avatar.php:32
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:103
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
+"Abonniere automatisch alle Kontakte, die mich abonnieren (sinnvoll für Nicht-"
+"Menschen)"
+
+#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: actions/profilesettings.php:34
 msgid "Avatar"
 msgstr "Avatar"
 
-#: ../actions/avatar.php:113
+#: ../actions/avatar.php:113 actions/profilesettings.php:350
+#: actions/profilesettings.php:379
 msgid "Avatar updated."
 msgstr "Avatar aktualisiert."
 
-#: ../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 "
@@ -188,276 +386,464 @@ msgstr ""
 "sollte in deinem Jabber/GTalk Konto eingehen. (Hast du %s zu deiner "
 "Freundeliste hinzugefügt?)"
 
-#: ../lib/util.php:1136
-msgid "Before »"
+#: ../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 ""
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+msgid "Awaiting confirmation on this phone number."
+msgstr "Warte auf die Bestätigung dieser Telefonnummer."
+
+#: ../lib/util.php:1318 lib/util.php:1452 lib/facebookaction.php:259
+#: lib/util.php:1792
+#, fuzzy
+msgid "Before »"
 msgstr "Früher »"
 
-#: ../actions/profilesettings.php:52
+#: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: actions/profilesettings.php:82 actions/register.php:184
+#: actions/profilesettings.php:84 actions/register.php:211
 msgid "Bio"
 msgstr "Biografie"
 
-#: ../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:222 actions/register.php:98
 msgid "Bio is too long (max 140 chars)."
 msgstr "Die Biografie ist zu lang (max. 140 Zeichen)"
 
-#: ../actions/updateprofile.php:118
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+msgid "Can't delete this notice."
+msgstr "Die Nachricht konnte nicht gelöscht werden."
+
+#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "Konnte Avatar-URL nicht öffnen '%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/profilesettings.php:433
 msgid "Can't save new password."
 msgstr "Konnte neues Passwort nicht speichern"
 
-#: ../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
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../lib/openid.php:121
+#: ../lib/openid.php:121 lib/openid.php:121
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Konnte kein OpenID consumer Objekt erzeugen."
 
-#: ../actions/imsettings.php:154
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
 msgid "Cannot normalize that Jabber ID"
 msgstr "Konnte diese Jabber ID nicht normalisieren"
 
-#: ../actions/password.php:45
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:204
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/profilesettings.php:189
 msgid "Change"
 msgstr "Ändern"
 
-#: ../actions/password.php:32
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: actions/deleteprofile.php:245
+msgid "Change email handling"
+msgstr ""
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: ../actions/password.php:43 ../actions/recoverpassword.php:166
-#: ../actions/register.php:179
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr ""
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#: actions/deleteprofile.php:242
+msgid "Change your profile settings"
+msgstr "Ändern der Profileinstellungen"
+
+#: ../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/profilesettings.php:187 actions/register.php:196
 msgid "Confirm"
 msgstr "Bestätigen"
 
-#: ../actions/confirmaddress.php:84
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
 msgid "Confirm Address"
 msgstr "Adresse bestätigen"
 
-#: ../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:259
 msgid "Confirmation cancelled."
 msgstr "Bestätigung abgebrochen."
 
-#: ../actions/confirmaddress.php:38
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+msgid "Confirmation code"
+msgstr "Bestätigungscode"
+
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
 msgid "Confirmation code not found."
 msgstr "Bestätigungscode nicht gefunden."
 
-#: ../actions/finishopenidlogin.php:91
+#: ../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:97
 msgid "Connect"
 msgstr "Verbinden"
 
-#: ../actions/finishopenidlogin.php:86
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
 msgid "Connect existing account"
 msgstr "Verbinde bestehendes Konto"
 
-#: ../lib/util.php:304
+#: ../lib/util.php:332 lib/util.php:348 lib/util.php:360
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../lib/openid.php:178
+#: ../lib/openid.php:178 lib/openid.php:178
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "Konnte OpenID-Formular nicht erstellen: %s"
 
-#: ../lib/openid.php:160
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:46 actions/twitapifriendships.php:62
+#, 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:39
+msgid "Could not follow user: User not found."
+msgstr ""
+
+#: ../lib/openid.php:160 lib/openid.php:160
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "Konnte nicht zum Server umleiten: %s"
 
-#: ../actions/updateprofile.php:161
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
 msgid "Could not save avatar info"
 msgstr "Konnte Avatarinfo nicht speichern"
 
-#: ../actions/updateprofile.php:154
+#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
 msgid "Could not save new profile info"
 msgstr "Neue Profildaten konnten nicht gespeichert werden."
 
-#: ../actions/profilesettings.php:146
-msgid "Couldn't confirm email."
-msgstr "E-Mail konnte nicht bestätigt werden."
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:70
+msgid "Could not subscribe other to you."
+msgstr ""
+
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:55
+msgid "Could not subscribe."
+msgstr ""
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr ""
 
 #: ../actions/finishremotesubscribe.php:99
+#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:112
 msgid "Couldn't convert request tokens to access tokens."
 msgstr "Konnte Anfrage-Token nicht in Zugriffs-Token umwandeln."
 
-#: ../actions/subscribe.php:59
-msgid "Couldn't create subscription."
-msgstr "Konnte Abonnement nicht erstellen."
-
-#: ../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/emailsettings.php:255
 msgid "Couldn't delete email confirmation."
 msgstr "Konnte E-Mailbestätigung nicht löschen."
 
-#: ../actions/unsubscribe.php:56
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:129
 msgid "Couldn't delete subscription."
 msgstr "Konnte Abonnement nicht löschen."
 
-#: ../actions/remotesubscribe.php:125
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+#: actions/twitapistatuses.php:82
+msgid "Couldn't find any statuses."
+msgstr "Konnte keine Statusmeldungen finden."
+
+#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
+#: actions/remotesubscribe.php:148
 msgid "Couldn't get a request token."
 msgstr "Konnte keinen Anfrage-Token bekommen."
 
-#: ../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:228
 msgid "Couldn't insert confirmation code."
 msgstr "Konnte keinen Bestätigungscode einfügen."
 
 #: ../actions/finishremotesubscribe.php:180
+#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:216
 msgid "Couldn't insert new subscription."
 msgstr "Konnte neues Abonnement nicht eintragen."
 
-#: ../actions/profilesettings.php:175
+#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
+#: actions/profilesettings.php:319 actions/twitapiaccount.php:74
 msgid "Couldn't save profile."
 msgstr "Konnte Profil nicht speichern."
 
-#: ../actions/confirmaddress.php:70 ../actions/imsettings.php:129
-#: ../actions/imsettings.php:234 ../actions/profilesettings.php:123
-msgid "Couldn't update user."
-msgstr "Konnte Benutzerdaten nicht aktualisieren."
-
-#: ../actions/finishopenidlogin.php:84
-msgid "Create"
-msgstr "Erstellen"
+#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
+#: actions/profilesettings.php:296
+msgid "Couldn't update user for autosubscribe."
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:70
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+#: actions/emailsettings.php:301 actions/emailsettings.php:315
+msgid "Couldn't update user record."
+msgstr ""
+
+#: ../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/emailsettings.php:179 actions/emailsettings.php:280
+#: actions/othersettings.php:173 actions/profilesettings.php:276
+msgid "Couldn't update user."
+msgstr "Konnte Benutzerdaten nicht aktualisieren."
+
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
+msgid "Create"
+msgstr "Erstellen"
+
+#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
 msgid "Create a new user with this nickname."
 msgstr "Neuen Nutzer mit diesem Nicknamen erstellen."
 
-#: ../actions/finishopenidlogin.php:68
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
 msgid "Create new account"
 msgstr "Neues Konto anlegen"
 
-#: ../actions/finishopenidlogin.php:191
+#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+#: actions/finishopenidlogin.php:208
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Erzeugen eines Kontos zu einer OpenID, die schon einem Nutzer gehört."
 
-#: ../actions/imsettings.php:45
+#: ../actions/imsettings.php:45 actions/imsettings.php:46
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Aktuelle bestätigte Jabber/GTalk-Adresse"
 
-#: ../actions/showstream.php:337
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+msgid "Current confirmed email address."
+msgstr ""
+
+#: ../actions/showstream.php:356 actions/showstream.php:367
+#: actions/showstream.php:418
 msgid "Currently"
 msgstr "Momentan"
 
-#: ../lib/util.php:893
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:87
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: ../lib/util.php:1061 lib/util.php:1110 lib/util.php:1417
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Datenbankfehler beim Einfügen der Antwort: %s"
 
-#: ../actions/profilesettings.php:54
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+msgid "Delete notice"
+msgstr ""
+
+#: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: actions/profilesettings.php:84 actions/register.php:186
+#: actions/profilesettings.php:86 actions/register.php:213
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Beschreibe dich selbst in 140 Zeichen"
 
-#: ../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/deleteprofile.php:244 actions/register.php:199
+#: actions/register.php:202
 msgid "Email"
 msgstr "E-Mail"
 
-#: ../actions/profilesettings.php:46
-msgid "Email address"
-msgstr "E-Mail Adresse "
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+msgid "Email Address"
+msgstr ""
+
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+msgid "Email Settings"
+msgstr ""
 
-#: ../actions/profilesettings.php:102 ../actions/register.php:63
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:89
 msgid "Email address already exists."
 msgstr "Diese E-Mail Adresse existiert bereits."
 
-#: ../lib/mail.php:82
+#: ../lib/mail.php:90 lib/mail.php:90
 msgid "Email address confirmation"
 msgstr "Bestätigung der E-Mail Adresse"
 
-#: ../actions/recoverpassword.php:176
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
+
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr ""
+
+#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
 msgid "Enter a nickname or email address."
 msgstr "Gib einen Spitznamen oder eine E-Mail Adresse ein."
 
-#: ../actions/userauthorization.php:136
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+msgid "Enter the code you received on your phone."
+msgstr ""
+
+#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
 msgid "Error authorizing token"
 msgstr "Fehler beim Autorisieren des Tokens"
 
-#: ../actions/finishopenidlogin.php:282
+#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
+#: actions/finishopenidlogin.php:274
 msgid "Error connecting user to OpenID."
 msgstr "Fehler beim Verbinden des Nutzers mit der OpenID."
 
-#: ../actions/finishaddopenid.php:78
+#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
 msgid "Error connecting user."
 msgstr "Fehler beim Verbinden des Nutzers."
 
 #: ../actions/finishremotesubscribe.php:151
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:164
 msgid "Error inserting avatar"
 msgstr "Fehler beim Einfügen des Avatars"
 
 #: ../actions/finishremotesubscribe.php:143
+#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:156
 msgid "Error inserting new profile"
 msgstr "Neues Profil konnte nicht angelegt werden"
 
-#: ../actions/postnotice.php:88
-msgid "Error inserting notice"
-msgstr "Fehler beim Einfügen der Nachricht"
-
 #: ../actions/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:180
 msgid "Error inserting remote profile"
 msgstr "Fehler beim Einfügen des entfernten Profils"
 
-#: ../actions/recoverpassword.php:201
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
 msgid "Error saving address confirmation."
 msgstr "Fehler beim Speichern der Adressbestätigung."
 
-#: ../actions/userauthorization.php:139
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
 msgid "Error saving remote profile"
 msgstr "Fehler beim Speichern des entfernten Profils"
 
-#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
+#: ../lib/openid.php:226 lib/openid.php:226
 msgid "Error saving the profile."
 msgstr "Fehler bei Speichern des Profils."
 
-#: ../lib/openid.php:237
+#: ../lib/openid.php:237 lib/openid.php:237
 msgid "Error saving the user."
 msgstr "Fehler beim Speichern des Nutzers."
 
-#: ../actions/password.php:80
+#: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/profilesettings.php:428
 msgid "Error saving user; invalid."
 msgstr "Fehler beim Speichern des Nutzers, ungültig."
 
-#: ../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:54 actions/login.php:80
+#: actions/register.php:117
 msgid "Error setting user."
 msgstr "Fehler bei den Nutzereinstellungen."
 
-#: ../actions/finishaddopenid.php:83
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
 msgid "Error updating profile"
 msgstr "Fehler beim Update des Profils"
 
 #: ../actions/finishremotesubscribe.php:161
+#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:174
 msgid "Error updating remote profile"
 msgstr "Fehler beim Update des entfernten Profils"
 
-#: ../actions/recoverpassword.php:79
+#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
 msgid "Error with confirmation code."
 msgstr "Fehler beim Bestätigungscode."
 
-#: ../actions/finishopenidlogin.php:89
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
 msgid "Existing nickname"
 msgstr "Nick wird bereits verwendet"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:326 lib/util.php:342 lib/util.php:354
 msgid "FAQ"
 msgstr "FAQ"
 
-#: ../actions/avatar.php:115
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/profilesettings.php:381
 msgid "Failed updating avatar."
 msgstr "Aktualisierung des Avatars fehlgeschlagen"
 
-#: ../actions/all.php:61 ../actions/allrss.php:74
+#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
+#: actions/allrss.php:64
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Feed der Freunde von %s"
 
-#: ../actions/replies.php:61 ../actions/repliesrss.php:80
+#: ../actions/replies.php:65 ../actions/repliesrss.php:80
+#: actions/replies.php:65 actions/repliesrss.php:66
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Feed der Antworten an %s"
 
-#: ../actions/login.php:118
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:54
+#, php-format
+msgid "Feed for tag %s"
+msgstr ""
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+msgid "Find content of notices"
+msgstr ""
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+msgid "Find people on this site"
+msgstr ""
+
+#: ../actions/login.php:122
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -465,39 +851,58 @@ msgstr ""
 "Bitte geben Sie aus Sicherheitsgründen ihren Benutzernamen und ihr Passwort "
 "ein, bevor die Änderungen an ihren Einstellungen vorgenommen werden."
 
-#: ../actions/profilesettings.php:44
+#: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: actions/profilesettings.php:77 actions/register.php:178
+#: actions/profilesettings.php:79 actions/register.php:205
 msgid "Full name"
 msgstr "Vollständiger Name"
 
-#: ../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/profilesettings.php:219 actions/register.php:95
 msgid "Full name is too long (max 255 chars)."
 msgstr "Ihr vollständiger Name ist zu lang (maximal 255 Zeichen)"
 
-#: ../lib/util.php:279
+#: ../lib/util.php:322 lib/util.php:338 lib/util.php:343 lib/util.php:350
 msgid "Help"
 msgstr "Hilfe"
 
-#: ../lib/util.php:274
+#: ../lib/util.php:298 lib/util.php:314 lib/util.php:325
 msgid "Home"
 msgstr "Startseite"
 
-#: ../actions/profilesettings.php:49
+#: ../actions/profilesettings.php:46 ../actions/register.php:167
+#: actions/profilesettings.php:79 actions/register.php:181
+#: actions/profilesettings.php:81 actions/register.php:208
 msgid "Homepage"
 msgstr "Homepage"
 
-#: ../actions/profilesettings.php:87
+#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: actions/profilesettings.php:210 actions/register.php:83
+#: actions/profilesettings.php:216 actions/register.php:92
 msgid "Homepage is not a valid URL."
 msgstr "Homepage ist kein gültiger URL."
 
-#: ../actions/imsettings.php:61
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+#: actions/emailsettings.php:101
+msgid "I want to post notices by email."
+msgstr ""
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+#: actions/deleteprofile.php:253
+msgid "IM"
+msgstr ""
+
+#: ../actions/imsettings.php:60 actions/imsettings.php:61
 msgid "IM Address"
 msgstr "IM Adresse"
 
-#: ../actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
 msgid "IM Settings"
 msgstr "IM Einstellungen"
 
-#: ../actions/finishopenidlogin.php:88
+#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -513,23 +918,32 @@ msgstr ""
 "Wenn du deinem Konto eine OpenID hinzufügen möchtest, dann trage sie hier "
 "ein und klicke auf \"Hinzufügen\"."
 
-#: ../actions/recoverpassword.php:122
+#: ../actions/recoverpassword.php:137
 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 ""
-"Wenn du deine Passwort verlegt hast, kannst du dir ein Neues an die "
-"E-Mailadresse schicken lasssen, die für dein Konto eingetragen ist."
 
-#: ../actions/password.php:69
+#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
+#: actions/emailsettings.php:68 actions/smssettings.php:76
+msgid "Incoming email"
+msgstr ""
+
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+#: actions/emailsettings.php:304
+msgid "Incoming email address removed."
+msgstr ""
+
+#: ../actions/password.php:69 actions/profilesettings.php:388
+#: actions/profilesettings.php:417
 msgid "Incorrect old password"
 msgstr "Altes Passwort falsch"
 
-#: ../actions/login.php:63
+#: ../actions/login.php:67 actions/login.php:67 actions/login.php:74
 msgid "Incorrect username or password."
 msgstr "Falscher Benutzername oder Passwort."
 
-#: ../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."
@@ -537,72 +951,99 @@ msgstr ""
 "Anweisungen für die Wiederherstellung deines Passworts wurden an deine "
 "hinterlegte E-Mailadresse geschickt."
 
-#: ../actions/updateprofile.php:113
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "Ungültiger Avatar-URL '%s'"
 
-#: ../actions/updateprofile.php:97
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "Ungültige Homepage '%s'"
 
-#: ../actions/updateprofile.php:81
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "Ungültige Lizenz-URL '%s'"
 
-#: ../actions/postnotice.php:61
+#: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:63
 msgid "Invalid notice content"
 msgstr "Ungültiger Nachrichteninhalt"
 
-#: ../actions/postnotice.php:67
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:69
 msgid "Invalid notice uri"
 msgstr "Ungülte Nachrichten-URI"
 
-#: ../actions/postnotice.php:72
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:74
 msgid "Invalid notice url"
 msgstr "Ungültige Nachrichten-URL"
 
-#: ../actions/updateprofile.php:86
+#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "Ungültige Profil-URL '%s'."
 
-#: ../actions/remotesubscribe.php:96
+#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
 msgid "Invalid profile URL (bad format)"
 msgstr "Ungültige Profil-URL (falsches Format)"
 
 #: ../actions/finishremotesubscribe.php:77
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:78
 msgid "Invalid profile URL returned by server."
 msgstr "Server antwortete mit ungültiger Profil-URL."
 
-#: ../actions/avatarbynickname.php:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
 msgid "Invalid size."
 msgstr "Ungültige Größe."
 
-#: ../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:256 actions/register.php:112
+#: actions/register.php:130
 msgid "Invalid username or password."
 msgstr "Benutzername oder Passwort falsch."
 
-#: ../lib/util.php:237
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr ""
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
+
+#: ../lib/util.php:306 lib/util.php:322 lib/util.php:332
+msgid "Invite"
+msgstr ""
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr ""
+
+#: ../lib/util.php:261 lib/util.php:277 lib/util.php:288
 #, 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 ""
 " Es wird mit der Microbloggingsoftware [Laconica](http://laconi.ca/) "
-"(Version %s) betrieben, die unter der [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html) erhältlich "
-"ist."
+"(Version %s) betrieben, die unter der [GNU Affero General Public License]"
+"(http://www.fsf.org/licensing/licenses/agpl-3.0.html) erhältlich ist."
 
-#: ../actions/imsettings.php:164
+#: ../actions/imsettings.php:173 actions/imsettings.php:181
 msgid "Jabber ID already belongs to another user."
 msgstr "Diese Jabber ID wird bereits von einem anderen Benutzer verwendet."
 
-#: ../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 "
@@ -612,339 +1053,559 @@ msgstr ""
 "versichere dich zuerst, dass du %s in deine Kontaktliste in deinem IM "
 "Programm oder GTalk aufgenommen hast."
 
-#: ../actions/profilesettings.php:55
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
+msgid "Language"
+msgstr "Sprache"
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr ""
+
+#: ../actions/profilesettings.php:52 ../actions/register.php:173
+#: actions/profilesettings.php:85 actions/register.php:187
+#: actions/profilesettings.php:87 actions/register.php:214
 msgid "Location"
 msgstr "Aufenthaltsort"
 
-#: ../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/profilesettings.php:225 actions/register.php:101
 msgid "Location is too long (max 255 chars)."
 msgstr "Aufenthaltsort ist zu lang (maximal 255 Zeichen)."
 
-#: ../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/login.php:104 actions/login.php:113 actions/openidlogin.php:88
+#: lib/util.php:336
 msgid "Login"
 msgstr "Einloggen"
 
-#: ../actions/openidlogin.php:44
+#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:60
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Mit [OpenID](%%doc.openid%%) Konto einloggen"
 
-#: ../actions/login.php:122
+#: ../actions/login.php:126
 #, 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 ""
 "Melde dich mit Nutzernamen und Passwort an. Du hast noch keinen Nutzernamen? "
 "[Registriere](%%action.register%%) ein neues Konto oder versuche es mit "
 "[OpenID](%%action.openidlogin%%)."
 
-#: ../lib/util.php:284
+#: ../lib/util.php:308 lib/util.php:324 lib/util.php:334
 msgid "Logout"
 msgstr "Abmelden"
 
-#: ../actions/login.php:106
+#: ../actions/register.php:166 actions/register.php:180
+#: actions/register.php:207
+msgid "Longer name, preferably your \"real\" name"
+msgstr ""
+
+#: ../actions/login.php:110 actions/login.php:110 actions/login.php:118
 msgid "Lost or forgotten password?"
 msgstr "Passwort vergessen?"
 
-#: ../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 ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr ""
+
+#: ../actions/showstream.php:300 actions/showstream.php:315
+#: actions/showstream.php:363
 msgid "Member since"
 msgstr "Mitglied seit"
 
-#: ../actions/userrss.php:70
+#: ../actions/userrss.php:70 actions/userrss.php:67
 #, php-format
 msgid "Microblog by %s"
 msgstr "Microblog von %s"
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
+#: ../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 ""
+
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php:85 actions/register.php:202
+#: actions/register.php:229
 msgid "My text and files are available under "
 msgstr "Meine Texte und Daten sind verfügbar unter"
 
-#: ../actions/finishopenidlogin.php:71
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+msgid "New"
+msgstr ""
+
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:138
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+#: actions/emailsettings.php:318
+msgid "New incoming email address added."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
 msgid "New nickname"
 msgstr "Neuer Nutzername"
 
-#: ../actions/newnotice.php:100
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:141
 msgid "New notice"
 msgstr "Neue Nachricht"
 
-#: ../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/profilesettings.php:185
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: ../actions/recoverpassword.php:275
+#: ../actions/recoverpassword.php:314
 msgid "New password successfully saved. You are now logged in."
 msgstr "Neues Passwort erfolgreich gespeichert. Du bist jetzt eingeloggt."
 
-#: ../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:108 actions/profilesettings.php:76
+#: actions/register.php:192
 msgid "Nickname"
 msgstr "Nutzername"
 
-#: ../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/finishopenidlogin.php:192 actions/profilesettings.php:231
+#: actions/register.php:85
 msgid "Nickname already in use. Try another one."
 msgstr "Nutzername wird bereits verwendet. Suche dir einen anderen aus."
 
-#: ../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:182 actions/profilesettings.php:209
+#: actions/register.php:83
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "Der Nutzername darf nur aus Kleinbuchstaben und Ziffern bestehen. "
 "Leerzeichen sind nicht erlaubt."
 
-#: ../actions/finishopenidlogin.php:170
+#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:187
 msgid "Nickname not allowed."
 msgstr "Nutzername nicht erlaubt."
 
-#: ../actions/remotesubscribe.php:72
+#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
 msgid "Nickname of the user you want to follow"
 msgstr "Nutzername des Nutzers, dem du folgen möchtest"
 
-#: ../actions/recoverpassword.php:147
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
 msgid "Nickname or email"
 msgstr "Nutzername oder E-Mail"
 
-#: ../actions/imsettings.php:147
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:104
+msgid "No"
+msgstr ""
+
+#: ../actions/imsettings.php:156 actions/imsettings.php:164
 msgid "No Jabber ID."
 msgstr "Keine Jabber-ID"
 
-#: ../actions/userauthorization.php:128
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
 msgid "No authorization request!"
 msgstr "Keine Bestätigungsanfrage!"
 
-#: ../actions/confirmaddress.php:33
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+msgid "No carrier selected."
+msgstr ""
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+msgid "No code entered"
+msgstr "Kein Code eingegeben"
+
+#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
 msgid "No confirmation code."
 msgstr "Kein Bestätigungs-Code."
 
-#: ../actions/newnotice.php:49
+#: ../actions/newnotice.php:44 actions/newmessage.php:53
+#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:52
+#: actions/newnotice.php:53
 msgid "No content!"
 msgstr "Kein Inhalt!"
 
-#: ../actions/userbyid.php:27
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+#: actions/emailsettings.php:197
+msgid "No email address."
+msgstr ""
+
+#: ../actions/userbyid.php:32 actions/userbyid.php:32
 msgid "No id."
 msgstr "Keine ID."
 
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+#: actions/emailsettings.php:292
+msgid "No incoming email address."
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:65
+#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:66
 msgid "No nickname provided by remote server."
 msgstr "Der entferne Server hat keinen Nutzernamen geliefert."
 
-#: ../actions/avatarbynickname.php:27
+#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 msgid "No nickname."
 msgstr "Kein Nutzername."
 
-#: ../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:243
 msgid "No pending confirmation to cancel."
 msgstr "Keine ausstehende Bestätigung, die abgebrochen werden kann."
 
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+msgid "No phone number."
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:72
+#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:73
 msgid "No profile URL returned by server."
 msgstr "Der entfernte Server hat keine Profil-URL geliefert."
 
-#: ../actions/recoverpassword.php:189
+#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
 msgid "No registered email address for that user."
 msgstr "Der Nutzer hat keine registrierte E-Mailadresse."
 
-#: ../actions/userauthorization.php:48
+#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
 msgid "No request found!"
 msgstr "Keine Anfrage gefunden!"
 
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
+#: actions/noticesearch.php:69 actions/peoplesearch.php:69
+#: actions/noticesearch.php:68 actions/peoplesearch.php:59
 msgid "No results"
 msgstr "Keine Ergebnisse"
 
-#: ../actions/avatarbynickname.php:32
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
 msgid "No size."
 msgstr "Keine Größe."
 
-#: ../actions/openidsettings.php:135
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:109
+#: actions/twitapistatuses.php:438
+msgid "No status found with that ID."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:411
+msgid "No status with that ID found."
+msgstr ""
+
+#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
 msgid "No such OpenID."
 msgstr "Diese OpenID ist nicht bekannt."
 
-#: ../actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29
 msgid "No such document."
 msgstr "Unbekanntes Dokument."
 
-#: ../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:38
+#: actions/shownotice.php:114
 msgid "No such notice."
 msgstr "Unbekannte Nachricht."
 
-#: ../actions/recoverpassword.php:56
+#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
 msgid "No such recovery code."
 msgstr "Unbekannter Wiederherstellungscode."
 
-#: ../actions/postnotice.php:56
+#: ../actions/postnotice.php:56 actions/postnotice.php:57
 msgid "No such subscription"
 msgstr "Unbekanntes Abonnement"
 
 #: ../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/showstream.php:157
+#: classes/Command.php:208 classes/Command.php:242 lib/gallery.php:85
+#: lib/subs.php:105
 msgid "No such user."
 msgstr "Unbekannter Benutzer."
 
-#: ../lib/gallery.php:76
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr ""
+
+#: ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
 msgstr "Niemand anzuzeigen!"
 
-#: ../actions/recoverpassword.php:60
+#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
 msgid "Not a recovery code."
 msgstr "Kein Wiederherstellungscode."
 
-#: ../actions/imsettings.php:158
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+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:423 lib/twitterapi.php:450
+#: lib/twitterapi.php:534
+msgid "Not a supported data format."
+msgstr ""
+
+#: ../actions/imsettings.php:167 actions/imsettings.php:175
 msgid "Not a valid Jabber ID"
 msgstr "Ungültige Jabber-ID"
 
-#: ../lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131
 msgid "Not a valid OpenID."
 msgstr "Ungültige OpenID."
 
-#: ../actions/profilesettings.php:75 ../actions/register.php:53
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+#: actions/emailsettings.php:208
+msgid "Not a valid email address"
+msgstr ""
+
+#: ../actions/register.php:63 actions/register.php:70 actions/register.php:79
 msgid "Not a valid email address."
 msgstr "Ungültige E-Mail-Adresse."
 
-#: ../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/profilesettings.php:212 actions/register.php:87
 msgid "Not a valid nickname."
 msgstr "Ungültiger Nutzername."
 
-#: ../actions/remotesubscribe.php:118
+#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
 msgid "Not a valid profile URL (incorrect services)."
 msgstr "Ungültige Profil-URL (falsche Dienste)."
 
-#: ../actions/remotesubscribe.php:111
+#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr "Ungültige Profil-URL (XRDS nicht definiert)."
 
-#: ../actions/remotesubscribe.php:104
+#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
 msgid "Not a valid profile URL (no YADIS document)."
 msgstr "Ungültige Profil-URL (kein YADIS-Dokument)."
 
-#: ../actions/avatar.php:95
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: actions/profilesettings.php:361
 msgid "Not an image or corrupt file."
 msgstr "Kein Bild oder defekte Datei."
 
 #: ../actions/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:52
 msgid "Not authorized."
 msgstr "Nicht autorisiert."
 
 #: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38
 msgid "Not expecting this response!"
 msgstr "Unerwartete Antwort!"
 
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
-#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+#: actions/twitapistatuses.php:304
+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:31 actions/newnotice.php:30
+#: actions/nudge.php:30 actions/subedit.php:31 actions/unblock.php:31
 msgid "Not logged in."
 msgstr "Nicht eingeloggt."
 
-#: ../actions/unsubscribe.php:43
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:117
 msgid "Not subscribed!."
 msgstr "Nicht abonniert!"
 
-#: ../actions/showstream.php:82
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+msgid "Notice Search"
+msgstr ""
+
+#: ../actions/showstream.php:82 actions/showstream.php:82
+#: actions/showstream.php:111 actions/showstream.php:118
+#: actions/showstream.php:123
 #, php-format
 msgid "Notice feed for %s"
 msgstr "Feed der Nachrichten von %s"
 
-#: ../actions/shownotice.php:39
+#: ../actions/shownotice.php:39 actions/shownotice.php:39
+#: actions/shownotice.php:45
 msgid "Notice has no profile"
 msgstr "Nachricht hat kein Profil"
 
-#: ../actions/showstream.php:297
+#: ../actions/showstream.php:316 actions/showstream.php:331
+#: actions/showstream.php:379
 msgid "Notices"
 msgstr "Nachrichten"
 
-#: ../actions/password.php:39
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
+#, php-format
+msgid "Notices tagged with %s"
+msgstr ""
+
+#: ../actions/password.php:39 actions/profilesettings.php:178
+#: actions/profilesettings.php:183
 msgid "Old password"
 msgstr "Altes Passwort"
 
-#: ../lib/util.php:288
+#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
+#: lib/util.php:330 actions/deleteprofile.php:247 lib/util.php:340
 msgid "OpenID"
 msgstr "OpenID"
 
-#: ../actions/finishopenidlogin.php:61
+#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
 msgid "OpenID Account Setup"
 msgstr "OpenID Account erstellen"
 
-#: ../lib/openid.php:180
+#: ../lib/openid.php:180 lib/openid.php:180
 msgid "OpenID Auto-Submit"
 msgstr "OpenID Automatische Übertragung"
 
 #: ../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/finishopenidlogin.php:150 actions/openidlogin.php:76
 msgid "OpenID Login"
 msgstr "OpenID Anmeldung"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
+#: actions/openidlogin.php:74 actions/openidsettings.php:50
+#: actions/openidlogin.php:82
 msgid "OpenID URL"
 msgstr "OpenID-URL"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
+#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 msgid "OpenID authentication cancelled."
 msgstr "OpenID-Authentifizierung abgebrochen."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
+#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "OpenID-Authentifizierung fehlgeschlagen: %s"
 
-#: ../lib/openid.php:133
+#: ../lib/openid.php:133 lib/openid.php:133
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "OpenID-Fehler: %s"
 
-#: ../actions/openidsettings.php:144
+#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
 msgid "OpenID removed."
 msgstr "OpenID entfernt."
 
-#: ../actions/openidsettings.php:37
+#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
 msgid "OpenID settings"
 msgstr "OpenID-Einstellungen"
 
-#: ../actions/avatar.php:84
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: actions/profilesettings.php:350
 msgid "Partial upload."
 msgstr "Unvollständiger Upload"
 
-#: ../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/login.php:109 actions/register.php:194
 msgid "Password"
 msgstr "Passwort"
 
-#: ../actions/recoverpassword.php:249
+#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
 msgid "Password and confirmation do not match."
 msgstr "Passwort und seine Bestätigung stimmen nicht überein."
 
-#: ../actions/recoverpassword.php:245
+#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
 msgid "Password must be 6 chars or more."
 msgstr "Passwort muss mehr als 6 Zeichen enthalten"
 
-#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
+#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 msgid "Password recovery requested"
 msgstr "Wiederherstellung des Passworts angefordert"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:274
+#: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: actions/profilesettings.php:408 actions/recoverpassword.php:326
+#: actions/profilesettings.php:437
 msgid "Password saved."
 msgstr "Passwort gespeichert."
 
-#: ../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/profilesettings.php:409 actions/register.php:107
 msgid "Passwords don't match."
 msgstr "Passwörter stimmen nicht überein."
 
-#: ../actions/peoplesearch.php:33
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+msgid "People"
+msgstr ""
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+msgid "People Search"
+msgstr ""
+
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
 msgid "People search"
 msgstr "Suche nach anderen Nutzern"
 
-#: ../lib/stream.php:44
+#: ../lib/stream.php:50 lib/personal.php:50
 msgid "Personal"
 msgstr "Eigene"
 
-#: ../actions/userauthorization.php:77
+#: ../actions/invite.php:133 actions/invite.php:141
+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, "
@@ -954,91 +1615,135 @@ msgstr ""
 "dieses Nutzers abonnieren möchtest. Wenn du das nicht wolltest, klicke auf "
 "\"Abbrechen\"."
 
-#: ../actions/imsettings.php:74
+#: ../actions/imsettings.php:73 actions/imsettings.php:74
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Schicke eine Nachricht, wenn sich mein Jabber/GTalk Status verändert."
 
-#: ../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
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../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:185 actions/othersettings.php:179
 msgid "Preferences saved."
 msgstr "Einstellungen gesichert."
 
-#: ../lib/util.php:300
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
+msgid "Preferred language"
+msgstr ""
+
+#: ../lib/util.php:328 lib/util.php:344 lib/util.php:356
 msgid "Privacy"
 msgstr "Privatsphäre"
 
-#: ../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:139 classes/Notice.php:149
 msgid "Problem saving notice."
 msgstr "Problem bei Speichern der Nachricht."
 
-#: ../lib/stream.php:54
+#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
+#: lib/settingsaction.php:84 actions/deleteprofile.php:241
 msgid "Profile"
 msgstr "Profil"
 
-#: ../actions/remotesubscribe.php:73
+#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
 msgid "Profile URL"
 msgstr "Profil-URL"
 
-#: ../actions/profilesettings.php:34
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
 msgid "Profile settings"
 msgstr "Profil Einstellungen"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
+#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
+#: actions/postnotice.php:52 actions/updateprofile.php:53
 msgid "Profile unknown"
 msgstr "Profil unbekannt"
 
-#: ../lib/util.php:276
-msgid "Public"
-msgstr "Öffentlich"
-
-#: ../actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:77
 msgid "Public Stream Feed"
 msgstr "Feed des öffentlichen Streams"
 
-#: ../actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 lib/stream.php:34
 msgid "Public timeline"
 msgstr "Öffentliche Zeitleiste"
 
-#: ../actions/recoverpassword.php:151
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:104
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
 msgid "Recover"
 msgstr "Wiederherstellung"
 
-#: ../actions/recoverpassword.php:141
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
 msgid "Recover password"
 msgstr "Stelle Passwort wieder her"
 
-#: ../actions/recoverpassword.php:67
+#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
 msgid "Recovery code for unknown user."
 msgstr "Wiederherstellungscode für unbekannten Nutzer."
 
-#: ../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:181 actions/register.php:234 lib/util.php:338
 msgid "Register"
 msgstr "Registrieren"
 
-#: ../actions/userauthorization.php:119
+#: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:173
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:241
+msgid "Registration successful"
+msgstr ""
+
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
 msgid "Reject"
 msgstr "Ablehnen"
 
-#: ../actions/login.php:99 ../actions/register.php:183
+#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
+#: actions/register.php:190 actions/login.php:110 actions/openidlogin.php:85
+#: actions/register.php:217
 msgid "Remember me"
 msgstr "Anmeldedaten merken"
 
-#: ../actions/updateprofile.php:69
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
 msgid "Remote profile with no matching profile"
 msgstr "Entferntes Profil ohne ein passendes Profil"
 
-#: ../actions/remotesubscribe.php:65
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
 msgid "Remote subscribe"
 msgstr "Entferntes Abonnement"
 
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php:48 actions/emailsettings.php:76
+#: actions/imsettings.php:49 actions/openidsettings.php:108
+#: actions/smssettings.php:50 actions/smssettings.php:84
+#: actions/twittersettings.php:59 actions/twittersettings.php:61
 msgid "Remove"
 msgstr "Entfernen"
 
-#: ../actions/openidsettings.php:68
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
 msgid "Remove OpenID"
 msgstr "Entferne OpenID"
 
@@ -1050,40 +1755,73 @@ msgstr ""
 "Wenn du deine einzige OpenID entfernst, kannst du dich nicht mehr einloggen! "
 "Falls du sie also entfernen musst, füge zuerst eine neue OpenID hinzu."
 
-#: ../lib/stream.php:49
+#: ../lib/stream.php:55 lib/personal.php:55
 msgid "Replies"
 msgstr "Antworten"
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:50
+#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
+#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #, php-format
 msgid "Replies to %s"
 msgstr "Antworten an %s"
 
-#: ../actions/recoverpassword.php:168
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: ../actions/recoverpassword.php:158
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
 msgid "Reset password"
 msgstr "Passwort zurücksetzen"
 
-#: ../actions/recoverpassword.php:167 ../actions/register.php:180
-msgid "Same as password above"
-msgstr "Gleiches Passwort wie zuvor"
-
-#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/deleteprofile.php:250 actions/subscriptions.php:73
+msgid "SMS"
+msgstr ""
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+msgid "SMS Phone number"
+msgstr ""
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:230
+msgid "SMS confirmation"
+msgstr ""
+
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
+msgid "Same as password above"
+msgstr "Gleiches Passwort wie zuvor"
+
+#: ../actions/register.php:156 actions/register.php:170
+#: actions/register.php:197
+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/twittersettings.php:83 actions/emailsettings.php:107
+#: actions/othersettings.php:56 actions/profilesettings.php:106
+#: actions/subscriptions.php:74 actions/tagother.php:100
+#: actions/twittersettings.php:82
 msgid "Save"
 msgstr "Speichern"
 
-#: ../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/util.php:327
 msgid "Search"
 msgstr "Suchen"
 
-#: ../actions/noticesearch.php:80
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:84
 msgid "Search Stream Feed"
 msgstr "Stream-Feed suchen"
 
-#: ../actions/noticesearch.php:30
+#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
+#: actions/noticesearch.php:29
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -1103,116 +1841,220 @@ msgstr ""
 "Trenne mehrere Suchbegriffe durch Leerzeichen. Ein Suchbegriff muss aus "
 "mindestens 3 Zeichen bestehen."
 
-#: ../lib/util.php:982
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+msgid "Select a carrier"
+msgstr ""
+
+#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
+#: lib/util.php:1306 lib/util.php:1731 lib/util.php:1646 lib/util.php:2158
 msgid "Send"
 msgstr "Senden"
 
-#: ../actions/imsettings.php:71
+#: ../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."
+msgstr ""
+
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+msgid "Send me notices of new subscriptions through email."
+msgstr ""
+
+#: ../actions/imsettings.php:70 actions/imsettings.php:71
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Schicke mir Nachrichten mittels Jabber/GTalk."
 
-#: ../lib/util.php:282
+#: ../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 ""
+
+#: ../lib/util.php:304 lib/util.php:320 lib/util.php:330
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: ../actions/profilesettings.php:183
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:336
 msgid "Settings saved."
 msgstr "Einstellungen gespeichert."
 
-#: ../actions/finishaddopenid.php:66
+#: ../actions/tag.php:60 actions/tag.php:60 actions/tag.php:59
+msgid "Showing most popular tags from the last week"
+msgstr ""
+
+#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
 msgid "Someone else already has this OpenID."
 msgstr "Jemand anderes hat schon diese OpenID."
 
 #: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
+#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
 msgid "Something weird happened."
 msgstr "Etwas eigenartiges ist passiert."
 
-#: ../lib/util.php:302
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr ""
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: ../lib/util.php:330 lib/util.php:346 lib/util.php:358
 msgid "Source"
 msgstr "Quellcode"
 
-#: ../actions/showstream.php:277
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:359
 msgid "Statistics"
 msgstr "Statistiken"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
+#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
+#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
+#: actions/finishopenidlogin.php:199 actions/finishopenidlogin.php:267
 msgid "Stored OpenID not found."
 msgstr "Gespeicherte OpenID nicht gefunden."
 
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:172
-#: ../actions/showstream.php:181
+#: ../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:254 lib/util.php:2078
 msgid "Subscribe"
 msgstr "Abonnieren"
 
-#: ../actions/showstream.php:294 ../actions/subscribers.php:27
+#: ../actions/showstream.php:313 ../actions/subscribers.php:27
+#: actions/showstream.php:328 actions/subscribers.php:27
+#: actions/showstream.php:376 lib/gallery.php:136 lib/gallery.php:137
 msgid "Subscribers"
 msgstr "Abonnenten"
 
-#: ../actions/userauthorization.php:309
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
 msgid "Subscription authorized"
 msgstr "Abonnement autorisiert"
 
-#: ../actions/userauthorization.php:319
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
 msgid "Subscription rejected"
 msgstr "Abonnement abgelehnt"
 
-#: ../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:288 actions/showstream.php:370 lib/gallery.php:131
+#: lib/gallery.php:132
 msgid "Subscriptions"
 msgstr "Abonnements"
 
-#: ../actions/avatar.php:87
+#: ../actions/avatar.php:87 actions/profilesettings.php:324
+#: actions/profilesettings.php:353
 msgid "System error uploading file."
 msgstr "Systemfehler beim hochladen der Datei."
 
-#: ../actions/noticesearch.php:34
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317 actions/profilesettings.php:90 actions/showstream.php:382
+#: actions/tag.php:40 actions/tagother.php:96 actions/tagother.php:162
+#: lib/profilelist.php:126 lib/profilelist.php:128
+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:33
 msgid "Text search"
 msgstr "Volltextsuche"
 
-#: ../actions/openidsettings.php:140
+#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
 msgid "That OpenID does not belong to you."
 msgstr "Diese OpenID gehört dir nicht."
 
-#: ../actions/confirmaddress.php:52
+#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
 msgid "That address has already been confirmed."
 msgstr "Diese Adresse wurde bereits bestätigt."
 
-#: ../actions/confirmaddress.php:43
+#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
 msgid "That confirmation code is not for you!"
 msgstr "Dieser Bestätigungscode ist nicht für dich!"
 
-#: ../actions/avatar.php:80
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:214
+msgid "That email address already belongs to another user."
+msgstr ""
+
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: actions/profilesettings.php:346
 msgid "That file is too big."
 msgstr "Diese Datei ist zu groß."
 
-#: ../actions/imsettings.php:161
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
 msgid "That is already your Jabber ID."
 msgstr "Diese JabberID hast du schon angegeben."
 
-#: ../actions/imsettings.php:224
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:211
+msgid "That is already your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+msgid "That is already your phone number."
+msgstr ""
+
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
 msgid "That is not your Jabber ID."
 msgstr "Dies ist nicht deine JabberID."
 
-#: ../actions/imsettings.php:201
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+#: actions/emailsettings.php:270
+msgid "That is not your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+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:247
 msgid "That is the wrong IM address."
 msgstr "Das ist die falsche IM Adresse."
 
-#: ../actions/newnotice.php:52
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+msgid "That is the wrong confirmation number."
+msgstr ""
+
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+msgid "That phone number already belongs to another user."
+msgstr ""
+
+#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: actions/newnotice.php:49 actions/twitapistatuses.php:330
+#: actions/newnotice.php:61 actions/twitapistatuses.php:271
 msgid "That's too long. Max notice size is 140 chars."
 msgstr ""
-"Das war zu lang. Die Länge einer Nachricht ist auf 140 Zeichen "
-"beschränkt."
+"Das war zu lang. Die Länge einer Nachricht ist auf 140 Zeichen beschränkt."
+
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+#: actions/twitapiaccount.php:55
+msgid "That's too long. Max notice size is 255 chars."
+msgstr ""
 
-#: ../actions/confirmaddress.php:86
+#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Die Adresse \"%s\" wurde für dein Konto bestätigt."
 
-#: ../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:285
 msgid "The address was removed."
 msgstr "Die Adresse wurde entfernt."
 
-#: ../actions/userauthorization.php:311
+#: ../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 "
@@ -1222,7 +2064,7 @@ msgstr ""
 "zurückgegeben. Lies nochmal die Anweisungen der Site, wie Abonnements "
 "bestätigt werden. Dein Abonnement-Token ist:"
 
-#: ../actions/userauthorization.php:321
+#: ../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 "
@@ -1232,25 +2074,30 @@ msgstr ""
 "zurückgegeben. Lies nochmal die Anweisungen der Site, wie Abonnements "
 "vollständig abgelehnt werden. Dein Abonnement-Token ist:"
 
-#: ../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 "Dies sind die Leute, die %ss Nachrichten lesen."
 
-#: ../actions/subscribers.php:33
+#: ../actions/subscribers.php:33 actions/subscribers.php:33
 msgid "These are the people who listen to your notices."
 msgstr "Dies sind die Leute, die deine Nachrichten lesen."
 
-#: ../actions/subscriptions.php:35
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Dies sind die Leute, deren Nachrichten %s liest."
 
-#: ../actions/subscriptions.php:33
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
 msgid "These are the people whose notices you listen to."
 msgstr "Dies sind die Leute, deren Nachrichten du liest."
 
-#: ../actions/recoverpassword.php:87
+#: ../actions/invite.php:89 actions/invite.php:96
+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 "Der Bestätigungscode ist zu alt. Bitte fange nochmal von vorne an."
 
@@ -1262,7 +2109,7 @@ msgstr ""
 "Dieses Formular sollte automatisch übermittelt werden. Wenn nicht, dann "
 "klicke auf \"Senden\", um zu deinem OpenID-Anbieter zu gelangen."
 
-#: ../actions/finishopenidlogin.php:56
+#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -1273,46 +2120,87 @@ msgstr ""
 "deine OpenID mit einem lokalen Konto verbinden. Du kannst entweder ein neues "
 "Konto erstellen oder mit einem vorhandenen Konto anmelden."
 
-#: ../lib/util.php:147
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:94
+#: actions/twitapifriendships.php:82 actions/twitapistatuses.php:428
+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:46
+#: actions/twitapidirect_messages.php:117 actions/twitapifriendships.php:30
+#: actions/twitapistatuses.php:239
+msgid "This method requires a POST."
+msgstr ""
+
+#: ../lib/util.php:164 lib/util.php:246 lib/util.php:257
 msgid "This page is not available in a media type you accept"
 msgstr "Dies Seite liegt in keinem von dir akzeptierten Mediatype vor."
 
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
+msgid "Timezone"
+msgstr ""
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr ""
+
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"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 ""
 "Für ein Abonnement kannst du dich entweder [einloggen](%%action.login%%) "
 "oder ein neues Konto [registrieren](%%action.register%%). Wenn du schon ein "
 "Konto auf einer [kompatiblen Microbloggingsite](%%doc.openmublog%%) hast, "
 "dann gib deine Profil-URL unten an."
 
-#: ../actions/profilesettings.php:51
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: actions/twitapifriendships.php:128
+msgid "Two user ids or screen_names must be supplied."
+msgstr ""
+
+#: ../actions/profilesettings.php:48 ../actions/register.php:169
+#: actions/profilesettings.php:81 actions/register.php:183
+#: actions/profilesettings.php:83 actions/register.php:210
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
-"URL deiner Homepage, deines Blogs, oder deines Profils auf einer anderen "
-"Site"
+"URL deiner Homepage, deines Blogs, oder deines Profils auf einer anderen Site"
 
-#: ../actions/remotesubscribe.php:74
+#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "Profil-URL bei einem anderen kompatiblen Microbloggingdienst"
 
-#: ../actions/imsettings.php:105 ../actions/recoverpassword.php:39
+#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
+#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
+#: actions/emailsettings.php:144 actions/imsettings.php:118
+#: actions/recoverpassword.php:39 actions/smssettings.php:143
+#: actions/twittersettings.php:108 actions/emailsettings.php:147
+#: actions/othersettings.php:146 actions/twittersettings.php:199
 msgid "Unexpected form submission."
 msgstr "Unerwartete Formulareingabe."
 
-#: ../actions/recoverpassword.php:237
+#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
 msgid "Unexpected password reset."
 msgstr "Unerwarteter Passwortreset."
 
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr "Unbekannter Befehl"
+
 #: ../actions/finishremotesubscribe.php:58
+#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:59
 msgid "Unknown version of OMB protocol."
 msgstr "Unbekannte OMB-Protokollversion."
 
-#: ../lib/util.php:245
+#: ../lib/util.php:269 lib/util.php:285 lib/util.php:296
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
@@ -1320,24 +2208,50 @@ msgstr ""
 "Wenn nicht anders angegeben unterstehen die Inhalte dieser Site dem "
 "Urheberrecht der Autoren und sind unter der"
 
-#: ../actions/confirmaddress.php:48
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr "Nicht erkannter Adresstyp %s"
 
-#: ../actions/showstream.php:193
+#: ../actions/showstream.php:209 actions/showstream.php:219
+#: actions/showstream.php:267 lib/util.php:2094
 msgid "Unsubscribe"
 msgstr "Abbestellen"
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
+#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
+#: actions/postnotice.php:45 actions/updateprofile.php:46
 msgid "Unsupported OMB version"
 msgstr "Nicht unterstützte OMB-Version"
 
-#: ../actions/avatar.php:105
+#: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: actions/profilesettings.php:371
 msgid "Unsupported image file format."
 msgstr "Bildformat wird nicht unterstützt."
 
-#: ../actions/avatar.php:68
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: actions/deleteprofile.php:251
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: actions/deleteprofile.php:254
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/twitapistatuses.php:126
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:198
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
+
+#: ../actions/avatar.php:68 actions/profilesettings.php:161
+#: actions/profilesettings.php:166
 msgid "Upload"
 msgstr "Hochladen"
 
@@ -1354,65 +2268,123 @@ msgstr ""
 "Verfügung gestellt werden. Nutze also ein Bild, das dir gehört und das du "
 "auch weitergeben möchtest."
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:182
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr ""
+
+#: ../actions/invite.php:114 actions/invite.php:121
+msgid ""
+"Use this form to invite your friends and colleagues to use this service."
+msgstr ""
+
+#: ../actions/register.php:159 ../actions/register.php:162
+#: actions/register.php:173 actions/register.php:176 actions/register.php:200
+#: actions/register.php:203
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 "Wird nur für Updates, wichtige Mitteilungen und zur "
 "Passwortwiederherstellung verwendet"
 
 #: ../actions/finishremotesubscribe.php:86
+#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:92
 msgid "User being listened to doesn't exist."
 msgstr "Aufgeführte Nutzer existiert nicht."
 
 #: ../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/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/showstream.php:57
+#: actions/twitapiaccount.php:63 actions/twitapifavorites.php:40
+#: actions/twitapistatuses.php:163 actions/twitapistatuses.php:492
+#: lib/twitterapi.php:590
 msgid "User has no profile."
 msgstr "Benutzer hat kein Profil."
 
-#: ../actions/remotesubscribe.php:71
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
 msgid "User nickname"
 msgstr "Benutzername"
 
-#: ../lib/util.php:969 ../lib/util.php:1159 lib/util.php:1293
-#, php-format
-#, fuzzy
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
+msgid "What timezone are you normally in?"
+msgstr "In welcher Zeitzone befinden Sie sich üblicherweise?"
+
+#: ../lib/util.php:1159 lib/util.php:1293 lib/util.php:1630
+#, fuzzy, php-format
 msgid "What's up, %s?"
 msgstr ""
 "#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Was ist los, %s?\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/profilesettings.php:57
+#: ../actions/profilesettings.php:54 ../actions/register.php:175
+#: actions/profilesettings.php:87 actions/register.php:189
+#: actions/profilesettings.php:89 actions/register.php:216
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Wo du bist, z.B. \"Stadt, Gebiet, Land\""
 
-#: ../actions/updateprofile.php:127
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Falscher Bildtyp für '%s'"
 
-#: ../actions/updateprofile.php:122
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Falsche Bildgröße bei '%s'"
 
-#: ../actions/finishaddopenid.php:64
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+#: actions/block.php:105
+msgid "Yes"
+msgstr ""
+
+#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
 msgid "You already have this OpenID!"
 msgstr "Diese OpenID hast du schon angegeben!"
 
-#: ../actions/recoverpassword.php:31
+#: ../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
 msgid "You are already logged in!"
 msgstr "Du bist bereits angemeldet!"
 
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:102
+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 "Hier kannst du dein Passwort ändern. Wähle ein Gutes!"
 
-#: ../actions/register.php:164
+#: ../actions/register.php:135 actions/register.php:145
 msgid "You can create a new account to start posting notices."
 msgstr "Du kannst ein neues Konto erstellen, um Nachrichten zu verschicken."
 
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
 #: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
@@ -1421,46 +2393,78 @@ msgstr ""
 "Du kannst eine OpenID aus deinem Konto entfernen, indem du auf \"Entfernen\" "
 "klickst."
 
-#: ../actions/imsettings.php:28
+#: ../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 ""
 "Du kannst Nachrichten mittels [Jabber/GTalk IM](%%doc.im%%) empfangen und "
 "senden. Stelle deine Adresse und Einstellungen unten ein."
 
 #: ../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 ""
 "Du kannst dein Profil auf den neusten Stand bringen, damit andere Leute mehr "
 "über dich erfahren können."
 
 #: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
+#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
+#: actions/finishremotesubscribe.php:83 actions/finishremotesubscribe.php:99
 msgid "You can use the local subscription!"
 msgstr "Du kannst ein lokales Abonnement erstellen!"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:51
+#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
+#: actions/finishopenidlogin.php:38 actions/register.php:68
+#: actions/register.php:77
 msgid "You can't register if you don't agree to the license."
 msgstr ""
-"Du kannst dich nicht registrieren, wenn du die Lizenz nicht "
-"akzeptierst."
+"Du kannst dich nicht registrieren, wenn du die Lizenz nicht akzeptierst."
 
-#: ../actions/updateprofile.php:62
+#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
 msgid "You did not send us that profile"
 msgstr "Dieses Profil hast du uns nicht geschickt"
 
-#: ../actions/recoverpassword.php:134
+#: ../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 ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: actions/twitapistatuses.php:455
+msgid "You may not delete another user's status."
+msgstr ""
+
+#: ../actions/invite.php:31 actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+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!"
+msgstr ""
+
+#: ../actions/recoverpassword.php:149
 msgid "You've been identified. Enter a  new password below. "
 msgstr "Du wurdest indentifiziert. Bitte trage unten ein neues Passwort ein."
 
-#: ../actions/openidlogin.php:67
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:84
 msgid "Your OpenID URL"
 msgstr "Deine OpenID URL"
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:164
 msgid "Your nickname on this server, or your registered email address."
 msgstr "Dein Benutzername oder E-Mail Adresse auf diesem Server."
 
@@ -1471,799 +2475,87 @@ msgid ""
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
 "Mit [OpenID](%%doc.openid%%) kannst du dich bei mehreren Sites mit demselben "
-"Nutzerkonto anmelden. Hier kannst du deine verknüpften OpenIDs "
-"verwalten."
+"Nutzerkonto anmelden. Hier kannst du deine verknüpften OpenIDs verwalten."
 
-#: ../lib/util.php:814
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:1287
 msgid "a few seconds ago"
 msgstr "vor wenigen Sekunden"
 
-#: ../lib/util.php:826
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:1299
 #, php-format
 msgid "about %d days ago"
 msgstr "vor %d Tagen"
 
-#: ../lib/util.php:822
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:1295
 #, php-format
 msgid "about %d hours ago"
 msgstr "vor %d Stunden"
 
-#: ../lib/util.php:818
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:1291
 #, php-format
 msgid "about %d minutes ago"
 msgstr "vor %d Minuten"
 
-#: ../lib/util.php:830
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:1303
 #, php-format
 msgid "about %d months ago"
 msgstr "vor %d Monaten"
 
-#: ../lib/util.php:824
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:1297
 msgid "about a day ago"
 msgstr "vor einem Tag"
 
-#: ../lib/util.php:816
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:1289
 msgid "about a minute ago"
 msgstr "vor einer Minute"
 
-#: ../lib/util.php:828
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:1301
 msgid "about a month ago"
 msgstr "vor einem Monat"
 
-#: ../lib/util.php:832
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:1305
 msgid "about a year ago"
 msgstr "vor einem Jahr"
 
-#: ../lib/util.php:820
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:1293
 msgid "about an hour ago"
 msgstr "vor einer Stunde"
 
-#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
-#: ../lib/stream.php:101
-msgid "in reply to..."
-msgstr "als Antwort auf... "
-
-#: ../actions/noticesearch.php:133 ../actions/showstream.php:390
-#: ../lib/stream.php:108
-msgid "reply"
-msgstr "antworten"
-
-#: ../actions/password.php:44
-msgid "same as password above"
-msgstr "Gleiches Passwort wie zuvor"
-
-#: ../lib/util.php:1127
-msgid "« After"
-msgstr "« Später"
-
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr "von"
-
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
-
-#: ../actions/invite.php:168 actions/invite.php:176
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
-
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
-
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
-#, php-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
-
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#, php-format
-msgid "%s public timeline"
-msgstr "%s öffentliche Zeitleiste"
-
-#: ../lib/mail.php:206 lib/mail.php:212
-#, php-format
-msgid "%s status"
-msgstr "%s Status"
-
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#, php-format
-msgid "%s timeline"
-msgstr "%s Zeitleiste"
-
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
-msgstr ""
-
-#: ../actions/register.php:213
-msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
-msgstr ""
-"(Sie sollten in Kürze eine E-Mail mit der Anleitung zur Überprüfung Ihrer "
-"Mailadresse erhalten.)"
-
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 kleingeschriebene Buchstaben oder Zahlen, keine Satz- oder Leerzeichen. "
-"Pflicht."
-
-#: ../actions/register.php:154 actions/register.php:168
-msgid "6 or more characters. Required."
-msgstr "6 oder mehr Buchstaben. Pflicht."
-
-#: ../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 ""
-"Ein Bestätigungscode wurde an die angegebene E-Mail Adresse geschickt. "
-"Überprüfen Sie Ihren Posteingang (auch den Spamordner!) für den Code und "
-"Anweisungen, wie dieser benutzt wird."
-
-#: ../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 ""
-"Ein Bestätigungscode wurde an die von Ihnen angegebene Telefonnummer "
-"gesandt. Überprüfen Sie bitte Ihren Posteingang (auch den Spamordner!) auf "
-"den Code und die Anweisungen, um ihn zu benutzen."
-
-#: ../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!"
-msgstr "API-Methode nicht gefunden!"
-
-#: ../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 "API-Methode im Aufbau."
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-msgid "Add or remove OpenIDs"
-msgstr ""
-
-#: ../actions/invite.php:131 actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
-msgstr ""
-
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-msgid "Are you sure you want to delete this notice?"
-msgstr "Sind sie sicher, dass sie diese Nachricht löschen wollen?"
-
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
-msgstr ""
-"Abonniere automatisch alle Kontakte, die mich abonnieren (sinnvoll für "
-"Nicht-Menschen)"
-
-#: ../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 ""
-
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr "Warte auf die Bestätigung dieser Telefonnummer."
-
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
-msgid "Can't delete this notice."
-msgstr "Die Nachricht konnte nicht gelöscht werden."
-
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-msgid "Cannot normalize that email address"
-msgstr ""
-
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr ""
-
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
-msgstr ""
-
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-msgid "Change your profile settings"
-msgstr "Ändern der Profileinstellungen"
-
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-msgid "Confirmation code"
-msgstr "Bestätigungscode"
-
-#: ../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/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
-msgstr ""
-
-#: ../lib/subs.php:54 lib/subs.php:61
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: ../lib/subs.php:46 lib/subs.php:46
-msgid "Could not subscribe."
-msgstr ""
-
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-msgid "Could not update user with confirmed email address."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-msgid "Couldn't find any statuses."
-msgstr "Konnte keine Statusmeldungen finden."
-
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-msgid "Couldn't update user for autosubscribe."
-msgstr ""
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-msgid "Couldn't update user record."
-msgstr ""
-
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-msgid "Current confirmed email address."
-msgstr ""
-
-#: ../classes/Notice.php:72 classes/Notice.php:86
-#, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr ""
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-msgid "Delete notice"
-msgstr ""
-
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-msgid "Email Address"
-msgstr ""
-
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-msgid "Email Settings"
-msgstr ""
-
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-msgid "Email address, like \"UserName@example.org\""
-msgstr ""
-
-#: ../actions/invite.php:129 actions/invite.php:137
-msgid "Email addresses"
-msgstr ""
-
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
-msgstr ""
-
-#: ../actions/tag.php:55 actions/tag.php:55
-#, php-format
-msgid "Feed for tag %s"
-msgstr ""
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr ""
-
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr ""
-
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-msgid "I want to post notices by email."
-msgstr ""
-
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
-msgstr ""
-
-#: ../actions/recoverpassword.php:137
-msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
-"email address you have stored  in your account."
-msgstr ""
-
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-msgid "Incoming email"
-msgstr ""
-
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-msgid "Incoming email address removed."
-msgstr ""
-
-#: ../actions/invite.php:55 actions/invite.php:62
-#, php-format
-msgid "Invalid email address: %s"
-msgstr ""
-
-#: ../actions/invite.php:79 actions/invite.php:86
-msgid "Invitation(s) sent"
-msgstr ""
-
-#: ../actions/invite.php:97 actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
-msgstr ""
-
-#: ../lib/util.php:306 lib/util.php:322
-msgid "Invite"
-msgstr ""
-
-#: ../actions/invite.php:123 actions/invite.php:130
-msgid "Invite new users"
-msgstr ""
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Language"
-msgstr "Sprache"
-
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-msgid "Language is too long (max 50 chars)."
-msgstr ""
-
-#: ../actions/register.php:166 actions/register.php:180
-msgid "Longer name, preferably your \"real\" name"
-msgstr ""
-
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-#: actions/emailsettings.php:81 actions/smssettings.php:89
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
-
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-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 ""
-
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-msgid "New"
-msgstr ""
-
-#: ../lib/mail.php:144 lib/mail.php:144
-#, php-format
-msgid "New email address for posting to %s"
-msgstr ""
-
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-msgid "New incoming email address added."
-msgstr ""
-
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-msgid "No"
-msgstr ""
-
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-msgid "No carrier selected."
-msgstr ""
-
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-msgid "No code entered"
-msgstr "Kein Code eingegeben"
-
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-msgid "No email address."
-msgstr ""
-
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-msgid "No incoming email address."
-msgstr ""
-
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-msgid "No phone number."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-msgid "No status found with that ID."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-msgid "No status with that ID found."
-msgstr ""
-
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-msgid "No user with that email address or username."
-msgstr ""
-
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-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
-msgid "Not a supported data format."
-msgstr ""
-
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-msgid "Not a valid email address"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-msgid "Not found"
-msgstr ""
-
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-msgid "Notice Search"
-msgstr ""
-
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81
-#, php-format
-msgid "Notices tagged with %s"
-msgstr ""
-
-#: ../actions/invite.php:135 actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-msgid "People"
-msgstr ""
-
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-msgid "People Search"
-msgstr ""
-
-#: ../actions/invite.php:133 actions/invite.php:141
-msgid "Personal message"
-msgstr ""
-
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Preferred language"
-msgstr ""
-
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
-
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-msgid "Publish a MicroID for my email address."
-msgstr ""
-
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr ""
-
-#: ../actions/register.php:28 actions/register.php:28
-msgid "Registration not allowed."
-msgstr ""
-
-#: ../actions/register.php:200 actions/register.php:214
-msgid "Registration successful"
-msgstr ""
-
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
-msgstr ""
-
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-msgid "SMS Phone number"
-msgstr ""
-
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-msgid "SMS Settings"
-msgstr ""
-
-#: ../lib/mail.php:219 lib/mail.php:225
-msgid "SMS confirmation"
-msgstr ""
-
-#: ../actions/register.php:156 actions/register.php:170
-msgid "Same as password above. Required."
-msgstr ""
-
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-msgid "Select a carrier"
-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."
-msgstr ""
-
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-msgid "Send me notices of new subscriptions through email."
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr ""
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
-msgstr ""
-
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317
-msgid "Tags"
-msgstr ""
-
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr ""
-
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr ""
-
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-msgid "That is already your email address."
-msgstr ""
-
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-msgid "That is already your phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-msgid "That is not your email address."
-msgstr ""
-
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-msgid "That is not your phone number."
-msgstr ""
-
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-msgid "That is the wrong confirmation number."
-msgstr ""
-
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-msgid "That phone number already belongs to another user."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-msgid "That's too long. Max notice size is 255 chars."
-msgstr ""
-
-#: ../actions/invite.php:89 actions/invite.php:96
-msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
-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."
-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."
-msgstr ""
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "Timezone"
-msgstr ""
-
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-msgid "Timezone not selected."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-msgid "Two user ids or screen_names must be supplied."
-msgstr ""
-
-#: ../index.php:57 index.php:57
-msgid "Unknown action"
-msgstr "Unbekannter Befehl"
-
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-msgid "Updates by SMS"
-msgstr ""
-
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr ""
-
-#: ../actions/invite.php:114 actions/invite.php:121
-msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
-msgstr ""
-
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr ""
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "What timezone are you normally in?"
-msgstr "In welcher Zeitzone befinden Sie sich üblicherweise?"
-
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-msgid "Yes"
-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/invite.php:81 actions/invite.php:88
-msgid "You are already subscribed to these users:"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
-msgstr ""
-
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-msgid "You may not delete another user's status."
-msgstr ""
-
-#: ../actions/invite.php:31 actions/invite.php:31
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-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!"
-msgstr ""
-
 #: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
+#: actions/showstream.php:441 lib/stream.php:99 lib/noticelist.php:211
 msgid "delete"
 msgstr ""
 
+#: ../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:135
+#: lib/facebookaction.php:202 lib/noticelist.php:189
+msgid "in reply to..."
+msgstr "als Antwort auf... "
+
+#: ../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:142
+#: lib/noticelist.php:199
+msgid "reply"
+msgstr "antworten"
+
+#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/profilesettings.php:188
+msgid "same as password above"
+msgstr "Gleiches Passwort wie zuvor"
+
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+#: actions/twitapistatuses.php:543
 msgid "unsupported file type"
 msgstr ""
 
+#: ../lib/util.php:1309 lib/util.php:1443 lib/facebookaction.php:251
+#: lib/util.php:1783
+#, fuzzy
+msgid "« After"
+msgstr "« Später"
+
 #: actions/deletenotice.php:74 actions/disfavor.php:43
 #: actions/emailsettings.php:127 actions/favor.php:45
 #: actions/finishopenidlogin.php:33 actions/imsettings.php:105
@@ -2273,6 +2565,12 @@ msgstr ""
 #: 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:38 actions/deleteprofile.php:127 actions/disfavor.php:47
+#: actions/emailsettings.php:130 actions/favor.php:49 actions/login.php:45
+#: actions/newmessage.php:44 actions/newnotice.php:36 actions/nudge.php:47
+#: actions/othersettings.php:139 actions/profilesettings.php:49
+#: actions/subedit.php:38 actions/tagother.php:113
+#: actions/twittersettings.php:188 actions/unblock.php:38
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -2296,12 +2594,14 @@ msgstr ""
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142
+#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:54
+#: actions/twitapifavorites.php:115
 msgid "This notice is already a favorite!"
 msgstr ""
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
+#: classes/Command.php:132 actions/favor.php:61
+#: actions/twitapifavorites.php:122
 msgid "Could not create favorite."
 msgstr ""
 
@@ -2310,11 +2610,12 @@ msgid "Disfavor"
 msgstr ""
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:62
 #, php-format
 msgid "%s favorite notices"
 msgstr ""
 
-#: actions/favoritesrss.php:64
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:66
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr ""
@@ -2340,47 +2641,50 @@ msgid ""
 "\n"
 msgstr ""
 
-#: actions/login.php:104
+#: actions/login.php:104 actions/login.php:111 actions/openidlogin.php:86
 msgid "Automatically login in the future; "
 msgstr ""
 
-#: actions/login.php:122
+#: actions/login.php:122 actions/login.php:130
 msgid "For security reasons, please re-enter your "
 msgstr ""
 
-#: actions/login.php:126
+#: actions/login.php:126 actions/login.php:134
 msgid "Login with your username and password. "
 msgstr ""
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+#: actions/newmessage.php:60 actions/twitapidirect_messages.php:136
 msgid "That's too long. Max message size is 140 chars."
 msgstr ""
 
-#: actions/newmessage.php:65
+#: actions/newmessage.php:65 actions/newmessage.php:68
 msgid "No recipient specified."
 msgstr ""
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
+#: classes/Command.php:206 actions/newmessage.php:71
+#: actions/newmessage.php:116 classes/Command.php:211
 msgid "You can't send a message to this user."
 msgstr ""
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
+#: classes/Command.php:209 actions/newmessage.php:74
+#: actions/twitapidirect_messages.php:153 classes/Command.php:214
 msgid ""
-"Don't send a message to yourself; just say it to yourself quietly "
-"instead."
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: actions/newmessage.php:108
+#: actions/newmessage.php:108 actions/microsummary.php:32
+#: actions/newmessage.php:111
 msgid "No such user"
 msgstr ""
 
-#: actions/newmessage.php:117
+#: actions/newmessage.php:117 actions/newmessage.php:120
 msgid "New message"
 msgstr ""
 
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:95 actions/noticesearch.php:94
 msgid "Notice without matching profile"
 msgstr ""
 
@@ -2427,6 +2731,7 @@ msgstr ""
 
 #: actions/profilesettings.php:115 actions/remotesubscribe.php:320
 #: actions/userauthorization.php:159 actions/userrss.php:76
+#: actions/profilesettings.php:120 actions/remotesubscribe.php:333
 msgid "User without matching profile"
 msgstr ""
 
@@ -2454,18 +2759,18 @@ msgstr ""
 msgid "New password successfully saved. "
 msgstr ""
 
-#: actions/register.php:95
+#: actions/register.php:95 actions/register.php:104
 msgid "Password must be 6 or more characters."
 msgstr ""
 
-#: actions/register.php:216
+#: actions/register.php:216 actions/register.php:243
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to..."
 msgstr ""
 
-#: actions/register.php:227
+#: actions/register.php:227 actions/register.php:254
 msgid "(You should receive a message by email momentarily, with "
 msgstr ""
 
@@ -2480,6 +2785,7 @@ msgid "Feed for favorites of %s"
 msgstr ""
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:88 actions/twitapifavorites.php:57
 msgid "Could not retrieve favorite notices."
 msgstr ""
 
@@ -2501,7 +2807,7 @@ msgstr ""
 msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: actions/showstream.php:154
+#: actions/showstream.php:154 lib/util.php:2105
 msgid "Send a message"
 msgstr ""
 
@@ -2510,73 +2816,78 @@ msgstr ""
 msgid "Mobile carrier for your phone. "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:64
 #, php-format
 msgid "Direct messages to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:65
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:69
 msgid "Direct Messages You've Sent"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:70
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:132
 msgid "No message text!"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:145
 msgid "Recipient user not found."
 msgstr ""
 
 #: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:148
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
-#: actions/twitapifavorites.php:92
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:64
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
-#: actions/twitapifavorites.php:95
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:67
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
+#: actions/twitapifavorites.php:158 lib/mail.php:303
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr ""
 
 #: actions/twitapifavorites.php:188 lib/mail.php:276
+#: actions/twitapifavorites.php:159 lib/mail.php:304
 #, php-format
 msgid ""
 "%1$s just added your notice from %2$s as one of their favorites.\n"
 "\n"
 msgstr ""
 
-#: actions/twittersettings.php:27
+#: actions/twittersettings.php:27 actions/twittersettings.php:29
 msgid ""
 "Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 
-#: actions/twittersettings.php:41
+#: actions/twittersettings.php:41 actions/twittersettings.php:43
 msgid "Twitter settings"
 msgstr ""
 
-#: actions/twittersettings.php:48
+#: actions/twittersettings.php:48 actions/twittersettings.php:50
 msgid "Twitter Account"
 msgstr ""
 
-#: actions/twittersettings.php:56
+#: actions/twittersettings.php:56 actions/twittersettings.php:58
 msgid "Current verified Twitter account."
 msgstr ""
 
@@ -2604,46 +2915,50 @@ msgstr ""
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:216
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr ""
 
-#: actions/twittersettings.php:128
+#: actions/twittersettings.php:128 actions/twittersettings.php:221
 msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: actions/twittersettings.php:137 actions/twittersettings.php:228
 #, php-format
 msgid "Unable to retrieve account information for \"%s\" from Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:234 actions/twittersettings.php:253
 msgid "Unable to save your Twitter settings!"
 msgstr ""
 
-#: actions/twittersettings.php:174
+#: actions/twittersettings.php:174 actions/twittersettings.php:261
 msgid "Twitter settings saved."
 msgstr ""
 
-#: actions/twittersettings.php:192
+#: actions/twittersettings.php:192 actions/twittersettings.php:272
 msgid "That is not your Twitter account."
 msgstr ""
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:280
 msgid "Couldn't remove Twitter user."
 msgstr ""
 
-#: actions/twittersettings.php:212
+#: actions/twittersettings.php:212 actions/twittersettings.php:284
 msgid "Twitter account removed."
 msgstr ""
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
+#: actions/twittersettings.php:299 actions/twittersettings.php:310
+#: actions/twittersettings.php:322
 msgid "Couldn't save Twitter preferences."
 msgstr ""
 
-#: actions/twittersettings.php:245
+#: actions/twittersettings.php:245 actions/twittersettings.php:330
 msgid "Twitter preferences saved."
 msgstr ""
 
@@ -2659,15 +2974,15 @@ msgstr ""
 msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#: classes/Channel.php:113
+#: classes/Channel.php:113 classes/Channel.php:129
 msgid "Command results"
 msgstr ""
 
-#: classes/Channel.php:148
+#: classes/Channel.php:148 classes/Channel.php:175
 msgid "Command complete"
 msgstr ""
 
-#: classes/Channel.php:158
+#: classes/Channel.php:158 classes/Channel.php:185
 msgid "Command failed"
 msgstr ""
 
@@ -2680,7 +2995,7 @@ msgstr ""
 msgid "Subscriptions: %1$s\n"
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:247
 msgid "User has no last notice"
 msgstr ""
 
@@ -2713,59 +3028,60 @@ msgstr ""
 msgid "About: %s"
 msgstr ""
 
-#: classes/Command.php:200
+#: classes/Command.php:200 classes/Command.php:202
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: classes/Command.php:214
+#: classes/Command.php:214 classes/Command.php:219
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: classes/Command.php:216
+#: classes/Command.php:216 classes/Command.php:221
 msgid "Error sending direct message."
 msgstr ""
 
-#: classes/Command.php:263
+#: classes/Command.php:263 classes/Command.php:268
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: classes/Command.php:270
+#: classes/Command.php:270 classes/Command.php:275
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: classes/Command.php:288
+#: classes/Command.php:288 classes/Command.php:293
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: classes/Command.php:295
+#: classes/Command.php:295 classes/Command.php:300
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330
+#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:315
+#: classes/Command.php:335
 msgid "Command not yet implemented."
 msgstr ""
 
-#: classes/Command.php:313
+#: classes/Command.php:313 classes/Command.php:318
 msgid "Notification off."
 msgstr ""
 
-#: classes/Command.php:315
+#: classes/Command.php:315 classes/Command.php:320
 msgid "Can't turn off notification."
 msgstr ""
 
-#: classes/Command.php:333
+#: classes/Command.php:333 classes/Command.php:338
 msgid "Notification on."
 msgstr ""
 
-#: classes/Command.php:335
+#: classes/Command.php:335 classes/Command.php:340
 msgid "Can't turn on notification."
 msgstr ""
 
-#: classes/Command.php:344
+#: classes/Command.php:344 classes/Command.php:349
 msgid "Commands:\n"
 msgstr ""
 
@@ -2777,23 +3093,23 @@ msgstr ""
 msgid "Could not update message with new URI."
 msgstr ""
 
-#: lib/gallery.php:46
+#: lib/gallery.php:46 lib/gallery.php:55
 msgid "User without matching profile in system."
 msgstr ""
 
-#: lib/mail.php:147
+#: lib/mail.php:147 lib/mail.php:141
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:249
+#: lib/mail.php:249 lib/mail.php:275
 #, php-format
 msgid "New private message from %s"
 msgstr ""
 
-#: lib/mail.php:253
+#: lib/mail.php:253 lib/mail.php:279
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -2837,18 +3153,460 @@ msgstr ""
 msgid "Your sent messages"
 msgstr ""
 
-#: lib/settingsaction.php:99
+#: lib/settingsaction.php:99 actions/deleteprofile.php:256
 msgid "Twitter"
 msgstr ""
 
-#: lib/settingsaction.php:100
+#: lib/settingsaction.php:100 actions/deleteprofile.php:257
 msgid "Twitter integration options"
 msgstr ""
 
-#: lib/util.php:1718
+#: lib/util.php:1718 lib/util.php:2145
 msgid "To"
 msgstr ""
 
 #: scripts/maildaemon.php:45
 msgid "Could not parse message."
 msgstr ""
+
+#: actions/block.php:45 actions/subedit.php:45 actions/unblock.php:45
+msgid "No profile specified."
+msgstr ""
+
+#: actions/block.php:52 actions/subedit.php:52 actions/tagother.php:45
+#: actions/unblock.php:52
+msgid "No profile with that ID."
+msgstr ""
+
+#: actions/block.php:78
+#, fuzzy
+msgid "Block user"
+msgstr "Unbekannter Benutzer."
+
+#: actions/block.php:81
+#, fuzzy
+msgid "Are you sure you want to block this user? "
+msgstr "Sind sie sicher, dass sie diese Nachricht löschen wollen?"
+
+#: actions/block.php:117
+#, fuzzy
+msgid "You have already blocked this user."
+msgstr "Du bist bereits angemeldet!"
+
+#: actions/block.php:124
+msgid "Failed to save block information."
+msgstr ""
+
+#: actions/deleteprofile.php:25
+msgid "Code not yet ready."
+msgstr ""
+
+#: actions/deleteprofile.php:36
+msgid "Export and delete your user information."
+msgstr ""
+
+#: actions/deleteprofile.php:88 actions/deleteprofile.php:119
+#, fuzzy
+msgid "Delete my account"
+msgstr "Neues Konto anlegen"
+
+#: actions/deleteprofile.php:89
+#, fuzzy
+msgid "Delete my account confirmation"
+msgstr "Konnte E-Mailbestätigung nicht löschen."
+
+#: actions/deleteprofile.php:117
+#, fuzzy
+msgid "Check if you are sure you want to delete your account."
+msgstr "Sind sie sicher, dass sie diese Nachricht löschen wollen?"
+
+#: actions/deleteprofile.php:259 lib/settingsaction.php:102
+msgid "Other"
+msgstr ""
+
+#: actions/deleteprofile.php:260 lib/settingsaction.php:103
+msgid "Other options"
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Add to favorites"
+msgstr ""
+
+#: actions/emailsettings.php:98
+msgid "Allow friends to nudge me and send me an email."
+msgstr ""
+
+#: actions/facebookremove.php:54
+#, fuzzy
+msgid "Couldn't remove Facebook user."
+msgstr "Konnte Benutzerdaten nicht aktualisieren."
+
+#: actions/favor.php:71
+msgid "Disfavor favorite"
+msgstr ""
+
+#: actions/favorited.php:31 lib/stream.php:45
+#, fuzzy
+msgid "Popular notices"
+msgstr "Unbekannte Nachricht."
+
+#: actions/favorited.php:54
+msgid "Showing recently popular notices"
+msgstr ""
+
+#: actions/featured.php:32 actions/featured.php:54 lib/stream.php:41
+msgid "Featured users"
+msgstr ""
+
+#: actions/finishremotesubscribe.php:186
+msgid "That user has blocked you from subscribing."
+msgstr ""
+
+#: actions/microsummary.php:39
+msgid "No current status"
+msgstr ""
+
+#: actions/newnotice.php:93
+#, fuzzy
+msgid "Notice posted"
+msgstr "Nachrichten"
+
+#: actions/newnotice.php:116 classes/Channel.php:140
+msgid "Ajax Error"
+msgstr ""
+
+#: actions/nudge.php:52
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
+
+#: actions/nudge.php:61
+msgid "Nudge sent"
+msgstr ""
+
+#: actions/othersettings.php:27
+msgid "Manage various other options."
+msgstr ""
+
+#: actions/othersettings.php:33
+#, fuzzy
+msgid "Other Settings"
+msgstr "Einstellungen"
+
+#: actions/othersettings.php:35
+msgid "URL Auto-shortening"
+msgstr ""
+
+#: actions/othersettings.php:54
+#, fuzzy
+msgid "Service"
+msgstr "Suchen"
+
+#: actions/othersettings.php:54
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/othersettings.php:155
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Aufenthaltsort ist zu lang (maximal 255 Zeichen)."
+
+#: actions/peopletag.php:33
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "Ungültige E-Mail-Adresse."
+
+#: actions/peopletag.php:45
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr ""
+
+#: actions/peopletag.php:87
+#, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+msgstr ""
+
+#: actions/profilesettings.php:92
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+
+#: actions/profilesettings.php:246 actions/tagother.php:131
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Ungültige Homepage '%s'"
+
+#: actions/profilesettings.php:328
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "Konnte Profil nicht speichern."
+
+#: actions/public.php:68
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
+msgstr ""
+
+#: actions/public.php:90
+msgid "Could not retrieve public stream."
+msgstr ""
+
+#: actions/register.php:67 actions/register.php:177
+msgid "Sorry, only invited people can register."
+msgstr ""
+
+#: actions/register.php:156
+msgid "With this form you can create a new account. "
+msgstr ""
+
+#: actions/remotesubscribe.php:136 actions/remotesubscribe.php:141
+msgid "That's a local profile! Login to subscribe."
+msgstr ""
+
+#: actions/subedit.php:68
+#, fuzzy
+msgid "You are not subscribed to that profile."
+msgstr "Dieses Profil hast du uns nicht geschickt"
+
+#: actions/subedit.php:81
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "Konnte Abonnement nicht erstellen."
+
+#: actions/subscribe.php:53
+#, fuzzy
+msgid "Not a local user."
+msgstr "Unbekannter Benutzer."
+
+#: actions/subscribe.php:67
+#, fuzzy
+msgid "Subscribed"
+msgstr "Abonnieren"
+
+#: actions/subscriptions.php:72
+#, fuzzy
+msgid "Jabber"
+msgstr "Keine Jabber-ID"
+
+#: actions/tagother.php:31
+#, fuzzy
+msgid "Not logged in"
+msgstr "Nicht eingeloggt."
+
+#: actions/tagother.php:40
+#, fuzzy
+msgid "No id argument."
+msgstr "Unbekanntes Dokument."
+
+#: actions/tagother.php:56
+msgid "Tag a person"
+msgstr ""
+
+#: actions/tagother.php:98
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
+msgstr ""
+
+#: actions/tagother.php:120
+#, fuzzy
+msgid "No such profile."
+msgstr "Unbekannte Nachricht."
+
+#: actions/tagother.php:146
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+
+#: actions/tagother.php:153
+#, fuzzy
+msgid "Could not save tags."
+msgstr "Konnte Avatarinfo nicht speichern"
+
+#: actions/tagother.php:188
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
+
+#: actions/tagrss.php:33
+#, fuzzy
+msgid "No such tag."
+msgstr "Unbekannte Nachricht."
+
+#: actions/tagrss.php:62
+#, fuzzy, php-format
+msgid "Microblog tagged with %s"
+msgstr "Microblog von %s"
+
+#: actions/twitapiblocks.php:45
+msgid "Block user failed."
+msgstr ""
+
+#: actions/twitapiblocks.php:66
+msgid "Unblock user failed."
+msgstr ""
+
+#: actions/twitapiusers.php:45
+#, fuzzy
+msgid "Not found."
+msgstr "Keine Anfrage gefunden!"
+
+#: actions/twittersettings.php:63
+msgid "Twitter user name"
+msgstr ""
+
+#: actions/twittersettings.php:67
+#, fuzzy
+msgid "Twitter password"
+msgstr "Neues Passwort"
+
+#: actions/twittersettings.php:129
+msgid "Twitter Friends"
+msgstr ""
+
+#: actions/unblock.php:73
+#, fuzzy
+msgid "Error removing the block."
+msgstr "Fehler beim Speichern des Nutzers."
+
+#: actions/unsubscribe.php:48
+#, fuzzy
+msgid "No profile id in request."
+msgstr "Der entfernte Server hat keine Profil-URL geliefert."
+
+#: actions/unsubscribe.php:55
+#, fuzzy
+msgid "No profile with that id."
+msgstr "Entferntes Profil ohne ein passendes Profil"
+
+#: actions/unsubscribe.php:69
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Abbestellen"
+
+#: classes/Notice.php:100
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "Problem bei Speichern der Nachricht."
+
+#: classes/Notice.php:105
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+
+#: classes/Notice.php:112
+msgid "You are banned from posting notices on this site."
+msgstr ""
+
+#: lib/gallery.php:98
+msgid "Filter tags"
+msgstr ""
+
+#: lib/gallery.php:104
+msgid "All"
+msgstr ""
+
+#: lib/gallery.php:108
+msgid "Tag"
+msgstr ""
+
+#: lib/gallery.php:109
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/gallery.php:110
+msgid "Go"
+msgstr ""
+
+#: lib/gallery.php:264
+#, fuzzy
+msgid "Subscriptions navigation"
+msgstr "Abonnements"
+
+#: lib/gallery.php:270 lib/gallery.php:292
+msgid "List"
+msgstr ""
+
+#: lib/gallery.php:280 lib/gallery.php:294
+msgid "Icons"
+msgstr ""
+
+#: lib/mail.php:92
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:242
+#, php-format
+msgid "You've been nudged by %s"
+msgstr ""
+
+#: lib/mail.php:246
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+msgstr ""
+
+#: lib/profilelist.php:146
+msgid "(none)"
+msgstr ""
+
+#: lib/stream.php:33
+msgid "Public"
+msgstr "Öffentlich"
+
+#: lib/stream.php:36 lib/stream.php:37
+msgid "Recent tags"
+msgstr ""
+
+#: lib/stream.php:40
+msgid "Featured"
+msgstr ""
+
+#: lib/stream.php:44
+#, fuzzy
+msgid "Popular"
+msgstr "Suche nach anderen Nutzern"
+
+#: lib/subs.php:51
+#, fuzzy
+msgid "User has blocked you."
+msgstr "Benutzer hat kein Profil."
+
+#: lib/util.php:2059
+msgid "Send a nudge"
+msgstr ""
+
+#: lib/util.php:2063
+msgid "Nudge sent!"
+msgstr ""
+
+#: lib/util.php:2194
+msgid "Block"
+msgstr ""
+
+#: lib/util.php:2198
+msgid "Unblock"
+msgstr ""
+
+#~ msgid "Couldn't confirm email."
+#~ msgstr "E-Mail konnte nicht bestätigt werden."
+
+#~ msgid "Email address"
+#~ msgstr "E-Mail Adresse "
+
+#~ msgid "Error inserting notice"
+#~ msgstr "Fehler beim Einfügen der Nachricht"
+
+#~ 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 ""
+#~ "Wenn du deine Passwort verlegt hast, kannst du dir ein Neues an die E-"
+#~ "Mailadresse schicken lasssen, die für dein Konto eingetragen ist."
diff --git a/el/LC_MESSAGES/laconica.po b/el/LC_MESSAGES/laconica.po
index 0171b419c7..65c43c1930 100644
--- a/el/LC_MESSAGES/laconica.po
+++ b/el/LC_MESSAGES/laconica.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"POT-Creation-Date: 2009-01-12 12:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,23 +17,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:61
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
 #: actions/finishopenidlogin.php:88 actions/register.php:205
+#: actions/register.php:232
 msgid ""
-" except this private data: password, email address, IM address, phone "
-"number."
+" except this private data: password, email address, IM address, phone number."
 msgstr ""
 
 #: ../actions/showstream.php:400 ../lib/stream.php:109
 #: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+#: lib/facebookaction.php:195 lib/noticelist.php:160
 msgid " from "
 msgstr ""
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: actions/twitapistatuses.php:341
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
 msgstr ""
@@ -74,7 +77,8 @@ msgid ""
 "Sincerely, %2$s\n"
 msgstr ""
 
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:115
+#: lib/mail.php:117
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr ""
@@ -91,11 +95,13 @@ msgid ""
 msgstr ""
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#: actions/twitapistatuses.php:344
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
+#: actions/shownotice.php:73
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr ""
@@ -114,26 +120,30 @@ msgstr "Δημόσια ροή %s"
 #: ../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/twitapistatuses.php:123
 #, php-format
 msgid "%s and friends"
 msgstr "%s και οι φίλοι του/της"
 
 #: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:31
 #, php-format
 msgid "%s public timeline"
 msgstr ""
 
-#: ../lib/mail.php:206 lib/mail.php:212
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:217
 #, php-format
 msgid "%s status"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:195
 #, php-format
 msgid "%s timeline"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:34
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
@@ -144,32 +154,35 @@ msgid ""
 "to confirm your email address.)"
 msgstr ""
 
-#: ../lib/util.php:257 lib/util.php:273
+#: ../lib/util.php:257 lib/util.php:273 lib/util.php:284
 #, 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 ""
 
-#: ../lib/util.php:259 lib/util.php:275
+#: ../lib/util.php:259 lib/util.php:275 lib/util.php:286
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr ""
 
-#: ../lib/util.php:274 lib/util.php:290
+#: ../lib/util.php:274 lib/util.php:290 lib/util.php:301
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 #: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
+#: actions/profilesettings.php:78
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 
 #: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:193
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/profilesettings.php:186
 msgid "6 or more characters"
 msgstr "6 ή περισσότεροι χαρακτήρες"
 
@@ -178,17 +191,19 @@ msgid "6 or more characters, and don't forget it!"
 msgstr "6 ή περισσότεροι χαρακτήρες και μην το ξεχάσετε!"
 
 #: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:195
 msgid "6 or more characters. Required."
 msgstr ""
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, 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
+#: actions/emailsettings.php:234
 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."
@@ -210,7 +225,14 @@ msgstr ""
 #: 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/twitapiusers.php:55 actions/twitapiaccount.php:30
+#: actions/twitapidirect_messages.php:107 actions/twitapifavorites.php:83
+#: actions/twitapifavorites.php:99 actions/twitapifriendships.php:117
+#: actions/twitapihelp.php:42 actions/twitapistatuses.php:77
+#: actions/twitapistatuses.php:144 actions/twitapistatuses.php:224
+#: actions/twitapistatuses.php:234 actions/twitapistatuses.php:386
+#: actions/twitapistatuses.php:395 actions/twitapistatuses.php:421
+#: actions/twitapiusers.php:30
 msgid "API method not found!"
 msgstr ""
 
@@ -228,11 +250,14 @@ msgstr ""
 #: 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/twitapistatuses.php:690 actions/twitapiaccount.php:39
+#: actions/twitapiaccount.php:89 actions/twitapiaccount.php:94
+#: actions/twitapidirect_messages.php:178 actions/twitapifavorites.php:139
+#: actions/twitapihelp.php:49 actions/twitapistatuses.php:549
 msgid "API method under construction."
 msgstr ""
 
-#: ../lib/util.php:324 lib/util.php:340
+#: ../lib/util.php:324 lib/util.php:340 lib/util.php:352
 msgid "About"
 msgstr "Περί"
 
@@ -244,7 +269,7 @@ msgstr "Αποδοχή"
 #: ../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/twittersettings.php:85 actions/twittersettings.php:84
 msgid "Add"
 msgstr "Προσθήκη"
 
@@ -253,6 +278,7 @@ msgid "Add OpenID"
 msgstr "Προσθήκη OpenID"
 
 #: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: actions/deleteprofile.php:248
 msgid "Add or remove OpenIDs"
 msgstr ""
 
@@ -267,6 +293,7 @@ msgid "Addresses of friends to invite (one per line)"
 msgstr ""
 
 #: ../actions/showstream.php:273 actions/showstream.php:288
+#: actions/showstream.php:336
 msgid "All subscriptions"
 msgstr ""
 
@@ -276,6 +303,7 @@ msgid "All updates for %s"
 msgstr ""
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:63
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr ""
@@ -287,7 +315,7 @@ msgstr ""
 msgid "Already logged in."
 msgstr ""
 
-#: ../lib/subs.php:42 lib/subs.php:42
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:47
 msgid "Already subscribed!."
 msgstr ""
 
@@ -300,14 +328,14 @@ msgid "Authorize subscription"
 msgstr ""
 
 #: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
+#: actions/register.php:192 actions/register.php:219
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:103
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
@@ -316,6 +344,7 @@ msgid "Avatar"
 msgstr ""
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
+#: actions/profilesettings.php:379
 msgid "Avatar updated."
 msgstr ""
 
@@ -336,18 +365,21 @@ msgstr ""
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
-#: ../lib/util.php:1318 lib/util.php:1452
-msgid "Before »"
+#: ../lib/util.php:1318 lib/util.php:1452 lib/facebookaction.php:259
+#: lib/util.php:1792
+msgid "Before »"
 msgstr ""
 
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
 #: actions/profilesettings.php:82 actions/register.php:184
+#: actions/profilesettings.php:84 actions/register.php:211
 msgid "Bio"
 msgstr "Βιογραφικό"
 
 #: ../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:222 actions/register.php:98
 msgid "Bio is too long (max 140 chars)."
 msgstr "Το βιογραφικό είναι πολύ μεγάλο (μέγιστο 140 χαρακτ.)."
 
@@ -362,6 +394,7 @@ msgstr ""
 
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
+#: actions/profilesettings.php:433
 msgid "Can't save new password."
 msgstr "Αδύνατη η αποθήκευση του νέου κωδικού"
 
@@ -380,14 +413,17 @@ msgid "Cannot normalize that Jabber ID"
 msgstr ""
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:204
 msgid "Cannot normalize that email address"
 msgstr ""
 
 #: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/profilesettings.php:189
 msgid "Change"
 msgstr "Αλλαγή"
 
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: actions/deleteprofile.php:245
 msgid "Change email handling"
 msgstr ""
 
@@ -400,6 +436,7 @@ msgid "Change your password"
 msgstr ""
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#: actions/deleteprofile.php:242
 msgid "Change your profile settings"
 msgstr ""
 
@@ -407,6 +444,7 @@ msgstr ""
 #: ../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/profilesettings.php:187 actions/register.php:196
 msgid "Confirm"
 msgstr "Επιβεβαίωση"
 
@@ -417,6 +455,7 @@ msgstr "Επιβεβαίωση διεύθυνσης"
 #: ../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:259
 msgid "Confirmation cancelled."
 msgstr "Η επιβεβαίωση ακυρώθηκε."
 
@@ -455,7 +494,7 @@ msgstr "Σύνδεση"
 msgid "Connect existing account"
 msgstr "Σύνδεση με υπάρχων λογαριασμό"
 
-#: ../lib/util.php:332 lib/util.php:348
+#: ../lib/util.php:332 lib/util.php:348 lib/util.php:360
 msgid "Contact"
 msgstr "Επικοινωνία"
 
@@ -466,11 +505,13 @@ msgstr ""
 
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:46 actions/twitapifriendships.php:62
 #, 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:39
 msgid "Could not follow user: User not found."
 msgstr ""
 
@@ -487,11 +528,11 @@ msgstr ""
 msgid "Could not save new profile info"
 msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ"
 
-#: ../lib/subs.php:54 lib/subs.php:61
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:70
 msgid "Could not subscribe other to you."
 msgstr ""
 
-#: ../lib/subs.php:46 lib/subs.php:46
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:55
 msgid "Could not subscribe."
 msgstr ""
 
@@ -500,7 +541,7 @@ msgid "Could not update user with confirmed email address."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101
+#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:112
 msgid "Couldn't convert request tokens to access tokens."
 msgstr ""
 
@@ -508,43 +549,50 @@ msgstr ""
 #: ../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/emailsettings.php:255
 msgid "Couldn't delete email confirmation."
 msgstr ""
 
-#: ../lib/subs.php:103 lib/subs.php:116
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:129
 msgid "Couldn't delete subscription."
 msgstr ""
 
 #: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+#: actions/twitapistatuses.php:82
 msgid "Couldn't find any statuses."
 msgstr ""
 
 #: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
+#: actions/remotesubscribe.php:148
 msgid "Couldn't get a request token."
 msgstr ""
 
 #: ../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:228
 msgid "Couldn't insert confirmation code."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182
+#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:216
 msgid "Couldn't insert new subscription."
 msgstr ""
 
 #: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
 #: actions/profilesettings.php:299 actions/twitapiaccount.php:94
+#: actions/profilesettings.php:319 actions/twitapiaccount.php:74
 msgid "Couldn't save profile."
 msgstr "Αδύνατη η αποθήκευση του προφίλ."
 
 #: ../actions/profilesettings.php:161 actions/profilesettings.php:276
+#: actions/profilesettings.php:296
 msgid "Couldn't update user for autosubscribe."
 msgstr ""
 
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
 #: actions/emailsettings.php:298 actions/emailsettings.php:312
+#: actions/emailsettings.php:301 actions/emailsettings.php:315
 msgid "Couldn't update user record."
 msgstr ""
 
@@ -556,6 +604,8 @@ msgstr ""
 #: 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/emailsettings.php:179 actions/emailsettings.php:280
+#: actions/othersettings.php:173 actions/profilesettings.php:276
 msgid "Couldn't update user."
 msgstr ""
 
@@ -572,6 +622,7 @@ msgid "Create new account"
 msgstr "Δημιουργία νέου λογαριασμού"
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+#: actions/finishopenidlogin.php:208
 msgid "Creating new account for OpenID that already has a user."
 msgstr ""
 
@@ -588,15 +639,16 @@ msgid "Current confirmed email address."
 msgstr ""
 
 #: ../actions/showstream.php:356 actions/showstream.php:367
+#: actions/showstream.php:418
 msgid "Currently"
 msgstr ""
 
-#: ../classes/Notice.php:72 classes/Notice.php:86
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:87
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr ""
 
-#: ../lib/util.php:1061 lib/util.php:1110
+#: ../lib/util.php:1061 lib/util.php:1110 lib/util.php:1417
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr ""
@@ -607,12 +659,15 @@ msgstr ""
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
+#: actions/profilesettings.php:86 actions/register.php:213
 msgid "Describe yourself and your interests in 140 chars"
 msgstr ""
 
 #: ../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/deleteprofile.php:244 actions/register.php:199
+#: actions/register.php:202
 msgid "Email"
 msgstr ""
 
@@ -624,7 +679,7 @@ msgstr ""
 msgid "Email Settings"
 msgstr ""
 
-#: ../actions/register.php:73 actions/register.php:80
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:89
 msgid "Email address already exists."
 msgstr "Η διεύθυνση email υπάρχει ήδη."
 
@@ -653,6 +708,7 @@ msgid "Error authorizing token"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
+#: actions/finishopenidlogin.php:274
 msgid "Error connecting user to OpenID."
 msgstr ""
 
@@ -661,17 +717,17 @@ msgid "Error connecting user."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:164
 msgid "Error inserting avatar"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145
+#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:156
 msgid "Error inserting new profile"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:180
 msgid "Error inserting remote profile"
 msgstr ""
 
@@ -692,13 +748,15 @@ msgid "Error saving the user."
 msgstr ""
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/profilesettings.php:428
 msgid "Error saving user; invalid."
 msgstr ""
 
 #: ../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/register.php:108 actions/login.php:54 actions/login.php:80
+#: actions/register.php:117
 msgid "Error setting user."
 msgstr ""
 
@@ -707,7 +765,7 @@ msgid "Error updating profile"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163
+#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:174
 msgid "Error updating remote profile"
 msgstr ""
 
@@ -719,11 +777,12 @@ msgstr ""
 msgid "Existing nickname"
 msgstr ""
 
-#: ../lib/util.php:326 lib/util.php:342
+#: ../lib/util.php:326 lib/util.php:342 lib/util.php:354
 msgid "FAQ"
 msgstr "Συχνές ερωτήσεις"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/profilesettings.php:381
 msgid "Failed updating avatar."
 msgstr ""
 
@@ -739,7 +798,7 @@ msgstr "Ροή φίλων του/της %s"
 msgid "Feed for replies to %s"
 msgstr "Ροή απαντήσεων προς τον/την %s"
 
-#: ../actions/tag.php:55 actions/tag.php:55
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:54
 #, php-format
 msgid "Feed for tag %s"
 msgstr ""
@@ -757,43 +816,49 @@ msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
-"Για λόγους ασφαλείας, παρακαλώ εισάγετε "
-"ξανά το όνομα χρήστη και τον κωδικό σας, πριν αλλάξετε τις ρυθμίσεις σας."
+"Για λόγους ασφαλείας, παρακαλώ εισάγετε ξανά το όνομα χρήστη και τον κωδικό "
+"σας, πριν αλλάξετε τις ρυθμίσεις σας."
 
 #: ../actions/profilesettings.php:44 ../actions/register.php:164
 #: actions/profilesettings.php:77 actions/register.php:178
+#: actions/profilesettings.php:79 actions/register.php:205
 msgid "Full name"
 msgstr "Ονοματεπώνυμο"
 
 #: ../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/profilesettings.php:219 actions/register.php:95
 msgid "Full name is too long (max 255 chars)."
 msgstr "Το ονοματεπώνυμο είναι πολύ μεγάλο (μέγιστο 255 χαρακτ.)."
 
-#: ../lib/util.php:322 lib/util.php:338
+#: ../lib/util.php:322 lib/util.php:338 lib/util.php:343 lib/util.php:350
 msgid "Help"
 msgstr "Βοήθεια"
 
-#: ../lib/util.php:298 lib/util.php:314
+#: ../lib/util.php:298 lib/util.php:314 lib/util.php:325
 msgid "Home"
 msgstr "Αρχή"
 
 #: ../actions/profilesettings.php:46 ../actions/register.php:167
 #: actions/profilesettings.php:79 actions/register.php:181
+#: actions/profilesettings.php:81 actions/register.php:208
 msgid "Homepage"
 msgstr "Αρχική σελίδα"
 
 #: ../actions/profilesettings.php:95 ../actions/register.php:76
 #: actions/profilesettings.php:210 actions/register.php:83
+#: actions/profilesettings.php:216 actions/register.php:92
 msgid "Homepage is not a valid URL."
 msgstr "Η αρχική σελίδα δεν είναι έγκυρο URL."
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+#: actions/emailsettings.php:101
 msgid "I want to post notices by email."
 msgstr ""
 
 #: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+#: actions/deleteprofile.php:253
 msgid "IM"
 msgstr ""
 
@@ -829,14 +894,16 @@ msgid "Incoming email"
 msgstr ""
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+#: actions/emailsettings.php:304
 msgid "Incoming email address removed."
 msgstr ""
 
 #: ../actions/password.php:69 actions/profilesettings.php:388
+#: actions/profilesettings.php:417
 msgid "Incorrect old password"
 msgstr "Λάθος παλιός κωδικός"
 
-#: ../actions/login.php:67 actions/login.php:67
+#: ../actions/login.php:67 actions/login.php:67 actions/login.php:74
 msgid "Incorrect username or password."
 msgstr "Λάθος όνομα χρήστη ή κωδικός"
 
@@ -845,8 +912,8 @@ msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
-"Οδηγίες για την ανάκτηση του κωδικού σας "
-"έχουν σταλεί στην διεύθυνση email που έχετε καταχωρίσει στον λογαριασμό σας."
+"Οδηγίες για την ανάκτηση του κωδικού σας έχουν σταλεί στην διεύθυνση email "
+"που έχετε καταχωρίσει στον λογαριασμό σας."
 
 #: ../actions/updateprofile.php:114 actions/updateprofile.php:115
 #, php-format
@@ -869,14 +936,17 @@ msgid "Invalid license URL '%s'"
 msgstr ""
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:63
 msgid "Invalid notice content"
 msgstr ""
 
 #: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:69
 msgid "Invalid notice uri"
 msgstr ""
 
 #: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:74
 msgid "Invalid notice url"
 msgstr ""
 
@@ -890,7 +960,7 @@ msgid "Invalid profile URL (bad format)"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:78
 msgid "Invalid profile URL returned by server."
 msgstr ""
 
@@ -901,6 +971,8 @@ msgstr ""
 #: ../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:256 actions/register.php:112
+#: actions/register.php:130
 msgid "Invalid username or password."
 msgstr ""
 
@@ -912,7 +984,7 @@ msgstr ""
 msgid "Invitation(s) sent to the following people:"
 msgstr ""
 
-#: ../lib/util.php:306 lib/util.php:322
+#: ../lib/util.php:306 lib/util.php:322 lib/util.php:332
 msgid "Invite"
 msgstr ""
 
@@ -920,12 +992,12 @@ msgstr ""
 msgid "Invite new users"
 msgstr ""
 
-#: ../lib/util.php:261 lib/util.php:277
+#: ../lib/util.php:261 lib/util.php:277 lib/util.php:288
 #, 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 ""
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
@@ -940,31 +1012,38 @@ msgid ""
 msgstr ""
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
 msgid "Language"
 msgstr ""
 
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+#: actions/profilesettings.php:234
 msgid "Language is too long (max 50 chars)."
 msgstr ""
 
 #: ../actions/profilesettings.php:52 ../actions/register.php:173
 #: actions/profilesettings.php:85 actions/register.php:187
+#: actions/profilesettings.php:87 actions/register.php:214
 msgid "Location"
 msgstr "Τοποθεσία"
 
 #: ../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/profilesettings.php:225 actions/register.php:101
 msgid "Location is too long (max 255 chars)."
 msgstr "Η τοποθεσία είναι πολύ μεγάλη (μέγιστο 255 χαρακτ.)."
 
 #: ../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/login.php:104 actions/login.php:113 actions/openidlogin.php:88
+#: lib/util.php:336
 msgid "Login"
 msgstr "Σύνδεση"
 
 #: ../actions/openidlogin.php:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:60
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Συνδεθείτε με έναν λογαριασμό [OpenID](%%doc.openid%%)."
@@ -972,23 +1051,24 @@ msgstr "Συνδεθείτε με έναν λογαριασμό [OpenID](%%doc.o
 #: ../actions/login.php:126
 #, 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 ""
-"Συνδεθείτε με το όνομα χρήστη και τον "
-"κωδικό σας. Δεν έχετε όνομα χρήστη ακόμα; "
-"Κάντε [εγγραφή](%%action.register%%) για ένα νέο λογαριασμό ή δοκιμάστε το [OpenID](%%action.openidlogin%%). "
+"Συνδεθείτε με το όνομα χρήστη και τον κωδικό σας. Δεν έχετε όνομα χρήστη "
+"ακόμα; Κάντε [εγγραφή](%%action.register%%) για ένα νέο λογαριασμό ή "
+"δοκιμάστε το [OpenID](%%action.openidlogin%%). "
 
-#: ../lib/util.php:308 lib/util.php:324
+#: ../lib/util.php:308 lib/util.php:324 lib/util.php:334
 msgid "Logout"
 msgstr "Αποσύνδεση"
 
 #: ../actions/register.php:166 actions/register.php:180
+#: actions/register.php:207
 msgid "Longer name, preferably your \"real\" name"
 msgstr ""
 
-#: ../actions/login.php:110 actions/login.php:110
+#: ../actions/login.php:110 actions/login.php:110 actions/login.php:118
 msgid "Lost or forgotten password?"
 msgstr "Χάσατε ή ξεχάσατε τον κωδικό σας;"
 
@@ -1003,6 +1083,7 @@ msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
 #: ../actions/showstream.php:300 actions/showstream.php:315
+#: actions/showstream.php:363
 msgid "Member since"
 msgstr "Μέλος από"
 
@@ -1020,6 +1101,7 @@ msgstr ""
 
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
 #: actions/finishopenidlogin.php:85 actions/register.php:202
+#: actions/register.php:229
 msgid "My text and files are available under "
 msgstr ""
 
@@ -1028,12 +1110,13 @@ msgstr ""
 msgid "New"
 msgstr ""
 
-#: ../lib/mail.php:144 lib/mail.php:144
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:138
 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+#: actions/emailsettings.php:318
 msgid "New incoming email address added."
 msgstr ""
 
@@ -1042,11 +1125,13 @@ msgid "New nickname"
 msgstr "Νέο ψευδώνυμο"
 
 #: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:141
 msgid "New notice"
 msgstr ""
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
 #: actions/profilesettings.php:180 actions/recoverpassword.php:185
+#: actions/profilesettings.php:185
 msgid "New password"
 msgstr "Νέος κωδικός"
 
@@ -1057,12 +1142,16 @@ msgstr ""
 #: ../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:108 actions/profilesettings.php:76
+#: actions/register.php:192
 msgid "Nickname"
 msgstr "Ψευδώνυμο"
 
 #: ../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/finishopenidlogin.php:192 actions/profilesettings.php:231
+#: actions/register.php:85
 msgid "Nickname already in use. Try another one."
 msgstr "Το ψευδώνυμο είναι ήδη σε χρήση. Δοκιμάστε κάποιο άλλο."
 
@@ -1070,10 +1159,13 @@ msgstr "Το ψευδώνυμο είναι ήδη σε χρήση. Δοκιμά
 #: ../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:182 actions/profilesettings.php:209
+#: actions/register.php:83
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Το ψευδώνυμο πρέπει να έχει μόνο πεζούς χαρακτήρες και χωρίς κενά."
 
 #: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:187
 msgid "Nickname not allowed."
 msgstr "Το ψευδώνυμο αυτό δεν επιτρέπεται."
 
@@ -1086,6 +1178,7 @@ msgid "Nickname or email"
 msgstr "Ψευδώνυμο ή email"
 
 #: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:104
 msgid "No"
 msgstr ""
 
@@ -1110,11 +1203,13 @@ msgid "No confirmation code."
 msgstr ""
 
 #: ../actions/newnotice.php:44 actions/newmessage.php:53
-#: actions/newnotice.php:44 classes/Command.php:197
+#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:52
+#: actions/newnotice.php:53
 msgid "No content!"
 msgstr ""
 
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+#: actions/emailsettings.php:197
 msgid "No email address."
 msgstr ""
 
@@ -1123,11 +1218,12 @@ msgid "No id."
 msgstr ""
 
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+#: actions/emailsettings.php:292
 msgid "No incoming email address."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67
+#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:66
 msgid "No nickname provided by remote server."
 msgstr ""
 
@@ -1138,6 +1234,7 @@ msgstr ""
 #: ../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:243
 msgid "No pending confirmation to cancel."
 msgstr ""
 
@@ -1146,7 +1243,7 @@ msgid "No phone number."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74
+#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:73
 msgid "No profile URL returned by server."
 msgstr ""
 
@@ -1160,6 +1257,7 @@ msgstr ""
 
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
 #: actions/noticesearch.php:69 actions/peoplesearch.php:69
+#: actions/noticesearch.php:68 actions/peoplesearch.php:59
 msgid "No results"
 msgstr ""
 
@@ -1168,11 +1266,13 @@ msgid "No size."
 msgstr ""
 
 #: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
+#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:109
+#: actions/twitapistatuses.php:438
 msgid "No status found with that ID."
 msgstr ""
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:411
 msgid "No status with that ID found."
 msgstr ""
 
@@ -1186,7 +1286,8 @@ msgstr ""
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
 #: ../lib/deleteaction.php:30 actions/shownotice.php:32
-#: actions/shownotice.php:83 lib/deleteaction.php:30
+#: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:38
+#: actions/shownotice.php:114
 msgid "No such notice."
 msgstr ""
 
@@ -1213,7 +1314,9 @@ msgstr ""
 #: 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
+#: lib/subs.php:33 lib/subs.php:95 actions/showstream.php:157
+#: classes/Command.php:208 classes/Command.php:242 lib/gallery.php:85
+#: lib/subs.php:105
 msgid "No such user."
 msgstr ""
 
@@ -1235,7 +1338,8 @@ 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:502 lib/twitterapi.php:423 lib/twitterapi.php:450
+#: lib/twitterapi.php:534
 msgid "Not a supported data format."
 msgstr ""
 
@@ -1248,15 +1352,17 @@ msgid "Not a valid OpenID."
 msgstr ""
 
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+#: actions/emailsettings.php:208
 msgid "Not a valid email address"
 msgstr ""
 
-#: ../actions/register.php:63 actions/register.php:70
+#: ../actions/register.php:63 actions/register.php:70 actions/register.php:79
 msgid "Not a valid email address."
 msgstr ""
 
 #: ../actions/profilesettings.php:91 ../actions/register.php:71
 #: actions/profilesettings.php:206 actions/register.php:78
+#: actions/profilesettings.php:212 actions/register.php:87
 msgid "Not a valid nickname."
 msgstr ""
 
@@ -1273,11 +1379,12 @@ msgid "Not a valid profile URL (no YADIS document)."
 msgstr ""
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: actions/profilesettings.php:361
 msgid "Not an image or corrupt file."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:52
 msgid "Not authorized."
 msgstr ""
 
@@ -1287,6 +1394,7 @@ msgid "Not expecting this response!"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+#: actions/twitapistatuses.php:304
 msgid "Not found"
 msgstr ""
 
@@ -1297,11 +1405,12 @@ msgstr ""
 #: 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
+#: lib/settingsaction.php:27 actions/block.php:31 actions/newnotice.php:30
+#: actions/nudge.php:30 actions/subedit.php:31 actions/unblock.php:31
 msgid "Not logged in."
 msgstr ""
 
-#: ../lib/subs.php:91 lib/subs.php:104
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:117
 msgid "Not subscribed!."
 msgstr ""
 
@@ -1310,15 +1419,19 @@ msgid "Notice Search"
 msgstr ""
 
 #: ../actions/showstream.php:82 actions/showstream.php:82
+#: actions/showstream.php:111 actions/showstream.php:118
+#: actions/showstream.php:123
 #, php-format
 msgid "Notice feed for %s"
 msgstr ""
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
+#: actions/shownotice.php:45
 msgid "Notice has no profile"
 msgstr ""
 
 #: ../actions/showstream.php:316 actions/showstream.php:331
+#: actions/showstream.php:379
 msgid "Notices"
 msgstr ""
 
@@ -1329,11 +1442,12 @@ msgid "Notices tagged with %s"
 msgstr ""
 
 #: ../actions/password.php:39 actions/profilesettings.php:178
+#: actions/profilesettings.php:183
 msgid "Old password"
 msgstr ""
 
 #: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
-#: lib/util.php:330
+#: lib/util.php:330 actions/deleteprofile.php:247 lib/util.php:340
 msgid "OpenID"
 msgstr ""
 
@@ -1348,11 +1462,13 @@ msgstr ""
 #: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
 #: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
+#: actions/finishopenidlogin.php:150 actions/openidlogin.php:76
 msgid "OpenID Login"
 msgstr ""
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 #: actions/openidlogin.php:74 actions/openidsettings.php:50
+#: actions/openidlogin.php:82
 msgid "OpenID URL"
 msgstr ""
 
@@ -1385,13 +1501,14 @@ msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: actions/profilesettings.php:350
 msgid "Partial upload."
 msgstr ""
 
 #: ../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/register.php:167 actions/login.php:109 actions/register.php:194
 msgid "Password"
 msgstr "Κωδικός"
 
@@ -1410,11 +1527,13 @@ msgstr ""
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
 #: actions/profilesettings.php:408 actions/recoverpassword.php:326
+#: actions/profilesettings.php:437
 msgid "Password saved."
 msgstr "Ο κωδικός αποθηκεύτηκε."
 
 #: ../actions/password.php:61 ../actions/register.php:88
 #: actions/profilesettings.php:380 actions/register.php:98
+#: actions/profilesettings.php:409 actions/register.php:107
 msgid "Passwords don't match."
 msgstr "Οι κωδικοί δεν ταυτίζονται."
 
@@ -1463,24 +1582,26 @@ msgstr "Προτιμήσεις"
 #: ../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:185 actions/othersettings.php:179
 msgid "Preferences saved."
 msgstr "Οι προτιμήσεις αποθηκεύτηκαν"
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
 msgid "Preferred language"
 msgstr ""
 
-#: ../lib/util.php:328 lib/util.php:344
+#: ../lib/util.php:328 lib/util.php:344 lib/util.php:356
 msgid "Privacy"
 msgstr ""
 
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119
+#: classes/Notice.php:119 classes/Notice.php:139 classes/Notice.php:149
 msgid "Problem saving notice."
 msgstr ""
 
 #: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
-#: lib/settingsaction.php:84
+#: lib/settingsaction.php:84 actions/deleteprofile.php:241
 msgid "Profile"
 msgstr ""
 
@@ -1497,11 +1618,11 @@ msgstr ""
 msgid "Profile unknown"
 msgstr ""
 
-#: ../actions/public.php:54 actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:77
 msgid "Public Stream Feed"
 msgstr ""
 
-#: ../actions/public.php:33 actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 lib/stream.php:34
 msgid "Public timeline"
 msgstr ""
 
@@ -1510,6 +1631,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:104
 msgid "Publish a MicroID for my email address."
 msgstr ""
 
@@ -1532,14 +1654,17 @@ msgstr ""
 
 #: ../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:181 actions/register.php:234 lib/util.php:338
 msgid "Register"
 msgstr ""
 
 #: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:173
 msgid "Registration not allowed."
 msgstr ""
 
 #: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:241
 msgid "Registration successful"
 msgstr ""
 
@@ -1548,7 +1673,8 @@ msgid "Reject"
 msgstr ""
 
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
-#: actions/register.php:190
+#: actions/register.php:190 actions/login.php:110 actions/openidlogin.php:85
+#: actions/register.php:217
 msgid "Remember me"
 msgstr ""
 
@@ -1566,7 +1692,7 @@ msgstr ""
 #: 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/twittersettings.php:61
 msgid "Remove"
 msgstr ""
 
@@ -1599,6 +1725,7 @@ msgid "Reset password"
 msgstr ""
 
 #: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/deleteprofile.php:250 actions/subscriptions.php:73
 msgid "SMS"
 msgstr ""
 
@@ -1610,7 +1737,7 @@ msgstr ""
 msgid "SMS Settings"
 msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:230
 msgid "SMS confirmation"
 msgstr ""
 
@@ -1619,6 +1746,7 @@ msgid "Same as password above"
 msgstr ""
 
 #: ../actions/register.php:156 actions/register.php:170
+#: actions/register.php:197
 msgid "Same as password above. Required."
 msgstr ""
 
@@ -1626,20 +1754,25 @@ msgstr ""
 #: ../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:107
+#: actions/othersettings.php:56 actions/profilesettings.php:106
+#: actions/subscriptions.php:74 actions/tagother.php:100
+#: actions/twittersettings.php:82
 msgid "Save"
 msgstr ""
 
 #: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316
+#: lib/util.php:316 lib/util.php:327
 msgid "Search"
 msgstr ""
 
 #: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:84
 msgid "Search Stream Feed"
 msgstr ""
 
 #: ../actions/noticesearch.php:30 actions/noticesearch.php:30
+#: actions/noticesearch.php:29
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -1658,7 +1791,7 @@ msgid "Select a carrier"
 msgstr ""
 
 #: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
-#: lib/util.php:1306 lib/util.php:1731
+#: lib/util.php:1306 lib/util.php:1731 lib/util.php:1646 lib/util.php:2158
 msgid "Send"
 msgstr ""
 
@@ -1685,15 +1818,16 @@ msgstr ""
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
-#: ../lib/util.php:304 lib/util.php:320
+#: ../lib/util.php:304 lib/util.php:320 lib/util.php:330
 msgid "Settings"
 msgstr ""
 
 #: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:336
 msgid "Settings saved."
 msgstr ""
 
-#: ../actions/tag.php:60 actions/tag.php:60
+#: ../actions/tag.php:60 actions/tag.php:60 actions/tag.php:59
 msgid "Showing most popular tags from the last week"
 msgstr ""
 
@@ -1714,27 +1848,31 @@ msgstr ""
 msgid "Sorry, that is not your incoming email address."
 msgstr ""
 
-#: ../lib/util.php:330 lib/util.php:346
+#: ../lib/util.php:330 lib/util.php:346 lib/util.php:358
 msgid "Source"
 msgstr ""
 
 #: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:359
 msgid "Statistics"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
 #: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
+#: actions/finishopenidlogin.php:199 actions/finishopenidlogin.php:267
 msgid "Stored OpenID not found."
 msgstr ""
 
 #: ../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:254 lib/util.php:2078
 msgid "Subscribe"
 msgstr ""
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
 #: actions/showstream.php:328 actions/subscribers.php:27
+#: actions/showstream.php:376 lib/gallery.php:136 lib/gallery.php:137
 msgid "Subscribers"
 msgstr ""
 
@@ -1749,15 +1887,20 @@ msgstr ""
 #: ../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:288 actions/showstream.php:370 lib/gallery.php:131
+#: lib/gallery.php:132
 msgid "Subscriptions"
 msgstr ""
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
+#: actions/profilesettings.php:353
 msgid "System error uploading file."
 msgstr ""
 
 #: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317
+#: lib/util.php:317 actions/profilesettings.php:90 actions/showstream.php:382
+#: actions/tag.php:40 actions/tagother.php:96 actions/tagother.php:162
+#: lib/profilelist.php:126 lib/profilelist.php:128
 msgid "Tags"
 msgstr ""
 
@@ -1766,6 +1909,7 @@ msgid "Text"
 msgstr ""
 
 #: ../actions/noticesearch.php:34 actions/noticesearch.php:34
+#: actions/noticesearch.php:33
 msgid "Text search"
 msgstr ""
 
@@ -1782,10 +1926,12 @@ msgid "That confirmation code is not for you!"
 msgstr ""
 
 #: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:214
 msgid "That email address already belongs to another user."
 msgstr ""
 
 #: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: actions/profilesettings.php:346
 msgid "That file is too big."
 msgstr ""
 
@@ -1794,6 +1940,7 @@ msgid "That is already your Jabber ID."
 msgstr ""
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:211
 msgid "That is already your email address."
 msgstr ""
 
@@ -1806,6 +1953,7 @@ msgid "That is not your Jabber ID."
 msgstr ""
 
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+#: actions/emailsettings.php:270
 msgid "That is not your email address."
 msgstr ""
 
@@ -1815,6 +1963,7 @@ msgstr ""
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
 #: actions/emailsettings.php:244 actions/imsettings.php:218
+#: actions/emailsettings.php:247
 msgid "That is the wrong IM address."
 msgstr ""
 
@@ -1828,10 +1977,12 @@ msgstr ""
 
 #: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
 #: actions/newnotice.php:49 actions/twitapistatuses.php:330
+#: actions/newnotice.php:61 actions/twitapistatuses.php:271
 msgid "That's too long. Max notice size is 140 chars."
 msgstr ""
 
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+#: actions/twitapiaccount.php:55
 msgid "That's too long. Max notice size is 255 chars."
 msgstr ""
 
@@ -1843,6 +1994,7 @@ msgstr ""
 #: ../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:285
 msgid "The address was removed."
 msgstr ""
 
@@ -1880,8 +2032,7 @@ msgstr ""
 
 #: ../actions/invite.php:89 actions/invite.php:96
 msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
+"These people are already users and you were automatically subscribed to them:"
 msgstr ""
 
 #: ../actions/recoverpassword.php:88
@@ -1904,44 +2055,50 @@ msgstr ""
 
 #: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511
+#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:94
+#: actions/twitapifriendships.php:82 actions/twitapistatuses.php:428
 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/twitapistatuses.php:303 actions/twitapiaccount.php:46
+#: actions/twitapidirect_messages.php:117 actions/twitapifriendships.php:30
+#: actions/twitapistatuses.php:239
 msgid "This method requires a POST."
 msgstr ""
 
-#: ../lib/util.php:164 lib/util.php:246
+#: ../lib/util.php:164 lib/util.php:246 lib/util.php:257
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
 msgid "Timezone"
 msgstr ""
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:228
 msgid "Timezone not selected."
 msgstr ""
 
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"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 ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: actions/twitapifriendships.php:128
 msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 #: actions/profilesettings.php:81 actions/register.php:183
+#: actions/profilesettings.php:83 actions/register.php:210
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 
@@ -1953,7 +2110,8 @@ msgstr ""
 #: ../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/twittersettings.php:108 actions/emailsettings.php:147
+#: actions/othersettings.php:146 actions/twittersettings.php:199
 msgid "Unexpected form submission."
 msgstr ""
 
@@ -1966,11 +2124,11 @@ msgid "Unknown action"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60
+#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:59
 msgid "Unknown version of OMB protocol."
 msgstr ""
 
-#: ../lib/util.php:269 lib/util.php:285
+#: ../lib/util.php:269 lib/util.php:285 lib/util.php:296
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
@@ -1982,6 +2140,7 @@ msgid "Unrecognized address type %s"
 msgstr ""
 
 #: ../actions/showstream.php:209 actions/showstream.php:219
+#: actions/showstream.php:267 lib/util.php:2094
 msgid "Unsubscribe"
 msgstr ""
 
@@ -1991,28 +2150,34 @@ msgid "Unsupported OMB version"
 msgstr ""
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: actions/profilesettings.php:371
 msgid "Unsupported image file format."
 msgstr ""
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: actions/deleteprofile.php:251
 msgid "Updates by SMS"
 msgstr ""
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: actions/deleteprofile.php:254
 msgid "Updates by instant messenger (IM)"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/twitapistatuses.php:126
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:198
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
 #: ../actions/avatar.php:68 actions/profilesettings.php:161
+#: actions/profilesettings.php:166
 msgid "Upload"
 msgstr ""
 
@@ -2030,17 +2195,17 @@ msgstr ""
 
 #: ../actions/invite.php:114 actions/invite.php:121
 msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
+"Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 
 #: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176
+#: actions/register.php:173 actions/register.php:176 actions/register.php:200
+#: actions/register.php:203
 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:92
 msgid "User being listened to doesn't exist."
 msgstr ""
 
@@ -2053,7 +2218,10 @@ msgstr ""
 #: 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/twitapiusers.php:87 lib/mailbox.php:50 actions/showstream.php:57
+#: actions/twitapiaccount.php:63 actions/twitapifavorites.php:40
+#: actions/twitapistatuses.php:163 actions/twitapistatuses.php:492
+#: lib/twitterapi.php:590
 msgid "User has no profile."
 msgstr ""
 
@@ -2066,16 +2234,18 @@ msgid "User not found."
 msgstr ""
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
 msgid "What timezone are you normally in?"
 msgstr ""
 
-#: ../lib/util.php:1159 lib/util.php:1293
+#: ../lib/util.php:1159 lib/util.php:1293 lib/util.php:1630
 #, php-format
 msgid "What's up, %s?"
 msgstr ""
 
 #: ../actions/profilesettings.php:54 ../actions/register.php:175
 #: actions/profilesettings.php:87 actions/register.php:189
+#: actions/profilesettings.php:89 actions/register.php:216
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 
@@ -2091,6 +2261,7 @@ msgstr ""
 
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
 #: actions/deletenotice.php:64 actions/deletenotice.php:79
+#: actions/block.php:105
 msgid "Yes"
 msgstr ""
 
@@ -2113,6 +2284,7 @@ msgid "You are already subscribed to these users:"
 msgstr ""
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:102
 msgid "You are not friends with the specified user."
 msgstr ""
 
@@ -2138,23 +2310,24 @@ msgstr ""
 #: ../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 ""
-"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
+#: actions/finishremotesubscribe.php:83 actions/finishremotesubscribe.php:99
 msgid "You can use the local subscription!"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
 #: actions/finishopenidlogin.php:38 actions/register.php:68
+#: actions/register.php:77
 msgid "You can't register if you don't agree to the license."
 msgstr ""
 
@@ -2176,6 +2349,7 @@ msgid ""
 msgstr ""
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: actions/twitapistatuses.php:455
 msgid "You may not delete another user's status."
 msgstr ""
 
@@ -2195,6 +2369,7 @@ msgid "You've been identified. Enter a  new password below. "
 msgstr ""
 
 #: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:84
 msgid "Your OpenID URL"
 msgstr ""
 
@@ -2209,77 +2384,82 @@ msgid ""
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
 
-#: ../lib/util.php:943 lib/util.php:992
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:1287
 msgid "a few seconds ago"
 msgstr ""
 
-#: ../lib/util.php:955 lib/util.php:1004
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:1299
 #, php-format
 msgid "about %d days ago"
 msgstr ""
 
-#: ../lib/util.php:951 lib/util.php:1000
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:1295
 #, php-format
 msgid "about %d hours ago"
 msgstr ""
 
-#: ../lib/util.php:947 lib/util.php:996
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:1291
 #, php-format
 msgid "about %d minutes ago"
 msgstr ""
 
-#: ../lib/util.php:959 lib/util.php:1008
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:1303
 #, php-format
 msgid "about %d months ago"
 msgstr ""
 
-#: ../lib/util.php:953 lib/util.php:1002
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:1297
 msgid "about a day ago"
 msgstr ""
 
-#: ../lib/util.php:945 lib/util.php:994
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:1289
 msgid "about a minute ago"
 msgstr ""
 
-#: ../lib/util.php:957 lib/util.php:1006
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:1301
 msgid "about a month ago"
 msgstr ""
 
-#: ../lib/util.php:961 lib/util.php:1010
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:1305
 msgid "about a year ago"
 msgstr ""
 
-#: ../lib/util.php:949 lib/util.php:998
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:1293
 msgid "about an hour ago"
 msgstr ""
 
 #: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
+#: actions/showstream.php:441 lib/stream.php:99 lib/noticelist.php:211
 msgid "delete"
 msgstr ""
 
 #: ../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/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:135
+#: lib/facebookaction.php:202 lib/noticelist.php:189
 msgid "in reply to..."
 msgstr ""
 
 #: ../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/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:142
+#: lib/noticelist.php:199
 msgid "reply"
 msgstr ""
 
 #: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/profilesettings.php:188
 msgid "same as password above"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+#: actions/twitapistatuses.php:543
 msgid "unsupported file type"
 msgstr ""
 
-#: ../lib/util.php:1309 lib/util.php:1443
-msgid "« After"
+#: ../lib/util.php:1309 lib/util.php:1443 lib/facebookaction.php:251
+#: lib/util.php:1783
+msgid "« After"
 msgstr ""
 
 #: actions/deletenotice.php:74 actions/disfavor.php:43
@@ -2291,6 +2471,12 @@ msgstr ""
 #: 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:38 actions/deleteprofile.php:127 actions/disfavor.php:47
+#: actions/emailsettings.php:130 actions/favor.php:49 actions/login.php:45
+#: actions/newmessage.php:44 actions/newnotice.php:36 actions/nudge.php:47
+#: actions/othersettings.php:139 actions/profilesettings.php:49
+#: actions/subedit.php:38 actions/tagother.php:113
+#: actions/twittersettings.php:188 actions/unblock.php:38
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -2314,12 +2500,14 @@ msgstr ""
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142
+#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:54
+#: actions/twitapifavorites.php:115
 msgid "This notice is already a favorite!"
 msgstr ""
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
+#: classes/Command.php:132 actions/favor.php:61
+#: actions/twitapifavorites.php:122
 msgid "Could not create favorite."
 msgstr ""
 
@@ -2328,11 +2516,12 @@ msgid "Disfavor"
 msgstr ""
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:62
 #, php-format
 msgid "%s favorite notices"
 msgstr ""
 
-#: actions/favoritesrss.php:64
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:66
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr ""
@@ -2358,47 +2547,50 @@ msgid ""
 "\n"
 msgstr ""
 
-#: actions/login.php:104
+#: actions/login.php:104 actions/login.php:111 actions/openidlogin.php:86
 msgid "Automatically login in the future; "
 msgstr ""
 
-#: actions/login.php:122
+#: actions/login.php:122 actions/login.php:130
 msgid "For security reasons, please re-enter your "
 msgstr ""
 
-#: actions/login.php:126
+#: actions/login.php:126 actions/login.php:134
 msgid "Login with your username and password. "
 msgstr ""
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+#: actions/newmessage.php:60 actions/twitapidirect_messages.php:136
 msgid "That's too long. Max message size is 140 chars."
 msgstr ""
 
-#: actions/newmessage.php:65
+#: actions/newmessage.php:65 actions/newmessage.php:68
 msgid "No recipient specified."
 msgstr ""
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
+#: classes/Command.php:206 actions/newmessage.php:71
+#: actions/newmessage.php:116 classes/Command.php:211
 msgid "You can't send a message to this user."
 msgstr ""
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
+#: classes/Command.php:209 actions/newmessage.php:74
+#: actions/twitapidirect_messages.php:153 classes/Command.php:214
 msgid ""
-"Don't send a message to yourself; just say it to yourself quietly "
-"instead."
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: actions/newmessage.php:108
+#: actions/newmessage.php:108 actions/microsummary.php:32
+#: actions/newmessage.php:111
 msgid "No such user"
 msgstr ""
 
-#: actions/newmessage.php:117
+#: actions/newmessage.php:117 actions/newmessage.php:120
 msgid "New message"
 msgstr ""
 
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:95 actions/noticesearch.php:94
 msgid "Notice without matching profile"
 msgstr ""
 
@@ -2445,6 +2637,7 @@ msgstr ""
 
 #: actions/profilesettings.php:115 actions/remotesubscribe.php:320
 #: actions/userauthorization.php:159 actions/userrss.php:76
+#: actions/profilesettings.php:120 actions/remotesubscribe.php:333
 msgid "User without matching profile"
 msgstr ""
 
@@ -2472,18 +2665,18 @@ msgstr ""
 msgid "New password successfully saved. "
 msgstr ""
 
-#: actions/register.php:95
+#: actions/register.php:95 actions/register.php:104
 msgid "Password must be 6 or more characters."
 msgstr ""
 
-#: actions/register.php:216
+#: actions/register.php:216 actions/register.php:243
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to..."
 msgstr ""
 
-#: actions/register.php:227
+#: actions/register.php:227 actions/register.php:254
 msgid "(You should receive a message by email momentarily, with "
 msgstr ""
 
@@ -2498,6 +2691,7 @@ msgid "Feed for favorites of %s"
 msgstr ""
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:88 actions/twitapifavorites.php:57
 msgid "Could not retrieve favorite notices."
 msgstr ""
 
@@ -2519,7 +2713,7 @@ msgstr ""
 msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: actions/showstream.php:154
+#: actions/showstream.php:154 lib/util.php:2105
 msgid "Send a message"
 msgstr ""
 
@@ -2528,73 +2722,78 @@ msgstr ""
 msgid "Mobile carrier for your phone. "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:64
 #, php-format
 msgid "Direct messages to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:65
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:69
 msgid "Direct Messages You've Sent"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:70
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:132
 msgid "No message text!"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:145
 msgid "Recipient user not found."
 msgstr ""
 
 #: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:148
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
-#: actions/twitapifavorites.php:92
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:64
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
-#: actions/twitapifavorites.php:95
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:67
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
+#: actions/twitapifavorites.php:158 lib/mail.php:303
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr ""
 
 #: actions/twitapifavorites.php:188 lib/mail.php:276
+#: actions/twitapifavorites.php:159 lib/mail.php:304
 #, php-format
 msgid ""
 "%1$s just added your notice from %2$s as one of their favorites.\n"
 "\n"
 msgstr ""
 
-#: actions/twittersettings.php:27
+#: actions/twittersettings.php:27 actions/twittersettings.php:29
 msgid ""
 "Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 
-#: actions/twittersettings.php:41
+#: actions/twittersettings.php:41 actions/twittersettings.php:43
 msgid "Twitter settings"
 msgstr ""
 
-#: actions/twittersettings.php:48
+#: actions/twittersettings.php:48 actions/twittersettings.php:50
 msgid "Twitter Account"
 msgstr ""
 
-#: actions/twittersettings.php:56
+#: actions/twittersettings.php:56 actions/twittersettings.php:58
 msgid "Current verified Twitter account."
 msgstr ""
 
@@ -2622,46 +2821,50 @@ msgstr ""
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:216
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr ""
 
-#: actions/twittersettings.php:128
+#: actions/twittersettings.php:128 actions/twittersettings.php:221
 msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: actions/twittersettings.php:137 actions/twittersettings.php:228
 #, php-format
 msgid "Unable to retrieve account information for \"%s\" from Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:234 actions/twittersettings.php:253
 msgid "Unable to save your Twitter settings!"
 msgstr ""
 
-#: actions/twittersettings.php:174
+#: actions/twittersettings.php:174 actions/twittersettings.php:261
 msgid "Twitter settings saved."
 msgstr ""
 
-#: actions/twittersettings.php:192
+#: actions/twittersettings.php:192 actions/twittersettings.php:272
 msgid "That is not your Twitter account."
 msgstr ""
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:280
 msgid "Couldn't remove Twitter user."
 msgstr ""
 
-#: actions/twittersettings.php:212
+#: actions/twittersettings.php:212 actions/twittersettings.php:284
 msgid "Twitter account removed."
 msgstr ""
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
+#: actions/twittersettings.php:299 actions/twittersettings.php:310
+#: actions/twittersettings.php:322
 msgid "Couldn't save Twitter preferences."
 msgstr ""
 
-#: actions/twittersettings.php:245
+#: actions/twittersettings.php:245 actions/twittersettings.php:330
 msgid "Twitter preferences saved."
 msgstr ""
 
@@ -2677,15 +2880,15 @@ msgstr ""
 msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#: classes/Channel.php:113
+#: classes/Channel.php:113 classes/Channel.php:129
 msgid "Command results"
 msgstr ""
 
-#: classes/Channel.php:148
+#: classes/Channel.php:148 classes/Channel.php:175
 msgid "Command complete"
 msgstr ""
 
-#: classes/Channel.php:158
+#: classes/Channel.php:158 classes/Channel.php:185
 msgid "Command failed"
 msgstr ""
 
@@ -2698,7 +2901,7 @@ msgstr ""
 msgid "Subscriptions: %1$s\n"
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:247
 msgid "User has no last notice"
 msgstr ""
 
@@ -2731,59 +2934,60 @@ msgstr ""
 msgid "About: %s"
 msgstr ""
 
-#: classes/Command.php:200
+#: classes/Command.php:200 classes/Command.php:202
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: classes/Command.php:214
+#: classes/Command.php:214 classes/Command.php:219
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: classes/Command.php:216
+#: classes/Command.php:216 classes/Command.php:221
 msgid "Error sending direct message."
 msgstr ""
 
-#: classes/Command.php:263
+#: classes/Command.php:263 classes/Command.php:268
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: classes/Command.php:270
+#: classes/Command.php:270 classes/Command.php:275
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: classes/Command.php:288
+#: classes/Command.php:288 classes/Command.php:293
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: classes/Command.php:295
+#: classes/Command.php:295 classes/Command.php:300
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330
+#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:315
+#: classes/Command.php:335
 msgid "Command not yet implemented."
 msgstr ""
 
-#: classes/Command.php:313
+#: classes/Command.php:313 classes/Command.php:318
 msgid "Notification off."
 msgstr ""
 
-#: classes/Command.php:315
+#: classes/Command.php:315 classes/Command.php:320
 msgid "Can't turn off notification."
 msgstr ""
 
-#: classes/Command.php:333
+#: classes/Command.php:333 classes/Command.php:338
 msgid "Notification on."
 msgstr ""
 
-#: classes/Command.php:335
+#: classes/Command.php:335 classes/Command.php:340
 msgid "Can't turn on notification."
 msgstr ""
 
-#: classes/Command.php:344
+#: classes/Command.php:344 classes/Command.php:349
 msgid "Commands:\n"
 msgstr ""
 
@@ -2795,23 +2999,23 @@ msgstr ""
 msgid "Could not update message with new URI."
 msgstr ""
 
-#: lib/gallery.php:46
+#: lib/gallery.php:46 lib/gallery.php:55
 msgid "User without matching profile in system."
 msgstr ""
 
-#: lib/mail.php:147
+#: lib/mail.php:147 lib/mail.php:141
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:249
+#: lib/mail.php:249 lib/mail.php:275
 #, php-format
 msgid "New private message from %s"
 msgstr ""
 
-#: lib/mail.php:253
+#: lib/mail.php:253 lib/mail.php:279
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -2855,18 +3059,419 @@ msgstr ""
 msgid "Your sent messages"
 msgstr ""
 
-#: lib/settingsaction.php:99
+#: lib/settingsaction.php:99 actions/deleteprofile.php:256
 msgid "Twitter"
 msgstr ""
 
-#: lib/settingsaction.php:100
+#: lib/settingsaction.php:100 actions/deleteprofile.php:257
 msgid "Twitter integration options"
 msgstr ""
 
-#: lib/util.php:1718
+#: lib/util.php:1718 lib/util.php:2145
 msgid "To"
 msgstr ""
 
 #: scripts/maildaemon.php:45
 msgid "Could not parse message."
 msgstr ""
+
+#: actions/block.php:45 actions/subedit.php:45 actions/unblock.php:45
+msgid "No profile specified."
+msgstr ""
+
+#: actions/block.php:52 actions/subedit.php:52 actions/tagother.php:45
+#: actions/unblock.php:52
+msgid "No profile with that ID."
+msgstr ""
+
+#: actions/block.php:78
+msgid "Block user"
+msgstr ""
+
+#: actions/block.php:81
+msgid "Are you sure you want to block this user? "
+msgstr ""
+
+#: actions/block.php:117
+msgid "You have already blocked this user."
+msgstr ""
+
+#: actions/block.php:124
+msgid "Failed to save block information."
+msgstr ""
+
+#: actions/deleteprofile.php:25
+msgid "Code not yet ready."
+msgstr ""
+
+#: actions/deleteprofile.php:36
+msgid "Export and delete your user information."
+msgstr ""
+
+#: actions/deleteprofile.php:88 actions/deleteprofile.php:119
+#, fuzzy
+msgid "Delete my account"
+msgstr "Δημιουργία νέου λογαριασμού"
+
+#: actions/deleteprofile.php:89
+msgid "Delete my account confirmation"
+msgstr ""
+
+#: actions/deleteprofile.php:117
+msgid "Check if you are sure you want to delete your account."
+msgstr ""
+
+#: actions/deleteprofile.php:259 lib/settingsaction.php:102
+msgid "Other"
+msgstr ""
+
+#: actions/deleteprofile.php:260 lib/settingsaction.php:103
+msgid "Other options"
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Add to favorites"
+msgstr ""
+
+#: actions/emailsettings.php:98
+msgid "Allow friends to nudge me and send me an email."
+msgstr ""
+
+#: actions/facebookremove.php:54
+msgid "Couldn't remove Facebook user."
+msgstr ""
+
+#: actions/favor.php:71
+msgid "Disfavor favorite"
+msgstr ""
+
+#: actions/favorited.php:31 lib/stream.php:45
+msgid "Popular notices"
+msgstr ""
+
+#: actions/favorited.php:54
+msgid "Showing recently popular notices"
+msgstr ""
+
+#: actions/featured.php:32 actions/featured.php:54 lib/stream.php:41
+msgid "Featured users"
+msgstr ""
+
+#: actions/finishremotesubscribe.php:186
+msgid "That user has blocked you from subscribing."
+msgstr ""
+
+#: actions/microsummary.php:39
+msgid "No current status"
+msgstr ""
+
+#: actions/newnotice.php:93
+msgid "Notice posted"
+msgstr ""
+
+#: actions/newnotice.php:116 classes/Channel.php:140
+msgid "Ajax Error"
+msgstr ""
+
+#: actions/nudge.php:52
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
+
+#: actions/nudge.php:61
+msgid "Nudge sent"
+msgstr ""
+
+#: actions/othersettings.php:27
+msgid "Manage various other options."
+msgstr ""
+
+#: actions/othersettings.php:33
+#, fuzzy
+msgid "Other Settings"
+msgstr "Ρυθμίσεις OpenID"
+
+#: actions/othersettings.php:35
+msgid "URL Auto-shortening"
+msgstr ""
+
+#: actions/othersettings.php:54
+msgid "Service"
+msgstr ""
+
+#: actions/othersettings.php:54
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/othersettings.php:155
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Η τοποθεσία είναι πολύ μεγάλη (μέγιστο 255 χαρακτ.)."
+
+#: actions/peopletag.php:33
+#, php-format
+msgid "Not a valid people tag: %s"
+msgstr ""
+
+#: actions/peopletag.php:45
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr ""
+
+#: actions/peopletag.php:87
+#, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+msgstr ""
+
+#: actions/profilesettings.php:92
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+
+#: actions/profilesettings.php:246 actions/tagother.php:131
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr ""
+
+#: actions/profilesettings.php:328
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "Αδύνατη η αποθήκευση του προφίλ."
+
+#: actions/public.php:68
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
+msgstr ""
+
+#: actions/public.php:90
+msgid "Could not retrieve public stream."
+msgstr ""
+
+#: actions/register.php:67 actions/register.php:177
+msgid "Sorry, only invited people can register."
+msgstr ""
+
+#: actions/register.php:156
+msgid "With this form you can create a new account. "
+msgstr ""
+
+#: actions/remotesubscribe.php:136 actions/remotesubscribe.php:141
+msgid "That's a local profile! Login to subscribe."
+msgstr ""
+
+#: actions/subedit.php:68
+msgid "You are not subscribed to that profile."
+msgstr ""
+
+#: actions/subedit.php:81
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ"
+
+#: actions/subscribe.php:53
+msgid "Not a local user."
+msgstr ""
+
+#: actions/subscribe.php:67
+msgid "Subscribed"
+msgstr ""
+
+#: actions/subscriptions.php:72
+msgid "Jabber"
+msgstr ""
+
+#: actions/tagother.php:31
+msgid "Not logged in"
+msgstr ""
+
+#: actions/tagother.php:40
+msgid "No id argument."
+msgstr ""
+
+#: actions/tagother.php:56
+msgid "Tag a person"
+msgstr ""
+
+#: actions/tagother.php:98
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
+msgstr ""
+
+#: actions/tagother.php:120
+#, fuzzy
+msgid "No such profile."
+msgstr "Αδύνατη η αποθήκευση του προφίλ."
+
+#: actions/tagother.php:146
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+
+#: actions/tagother.php:153
+#, fuzzy
+msgid "Could not save tags."
+msgstr "Αδύνατη η αποθήκευση του προφίλ."
+
+#: actions/tagother.php:188
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
+
+#: actions/tagrss.php:33
+msgid "No such tag."
+msgstr ""
+
+#: actions/tagrss.php:62
+#, php-format
+msgid "Microblog tagged with %s"
+msgstr ""
+
+#: actions/twitapiblocks.php:45
+msgid "Block user failed."
+msgstr ""
+
+#: actions/twitapiblocks.php:66
+msgid "Unblock user failed."
+msgstr ""
+
+#: actions/twitapiusers.php:45
+msgid "Not found."
+msgstr ""
+
+#: actions/twittersettings.php:63
+msgid "Twitter user name"
+msgstr ""
+
+#: actions/twittersettings.php:67
+#, fuzzy
+msgid "Twitter password"
+msgstr "Νέος κωδικός"
+
+#: actions/twittersettings.php:129
+msgid "Twitter Friends"
+msgstr ""
+
+#: actions/unblock.php:73
+msgid "Error removing the block."
+msgstr ""
+
+#: actions/unsubscribe.php:48
+msgid "No profile id in request."
+msgstr ""
+
+#: actions/unsubscribe.php:55
+msgid "No profile with that id."
+msgstr ""
+
+#: actions/unsubscribe.php:69
+msgid "Unsubscribed"
+msgstr ""
+
+#: classes/Notice.php:100
+msgid "Problem saving notice. Unknown user."
+msgstr ""
+
+#: classes/Notice.php:105
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+
+#: classes/Notice.php:112
+msgid "You are banned from posting notices on this site."
+msgstr ""
+
+#: lib/gallery.php:98
+msgid "Filter tags"
+msgstr ""
+
+#: lib/gallery.php:104
+msgid "All"
+msgstr ""
+
+#: lib/gallery.php:108
+msgid "Tag"
+msgstr ""
+
+#: lib/gallery.php:109
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/gallery.php:110
+msgid "Go"
+msgstr ""
+
+#: lib/gallery.php:264
+msgid "Subscriptions navigation"
+msgstr ""
+
+#: lib/gallery.php:270 lib/gallery.php:292
+msgid "List"
+msgstr ""
+
+#: lib/gallery.php:280 lib/gallery.php:294
+msgid "Icons"
+msgstr ""
+
+#: lib/mail.php:92
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:242
+#, php-format
+msgid "You've been nudged by %s"
+msgstr ""
+
+#: lib/mail.php:246
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+msgstr ""
+
+#: lib/profilelist.php:146
+msgid "(none)"
+msgstr ""
+
+#: lib/stream.php:33
+msgid "Public"
+msgstr ""
+
+#: lib/stream.php:36 lib/stream.php:37
+msgid "Recent tags"
+msgstr ""
+
+#: lib/stream.php:40
+msgid "Featured"
+msgstr ""
+
+#: lib/stream.php:44
+msgid "Popular"
+msgstr ""
+
+#: lib/subs.php:51
+msgid "User has blocked you."
+msgstr ""
+
+#: lib/util.php:2059
+msgid "Send a nudge"
+msgstr ""
+
+#: lib/util.php:2063
+msgid "Nudge sent!"
+msgstr ""
+
+#: lib/util.php:2194
+msgid "Block"
+msgstr ""
+
+#: lib/util.php:2198
+msgid "Unblock"
+msgstr ""
diff --git a/en_GB/LC_MESSAGES/laconica.po b/en_GB/LC_MESSAGES/laconica.po
index 726a771b1f..888c987d24 100644
--- a/en_GB/LC_MESSAGES/laconica.po
+++ b/en_GB/LC_MESSAGES/laconica.po
@@ -7,46 +7,87 @@
 #, fuzzy
 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"
-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"POT-Creation-Date: 2009-01-12 12:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"#-#-#-#-#  laconica.pot (laconica)  #-#-#-#-#\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/noticesearchrss.php:64
+#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:61
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr "Search Stream for ‘%s’"
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: actions/finishopenidlogin.php:88 actions/register.php:205
+#: actions/register.php:232
+msgid ""
+" except this private data: password, email address, IM address, phone number."
+msgstr ""
+"except this private data: password, e-mail address, IM address, phone number."
+
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+#: lib/facebookaction.php:195 lib/noticelist.php:160
+msgid " from "
+msgstr ""
+
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: actions/twitapistatuses.php:341
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr ""
+
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
+
+#: ../actions/invite.php:170
+#, php-format
 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 ""
-"except this private data: password, e-mail address, IM address, phone "
-"number."
 
-#: ../actions/subscribe.php:84
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:115
+#: lib/mail.php:117
 #, 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"
@@ -57,409 +98,735 @@ msgid ""
 "%4$s.\n"
 msgstr ""
 
-#: ../actions/shownotice.php:45
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#: actions/twitapistatuses.php:344
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
+
+#: ../actions/shownotice.php:45 actions/shownotice.php:45
+#: actions/shownotice.php:73
 #, php-format
 msgid "%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
+#, php-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../actions/publicrss.php:62 actions/publicrss.php:48
 #, 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/twitapistatuses.php:123
 #, 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:31
+#, php-format
+msgid "%s public timeline"
+msgstr ""
+
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:217
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:195
+#, php-format
+msgid "%s timeline"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:34
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+
+#: ../lib/util.php:257 lib/util.php:273 lib/util.php:284
 #, 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 "
-"[%%site.broughtby%%](%%site.broughtbyurl%%)"
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%)"
 
-#: ../lib/util.php:235
+#: ../lib/util.php:259 lib/util.php:275 lib/util.php:286
 #, php-format
 msgid "**%%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 lib/util.php:301
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ". Contributors should be attributed by full name or nickname."
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: ../actions/register.php:176
+#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
+#: actions/profilesettings.php:78
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 lowercase letters or numbers, no punctuation or spaces"
 
-#: ../actions/password.php:42 ../actions/register.php:178
+#: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:193
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/profilesettings.php:186
 msgid "6 or more characters"
 msgstr "6 or more characters"
 
-#: ../actions/recoverpassword.php:165
+#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
 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:195
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, 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 ""
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
+
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:234
+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 ""
+
+#: ../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/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:30
+#: actions/twitapidirect_messages.php:107 actions/twitapifavorites.php:83
+#: actions/twitapifavorites.php:99 actions/twitapifriendships.php:117
+#: actions/twitapihelp.php:42 actions/twitapistatuses.php:77
+#: actions/twitapistatuses.php:144 actions/twitapistatuses.php:224
+#: actions/twitapistatuses.php:234 actions/twitapistatuses.php:386
+#: actions/twitapistatuses.php:395 actions/twitapistatuses.php:421
+#: actions/twitapiusers.php:30
+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:39
+#: actions/twitapiaccount.php:89 actions/twitapiaccount.php:94
+#: actions/twitapidirect_messages.php:178 actions/twitapifavorites.php:139
+#: actions/twitapihelp.php:49 actions/twitapistatuses.php:549
+msgid "API method under construction."
 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/util.php:352
 msgid "About"
 msgstr "About"
 
-#: ../actions/userauthorization.php:118
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
 msgid "Accept"
 msgstr "Accept"
 
-#: ../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/twittersettings.php:84
 msgid "Add"
 msgstr "Add"
 
-#: ../actions/openidsettings.php:43
+#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
 msgid "Add OpenID"
 msgstr "Add OpenID"
 
-#: ../actions/imsettings.php:39
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: actions/deleteprofile.php:248
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
 msgid "Address"
 msgstr "Address"
 
-#: ../actions/showstream.php:254
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
+
+#: ../actions/showstream.php:273 actions/showstream.php:288
+#: actions/showstream.php:336
 msgid "All subscriptions"
 msgstr "All subscriptions"
 
-#: ../actions/publicrss.php:62
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
 #, php-format
 msgid "All updates for %s"
 msgstr "All updates for %s"
 
-#: ../actions/noticesearchrss.php:66
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:63
 #, 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
 msgid "Already logged in."
 msgstr "Already logged in."
 
-#: ../actions/subscribe.php:48
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:47
 msgid "Already subscribed!."
 msgstr "Already subscribed!"
 
-#: ../actions/userauthorization.php:76
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+msgid "Are you sure you want to delete this notice?"
+msgstr ""
+
+#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
 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 actions/register.php:219
 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
+#: actions/profilesettings.php:103
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
+
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
 #: actions/profilesettings.php:34
 msgid "Avatar"
 msgstr ""
 
-#: ../actions/avatar.php:113
+#: ../actions/avatar.php:113 actions/profilesettings.php:350
+#: actions/profilesettings.php:379
 msgid "Avatar updated."
 msgstr "Avatar updated."
 
-#: ../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 ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy "
-"list?)"
+"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 ""
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+msgid "Awaiting confirmation on this phone number."
+msgstr ""
 
 #  erm, not sure what to do here, » is recognised as a quotation mark.
-#: ../lib/util.php:1136
-msgid "Before »"
+#: ../lib/util.php:1318 lib/util.php:1452 lib/facebookaction.php:259
+#: lib/util.php:1792
+#, fuzzy
+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:84 actions/register.php:211
 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:222 actions/register.php:98
 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
+msgid "Can't delete this notice."
+msgstr ""
+
+#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
 #, 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/profilesettings.php:433
 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
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../lib/openid.php:121
+#: ../lib/openid.php:121 lib/openid.php:121
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Cannot instantiate OpenID consumer object."
 
-#: ../actions/imsettings.php:154
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
 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:204
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/profilesettings.php:189
 msgid "Change"
 msgstr "Change"
 
-#: ../actions/password.php:32
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: actions/deleteprofile.php:245
+msgid "Change email handling"
+msgstr ""
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
 msgid "Change password"
 msgstr "Change password"
 
-#: ../actions/password.php:43 ../actions/recoverpassword.php:166
-#: ../actions/register.php:179
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr ""
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#: actions/deleteprofile.php:242
+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/profilesettings.php:187 actions/register.php:196
 msgid "Confirm"
 msgstr "Confirm"
 
-#: ../actions/confirmaddress.php:84
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
 msgid "Confirm Address"
 msgstr "Confirm Address"
 
-#: ../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:259
 msgid "Confirmation cancelled."
 msgstr "Confirmation cancelled."
 
-#: ../actions/confirmaddress.php:38
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+msgid "Confirmation code"
+msgstr ""
+
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
 msgid "Confirmation code not found."
 msgstr "Confirmation code not found."
 
-#: ../actions/finishopenidlogin.php:91
+#: ../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:97
 msgid "Connect"
 msgstr "Connect"
 
-#: ../actions/finishopenidlogin.php:86
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
 msgid "Connect existing account"
 msgstr "Connect existing account"
 
-#: ../lib/util.php:304 ../lib/util.php:332 lib/util.php:348
+#: ../lib/util.php:332 lib/util.php:348 lib/util.php:360
 msgid "Contact"
 msgstr ""
 
 #  Thought form was incorrect
-#: ../lib/openid.php:178
+#: ../lib/openid.php:178 lib/openid.php:178
 #, 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:46 actions/twitapifriendships.php:62
+#, 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:39
+msgid "Could not follow user: User not found."
+msgstr ""
+
+#: ../lib/openid.php:160 lib/openid.php:160
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "Could not redirect to server: %s"
 
-#: ../actions/updateprofile.php:161
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
 msgid "Could not save avatar info"
 msgstr "Could not save avatar info"
 
-#: ../actions/updateprofile.php:154
+#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
 msgid "Could not save new profile info"
 msgstr "Could not save new profile info"
 
-#: ../actions/profilesettings.php:146
-msgid "Couldn't confirm email."
-msgstr "Couldn’t confirm e-mail."
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:70
+msgid "Could not subscribe other to you."
+msgstr ""
+
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:55
+msgid "Could not subscribe."
+msgstr ""
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr ""
 
 #: ../actions/finishremotesubscribe.php:99
+#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:112
 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/emailsettings.php:255
 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:129
 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:82
+msgid "Couldn't find any statuses."
+msgstr ""
+
+#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
+#: actions/remotesubscribe.php:148
 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:228
 msgid "Couldn't insert confirmation code."
 msgstr "Couldn’t insert confirmation code."
 
 #: ../actions/finishremotesubscribe.php:180
+#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:216
 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:319 actions/twitapiaccount.php:74
 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:296
+msgid "Couldn't update user for autosubscribe."
+msgstr ""
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+#: actions/emailsettings.php:301 actions/emailsettings.php:315
+msgid "Couldn't update user record."
+msgstr ""
+
+#: ../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/emailsettings.php:179 actions/emailsettings.php:280
+#: actions/othersettings.php:173 actions/profilesettings.php:276
 msgid "Couldn't update user."
 msgstr "Couldn’t update user."
 
-#: ../actions/finishopenidlogin.php:84
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
 msgid "Create"
 msgstr "Create"
 
-#: ../actions/finishopenidlogin.php:70
+#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
 msgid "Create a new user with this nickname."
 msgstr "Create a new user with this nickname."
 
-#: ../actions/finishopenidlogin.php:68
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
 msgid "Create new account"
 msgstr "Create new account"
 
-#: ../actions/finishopenidlogin.php:191
+#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+#: actions/finishopenidlogin.php:208
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Creating new account for OpenID that already has a user."
 
-#: ../actions/imsettings.php:45
+#: ../actions/imsettings.php:45 actions/imsettings.php:46
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Current confirmed Jabber/GTalk address."
 
-#: ../actions/showstream.php:337
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+msgid "Current confirmed email address."
+msgstr ""
+
+#: ../actions/showstream.php:356 actions/showstream.php:367
+#: actions/showstream.php:418
 msgid "Currently"
 msgstr "Currently"
 
-#: ../lib/util.php:893
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:87
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: ../lib/util.php:1061 lib/util.php:1110 lib/util.php:1417
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "DB error inserting reply: %s"
 
-#: ../actions/profilesettings.php:54
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+msgid "Delete notice"
+msgstr ""
+
+#: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: actions/profilesettings.php:84 actions/register.php:186
+#: actions/profilesettings.php:86 actions/register.php:213
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Describe yourself and your interests in 140 chars"
 
-#: ../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/deleteprofile.php:244 actions/register.php:199
+#: actions/register.php:202
 msgid "Email"
 msgstr ""
 
-#: ../actions/profilesettings.php:46
-msgid "Email address"
-msgstr "E-mail address"
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+msgid "Email Address"
+msgstr ""
+
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+msgid "Email Settings"
+msgstr ""
 
-#: ../actions/profilesettings.php:102 ../actions/register.php:63
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:89
 msgid "Email address already exists."
 msgstr "E-mail address already exists."
 
-#: ../lib/mail.php:82
+#: ../lib/mail.php:90 lib/mail.php:90
 msgid "Email address confirmation"
 msgstr "E-mail address confirmation"
 
-#: ../actions/recoverpassword.php:176
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
+
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr ""
+
+#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
 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
+msgid "Enter the code you received on your phone."
+msgstr ""
+
+#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
 msgid "Error authorizing token"
 msgstr "Error authorising token."
 
-#: ../actions/finishopenidlogin.php:282
+#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
+#: actions/finishopenidlogin.php:274
 msgid "Error connecting user to OpenID."
 msgstr "Error connecting user to OpenID."
 
-#: ../actions/finishaddopenid.php:78
+#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
 msgid "Error connecting user."
 msgstr "Error connecting user."
 
 #: ../actions/finishremotesubscribe.php:151
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:164
 msgid "Error inserting avatar"
 msgstr "Error inserting avatar"
 
 #: ../actions/finishremotesubscribe.php:143
+#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:156
 msgid "Error inserting new profile"
 msgstr "Error inserting new profile"
 
-#: ../actions/postnotice.php:88
-msgid "Error inserting notice"
-msgstr "Error inserting notice"
-
 #: ../actions/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:180
 msgid "Error inserting remote profile"
 msgstr "Error inserting remote profile"
 
-#: ../actions/recoverpassword.php:201
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
 msgid "Error saving address confirmation."
 msgstr "Error saving address confirmation."
 
-#: ../actions/userauthorization.php:139
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
 msgid "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
 msgid "Error saving the profile."
 msgstr "Error saving the profile."
 
-#: ../lib/openid.php:237
+#: ../lib/openid.php:237 lib/openid.php:237
 msgid "Error saving the user."
 msgstr "Error saving the user."
 
-#: ../actions/password.php:80
+#: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/profilesettings.php:428
 msgid "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:54 actions/login.php:80
+#: actions/register.php:117
 msgid "Error setting user."
 msgstr "Error setting user."
 
 #  Added full stop
-#: ../actions/finishaddopenid.php:83
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
 msgid "Error updating profile"
 msgstr "Error updating profile."
 
 #  Added full stop
 #: ../actions/finishremotesubscribe.php:161
+#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:174
 msgid "Error updating remote profile"
 msgstr "Error updating remote profile."
 
-#: ../actions/recoverpassword.php:79
+#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
 msgid "Error with confirmation code."
 msgstr "Error with confirmation code."
 
-#: ../actions/finishopenidlogin.php:89
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
 msgid "Existing nickname"
 msgstr "Existing nickname"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:326 lib/util.php:342 lib/util.php:354
 msgid "FAQ"
 msgstr "F.A.Q."
 
-#: ../actions/avatar.php:115
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/profilesettings.php:381
 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
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Feed for friends of %s"
 
-#: ../actions/replies.php:61 ../actions/repliesrss.php:80
+#: ../actions/replies.php:65 ../actions/repliesrss.php:80
+#: actions/replies.php:65 actions/repliesrss.php:66
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Feed for replies to %s"
 
-#: ../actions/login.php:118
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:54
+#, php-format
+msgid "Feed for tag %s"
+msgstr ""
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+msgid "Find content of notices"
+msgstr ""
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+msgid "Find people on this site"
+msgstr ""
+
+#: ../actions/login.php:122
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -467,41 +834,60 @@ 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:79 actions/register.php:205
 msgid "Full name"
 msgstr "Full name"
 
-#: ../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/profilesettings.php:219 actions/register.php:95
 msgid "Full name is too long (max 255 chars)."
 msgstr "Full name is too long (max 255 chars)."
 
-#: ../lib/util.php:279
+#: ../lib/util.php:322 lib/util.php:338 lib/util.php:343 lib/util.php:350
 msgid "Help"
 msgstr "Help"
 
-#: ../lib/util.php:274
+#: ../lib/util.php:298 lib/util.php:314 lib/util.php:325
 msgid "Home"
 msgstr "Home"
 
-#: ../actions/profilesettings.php:49
+#: ../actions/profilesettings.php:46 ../actions/register.php:167
+#: actions/profilesettings.php:79 actions/register.php:181
+#: actions/profilesettings.php:81 actions/register.php:208
 msgid "Homepage"
 msgstr "Homepage"
 
-#: ../actions/profilesettings.php:87
+#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: actions/profilesettings.php:210 actions/register.php:83
+#: actions/profilesettings.php:216 actions/register.php:92
 msgid "Homepage is not a valid URL."
 msgstr "Homepage is not a valid URL."
 
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+#: actions/emailsettings.php:101
+msgid "I want to post notices by email."
+msgstr ""
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+#: actions/deleteprofile.php:253
+msgid "IM"
+msgstr ""
+
 #  possibly use I.M.
-#: ../actions/imsettings.php:61
+#: ../actions/imsettings.php:60 actions/imsettings.php:61
 msgid "IM Address"
 msgstr "IM Address"
 
 #  requires full stops?
-#: ../actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
 msgid "IM Settings"
 msgstr "IM Settings"
 
-#: ../actions/finishopenidlogin.php:88
+#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -517,23 +903,32 @@ msgstr ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click ‘Add’."
 
-#: ../actions/recoverpassword.php:122
+#: ../actions/recoverpassword.php:137
 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 ""
-"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/password.php:69
+#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
+#: actions/emailsettings.php:68 actions/smssettings.php:76
+msgid "Incoming email"
+msgstr ""
+
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+#: actions/emailsettings.php:304
+msgid "Incoming email address removed."
+msgstr ""
+
+#: ../actions/password.php:69 actions/profilesettings.php:388
+#: actions/profilesettings.php:417
 msgid "Incorrect old password"
 msgstr "Incorrect old password"
 
-#: ../actions/login.php:63
+#: ../actions/login.php:67 actions/login.php:67 actions/login.php:74
 msgid "Incorrect username or password."
 msgstr "Incorrect username or password."
 
-#: ../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."
@@ -542,500 +937,777 @@ msgstr ""
 "address registered to your account."
 
 #  Avatar?
-#: ../actions/updateprofile.php:113
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "Invalid avatar URL ‘%s’"
 
-#: ../actions/updateprofile.php:97
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "Invalid homepage ‘%s’"
 
-#: ../actions/updateprofile.php:81
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
 #, 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:63
 msgid "Invalid notice content"
 msgstr "Invalid notice content"
 
-#: ../actions/postnotice.php:67
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:69
 msgid "Invalid notice uri"
 msgstr "Invalid notice URI"
 
-#: ../actions/postnotice.php:72
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:74
 msgid "Invalid notice url"
 msgstr "Invalid notice URL"
 
-#: ../actions/updateprofile.php:86
+#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "Invalid profile URL ‘%s’."
 
-#: ../actions/remotesubscribe.php:96
+#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
 msgid "Invalid profile URL (bad format)"
 msgstr "Invalid profile URL (bad format)"
 
 #: ../actions/finishremotesubscribe.php:77
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:78
 msgid "Invalid profile URL returned by server."
 msgstr "Invalid profile URL returned by server."
 
-#: ../actions/avatarbynickname.php:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
 msgid "Invalid size."
 msgstr "Invalid size."
 
-#: ../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:256 actions/register.php:112
+#: actions/register.php:130
 msgid "Invalid username or password."
 msgstr "Invalid username or password."
 
-#: ../lib/util.php:237
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr ""
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
+
+#: ../lib/util.php:306 lib/util.php:322 lib/util.php:332
+msgid "Invite"
+msgstr ""
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr ""
+
+#: ../lib/util.php:261 lib/util.php:277 lib/util.php:288
 #, 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 ""
-"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
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID already belongs to another user."
 
-#: ../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 ""
-"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:95
+msgid "Language"
+msgstr ""
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+#: actions/profilesettings.php:234
+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:87 actions/register.php:214
 msgid "Location"
 msgstr "Location"
 
-#: ../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/profilesettings.php:225 actions/register.php:101
 msgid "Location is too long (max 255 chars)."
 msgstr "Location is too long (max 255 chars)."
 
-#: ../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/login.php:104 actions/login.php:113 actions/openidlogin.php:88
+#: lib/util.php:336
 msgid "Login"
 msgstr "Log-in"
 
-#: ../actions/openidlogin.php:44
+#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:60
 #, 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 ""
-"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 ""
-"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/util.php:334
 msgid "Logout"
 msgstr "Log out"
 
-#: ../actions/login.php:106
+#: ../actions/register.php:166 actions/register.php:180
+#: actions/register.php:207
+msgid "Longer name, preferably your \"real\" name"
+msgstr ""
+
+#: ../actions/login.php:110 actions/login.php:110 actions/login.php:118
 msgid "Lost or forgotten password?"
 msgstr "Lost or forgotten password?"
 
-#: ../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 ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr ""
+
+#: ../actions/showstream.php:300 actions/showstream.php:315
+#: actions/showstream.php:363
 msgid "Member since"
 msgstr "Member since"
 
-#: ../actions/userrss.php:70
+#: ../actions/userrss.php:70 actions/userrss.php:67
 #, php-format
 msgid "Microblog by %s"
 msgstr "Microblog by %s"
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
+#: ../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 ""
+
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php:85 actions/register.php:202
+#: actions/register.php:229
 msgid "My text and files are available under "
 msgstr "My text and files are available under"
 
-#: ../actions/finishopenidlogin.php:71
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+msgid "New"
+msgstr ""
+
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:138
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+#: actions/emailsettings.php:318
+msgid "New incoming email address added."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
 msgid "New nickname"
 msgstr "New nickname"
 
-#: ../actions/newnotice.php:100
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:141
 msgid "New notice"
 msgstr "New notice"
 
-#: ../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/profilesettings.php:185
 msgid "New password"
 msgstr "New password"
 
-#: ../actions/recoverpassword.php:275
+#: ../actions/recoverpassword.php:314
 msgid "New password successfully saved. You are now logged in."
 msgstr "New password successfully saved. You are now logged in."
 
-#: ../actions/login.php: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:108 actions/profilesettings.php:76
+#: actions/register.php:192
 msgid "Nickname"
 msgstr "Nickname"
 
-#: ../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/finishopenidlogin.php:192 actions/profilesettings.php:231
+#: actions/register.php:85
 msgid "Nickname already in use. Try another one."
 msgstr "Nickname already in use. Try another one."
 
-#: ../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:182 actions/profilesettings.php:209
+#: actions/register.php:83
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Nickname must have only lowercase letters and numbers and no spaces."
 
-#: ../actions/finishopenidlogin.php:170
+#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:187
 msgid "Nickname not allowed."
 msgstr "Nickname not allowed."
 
-#: ../actions/remotesubscribe.php:72
+#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
 msgid "Nickname of the user you want to follow"
 msgstr "Nickname of the user you want to follow"
 
-#: ../actions/recoverpassword.php:147
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
 msgid "Nickname or email"
 msgstr "Nickname or e-mail"
 
-#: ../actions/imsettings.php:147
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:104
+msgid "No"
+msgstr ""
+
+#: ../actions/imsettings.php:156 actions/imsettings.php:164
 msgid "No Jabber ID."
 msgstr "No Jabber ID."
 
-#: ../actions/userauthorization.php:128 ../actions/userauthorization.php:129
-#: actions/userauthorization.php:136
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
 msgid "No authorization request!"
 msgstr ""
 
-#: ../actions/confirmaddress.php:33
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+msgid "No carrier selected."
+msgstr ""
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+msgid "No code entered"
+msgstr ""
+
+#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
 msgid "No confirmation code."
 msgstr "No confirmation code."
 
-#: ../actions/newnotice.php:49
+#: ../actions/newnotice.php:44 actions/newmessage.php:53
+#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:52
+#: actions/newnotice.php:53
 msgid "No content!"
 msgstr "No content!"
 
-#: ../actions/userbyid.php:27
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+#: actions/emailsettings.php:197
+msgid "No email address."
+msgstr ""
+
+#: ../actions/userbyid.php:32 actions/userbyid.php:32
 msgid "No id."
 msgstr "No id."
 
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+#: actions/emailsettings.php:292
+msgid "No incoming email address."
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:65
+#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:66
 msgid "No nickname provided by remote server."
 msgstr "No nickname provided by remote server."
 
-#: ../actions/avatarbynickname.php:27
+#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 msgid "No nickname."
 msgstr "No nickname."
 
-#: ../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:243
 msgid "No pending confirmation to cancel."
 msgstr "No pending confirmation to cancel."
 
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+msgid "No phone number."
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:72
+#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:73
 msgid "No profile URL returned by server."
 msgstr "No profile URL returned by server."
 
-#: ../actions/recoverpassword.php:189
+#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
 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
 msgid "No request found!"
 msgstr "No request found!"
 
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
+#: actions/noticesearch.php:69 actions/peoplesearch.php:69
+#: actions/noticesearch.php:68 actions/peoplesearch.php:59
 msgid "No results"
 msgstr "No results"
 
-#: ../actions/avatarbynickname.php:32
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
 msgid "No size."
 msgstr "No size."
 
-#: ../actions/openidsettings.php:135
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:109
+#: actions/twitapistatuses.php:438
+msgid "No status found with that ID."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:411
+msgid "No status with that ID found."
+msgstr ""
+
+#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
 msgid "No such OpenID."
 msgstr "No such OpenID."
 
-#: ../actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29
 msgid "No such document."
 msgstr "No such document."
 
-#: ../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:38
+#: actions/shownotice.php:114
 msgid "No such notice."
 msgstr "No such notice."
 
-#: ../actions/recoverpassword.php:56
+#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
 msgid "No such recovery code."
 msgstr "No such recovery code."
 
-#: ../actions/postnotice.php:56
+#: ../actions/postnotice.php:56 actions/postnotice.php:57
 msgid "No such subscription"
 msgstr "No such subscription"
 
 #: ../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/showstream.php:157
+#: classes/Command.php:208 classes/Command.php:242 lib/gallery.php:85
+#: lib/subs.php:105
 msgid "No such user."
 msgstr "No such user."
 
-#: ../lib/gallery.php:76
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr ""
+
+#: ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
 msgstr "Nobody to show!"
 
-#: ../actions/recoverpassword.php:60
+#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
 msgid "Not a recovery code."
 msgstr "Not a recovery code."
 
-#: ../actions/imsettings.php:158
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+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:423 lib/twitterapi.php:450
+#: lib/twitterapi.php:534
+msgid "Not a supported data format."
+msgstr ""
+
+#: ../actions/imsettings.php:167 actions/imsettings.php:175
 msgid "Not a valid Jabber ID"
 msgstr "Not a valid Jabber ID"
 
-#: ../lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131
 msgid "Not a valid OpenID."
 msgstr "Not a valid OpenID."
 
-#: ../actions/profilesettings.php:75 ../actions/register.php:53
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+#: actions/emailsettings.php:208
+msgid "Not a valid email address"
+msgstr ""
+
+#: ../actions/register.php:63 actions/register.php:70 actions/register.php:79
 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/profilesettings.php:212 actions/register.php:87
 msgid "Not a valid nickname."
 msgstr "Not a valid nickname."
 
-#: ../actions/remotesubscribe.php:118
+#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
 msgid "Not a valid profile URL (incorrect services)."
 msgstr "Not a valid profile URL (incorrect services)."
 
-#: ../actions/remotesubscribe.php:111
+#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr "Not a valid profile URL (no XRDS defined)."
 
-#: ../actions/remotesubscribe.php:104
+#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
 msgid "Not a valid profile URL (no YADIS document)."
 msgstr "Not a valid profile URL (no YADIS document)."
 
-#: ../actions/avatar.php:95
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: actions/profilesettings.php:361
 msgid "Not an image or corrupt file."
 msgstr "Not an image or corrupt file."
 
 #: ../actions/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:52
 msgid "Not authorized."
 msgstr "Not authorised."
 
 #: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38
 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
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+#: actions/twitapistatuses.php:304
+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:31 actions/newnotice.php:30
+#: actions/nudge.php:30 actions/subedit.php:31 actions/unblock.php:31
 msgid "Not logged in."
 msgstr "Not logged in."
 
-#: ../actions/unsubscribe.php:43
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:117
 msgid "Not subscribed!."
 msgstr "Not subscribed!"
 
-#: ../actions/showstream.php:82
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+msgid "Notice Search"
+msgstr ""
+
+#: ../actions/showstream.php:82 actions/showstream.php:82
+#: actions/showstream.php:111 actions/showstream.php:118
+#: actions/showstream.php:123
 #, php-format
 msgid "Notice feed for %s"
 msgstr "Notice feed for %s"
 
-#: ../actions/shownotice.php:39
+#: ../actions/shownotice.php:39 actions/shownotice.php:39
+#: actions/shownotice.php:45
 msgid "Notice has no profile"
 msgstr "Notice has no profile"
 
-#: ../actions/showstream.php:297
+#: ../actions/showstream.php:316 actions/showstream.php:331
+#: actions/showstream.php:379
 msgid "Notices"
 msgstr "Notices"
 
-#: ../actions/password.php:39
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
+#, php-format
+msgid "Notices tagged with %s"
+msgstr ""
+
+#: ../actions/password.php:39 actions/profilesettings.php:178
+#: actions/profilesettings.php:183
 msgid "Old password"
 msgstr "Old password"
 
-#: ../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 actions/deleteprofile.php:247 lib/util.php:340
 msgid "OpenID"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:61
+#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
 msgid "OpenID Account Setup"
 msgstr "OpenID Account Setup"
 
-#: ../lib/openid.php:180
+#: ../lib/openid.php:180 lib/openid.php:180
 msgid "OpenID Auto-Submit"
 msgstr "OpenID Auto-Submit"
 
 #: ../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/finishopenidlogin.php:150 actions/openidlogin.php:76
 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:82
 msgid "OpenID URL"
 msgstr "OpenID URL"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
+#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 msgid "OpenID authentication cancelled."
 msgstr "OpenID authentication cancelled."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
+#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "OpenID authentication failed: %s"
 
-#: ../lib/openid.php:133
+#: ../lib/openid.php:133 lib/openid.php:133
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "OpenID failure: %s"
 
-#: ../actions/openidsettings.php:144
+#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
 msgid "OpenID removed."
 msgstr "OpenID removed."
 
-#: ../actions/openidsettings.php:37
+#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
 msgid "OpenID settings"
 msgstr "OpenID settings"
 
-#: ../actions/avatar.php:84
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: actions/profilesettings.php:350
 msgid "Partial upload."
 msgstr "Partial upload."
 
-#: ../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/login.php:109 actions/register.php:194
 msgid "Password"
 msgstr "Password"
 
-#: ../actions/recoverpassword.php:249
+#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
 msgid "Password and confirmation do not match."
 msgstr "Password and confirmation do not match."
 
-#: ../actions/recoverpassword.php:245
+#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
 msgid "Password must be 6 chars or more."
 msgstr "Password must be 6 chars or more."
 
-#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
+#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 msgid "Password recovery requested"
 msgstr "Password recovery requested"
 
-#: ../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/profilesettings.php:437
 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/profilesettings.php:409 actions/register.php:107
 msgid "Passwords don't match."
 msgstr "Passwords don’t match."
 
-#: ../actions/peoplesearch.php:33
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+msgid "People"
+msgstr ""
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+msgid "People Search"
+msgstr ""
+
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
 msgid "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
 msgid "Personal"
 msgstr ""
 
-#: ../actions/userauthorization.php:77
+#: ../actions/invite.php:133 actions/invite.php:141
+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 "
-"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
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Post a notice when my Jabber/GTalk status changes."
 
-#: ../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
 msgid "Preferences"
 msgstr "Preferences"
 
-#: ../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:185 actions/othersettings.php:179
 msgid "Preferences saved."
 msgstr "Preferences saved."
 
-#: ../lib/util.php:300
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
+msgid "Preferred language"
+msgstr ""
+
+#: ../lib/util.php:328 lib/util.php:344 lib/util.php:356
 msgid "Privacy"
 msgstr "Privacy"
 
-#: ../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:139 classes/Notice.php:149
 msgid "Problem saving notice."
 msgstr "Problem saving notice."
 
-#: ../lib/stream.php:54
+#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
+#: lib/settingsaction.php:84 actions/deleteprofile.php:241
 msgid "Profile"
 msgstr "Profile"
 
-#: ../actions/remotesubscribe.php:73
+#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
 msgid "Profile URL"
 msgstr "Profile URL"
 
-#: ../actions/profilesettings.php:34
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
 msgid "Profile settings"
 msgstr "Profile settings"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
+#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
+#: actions/postnotice.php:52 actions/updateprofile.php:53
 msgid "Profile unknown"
 msgstr "Unknown profile"
 
-#: ../lib/util.php:276
-msgid "Public"
-msgstr ""
-
-#: ../actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:77
 msgid "Public Stream Feed"
 msgstr "Public Stream Feed"
 
-#: ../actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 lib/stream.php:34
 msgid "Public timeline"
 msgstr "Public timeline"
 
-#: ../actions/recoverpassword.php:151
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:104
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
 msgid "Recover"
 msgstr "Recover"
 
-#: ../actions/recoverpassword.php:141
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
 msgid "Recover password"
 msgstr "Recover password"
 
-#: ../actions/recoverpassword.php:67
+#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
 msgid "Recovery code for unknown user."
 msgstr "Recovery code for unknown user."
 
-#: ../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:181 actions/register.php:234 lib/util.php:338
 msgid "Register"
 msgstr "Register"
 
-#: ../actions/userauthorization.php:119 ../actions/userauthorization.php:120
-#: actions/userauthorization.php:127
+#: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:173
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:241
+msgid "Registration successful"
+msgstr ""
+
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
 msgid "Reject"
 msgstr ""
 
-#: ../actions/login.php:99 ../actions/register.php:183
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
-#: actions/register.php:190
+#: actions/register.php:190 actions/login.php:110 actions/openidlogin.php:85
+#: actions/register.php:217
 msgid "Remember me"
 msgstr ""
 
-#: ../actions/updateprofile.php:69 ../actions/updateprofile.php:70
-#: actions/updateprofile.php:71
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
 msgid "Remote profile with no matching profile"
 msgstr ""
 
@@ -1043,13 +1715,13 @@ msgstr ""
 msgid "Remote subscribe"
 msgstr ""
 
-#: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
 #: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
+#: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
 #: ../actions/smssettings.php:50 ../actions/smssettings.php:84
 #: actions/emailsettings.php:48 actions/emailsettings.php:76
 #: actions/imsettings.php:49 actions/openidsettings.php:108
 #: actions/smssettings.php:50 actions/smssettings.php:84
-#: actions/twittersettings.php:59
+#: actions/twittersettings.php:59 actions/twittersettings.php:61
 msgid "Remove"
 msgstr ""
 
@@ -1063,51 +1735,73 @@ msgid ""
 "remove it, add another OpenID first."
 msgstr ""
 
-#: ../lib/stream.php:49 ../lib/stream.php:55 lib/personal.php:55
+#: ../lib/stream.php:55 lib/personal.php:55
 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
 #, 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
 msgid "Reset"
 msgstr ""
 
-#: ../actions/recoverpassword.php:158 ../actions/recoverpassword.php:173
-#: actions/recoverpassword.php:178
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
 msgid "Reset password"
 msgstr ""
 
-#: ../actions/recoverpassword.php:167 ../actions/register.php:180
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/deleteprofile.php:250 actions/subscriptions.php:73
+msgid "SMS"
+msgstr ""
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+msgid "SMS Phone number"
+msgstr ""
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:230
+msgid "SMS confirmation"
+msgstr ""
+
 #: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
 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:197
+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/twittersettings.php:83
+#: actions/twittersettings.php:83 actions/emailsettings.php:107
+#: actions/othersettings.php:56 actions/profilesettings.php:106
+#: actions/subscriptions.php:74 actions/tagother.php:100
+#: actions/twittersettings.php:82
 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/util.php:327
 msgid "Search"
 msgstr ""
 
 #: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:84
 msgid "Search Stream Feed"
 msgstr ""
 
 #: ../actions/noticesearch.php:30 actions/noticesearch.php:30
+#: actions/noticesearch.php:29
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -1121,25 +1815,51 @@ msgid ""
 "Separate the terms by spaces; they must be 3 characters or more."
 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/smssettings.php:296 actions/smssettings.php:304
+msgid "Select a carrier"
+msgstr ""
+
+#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
+#: lib/util.php:1306 lib/util.php:1731 lib/util.php:1646 lib/util.php:2158
 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
+msgid "Send email to this address to post new notices."
+msgstr ""
+
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+msgid "Send me notices of new subscriptions through email."
+msgstr ""
+
+#: ../actions/imsettings.php:70 actions/imsettings.php:71
 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 ""
+
+#: ../lib/util.php:304 lib/util.php:320 lib/util.php:330
 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:336
 msgid "Settings saved."
 msgstr ""
 
+#: ../actions/tag.php:60 actions/tag.php:60 actions/tag.php:59
+msgid "Showing most popular tags from the last week"
+msgstr ""
+
 #: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
 msgid "Someone else already has this OpenID."
 msgstr ""
@@ -1149,57 +1869,80 @@ 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
+msgid "Sorry, no incoming email allowed."
+msgstr ""
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: ../lib/util.php:330 lib/util.php:346 lib/util.php:358
 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:359
 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:199 actions/finishopenidlogin.php:267
 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:254 lib/util.php:2078
 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:376 lib/gallery.php:136 lib/gallery.php:137
 msgid "Subscribers"
 msgstr ""
 
-#: ../actions/userauthorization.php:309 ../actions/userauthorization.php:310
-#: actions/userauthorization.php:322
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
 msgid "Subscription authorized"
 msgstr ""
 
-#: ../actions/userauthorization.php:319
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
 msgid "Subscription rejected"
 msgstr "Subscription rejected"
 
-#: ../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:288 actions/showstream.php:370 lib/gallery.php:131
+#: lib/gallery.php:132
 msgid "Subscriptions"
 msgstr "Subscriptions"
 
-#: ../actions/avatar.php:87
+#: ../actions/avatar.php:87 actions/profilesettings.php:324
+#: actions/profilesettings.php:353
 msgid "System error uploading file."
 msgstr "System error uploading file."
 
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317 actions/profilesettings.php:90 actions/showstream.php:382
+#: actions/tag.php:40 actions/tagother.php:96 actions/tagother.php:162
+#: lib/profilelist.php:126 lib/profilelist.php:128
+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:33
 msgid "Text search"
 msgstr ""
 
-#: ../actions/openidsettings.php:140
+#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
 msgid "That OpenID does not belong to you."
 msgstr "That OpenID does not belong to you."
 
@@ -1211,60 +1954,94 @@ msgstr ""
 msgid "That confirmation code is not for you!"
 msgstr ""
 
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:214
+msgid "That email address already belongs to another user."
+msgstr ""
+
 #: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: actions/profilesettings.php:346
 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
 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:211
+msgid "That is already your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+msgid "That is already your phone number."
+msgstr ""
+
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
 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:270
+msgid "That is not your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+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:247
 msgid "That is the wrong IM address."
 msgstr ""
 
-#: ../actions/newnotice.php:52 ../actions/newnotice.php:49
-#: ../actions/twitapistatuses.php:408 actions/newnotice.php:49
-#: actions/twitapistatuses.php:330
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+msgid "That is the wrong confirmation number."
+msgstr ""
+
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+msgid "That phone number already belongs to another user."
+msgstr ""
+
+#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: actions/newnotice.php:49 actions/twitapistatuses.php:330
+#: actions/newnotice.php:61 actions/twitapistatuses.php:271
 msgid "That's too long. Max notice size is 140 chars."
 msgstr ""
 
-#: ../actions/confirmaddress.php:86 ../actions/confirmaddress.php:92
-#: actions/confirmaddress.php:92
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+#: actions/twitapiaccount.php:55
+msgid "That's too long. Max notice size is 255 chars."
+msgstr ""
+
+#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr ""
 
-#: ../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:285
 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 ""
 
-#: ../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 ""
 
-#: ../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."
@@ -1282,7 +2059,12 @@ 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
+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 ""
 
@@ -1300,22 +2082,52 @@ msgid ""
 "your existing account, if you have one."
 msgstr ""
 
-#: ../lib/util.php:147 ../lib/util.php:164 lib/util.php:246
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:94
+#: actions/twitapifriendships.php:82 actions/twitapistatuses.php:428
+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:46
+#: actions/twitapidirect_messages.php:117 actions/twitapifriendships.php:30
+#: actions/twitapistatuses.php:239
+msgid "This method requires a POST."
+msgstr ""
+
+#: ../lib/util.php:164 lib/util.php:246 lib/util.php:257
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
+msgid "Timezone"
+msgstr ""
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr ""
+
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"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 ""
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: actions/twitapifriendships.php:128
+msgid "Two user ids or screen_names must be supplied."
 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:83 actions/register.php:210
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 
@@ -1323,25 +2135,29 @@ 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/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/emailsettings.php:147
+#: actions/othersettings.php:146 actions/twittersettings.php:199
 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
 msgid "Unexpected password reset."
 msgstr ""
 
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60
+#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:59
 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 lib/util.php:296
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
@@ -1352,22 +2168,45 @@ msgstr ""
 msgid "Unrecognized address type %s"
 msgstr ""
 
-#: ../actions/showstream.php:193 ../actions/showstream.php:209
-#: actions/showstream.php:219
+#: ../actions/showstream.php:209 actions/showstream.php:219
+#: actions/showstream.php:267 lib/util.php:2094
 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
 msgid "Unsupported OMB version"
 msgstr ""
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: actions/profilesettings.php:371
 msgid "Unsupported image file format."
 msgstr ""
 
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: actions/deleteprofile.php:251
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: actions/deleteprofile.php:254
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/twitapistatuses.php:126
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:198
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
+
 #: ../actions/avatar.php:68 actions/profilesettings.php:161
+#: actions/profilesettings.php:166
 msgid "Upload"
 msgstr ""
 
@@ -1379,28 +2218,39 @@ msgid ""
 "share."
 msgstr ""
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:182
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr ""
+
+#: ../actions/invite.php:114 actions/invite.php:121
+msgid ""
+"Use this form to invite your friends and colleagues to use this service."
+msgstr ""
+
 #: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176
+#: actions/register.php:173 actions/register.php:176 actions/register.php:200
+#: actions/register.php:203
 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:92
 msgid "User being listened to doesn't exist."
 msgstr ""
 
 #: ../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/showstream.php:57
+#: actions/twitapiaccount.php:63 actions/twitapifavorites.php:40
+#: actions/twitapistatuses.php:163 actions/twitapistatuses.php:492
+#: lib/twitterapi.php:590
 msgid "User has no profile."
 msgstr ""
 
@@ -1408,46 +2258,78 @@ 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:101
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../lib/util.php:1159 lib/util.php:1293 lib/util.php:1630
 #, php-format
 msgid "What's up, %s?"
 msgstr ""
 
-#: ../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:89 actions/register.php:216
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 
-#: ../actions/updateprofile.php:127 ../actions/updateprofile.php:128
-#: actions/updateprofile.php:129
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr ""
 
-#: ../actions/updateprofile.php:122 ../actions/updateprofile.php:123
-#: actions/updateprofile.php:124
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr ""
 
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+#: actions/block.php:105
+msgid "Yes"
+msgstr ""
+
 #: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
 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
 msgid "You are already logged in!"
 msgstr ""
 
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:102
+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/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 ""
 
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
 #: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
@@ -1457,41 +2339,70 @@ msgstr ""
 #: ../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 ""
-"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
+#: actions/finishremotesubscribe.php:83 actions/finishremotesubscribe.php:99
 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/register.php:77
 msgid "You can't register if you don't agree to the license."
 msgstr ""
 
-#: ../actions/updateprofile.php:62 ../actions/updateprofile.php:63
-#: actions/updateprofile.php:64
+#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
 msgid "You did not send us that profile"
 msgstr ""
 
-#: ../actions/recoverpassword.php:134 ../actions/recoverpassword.php:149
+#: ../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 ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: actions/twitapistatuses.php:455
+msgid "You may not delete another user's status."
+msgstr ""
+
+#: ../actions/invite.php:31 actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+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!"
+msgstr ""
+
+#: ../actions/recoverpassword.php:149
 msgid "You've been identified. Enter a  new password below. "
 msgstr ""
 
 #: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:84
 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."
 msgstr ""
 
@@ -1502,789 +2413,86 @@ msgid ""
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
 
-#: ../lib/util.php:814 ../lib/util.php:943 lib/util.php:992
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:1287
 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:1299
 #, 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:1295
 #, 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:1291
 #, 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:1303
 #, 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:1297
 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:1289
 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:1301
 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:1305
 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:1293
 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..."
-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
-msgid "reply"
-msgstr ""
-
-#: ../actions/password.php:44 actions/profilesettings.php:183
-msgid "same as password above"
-msgstr ""
-
-#  erm, not sure what to do here, « is recognised as a quotation mark.
-#: ../lib/util.php:1127
-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 "
-msgstr ""
-
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
-
-#: ../actions/invite.php:168 actions/invite.php:176
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
-
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
-
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
-#, php-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#, php-format
-msgid "%s public timeline"
-msgstr ""
-
-#: ../lib/mail.php:206 lib/mail.php:212
-#, php-format
-msgid "%s status"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#, php-format
-msgid "%s timeline"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
-msgstr ""
-
-#: ../actions/register.php:213
-msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
-msgstr ""
-
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-
-#: ../actions/register.php:154 actions/register.php:168
-msgid "6 or more characters. Required."
-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 ""
-
-#: ../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/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!"
-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 ""
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-msgid "Add or remove OpenIDs"
-msgstr ""
-
-#: ../actions/invite.php:131 actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
-msgstr ""
-
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-msgid "Are you sure you want to delete this notice?"
-msgstr ""
-
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr ""
-
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
-msgid "Can't delete this notice."
-msgstr ""
-
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-msgid "Cannot normalize that email address"
-msgstr ""
-
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr ""
-
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
-msgstr ""
-
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-msgid "Change your profile settings"
-msgstr ""
-
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-msgid "Confirmation code"
-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/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
-msgstr ""
-
-#: ../lib/subs.php:54 lib/subs.php:61
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: ../lib/subs.php:46 lib/subs.php:46
-msgid "Could not subscribe."
-msgstr ""
-
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-msgid "Could not update user with confirmed email address."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-msgid "Couldn't find any statuses."
-msgstr ""
-
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-msgid "Couldn't update user for autosubscribe."
-msgstr ""
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-msgid "Couldn't update user record."
-msgstr ""
-
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-msgid "Current confirmed email address."
-msgstr ""
-
-#: ../classes/Notice.php:72 classes/Notice.php:86
-#, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr ""
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-msgid "Delete notice"
-msgstr ""
-
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-msgid "Email Address"
-msgstr ""
-
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-msgid "Email Settings"
-msgstr ""
-
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-msgid "Email address, like \"UserName@example.org\""
-msgstr ""
-
-#: ../actions/invite.php:129 actions/invite.php:137
-msgid "Email addresses"
-msgstr ""
-
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
-msgstr ""
-
-#: ../actions/tag.php:55 actions/tag.php:55
-#, php-format
-msgid "Feed for tag %s"
-msgstr ""
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr ""
-
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr ""
-
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-msgid "I want to post notices by email."
-msgstr ""
-
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
-msgstr ""
-
-#: ../actions/recoverpassword.php:137
-msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
-"email address you have stored  in your account."
-msgstr ""
-
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-msgid "Incoming email"
-msgstr ""
-
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-msgid "Incoming email address removed."
-msgstr ""
-
-#: ../actions/invite.php:55 actions/invite.php:62
-#, php-format
-msgid "Invalid email address: %s"
-msgstr ""
-
-#: ../actions/invite.php:79 actions/invite.php:86
-msgid "Invitation(s) sent"
-msgstr ""
-
-#: ../actions/invite.php:97 actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
-msgstr ""
-
-#: ../lib/util.php:306 lib/util.php:322
-msgid "Invite"
-msgstr ""
-
-#: ../actions/invite.php:123 actions/invite.php:130
-msgid "Invite new users"
-msgstr ""
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Language"
-msgstr ""
-
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-msgid "Language is too long (max 50 chars)."
-msgstr ""
-
-#: ../actions/register.php:166 actions/register.php:180
-msgid "Longer name, preferably your \"real\" name"
-msgstr ""
-
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-#: actions/emailsettings.php:81 actions/smssettings.php:89
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
-
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-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 ""
-
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-msgid "New"
-msgstr ""
-
-#: ../lib/mail.php:144 lib/mail.php:144
-#, php-format
-msgid "New email address for posting to %s"
-msgstr ""
-
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-msgid "New incoming email address added."
-msgstr ""
-
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-msgid "No"
-msgstr ""
-
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-msgid "No carrier selected."
-msgstr ""
-
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-msgid "No code entered"
-msgstr ""
-
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-msgid "No email address."
-msgstr ""
-
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-msgid "No incoming email address."
-msgstr ""
-
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-msgid "No phone number."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-msgid "No status found with that ID."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-msgid "No status with that ID found."
-msgstr ""
-
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-msgid "No user with that email address or username."
-msgstr ""
-
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-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
-msgid "Not a supported data format."
-msgstr ""
-
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-msgid "Not a valid email address"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-msgid "Not found"
-msgstr ""
-
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-msgid "Notice Search"
-msgstr ""
-
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81
-#, php-format
-msgid "Notices tagged with %s"
-msgstr ""
-
-#: ../actions/invite.php:135 actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-msgid "People"
-msgstr ""
-
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-msgid "People Search"
-msgstr ""
-
-#: ../actions/invite.php:133 actions/invite.php:141
-msgid "Personal message"
-msgstr ""
-
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Preferred language"
-msgstr ""
-
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
-
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-msgid "Publish a MicroID for my email address."
-msgstr ""
-
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr ""
-
-#: ../actions/register.php:28 actions/register.php:28
-msgid "Registration not allowed."
-msgstr ""
-
-#: ../actions/register.php:200 actions/register.php:214
-msgid "Registration successful"
-msgstr ""
-
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
-msgstr ""
-
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-msgid "SMS Phone number"
-msgstr ""
-
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-msgid "SMS Settings"
-msgstr ""
-
-#: ../lib/mail.php:219 lib/mail.php:225
-msgid "SMS confirmation"
-msgstr ""
-
-#: ../actions/register.php:156 actions/register.php:170
-msgid "Same as password above. Required."
-msgstr ""
-
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-msgid "Select a carrier"
-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."
-msgstr ""
-
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-msgid "Send me notices of new subscriptions through email."
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr ""
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
-msgstr ""
-
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317
-msgid "Tags"
-msgstr ""
-
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr ""
-
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr ""
-
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-msgid "That is already your email address."
-msgstr ""
-
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-msgid "That is already your phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-msgid "That is not your email address."
-msgstr ""
-
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-msgid "That is not your phone number."
-msgstr ""
-
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-msgid "That is the wrong confirmation number."
-msgstr ""
-
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-msgid "That phone number already belongs to another user."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-msgid "That's too long. Max notice size is 255 chars."
-msgstr ""
-
-#: ../actions/invite.php:89 actions/invite.php:96
-msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
-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."
-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."
-msgstr ""
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "Timezone"
-msgstr ""
-
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-msgid "Timezone not selected."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-msgid "Two user ids or screen_names must be supplied."
-msgstr ""
-
-#: ../index.php:57 index.php:57
-msgid "Unknown action"
-msgstr ""
-
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-msgid "Updates by SMS"
-msgstr ""
-
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr ""
-
-#: ../actions/invite.php:114 actions/invite.php:121
-msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
-msgstr ""
-
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr ""
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "What timezone are you normally in?"
-msgstr ""
-
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-msgid "Yes"
-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/invite.php:81 actions/invite.php:88
-msgid "You are already subscribed to these users:"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
-msgstr ""
-
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-msgid "You may not delete another user's status."
+#: ../actions/showstream.php:423 ../lib/stream.php:132
+#: actions/showstream.php:441 lib/stream.php:99 lib/noticelist.php:211
+msgid "delete"
 msgstr ""
 
-#: ../actions/invite.php:31 actions/invite.php:31
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
+#: ../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:135
+#: lib/facebookaction.php:202 lib/noticelist.php:189
+msgid "in reply to..."
 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/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:142
+#: lib/noticelist.php:199
+msgid "reply"
 msgstr ""
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
+#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/profilesettings.php:188
+msgid "same as password above"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+#: actions/twitapistatuses.php:543
 msgid "unsupported file type"
 msgstr ""
 
+#  erm, not sure what to do here, « is recognised as a quotation mark.
+#: ../lib/util.php:1309 lib/util.php:1443 lib/facebookaction.php:251
+#: lib/util.php:1783
+#, fuzzy
+msgid "« After"
+msgstr "← After"
+
 #: actions/deletenotice.php:74 actions/disfavor.php:43
 #: actions/emailsettings.php:127 actions/favor.php:45
 #: actions/finishopenidlogin.php:33 actions/imsettings.php:105
@@ -2294,6 +2502,12 @@ msgstr ""
 #: 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:38 actions/deleteprofile.php:127 actions/disfavor.php:47
+#: actions/emailsettings.php:130 actions/favor.php:49 actions/login.php:45
+#: actions/newmessage.php:44 actions/newnotice.php:36 actions/nudge.php:47
+#: actions/othersettings.php:139 actions/profilesettings.php:49
+#: actions/subedit.php:38 actions/tagother.php:113
+#: actions/twittersettings.php:188 actions/unblock.php:38
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -2317,12 +2531,14 @@ msgstr ""
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142
+#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:54
+#: actions/twitapifavorites.php:115
 msgid "This notice is already a favorite!"
 msgstr ""
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
+#: classes/Command.php:132 actions/favor.php:61
+#: actions/twitapifavorites.php:122
 msgid "Could not create favorite."
 msgstr ""
 
@@ -2331,11 +2547,12 @@ msgid "Disfavor"
 msgstr ""
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:62
 #, php-format
 msgid "%s favorite notices"
 msgstr ""
 
-#: actions/favoritesrss.php:64
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:66
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr ""
@@ -2361,47 +2578,50 @@ msgid ""
 "\n"
 msgstr ""
 
-#: actions/login.php:104
+#: actions/login.php:104 actions/login.php:111 actions/openidlogin.php:86
 msgid "Automatically login in the future; "
 msgstr ""
 
-#: actions/login.php:122
+#: actions/login.php:122 actions/login.php:130
 msgid "For security reasons, please re-enter your "
 msgstr ""
 
-#: actions/login.php:126
+#: actions/login.php:126 actions/login.php:134
 msgid "Login with your username and password. "
 msgstr ""
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+#: actions/newmessage.php:60 actions/twitapidirect_messages.php:136
 msgid "That's too long. Max message size is 140 chars."
 msgstr ""
 
-#: actions/newmessage.php:65
+#: actions/newmessage.php:65 actions/newmessage.php:68
 msgid "No recipient specified."
 msgstr ""
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
+#: classes/Command.php:206 actions/newmessage.php:71
+#: actions/newmessage.php:116 classes/Command.php:211
 msgid "You can't send a message to this user."
 msgstr ""
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
+#: classes/Command.php:209 actions/newmessage.php:74
+#: actions/twitapidirect_messages.php:153 classes/Command.php:214
 msgid ""
-"Don't send a message to yourself; just say it to yourself quietly "
-"instead."
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: actions/newmessage.php:108
+#: actions/newmessage.php:108 actions/microsummary.php:32
+#: actions/newmessage.php:111
 msgid "No such user"
 msgstr ""
 
-#: actions/newmessage.php:117
+#: actions/newmessage.php:117 actions/newmessage.php:120
 msgid "New message"
 msgstr ""
 
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:95 actions/noticesearch.php:94
 msgid "Notice without matching profile"
 msgstr ""
 
@@ -2448,6 +2668,7 @@ msgstr ""
 
 #: actions/profilesettings.php:115 actions/remotesubscribe.php:320
 #: actions/userauthorization.php:159 actions/userrss.php:76
+#: actions/profilesettings.php:120 actions/remotesubscribe.php:333
 msgid "User without matching profile"
 msgstr ""
 
@@ -2475,18 +2696,18 @@ msgstr ""
 msgid "New password successfully saved. "
 msgstr ""
 
-#: actions/register.php:95
+#: actions/register.php:95 actions/register.php:104
 msgid "Password must be 6 or more characters."
 msgstr ""
 
-#: actions/register.php:216
+#: actions/register.php:216 actions/register.php:243
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to..."
 msgstr ""
 
-#: actions/register.php:227
+#: actions/register.php:227 actions/register.php:254
 msgid "(You should receive a message by email momentarily, with "
 msgstr ""
 
@@ -2501,6 +2722,7 @@ msgid "Feed for favorites of %s"
 msgstr ""
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:88 actions/twitapifavorites.php:57
 msgid "Could not retrieve favorite notices."
 msgstr ""
 
@@ -2522,7 +2744,7 @@ msgstr ""
 msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: actions/showstream.php:154
+#: actions/showstream.php:154 lib/util.php:2105
 msgid "Send a message"
 msgstr ""
 
@@ -2531,73 +2753,78 @@ msgstr ""
 msgid "Mobile carrier for your phone. "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:64
 #, php-format
 msgid "Direct messages to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:65
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:69
 msgid "Direct Messages You've Sent"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:70
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:132
 msgid "No message text!"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:145
 msgid "Recipient user not found."
 msgstr ""
 
 #: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:148
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
-#: actions/twitapifavorites.php:92
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:64
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
-#: actions/twitapifavorites.php:95
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:67
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
+#: actions/twitapifavorites.php:158 lib/mail.php:303
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr ""
 
 #: actions/twitapifavorites.php:188 lib/mail.php:276
+#: actions/twitapifavorites.php:159 lib/mail.php:304
 #, php-format
 msgid ""
 "%1$s just added your notice from %2$s as one of their favorites.\n"
 "\n"
 msgstr ""
 
-#: actions/twittersettings.php:27
+#: actions/twittersettings.php:27 actions/twittersettings.php:29
 msgid ""
 "Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 
-#: actions/twittersettings.php:41
+#: actions/twittersettings.php:41 actions/twittersettings.php:43
 msgid "Twitter settings"
 msgstr ""
 
-#: actions/twittersettings.php:48
+#: actions/twittersettings.php:48 actions/twittersettings.php:50
 msgid "Twitter Account"
 msgstr ""
 
-#: actions/twittersettings.php:56
+#: actions/twittersettings.php:56 actions/twittersettings.php:58
 msgid "Current verified Twitter account."
 msgstr ""
 
@@ -2625,46 +2852,50 @@ msgstr ""
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:216
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr ""
 
-#: actions/twittersettings.php:128
+#: actions/twittersettings.php:128 actions/twittersettings.php:221
 msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: actions/twittersettings.php:137 actions/twittersettings.php:228
 #, php-format
 msgid "Unable to retrieve account information for \"%s\" from Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:234 actions/twittersettings.php:253
 msgid "Unable to save your Twitter settings!"
 msgstr ""
 
-#: actions/twittersettings.php:174
+#: actions/twittersettings.php:174 actions/twittersettings.php:261
 msgid "Twitter settings saved."
 msgstr ""
 
-#: actions/twittersettings.php:192
+#: actions/twittersettings.php:192 actions/twittersettings.php:272
 msgid "That is not your Twitter account."
 msgstr ""
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:280
 msgid "Couldn't remove Twitter user."
 msgstr ""
 
-#: actions/twittersettings.php:212
+#: actions/twittersettings.php:212 actions/twittersettings.php:284
 msgid "Twitter account removed."
 msgstr ""
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
+#: actions/twittersettings.php:299 actions/twittersettings.php:310
+#: actions/twittersettings.php:322
 msgid "Couldn't save Twitter preferences."
 msgstr ""
 
-#: actions/twittersettings.php:245
+#: actions/twittersettings.php:245 actions/twittersettings.php:330
 msgid "Twitter preferences saved."
 msgstr ""
 
@@ -2680,15 +2911,15 @@ msgstr ""
 msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#: classes/Channel.php:113
+#: classes/Channel.php:113 classes/Channel.php:129
 msgid "Command results"
 msgstr ""
 
-#: classes/Channel.php:148
+#: classes/Channel.php:148 classes/Channel.php:175
 msgid "Command complete"
 msgstr ""
 
-#: classes/Channel.php:158
+#: classes/Channel.php:158 classes/Channel.php:185
 msgid "Command failed"
 msgstr ""
 
@@ -2701,7 +2932,7 @@ msgstr ""
 msgid "Subscriptions: %1$s\n"
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:247
 msgid "User has no last notice"
 msgstr ""
 
@@ -2734,59 +2965,60 @@ msgstr ""
 msgid "About: %s"
 msgstr ""
 
-#: classes/Command.php:200
+#: classes/Command.php:200 classes/Command.php:202
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: classes/Command.php:214
+#: classes/Command.php:214 classes/Command.php:219
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: classes/Command.php:216
+#: classes/Command.php:216 classes/Command.php:221
 msgid "Error sending direct message."
 msgstr ""
 
-#: classes/Command.php:263
+#: classes/Command.php:263 classes/Command.php:268
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: classes/Command.php:270
+#: classes/Command.php:270 classes/Command.php:275
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: classes/Command.php:288
+#: classes/Command.php:288 classes/Command.php:293
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: classes/Command.php:295
+#: classes/Command.php:295 classes/Command.php:300
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330
+#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:315
+#: classes/Command.php:335
 msgid "Command not yet implemented."
 msgstr ""
 
-#: classes/Command.php:313
+#: classes/Command.php:313 classes/Command.php:318
 msgid "Notification off."
 msgstr ""
 
-#: classes/Command.php:315
+#: classes/Command.php:315 classes/Command.php:320
 msgid "Can't turn off notification."
 msgstr ""
 
-#: classes/Command.php:333
+#: classes/Command.php:333 classes/Command.php:338
 msgid "Notification on."
 msgstr ""
 
-#: classes/Command.php:335
+#: classes/Command.php:335 classes/Command.php:340
 msgid "Can't turn on notification."
 msgstr ""
 
-#: classes/Command.php:344
+#: classes/Command.php:344 classes/Command.php:349
 msgid "Commands:\n"
 msgstr ""
 
@@ -2798,23 +3030,23 @@ msgstr ""
 msgid "Could not update message with new URI."
 msgstr ""
 
-#: lib/gallery.php:46
+#: lib/gallery.php:46 lib/gallery.php:55
 msgid "User without matching profile in system."
 msgstr ""
 
-#: lib/mail.php:147
+#: lib/mail.php:147 lib/mail.php:141
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:249
+#: lib/mail.php:249 lib/mail.php:275
 #, php-format
 msgid "New private message from %s"
 msgstr ""
 
-#: lib/mail.php:253
+#: lib/mail.php:253 lib/mail.php:279
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -2858,18 +3090,454 @@ msgstr ""
 msgid "Your sent messages"
 msgstr ""
 
-#: lib/settingsaction.php:99
+#: lib/settingsaction.php:99 actions/deleteprofile.php:256
 msgid "Twitter"
 msgstr ""
 
-#: lib/settingsaction.php:100
+#: lib/settingsaction.php:100 actions/deleteprofile.php:257
 msgid "Twitter integration options"
 msgstr ""
 
-#: lib/util.php:1718
+#: lib/util.php:1718 lib/util.php:2145
 msgid "To"
 msgstr ""
 
 #: scripts/maildaemon.php:45
 msgid "Could not parse message."
 msgstr ""
+
+#: actions/block.php:45 actions/subedit.php:45 actions/unblock.php:45
+msgid "No profile specified."
+msgstr ""
+
+#: actions/block.php:52 actions/subedit.php:52 actions/tagother.php:45
+#: actions/unblock.php:52
+msgid "No profile with that ID."
+msgstr ""
+
+#: actions/block.php:78
+#, fuzzy
+msgid "Block user"
+msgstr "No such user."
+
+#: actions/block.php:81
+msgid "Are you sure you want to block this user? "
+msgstr ""
+
+#: actions/block.php:117
+msgid "You have already blocked this user."
+msgstr ""
+
+#: actions/block.php:124
+msgid "Failed to save block information."
+msgstr ""
+
+#: actions/deleteprofile.php:25
+msgid "Code not yet ready."
+msgstr ""
+
+#: actions/deleteprofile.php:36
+msgid "Export and delete your user information."
+msgstr ""
+
+#: actions/deleteprofile.php:88 actions/deleteprofile.php:119
+#, fuzzy
+msgid "Delete my account"
+msgstr "Create new account"
+
+#: actions/deleteprofile.php:89
+#, fuzzy
+msgid "Delete my account confirmation"
+msgstr "Couldn’t delete e-mail confirmation."
+
+#: actions/deleteprofile.php:117
+msgid "Check if you are sure you want to delete your account."
+msgstr ""
+
+#: actions/deleteprofile.php:259 lib/settingsaction.php:102
+msgid "Other"
+msgstr ""
+
+#: actions/deleteprofile.php:260 lib/settingsaction.php:103
+msgid "Other options"
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Add to favorites"
+msgstr ""
+
+#: actions/emailsettings.php:98
+msgid "Allow friends to nudge me and send me an email."
+msgstr ""
+
+#: actions/facebookremove.php:54
+#, fuzzy
+msgid "Couldn't remove Facebook user."
+msgstr "Couldn’t update user."
+
+#: actions/favor.php:71
+msgid "Disfavor favorite"
+msgstr ""
+
+#: actions/favorited.php:31 lib/stream.php:45
+#, fuzzy
+msgid "Popular notices"
+msgstr "No such notice."
+
+#: actions/favorited.php:54
+msgid "Showing recently popular notices"
+msgstr ""
+
+#: actions/featured.php:32 actions/featured.php:54 lib/stream.php:41
+msgid "Featured users"
+msgstr ""
+
+#: actions/finishremotesubscribe.php:186
+msgid "That user has blocked you from subscribing."
+msgstr ""
+
+#: actions/microsummary.php:39
+msgid "No current status"
+msgstr ""
+
+#: actions/newnotice.php:93
+#, fuzzy
+msgid "Notice posted"
+msgstr "Notices"
+
+#: actions/newnotice.php:116 classes/Channel.php:140
+msgid "Ajax Error"
+msgstr ""
+
+#: actions/nudge.php:52
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
+
+#: actions/nudge.php:61
+msgid "Nudge sent"
+msgstr ""
+
+#: actions/othersettings.php:27
+msgid "Manage various other options."
+msgstr ""
+
+#  requires full stops?
+#: actions/othersettings.php:33
+#, fuzzy
+msgid "Other Settings"
+msgstr "IM Settings"
+
+#: actions/othersettings.php:35
+msgid "URL Auto-shortening"
+msgstr ""
+
+#: actions/othersettings.php:54
+msgid "Service"
+msgstr ""
+
+#: actions/othersettings.php:54
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/othersettings.php:155
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Location is too long (max 255 chars)."
+
+#: actions/peopletag.php:33
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "Not a valid e-mail address."
+
+#: actions/peopletag.php:45
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr ""
+
+#: actions/peopletag.php:87
+#, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+msgstr ""
+
+#: actions/profilesettings.php:92
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+
+#: actions/profilesettings.php:246 actions/tagother.php:131
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Invalid homepage ‘%s’"
+
+#: actions/profilesettings.php:328
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "Couldn’t save profile."
+
+#: actions/public.php:68
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
+msgstr ""
+
+#: actions/public.php:90
+msgid "Could not retrieve public stream."
+msgstr ""
+
+#: actions/register.php:67 actions/register.php:177
+msgid "Sorry, only invited people can register."
+msgstr ""
+
+#: actions/register.php:156
+msgid "With this form you can create a new account. "
+msgstr ""
+
+#: actions/remotesubscribe.php:136 actions/remotesubscribe.php:141
+msgid "That's a local profile! Login to subscribe."
+msgstr ""
+
+#: actions/subedit.php:68
+msgid "You are not subscribed to that profile."
+msgstr ""
+
+#: actions/subedit.php:81
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "Couldn’t create subscription."
+
+#: actions/subscribe.php:53
+#, fuzzy
+msgid "Not a local user."
+msgstr "No such user."
+
+#: actions/subscribe.php:67
+#, fuzzy
+msgid "Subscribed"
+msgstr "Not subscribed!"
+
+#: actions/subscriptions.php:72
+#, fuzzy
+msgid "Jabber"
+msgstr "No Jabber ID."
+
+#: actions/tagother.php:31
+#, fuzzy
+msgid "Not logged in"
+msgstr "Not logged in."
+
+#: actions/tagother.php:40
+#, fuzzy
+msgid "No id argument."
+msgstr "No such document."
+
+#: actions/tagother.php:56
+msgid "Tag a person"
+msgstr ""
+
+#: actions/tagother.php:98
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
+msgstr ""
+
+#: actions/tagother.php:120
+#, fuzzy
+msgid "No such profile."
+msgstr "No such notice."
+
+#: actions/tagother.php:146
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+
+#: actions/tagother.php:153
+#, fuzzy
+msgid "Could not save tags."
+msgstr "Could not save avatar info"
+
+#: actions/tagother.php:188
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
+
+#: actions/tagrss.php:33
+#, fuzzy
+msgid "No such tag."
+msgstr "No such notice."
+
+#: actions/tagrss.php:62
+#, fuzzy, php-format
+msgid "Microblog tagged with %s"
+msgstr "Microblog by %s"
+
+#: actions/twitapiblocks.php:45
+msgid "Block user failed."
+msgstr ""
+
+#: actions/twitapiblocks.php:66
+msgid "Unblock user failed."
+msgstr ""
+
+#: actions/twitapiusers.php:45
+#, fuzzy
+msgid "Not found."
+msgstr "No request found!"
+
+#: actions/twittersettings.php:63
+msgid "Twitter user name"
+msgstr ""
+
+#: actions/twittersettings.php:67
+#, fuzzy
+msgid "Twitter password"
+msgstr "New password"
+
+#: actions/twittersettings.php:129
+msgid "Twitter Friends"
+msgstr ""
+
+#: actions/unblock.php:73
+#, fuzzy
+msgid "Error removing the block."
+msgstr "Error saving the user."
+
+#: actions/unsubscribe.php:48
+#, fuzzy
+msgid "No profile id in request."
+msgstr "No profile URL returned by server."
+
+#: actions/unsubscribe.php:55
+msgid "No profile with that id."
+msgstr ""
+
+#: actions/unsubscribe.php:69
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Not subscribed!"
+
+#: classes/Notice.php:100
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "Problem saving notice."
+
+#: classes/Notice.php:105
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+
+#: classes/Notice.php:112
+msgid "You are banned from posting notices on this site."
+msgstr ""
+
+#: lib/gallery.php:98
+msgid "Filter tags"
+msgstr ""
+
+#: lib/gallery.php:104
+msgid "All"
+msgstr ""
+
+#: lib/gallery.php:108
+msgid "Tag"
+msgstr ""
+
+#: lib/gallery.php:109
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/gallery.php:110
+msgid "Go"
+msgstr ""
+
+#: lib/gallery.php:264
+#, fuzzy
+msgid "Subscriptions navigation"
+msgstr "Subscriptions"
+
+#: lib/gallery.php:270 lib/gallery.php:292
+msgid "List"
+msgstr ""
+
+#: lib/gallery.php:280 lib/gallery.php:294
+msgid "Icons"
+msgstr ""
+
+#: lib/mail.php:92
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:242
+#, php-format
+msgid "You've been nudged by %s"
+msgstr ""
+
+#: lib/mail.php:246
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+msgstr ""
+
+#: lib/profilelist.php:146
+msgid "(none)"
+msgstr ""
+
+#: lib/stream.php:33
+msgid "Public"
+msgstr ""
+
+#: lib/stream.php:36 lib/stream.php:37
+msgid "Recent tags"
+msgstr ""
+
+#: lib/stream.php:40
+msgid "Featured"
+msgstr ""
+
+#: lib/stream.php:44
+#, fuzzy
+msgid "Popular"
+msgstr "People search"
+
+#: lib/subs.php:51
+msgid "User has blocked you."
+msgstr ""
+
+#: lib/util.php:2059
+msgid "Send a nudge"
+msgstr ""
+
+#: lib/util.php:2063
+msgid "Nudge sent!"
+msgstr ""
+
+#: lib/util.php:2194
+msgid "Block"
+msgstr ""
+
+#: lib/util.php:2198
+msgid "Unblock"
+msgstr ""
+
+#~ 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."
diff --git a/es/LC_MESSAGES/laconica.po b/es/LC_MESSAGES/laconica.po
index 4cc5a07194..7d14f9ca64 100644
--- a/es/LC_MESSAGES/laconica.po
+++ b/es/LC_MESSAGES/laconica.po
@@ -6,46 +6,88 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-14 21:07+1200\n"
+"POT-Creation-Date: 2009-01-12 12:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\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"
-"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"
 
-#: ../actions/noticesearchrss.php:64
+#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:61
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr "Busca \"%s\" en el Corriente"
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: actions/finishopenidlogin.php:88 actions/register.php:205
+#: actions/register.php:232
 msgid ""
-" except this private data: password, email address, IM address, phone "
-"number."
+" except this private data: password, email address, IM address, phone number."
 msgstr ""
 "excepto los siguientes datos privados: contraseña, dirección de correo "
 "electrónico, dirección de mensajería instantánea, número de teléfono."
 
-#: ../actions/subscribe.php:84
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+#: lib/facebookaction.php:195 lib/noticelist.php:160
+msgid " from "
+msgstr ""
+
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: actions/twitapistatuses.php:341
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr ""
+
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
+
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:115
+#: lib/mail.php:117
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s ahora está escuchando tus avisos en %2$s"
 
-#: ../actions/subscribe.php:86
+#: ../lib/mail.php:126
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -62,405 +104,736 @@ msgstr ""
 "Atentamente,\n"
 "%4$s.\n"
 
-#: ../actions/shownotice.php:45
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#: actions/twitapistatuses.php:344
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
+
+#: ../actions/shownotice.php:45 actions/shownotice.php:45
+#: actions/shownotice.php:73
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "estado de %1$s en %2$s"
 
-#: ../actions/publicrss.php:60
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../actions/publicrss.php:62 actions/publicrss.php:48
 #, php-format
 msgid "%s Public Stream"
 msgstr "Flujo público de %s"
 
-#: ../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/twitapistatuses.php:123
 #, php-format
 msgid "%s and friends"
 msgstr "%s y amigos"
 
-#: ../lib/util.php:233
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:31
+#, php-format
+msgid "%s public timeline"
+msgstr ""
+
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:217
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:195
+#, php-format
+msgid "%s timeline"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:34
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+
+#: ../lib/util.php:257 lib/util.php:273 lib/util.php:284
 #, 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%%** es un servicio de microblogueo de "
-"[%%site.broughtby%%**](%%site.broughtbyurl%%)."
+"**%%site.name%%** es un servicio de microblogueo de [%%site.broughtby%%**](%%"
+"site.broughtbyurl%%)."
 
-#: ../lib/util.php:235
+#: ../lib/util.php:259 lib/util.php:275 lib/util.php:286
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** es un servicio de microblogueo."
 
-#: ../lib/util.php:250
+#: ../lib/util.php:274 lib/util.php:290 lib/util.php:301
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ". Los colaboradores deben ser citados por su nombre completo o apodo."
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: ../actions/register.php:176
+#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
+#: actions/profilesettings.php:78
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
-"1-64 letras en minúscula o números, sin signos de puntuación o "
-"espacios"
+"1-64 letras en minúscula o números, sin signos de puntuación o espacios"
+
+#: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:193
+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/profilesettings.php:186
 msgid "6 or more characters"
 msgstr "6 o más caracteres"
 
-#: ../actions/recoverpassword.php:165
+#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 o más caracteres, ¡no te olvides!"
 
-#: ../actions/imsettings.php:188
+#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:195
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, 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 ""
 "Un código de confirmación fue enviado a la dirección de mensajería "
 "instantánea que agregaste. Debes aprobar a %s para que pueda enviarte "
 "mensajes."
 
-#: ../lib/util.php:296
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:234
+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 ""
+
+#: ../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/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:30
+#: actions/twitapidirect_messages.php:107 actions/twitapifavorites.php:83
+#: actions/twitapifavorites.php:99 actions/twitapifriendships.php:117
+#: actions/twitapihelp.php:42 actions/twitapistatuses.php:77
+#: actions/twitapistatuses.php:144 actions/twitapistatuses.php:224
+#: actions/twitapistatuses.php:234 actions/twitapistatuses.php:386
+#: actions/twitapistatuses.php:395 actions/twitapistatuses.php:421
+#: actions/twitapiusers.php:30
+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:39
+#: actions/twitapiaccount.php:89 actions/twitapiaccount.php:94
+#: actions/twitapidirect_messages.php:178 actions/twitapifavorites.php:139
+#: actions/twitapihelp.php:49 actions/twitapistatuses.php:549
+msgid "API method under construction."
+msgstr ""
+
+#: ../lib/util.php:324 lib/util.php:340 lib/util.php:352
 msgid "About"
 msgstr "Acerca de"
 
-#: ../actions/userauthorization.php:118
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
 msgid "Accept"
 msgstr "Aceptar"
 
-#: ../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/twittersettings.php:84
 msgid "Add"
 msgstr "Añadir"
 
-#: ../actions/openidsettings.php:43
+#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
 msgid "Add OpenID"
 msgstr "Añadir OpenID"
 
-#: ../actions/imsettings.php:39
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: actions/deleteprofile.php:248
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
 msgid "Address"
 msgstr "Dirección"
 
-#: ../actions/showstream.php:254
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
+
+#: ../actions/showstream.php:273 actions/showstream.php:288
+#: actions/showstream.php:336
 msgid "All subscriptions"
 msgstr "Todas las suscripciones"
 
-#: ../actions/publicrss.php:62
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
 #, php-format
 msgid "All updates for %s"
 msgstr "Todas las actualizaciones para %s"
 
-#: ../actions/noticesearchrss.php:66
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:63
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "Todas las actualizaciones que corresponden a la frase a buscar \"%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
 msgid "Already logged in."
 msgstr "Ya estás conectado."
 
-#: ../actions/subscribe.php:48
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:47
 msgid "Already subscribed!."
 msgstr "¡Ya está suscrito!"
 
-#: ../actions/userauthorization.php:76
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+msgid "Are you sure you want to delete this notice?"
+msgstr ""
+
+#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
 msgid "Authorize subscription"
 msgstr "Autorizar la suscripción"
 
-#: ../actions/login.php:100 ../actions/register.php:184
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192 actions/register.php:219
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Iniciar sesión automáticamente en el futuro. ¡No usar en ordenadores "
 "compartidos! "
 
-#: ../actions/avatar.php:32
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:103
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
+
+#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: actions/profilesettings.php:34
 msgid "Avatar"
 msgstr "Avatar"
 
-#: ../actions/avatar.php:113
+#: ../actions/avatar.php:113 actions/profilesettings.php:350
+#: actions/profilesettings.php:379
 msgid "Avatar updated."
 msgstr "Avatar actualizado"
 
-#: ../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 ""
 "A la espera de una confirmación para esta dirección. Busca en tu cuenta "
-"Jabber/GTalk un mensaje con más instrucciones. (¿Has añadido a %s a tu "
-"lista de amigos?)"
+"Jabber/GTalk un mensaje con más instrucciones. (¿Has añadido a %s a tu lista "
+"de amigos?)"
+
+#: ../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 ""
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+msgid "Awaiting confirmation on this phone number."
+msgstr ""
 
-#: ../lib/util.php:1136
-msgid "Before »"
+#: ../lib/util.php:1318 lib/util.php:1452 lib/facebookaction.php:259
+#: lib/util.php:1792
+#, fuzzy
+msgid "Before »"
 msgstr "Antes"
 
-#: ../actions/profilesettings.php:52
+#: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: actions/profilesettings.php:82 actions/register.php:184
+#: actions/profilesettings.php:84 actions/register.php:211
 msgid "Bio"
 msgstr "Biografía"
 
-#: ../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:222 actions/register.php:98
 msgid "Bio is too long (max 140 chars)."
 msgstr "La biografía es demasiado larga (máx. 140 caracteres)."
 
-#: ../actions/updateprofile.php:118
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+msgid "Can't delete this notice."
+msgstr ""
+
+#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "No se puede leer el URL del avatar '%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/profilesettings.php:433
 msgid "Can't save new password."
 msgstr "No se puede guardar la nueva contraseña."
 
-#: ../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
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../lib/openid.php:121
+#: ../lib/openid.php:121 lib/openid.php:121
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Imposible crear una instancia del objeto OpenID."
 
-#: ../actions/imsettings.php:154
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
 msgid "Cannot normalize that Jabber ID"
 msgstr "No se puede normalizar este Jabber ID"
 
-#: ../actions/password.php:45
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:204
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/profilesettings.php:189
 msgid "Change"
 msgstr "Cambiar"
 
-#: ../actions/password.php:32
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: actions/deleteprofile.php:245
+msgid "Change email handling"
+msgstr ""
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: ../actions/password.php:43 ../actions/recoverpassword.php:166
-#: ../actions/register.php:179
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr ""
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#: actions/deleteprofile.php:242
+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/profilesettings.php:187 actions/register.php:196
 msgid "Confirm"
 msgstr "Confirmar"
 
-#: ../actions/confirmaddress.php:84
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
 msgid "Confirm Address"
 msgstr "Confirmar la dirección"
 
-#: ../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:259
 msgid "Confirmation cancelled."
 msgstr "Confirmación cancelada."
 
-#: ../actions/confirmaddress.php:38
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+msgid "Confirmation code"
+msgstr ""
+
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
 msgid "Confirmation code not found."
 msgstr "Código de confirmación no encontrado."
 
-#: ../actions/finishopenidlogin.php:91
+#: ../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:97
 msgid "Connect"
 msgstr "Conectarse"
 
-#: ../actions/finishopenidlogin.php:86
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
 msgid "Connect existing account"
 msgstr "Conectarse a una cuenta existente"
 
-#: ../lib/util.php:304
+#: ../lib/util.php:332 lib/util.php:348 lib/util.php:360
 msgid "Contact"
 msgstr "Ponerse en contacto"
 
-#: ../lib/openid.php:178
+#: ../lib/openid.php:178 lib/openid.php:178
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "No se pudo crear el formulario OpenID: %s"
 
-#: ../lib/openid.php:160
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:46 actions/twitapifriendships.php:62
+#, 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:39
+msgid "Could not follow user: User not found."
+msgstr ""
+
+#: ../lib/openid.php:160 lib/openid.php:160
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "No se pudo redirigir al servidor: %s"
 
-#: ../actions/updateprofile.php:161
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
 msgid "Could not save avatar info"
 msgstr "No se pudo guardar la información del avatar"
 
-#: ../actions/updateprofile.php:154
+#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
 msgid "Could not save new profile info"
 msgstr "No se pudo guardar la información del nuevo perfil"
 
-#: ../actions/profilesettings.php:146
-msgid "Couldn't confirm email."
-msgstr "No se pudo confirmar el correo electrónico."
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:70
+msgid "Could not subscribe other to you."
+msgstr ""
+
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:55
+msgid "Could not subscribe."
+msgstr ""
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr ""
 
 #: ../actions/finishremotesubscribe.php:99
+#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:112
 msgid "Couldn't convert request tokens to access tokens."
 msgstr "No se pudieron convertir las señales de petición a señales de acceso."
 
-#: ../actions/subscribe.php:59
-msgid "Couldn't create subscription."
-msgstr "No se pudo crear la suscripción."
-
-#: ../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/emailsettings.php:255
 msgid "Couldn't delete email confirmation."
 msgstr "No se pudo eliminar la confirmación de correo electrónico."
 
-#: ../actions/unsubscribe.php:56
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:129
 msgid "Couldn't delete subscription."
 msgstr "No se pudo eliminar la suscripción."
 
-#: ../actions/remotesubscribe.php:125
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+#: actions/twitapistatuses.php:82
+msgid "Couldn't find any statuses."
+msgstr ""
+
+#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
+#: actions/remotesubscribe.php:148
 msgid "Couldn't get a request token."
 msgstr "No se pudo obtener la señal de petición."
 
-#: ../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:228
 msgid "Couldn't insert confirmation code."
 msgstr "No se pudo insertar el código de confirmación."
 
 #: ../actions/finishremotesubscribe.php:180
+#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:216
 msgid "Couldn't insert new subscription."
 msgstr "No se pudo insertar una nueva suscripción."
 
-#: ../actions/profilesettings.php:175
+#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
+#: actions/profilesettings.php:319 actions/twitapiaccount.php:74
 msgid "Couldn't save profile."
 msgstr "No se pudo guardar el perfil."
 
-#: ../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:296
+msgid "Couldn't update user for autosubscribe."
+msgstr ""
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+#: actions/emailsettings.php:301 actions/emailsettings.php:315
+msgid "Couldn't update user record."
+msgstr ""
+
+#: ../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/emailsettings.php:179 actions/emailsettings.php:280
+#: actions/othersettings.php:173 actions/profilesettings.php:276
 msgid "Couldn't update user."
 msgstr "No se pudo actualizar el usuario."
 
-#: ../actions/finishopenidlogin.php:84
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
 msgid "Create"
 msgstr "Crear"
 
-#: ../actions/finishopenidlogin.php:70
+#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
 msgid "Create a new user with this nickname."
 msgstr "Crear un nuevo usuario con este apodo."
 
-#: ../actions/finishopenidlogin.php:68
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
 msgid "Create new account"
 msgstr "Crear una nueva cuenta"
 
-#: ../actions/finishopenidlogin.php:191
+#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+#: actions/finishopenidlogin.php:208
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Crear nueva cuenta para un OpenID que ya tiene un usuario."
 
-#: ../actions/imsettings.php:45
+#: ../actions/imsettings.php:45 actions/imsettings.php:46
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Dirección actual Jabber/Gtalk confirmada."
 
-#: ../actions/showstream.php:337
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+msgid "Current confirmed email address."
+msgstr ""
+
+#: ../actions/showstream.php:356 actions/showstream.php:367
+#: actions/showstream.php:418
 msgid "Currently"
 msgstr "Actualmente"
 
-#: ../lib/util.php:893
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:87
 #, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Error de BD al insertar respuesta: %s"
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: ../lib/util.php:1061 lib/util.php:1110 lib/util.php:1417
+#, php-format
+msgid "DB error inserting reply: %s"
+msgstr "Error de BD al insertar respuesta: %s"
+
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+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:86 actions/register.php:213
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Cuéntanos algo sobre ti y tus intereses en 140 caracteres"
 
-#: ../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/deleteprofile.php:244 actions/register.php:199
+#: actions/register.php:202
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: ../actions/profilesettings.php:46
-msgid "Email address"
-msgstr "Dirección de correo electrónico"
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+msgid "Email Address"
+msgstr ""
+
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+msgid "Email Settings"
+msgstr ""
 
-#: ../actions/profilesettings.php:102 ../actions/register.php:63
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:89
 msgid "Email address already exists."
 msgstr "La dirección de correo electrónico ya existe."
 
-#: ../lib/mail.php:82
+#: ../lib/mail.php:90 lib/mail.php:90
 msgid "Email address confirmation"
 msgstr "Confirmacion de correo electronico"
 
-#: ../actions/recoverpassword.php:176
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
+
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr ""
+
+#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
 msgid "Enter a nickname or email address."
 msgstr "Ingresa un apodo o correo electronico"
 
-#: ../actions/userauthorization.php:136
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+msgid "Enter the code you received on your phone."
+msgstr ""
+
+#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
 msgid "Error authorizing token"
 msgstr "Error al autorizar señal"
 
-#: ../actions/finishopenidlogin.php:282
+#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
+#: actions/finishopenidlogin.php:274
 msgid "Error connecting user to OpenID."
 msgstr "Error al conectar tu usuario a OpenID"
 
-#: ../actions/finishaddopenid.php:78
+#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
 msgid "Error connecting user."
 msgstr "Error al conectar usuario"
 
 #: ../actions/finishremotesubscribe.php:151
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:164
 msgid "Error inserting avatar"
 msgstr "Error al insertar el avatar"
 
 #: ../actions/finishremotesubscribe.php:143
+#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:156
 msgid "Error inserting new profile"
 msgstr "Error al insertar el nuevo perfil"
 
-#: ../actions/postnotice.php:88
-msgid "Error inserting notice"
-msgstr "Error al insertar aviso"
-
 #: ../actions/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:180
 msgid "Error inserting remote profile"
 msgstr "Error al insertar perfil remoto"
 
-#: ../actions/recoverpassword.php:201
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
 msgid "Error saving address confirmation."
 msgstr "Error al guardar confirmación de la dirección."
 
-#: ../actions/userauthorization.php:139
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
 msgid "Error saving remote profile"
 msgstr "Error al guardar perfil remoto"
 
-#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
+#: ../lib/openid.php:226 lib/openid.php:226
 msgid "Error saving the profile."
 msgstr "Error al guardar el perfil."
 
-#: ../lib/openid.php:237
+#: ../lib/openid.php:237 lib/openid.php:237
 msgid "Error saving the user."
 msgstr "Error al guardar el usuario."
 
-#: ../actions/password.php:80
+#: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/profilesettings.php:428
 msgid "Error saving user; invalid."
 msgstr "Error al guardar el usuario; inválido."
 
-#: ../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:54 actions/login.php:80
+#: actions/register.php:117
 msgid "Error setting user."
 msgstr "Error al configurar el usuario."
 
-#: ../actions/finishaddopenid.php:83
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
 msgid "Error updating profile"
 msgstr "Error al actualizar el perfil"
 
 #: ../actions/finishremotesubscribe.php:161
+#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:174
 msgid "Error updating remote profile"
 msgstr "Error al actualizar el perfil remoto"
 
-#: ../actions/recoverpassword.php:79
+#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
 msgid "Error with confirmation code."
 msgstr "Error con el código de confirmación."
 
-#: ../actions/finishopenidlogin.php:89
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
 msgid "Existing nickname"
 msgstr "Apodo existente"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:326 lib/util.php:342 lib/util.php:354
 msgid "FAQ"
 msgstr "Preguntas Frecuentes"
 
-#: ../actions/avatar.php:115
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/profilesettings.php:381
 msgid "Failed updating avatar."
 msgstr "Error al actualizar 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
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Feed de los amigos de %s"
 
-#: ../actions/replies.php:61 ../actions/repliesrss.php:80
+#: ../actions/replies.php:65 ../actions/repliesrss.php:80
+#: actions/replies.php:65 actions/repliesrss.php:66
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Feed de respuestas a %s"
 
-#: ../actions/login.php:118
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:54
+#, php-format
+msgid "Feed for tag %s"
+msgstr ""
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+msgid "Find content of notices"
+msgstr ""
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+msgid "Find people on this site"
+msgstr ""
+
+#: ../actions/login.php:122
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -468,39 +841,58 @@ msgstr ""
 "Por razones de seguridad, por favor vuelve a escribir tu nombre de usuario y "
 "contraseña antes de cambiar tu configuración."
 
-#: ../actions/profilesettings.php:44
+#: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: actions/profilesettings.php:77 actions/register.php:178
+#: actions/profilesettings.php:79 actions/register.php:205
 msgid "Full name"
 msgstr "Nombre completo"
 
-#: ../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/profilesettings.php:219 actions/register.php:95
 msgid "Full name is too long (max 255 chars)."
 msgstr "Tu nombre es demasiado largo (max. 255 carac.)"
 
-#: ../lib/util.php:279
+#: ../lib/util.php:322 lib/util.php:338 lib/util.php:343 lib/util.php:350
 msgid "Help"
 msgstr "Ayuda"
 
-#: ../lib/util.php:274
+#: ../lib/util.php:298 lib/util.php:314 lib/util.php:325
 msgid "Home"
 msgstr "Portada"
 
-#: ../actions/profilesettings.php:49
+#: ../actions/profilesettings.php:46 ../actions/register.php:167
+#: actions/profilesettings.php:79 actions/register.php:181
+#: actions/profilesettings.php:81 actions/register.php:208
 msgid "Homepage"
 msgstr "Página personal"
 
-#: ../actions/profilesettings.php:87
+#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: actions/profilesettings.php:210 actions/register.php:83
+#: actions/profilesettings.php:216 actions/register.php:92
 msgid "Homepage is not a valid URL."
 msgstr "La página personal no es un URL válido."
 
-#: ../actions/imsettings.php:61
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+#: actions/emailsettings.php:101
+msgid "I want to post notices by email."
+msgstr ""
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+#: actions/deleteprofile.php:253
+msgid "IM"
+msgstr ""
+
+#: ../actions/imsettings.php:60 actions/imsettings.php:61
 msgid "IM Address"
 msgstr "Dirección de mensajería instantánea"
 
-#: ../actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
 msgid "IM Settings"
 msgstr "Configuración de mensajería instantánea"
 
-#: ../actions/finishopenidlogin.php:88
+#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -516,23 +908,32 @@ msgstr ""
 "Si quieres agregar una cuenta OpenID, ponla en el campo de abajo y haz clic "
 "en \"Añadir\"."
 
-#: ../actions/recoverpassword.php:122
+#: ../actions/recoverpassword.php:137
 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 ""
-"Si olvidaste o perdiste tu contraseña, puedes recibir una nueva en la "
-"dirección de correo electrónico que usaste para registrar tu cuenta."
 
-#: ../actions/password.php:69
+#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
+#: actions/emailsettings.php:68 actions/smssettings.php:76
+msgid "Incoming email"
+msgstr ""
+
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+#: actions/emailsettings.php:304
+msgid "Incoming email address removed."
+msgstr ""
+
+#: ../actions/password.php:69 actions/profilesettings.php:388
+#: actions/profilesettings.php:417
 msgid "Incorrect old password"
 msgstr "Contraseña antigua incorrecta."
 
-#: ../actions/login.php:63
+#: ../actions/login.php:67 actions/login.php:67 actions/login.php:74
 msgid "Incorrect username or password."
 msgstr "Nombre de usuario o contraseña incorrectos."
 
-#: ../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."
@@ -540,71 +941,99 @@ msgstr ""
 "Se enviaron instrucciones para recuperar tu contraseña a la dirección de "
 "correo registrada."
 
-#: ../actions/updateprofile.php:113
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "El URL del avatar '%s' es inválido"
 
-#: ../actions/updateprofile.php:97
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "El sitio '%s' es inválido"
 
-#: ../actions/updateprofile.php:81
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "El URL de la licencia '%s' es inválido"
 
-#: ../actions/postnotice.php:61
+#: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:63
 msgid "Invalid notice content"
 msgstr "El contenido del aviso es inválido"
 
-#: ../actions/postnotice.php:67
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:69
 msgid "Invalid notice uri"
 msgstr "El URI del aviso es inválido"
 
-#: ../actions/postnotice.php:72
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:74
 msgid "Invalid notice url"
 msgstr "El URL del aviso es inválido"
 
-#: ../actions/updateprofile.php:86
+#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "El URL del perfil '%s' es inválido"
 
-#: ../actions/remotesubscribe.php:96
+#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
 msgid "Invalid profile URL (bad format)"
 msgstr "El URL del perfil es inválido (formato incorrecto)"
 
 #: ../actions/finishremotesubscribe.php:77
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:78
 msgid "Invalid profile URL returned by server."
 msgstr "URL del perfil devuelto por el servidor inválido."
 
-#: ../actions/avatarbynickname.php:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
 msgid "Invalid size."
 msgstr "Tamaño inválido."
 
-#: ../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:256 actions/register.php:112
+#: actions/register.php:130
 msgid "Invalid username or password."
 msgstr "Usuario o contraseña inválidos."
 
-#: ../lib/util.php:237
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr ""
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
+
+#: ../lib/util.php:306 lib/util.php:322 lib/util.php:332
+msgid "Invite"
+msgstr ""
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr ""
+
+#: ../lib/util.php:261 lib/util.php:277 lib/util.php:288
 #, 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 ""
 "Usa el software de microblogueo [Laconica](http://laconi.ca), versión %s, "
-"disponible bajo la [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"disponible bajo la [GNU Affero General Public License](http://www.fsf.org/"
+"licensing/licenses/agpl-3.0.html)."
 
-#: ../actions/imsettings.php:164
+#: ../actions/imsettings.php:173 actions/imsettings.php:181
 msgid "Jabber ID already belongs to another user."
 msgstr "El Jabber ID ya pertenece a otro usuario."
 
-#: ../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 "
@@ -614,192 +1043,341 @@ msgstr ""
 "Primero, asegúrate de agregar a %s a tu lista de amigos en tu cliente de "
 "mensajería instantánea o en GTalk."
 
-#: ../actions/profilesettings.php:55
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
+msgid "Language"
+msgstr ""
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr ""
+
+#: ../actions/profilesettings.php:52 ../actions/register.php:173
+#: actions/profilesettings.php:85 actions/register.php:187
+#: actions/profilesettings.php:87 actions/register.php:214
 msgid "Location"
 msgstr "Ubicación"
 
-#: ../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/profilesettings.php:225 actions/register.php:101
 msgid "Location is too long (max 255 chars)."
 msgstr "La ubicación es demasiado larga (máx. 255 caracteres)."
 
-#: ../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/login.php:104 actions/login.php:113 actions/openidlogin.php:88
+#: lib/util.php:336
 msgid "Login"
 msgstr "Inicio de sesión"
 
-#: ../actions/openidlogin.php:44
+#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:60
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Inicio de sesión con una cuenta [OpenID](%%doc.openid%%)."
 
-#: ../actions/login.php:122
+#: ../actions/login.php:126
 #, 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 ""
-"Inicia una sesión con tu usuario y contraseña. ¿Aún no tienes usuario? "
-"[Crea](%%action.register%%) una cuenta nueva o prueba [OpenID] "
-"(%%action.openidlogin%%). "
+"Inicia una sesión con tu usuario y contraseña. ¿Aún no tienes usuario? [Crea]"
+"(%%action.register%%) una cuenta nueva o prueba [OpenID] (%%action."
+"openidlogin%%). "
 
-#: ../lib/util.php:284
+#: ../lib/util.php:308 lib/util.php:324 lib/util.php:334
 msgid "Logout"
 msgstr "Salir"
 
-#: ../actions/login.php:106
+#: ../actions/register.php:166 actions/register.php:180
+#: actions/register.php:207
+msgid "Longer name, preferably your \"real\" name"
+msgstr ""
+
+#: ../actions/login.php:110 actions/login.php:110 actions/login.php:118
 msgid "Lost or forgotten password?"
 msgstr "¿Contraseña olvidada o perdida?"
 
-#: ../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 ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr ""
+
+#: ../actions/showstream.php:300 actions/showstream.php:315
+#: actions/showstream.php:363
 msgid "Member since"
 msgstr "Miembro desde"
 
-#: ../actions/userrss.php:70
+#: ../actions/userrss.php:70 actions/userrss.php:67
 #, php-format
 msgid "Microblog by %s"
 msgstr "Microblog por %s"
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
+#: ../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 ""
+
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php:85 actions/register.php:202
+#: actions/register.php:229
 msgid "My text and files are available under "
 msgstr "Mi texto y archivos están disponibles bajo"
 
-#: ../actions/finishopenidlogin.php:71
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+msgid "New"
+msgstr ""
+
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:138
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+#: actions/emailsettings.php:318
+msgid "New incoming email address added."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
 msgid "New nickname"
 msgstr "Nuevo apodo"
 
-#: ../actions/newnotice.php:100
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:141
 msgid "New notice"
 msgstr "Nuevo aviso"
 
-#: ../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/profilesettings.php:185
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: ../actions/recoverpassword.php:275
+#: ../actions/recoverpassword.php:314
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nueva contraseña guardada correctamente. Has iniciado una sesión."
 
-#: ../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:108 actions/profilesettings.php:76
+#: actions/register.php:192
 msgid "Nickname"
 msgstr "Apodo"
 
-#: ../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/finishopenidlogin.php:192 actions/profilesettings.php:231
+#: actions/register.php:85
 msgid "Nickname already in use. Try another one."
 msgstr "El apodo ya existe. Prueba otro."
 
-#: ../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:182 actions/profilesettings.php:209
+#: actions/register.php:83
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "El apodo debe tener solamente letras minúsculas y números y no puede tener "
 "espacios. "
 
-#: ../actions/finishopenidlogin.php:170
+#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:187
 msgid "Nickname not allowed."
 msgstr "Apodo prohibido."
 
-#: ../actions/remotesubscribe.php:72
+#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
 msgid "Nickname of the user you want to follow"
 msgstr "Apodo del usuario que quieres seguir"
 
-#: ../actions/recoverpassword.php:147
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
 msgid "Nickname or email"
 msgstr "Apodo o correo electrónico"
 
-#: ../actions/imsettings.php:147
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:104
+msgid "No"
+msgstr ""
+
+#: ../actions/imsettings.php:156 actions/imsettings.php:164
 msgid "No Jabber ID."
 msgstr "Ningún Jabber ID."
 
-#: ../actions/userauthorization.php:128
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
 msgid "No authorization request!"
 msgstr "¡Ninguna petición de autorización!"
 
-#: ../actions/confirmaddress.php:33
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+msgid "No carrier selected."
+msgstr ""
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+msgid "No code entered"
+msgstr ""
+
+#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
 msgid "No confirmation code."
 msgstr "Ningún código de confirmación."
 
-#: ../actions/newnotice.php:49
+#: ../actions/newnotice.php:44 actions/newmessage.php:53
+#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:52
+#: actions/newnotice.php:53
 msgid "No content!"
 msgstr "¡Ningún contenido!"
 
-#: ../actions/userbyid.php:27
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+#: actions/emailsettings.php:197
+msgid "No email address."
+msgstr ""
+
+#: ../actions/userbyid.php:32 actions/userbyid.php:32
 msgid "No id."
 msgstr "Ningún identificador."
 
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+#: actions/emailsettings.php:292
+msgid "No incoming email address."
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:65
+#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:66
 msgid "No nickname provided by remote server."
 msgstr "Ningún apodo devuelto por el servidor remoto."
 
-#: ../actions/avatarbynickname.php:27
+#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 msgid "No nickname."
 msgstr "Ningún apodo."
 
-#: ../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:243
 msgid "No pending confirmation to cancel."
 msgstr "Ninguna confirmación pendiente para cancelar."
 
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+msgid "No phone number."
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:72
+#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:73
 msgid "No profile URL returned by server."
 msgstr "Ningun URL de perfil devuelto por el servidor."
 
-#: ../actions/recoverpassword.php:189
+#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
 msgid "No registered email address for that user."
 msgstr "Ninguna dirección de correo electrónico registrada por este usuario."
 
-#: ../actions/userauthorization.php:48
+#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
 msgid "No request found!"
 msgstr "¡Ninguna petición encontrada!"
 
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
+#: actions/noticesearch.php:69 actions/peoplesearch.php:69
+#: actions/noticesearch.php:68 actions/peoplesearch.php:59
 msgid "No results"
 msgstr "Ningún resultado"
 
-#: ../actions/avatarbynickname.php:32
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
 msgid "No size."
 msgstr "Ningún tamaño."
 
-#: ../actions/openidsettings.php:135
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:109
+#: actions/twitapistatuses.php:438
+msgid "No status found with that ID."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:411
+msgid "No status with that ID found."
+msgstr ""
+
+#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
 msgid "No such OpenID."
 msgstr "No existe esa cuenta OpenID."
 
-#: ../actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29
 msgid "No such document."
 msgstr "No existe ese documento."
 
-#: ../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:38
+#: actions/shownotice.php:114
 msgid "No such notice."
 msgstr "No existe ese aviso."
 
-#: ../actions/recoverpassword.php:56
+#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
 msgid "No such recovery code."
 msgstr "No existe ese código de recuperación."
 
-#: ../actions/postnotice.php:56
+#: ../actions/postnotice.php:56 actions/postnotice.php:57
 msgid "No such subscription"
 msgstr "No existe esa suscripción"
 
 #: ../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/showstream.php:157
+#: classes/Command.php:208 classes/Command.php:242 lib/gallery.php:85
+#: lib/subs.php:105
 msgid "No such user."
 msgstr "No existe ese usuario."
 
-#: ../lib/gallery.php:76
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr ""
+
+#: ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
 msgstr "¡Nadie a mostrar!"
 
-#: ../actions/recoverpassword.php:60
+#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
 msgid "Not a recovery code."
 msgstr "No es un código de recuperación."
 
-#: ../actions/imsettings.php:158
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+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:423 lib/twitterapi.php:450
+#: lib/twitterapi.php:534
+msgid "Not a supported data format."
+msgstr ""
+
+#: ../actions/imsettings.php:167 actions/imsettings.php:175
 msgid "Not a valid Jabber ID"
 msgstr "Jabber ID no válido"
 
@@ -811,146 +1389,217 @@ msgstr ""
 "La cuenta OpenID no es válida\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/profilesettings.php:75 ../actions/register.php:53
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+#: actions/emailsettings.php:208
+msgid "Not a valid email address"
+msgstr ""
+
+#: ../actions/register.php:63 actions/register.php:70 actions/register.php:79
 msgid "Not a valid email address."
 msgstr "Correo electrónico no válido"
 
-#: ../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/profilesettings.php:212 actions/register.php:87
 msgid "Not a valid nickname."
 msgstr "Apodo no válido"
 
-#: ../actions/remotesubscribe.php:118
+#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
 msgid "Not a valid profile URL (incorrect services)."
 msgstr "URL de perfil no válido (servicios incorrectos)."
 
-#: ../actions/remotesubscribe.php:111
+#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr "URL de perfil no válido (XRDS no definido)."
 
-#: ../actions/remotesubscribe.php:104
+#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
 msgid "Not a valid profile URL (no YADIS document)."
 msgstr "URL de perfil no válido (ningún documento YADIS)."
 
-#: ../actions/avatar.php:95
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: actions/profilesettings.php:361
 msgid "Not an image or corrupt file."
 msgstr "No es una imagen o es un fichero corrupto."
 
 #: ../actions/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:52
 msgid "Not authorized."
 msgstr "No autorizado."
 
 #: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38
 msgid "Not expecting this response!"
 msgstr "¡Respuesta inesperada!"
 
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
-#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+#: actions/twitapistatuses.php:304
+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:31 actions/newnotice.php:30
+#: actions/nudge.php:30 actions/subedit.php:31 actions/unblock.php:31
 msgid "Not logged in."
 msgstr "No conectado."
 
-#: ../actions/unsubscribe.php:43
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:117
 msgid "Not subscribed!."
 msgstr "¡No estás suscrito!"
 
-#: ../actions/showstream.php:82
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+msgid "Notice Search"
+msgstr ""
+
+#: ../actions/showstream.php:82 actions/showstream.php:82
+#: actions/showstream.php:111 actions/showstream.php:118
+#: actions/showstream.php:123
 #, php-format
 msgid "Notice feed for %s"
 msgstr "Feed de avisos de %s"
 
-#: ../actions/shownotice.php:39
+#: ../actions/shownotice.php:39 actions/shownotice.php:39
+#: actions/shownotice.php:45
 msgid "Notice has no profile"
 msgstr "Aviso sin perfil"
 
-#: ../actions/showstream.php:297
+#: ../actions/showstream.php:316 actions/showstream.php:331
+#: actions/showstream.php:379
 msgid "Notices"
 msgstr "Avisos"
 
-#: ../actions/password.php:39
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
+#, php-format
+msgid "Notices tagged with %s"
+msgstr ""
+
+#: ../actions/password.php:39 actions/profilesettings.php:178
+#: actions/profilesettings.php:183
 msgid "Old password"
 msgstr "Antigua contraseña"
 
-#: ../lib/util.php:288
+#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
+#: lib/util.php:330 actions/deleteprofile.php:247 lib/util.php:340
 msgid "OpenID"
 msgstr "Cuenta OpenID"
 
-#: ../actions/finishopenidlogin.php:61
+#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
 msgid "OpenID Account Setup"
 msgstr "Configuración de la Cuenta OpenID"
 
-#: ../lib/openid.php:180
+#: ../lib/openid.php:180 lib/openid.php:180
 msgid "OpenID Auto-Submit"
 msgstr "Auto-envío de OpenID"
 
 #: ../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/finishopenidlogin.php:150 actions/openidlogin.php:76
 msgid "OpenID Login"
 msgstr "Ingreso desde una cuenta OpenID"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
+#: actions/openidlogin.php:74 actions/openidsettings.php:50
+#: actions/openidlogin.php:82
 msgid "OpenID URL"
 msgstr "URL de la cuenta OpenID"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
+#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 msgid "OpenID authentication cancelled."
 msgstr "Autenticación OpenID cancelada."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
+#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "Autenticación OpenID fallida: %s"
 
-#: ../lib/openid.php:133
+#: ../lib/openid.php:133 lib/openid.php:133
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "Error OpenID: %s"
 
-#: ../actions/openidsettings.php:144
+#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
 msgid "OpenID removed."
 msgstr "OpenID eliminado."
 
-#: ../actions/openidsettings.php:37
+#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
 msgid "OpenID settings"
 msgstr "Configuración OpenID"
 
-#: ../actions/avatar.php:84
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: actions/profilesettings.php:350
 msgid "Partial upload."
 msgstr "Carga parcial."
 
-#: ../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/login.php:109 actions/register.php:194
 msgid "Password"
 msgstr "Contraseña"
 
-#: ../actions/recoverpassword.php:249
+#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
 msgid "Password and confirmation do not match."
 msgstr "La contraseña y la confirmación no coinciden."
 
-#: ../actions/recoverpassword.php:245
+#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
 msgid "Password must be 6 chars or more."
 msgstr "La contraseña debe tener 6 o más caracteres."
 
-#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
+#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 msgid "Password recovery requested"
 msgstr "Recuperación de contraseña solicitada"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:274
+#: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: actions/profilesettings.php:408 actions/recoverpassword.php:326
+#: actions/profilesettings.php:437
 msgid "Password saved."
 msgstr "Contraseña guardada"
 
-#: ../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/profilesettings.php:409 actions/register.php:107
 msgid "Passwords don't match."
 msgstr "Las contraseñas no coinciden"
 
-#: ../actions/peoplesearch.php:33
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+msgid "People"
+msgstr ""
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+msgid "People Search"
+msgstr ""
+
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
 msgid "People search"
 msgstr "Buscador de gente"
 
-#: ../lib/stream.php:44
+#: ../lib/stream.php:50 lib/personal.php:50
 msgid "Personal"
 msgstr "Personal"
 
-#: ../actions/userauthorization.php:77
+#: ../actions/invite.php:133 actions/invite.php:141
+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, "
@@ -960,91 +1609,135 @@ msgstr ""
 "avisos de este usuario. Si no pediste esta suscripción, haz clic en "
 "\"Cancelar\"."
 
-#: ../actions/imsettings.php:74
+#: ../actions/imsettings.php:73 actions/imsettings.php:74
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Enviar un aviso cuando el estado de mi Jabber/GTalk cambie."
 
-#: ../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
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../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:185 actions/othersettings.php:179
 msgid "Preferences saved."
 msgstr "Preferencias guardadas."
 
-#: ../lib/util.php:300
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
+msgid "Preferred language"
+msgstr ""
+
+#: ../lib/util.php:328 lib/util.php:344 lib/util.php:356
 msgid "Privacy"
 msgstr "Privacidad"
 
-#: ../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:139 classes/Notice.php:149
 msgid "Problem saving notice."
 msgstr "Hubo un problema al guardar el aviso."
 
-#: ../lib/stream.php:54
+#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
+#: lib/settingsaction.php:84 actions/deleteprofile.php:241
 msgid "Profile"
 msgstr "Perfil"
 
-#: ../actions/remotesubscribe.php:73
+#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
 msgid "Profile URL"
 msgstr "URL del perfil"
 
-#: ../actions/profilesettings.php:34
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
 msgid "Profile settings"
 msgstr "Configuración del perfil"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
+#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
+#: actions/postnotice.php:52 actions/updateprofile.php:53
 msgid "Profile unknown"
 msgstr "Perfil desconocido"
 
-#: ../lib/util.php:276
-msgid "Public"
-msgstr "Público"
-
-#: ../actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:77
 msgid "Public Stream Feed"
 msgstr "Feed del flujo público"
 
-#: ../actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 lib/stream.php:34
 msgid "Public timeline"
 msgstr "Línea temporal pública"
 
-#: ../actions/recoverpassword.php:151
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:104
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
 msgid "Recover"
 msgstr "Recuperar"
 
-#: ../actions/recoverpassword.php:141
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
 msgid "Recover password"
 msgstr "Recuperar contraseña"
 
-#: ../actions/recoverpassword.php:67
+#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
 msgid "Recovery code for unknown user."
 msgstr "Código de recuperación para usuario desconocido."
 
-#: ../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:181 actions/register.php:234 lib/util.php:338
 msgid "Register"
 msgstr "Registrarse"
 
-#: ../actions/userauthorization.php:119
+#: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:173
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:241
+msgid "Registration successful"
+msgstr ""
+
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
 msgid "Reject"
 msgstr "Rechazar"
 
-#: ../actions/login.php:99 ../actions/register.php:183
+#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
+#: actions/register.php:190 actions/login.php:110 actions/openidlogin.php:85
+#: actions/register.php:217
 msgid "Remember me"
 msgstr "Recordarme"
 
-#: ../actions/updateprofile.php:69
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
 msgid "Remote profile with no matching profile"
 msgstr "Perfil remoto sin perfil coincidente"
 
-#: ../actions/remotesubscribe.php:65
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
 msgid "Remote subscribe"
 msgstr "Subscripción remota"
 
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php:48 actions/emailsettings.php:76
+#: actions/imsettings.php:49 actions/openidsettings.php:108
+#: actions/smssettings.php:50 actions/smssettings.php:84
+#: actions/twittersettings.php:59 actions/twittersettings.php:61
 msgid "Remove"
 msgstr "Eliminar"
 
-#: ../actions/openidsettings.php:68
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
 msgid "Remove OpenID"
 msgstr "Eliminar OpenID"
 
@@ -1056,40 +1749,73 @@ msgstr ""
 "¡Si eliminas tu único OpenID no podrás volver a entrar! Si necesitas "
 "eliminarlo, agrega otro antes."
 
-#: ../lib/stream.php:49
+#: ../lib/stream.php:55 lib/personal.php:55
 msgid "Replies"
 msgstr "Respuestas"
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:50
+#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
+#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #, php-format
 msgid "Replies to %s"
 msgstr "Respuestas a %s"
 
-#: ../actions/recoverpassword.php:168
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
 msgid "Reset"
 msgstr "Restablecer"
 
-#: ../actions/recoverpassword.php:158
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
 msgid "Reset password"
 msgstr "Restablecer contraseña"
 
-#: ../actions/recoverpassword.php:167 ../actions/register.php:180
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/deleteprofile.php:250 actions/subscriptions.php:73
+msgid "SMS"
+msgstr ""
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+msgid "SMS Phone number"
+msgstr ""
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:230
+msgid "SMS confirmation"
+msgstr ""
+
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
 msgid "Same as password above"
 msgstr "Igual a la contraseña de arriba"
 
-#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
+#: ../actions/register.php:156 actions/register.php:170
+#: actions/register.php:197
+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/twittersettings.php:83 actions/emailsettings.php:107
+#: actions/othersettings.php:56 actions/profilesettings.php:106
+#: actions/subscriptions.php:74 actions/tagother.php:100
+#: actions/twittersettings.php:82
 msgid "Save"
 msgstr "Guardar"
 
-#: ../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/util.php:327
 msgid "Search"
 msgstr "Buscar"
 
-#: ../actions/noticesearch.php:80
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:84
 msgid "Search Stream Feed"
 msgstr "Feed del flujo de búsqueda"
 
-#: ../actions/noticesearch.php:30
+#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
+#: actions/noticesearch.php:29
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -1105,159 +1831,267 @@ msgid ""
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
 "Buscar personas en %%site.name%% por nombre, ubicación o intereses. Separa "
-"los términos con espacios; deben tener una longitud mínima de 3 "
-"caracteres."
+"los términos con espacios; deben tener una longitud mínima de 3 caracteres."
 
-#: ../lib/util.php:982
-msgid "Send"
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+msgid "Select a carrier"
+msgstr ""
+
+#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
+#: lib/util.php:1306 lib/util.php:1731 lib/util.php:1646 lib/util.php:2158
+msgid "Send"
 msgstr "Enviar"
 
-#: ../actions/imsettings.php:71
+#: ../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."
+msgstr ""
+
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+msgid "Send me notices of new subscriptions through email."
+msgstr ""
+
+#: ../actions/imsettings.php:70 actions/imsettings.php:71
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Enviarme avisos por Jabber/GTalk"
 
-#: ../lib/util.php:282
+#: ../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 ""
+
+#: ../lib/util.php:304 lib/util.php:320 lib/util.php:330
 msgid "Settings"
 msgstr "Configuración"
 
-#: ../actions/profilesettings.php:183
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:336
 msgid "Settings saved."
 msgstr "Configuración guardada."
 
-#: ../actions/finishaddopenid.php:66
+#: ../actions/tag.php:60 actions/tag.php:60 actions/tag.php:59
+msgid "Showing most popular tags from the last week"
+msgstr ""
+
+#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
 msgid "Someone else already has this OpenID."
 msgstr "Alguien ya tiene este OpenID."
 
 #: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
+#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
 msgid "Something weird happened."
 msgstr "Algo raro pasó."
 
-#: ../lib/util.php:302
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr ""
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: ../lib/util.php:330 lib/util.php:346 lib/util.php:358
 msgid "Source"
 msgstr "Fuente"
 
-#: ../actions/showstream.php:277
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:359
 msgid "Statistics"
 msgstr "Estadísticas"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
+#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
+#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
+#: actions/finishopenidlogin.php:199 actions/finishopenidlogin.php:267
 msgid "Stored OpenID not found."
 msgstr "No se ha encontrado el OpenID almacenado."
 
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:172
-#: ../actions/showstream.php:181
+#: ../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:254 lib/util.php:2078
 msgid "Subscribe"
 msgstr "Suscribirse"
 
-#: ../actions/showstream.php:294 ../actions/subscribers.php:27
+#: ../actions/showstream.php:313 ../actions/subscribers.php:27
+#: actions/showstream.php:328 actions/subscribers.php:27
+#: actions/showstream.php:376 lib/gallery.php:136 lib/gallery.php:137
 msgid "Subscribers"
 msgstr "Suscriptores"
 
-#: ../actions/userauthorization.php:309
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
 msgid "Subscription authorized"
 msgstr "Suscripción autorizada"
 
-#: ../actions/userauthorization.php:319
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
 msgid "Subscription rejected"
 msgstr "Suscripción rechazada"
 
-#: ../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:288 actions/showstream.php:370 lib/gallery.php:131
+#: lib/gallery.php:132
 msgid "Subscriptions"
 msgstr "Suscripciones"
 
-#: ../actions/avatar.php:87
+#: ../actions/avatar.php:87 actions/profilesettings.php:324
+#: actions/profilesettings.php:353
 msgid "System error uploading file."
 msgstr "Error del sistema al cargar el archivo."
 
-#: ../actions/noticesearch.php:34
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317 actions/profilesettings.php:90 actions/showstream.php:382
+#: actions/tag.php:40 actions/tagother.php:96 actions/tagother.php:162
+#: lib/profilelist.php:126 lib/profilelist.php:128
+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:33
 msgid "Text search"
 msgstr "Búsqueda de texto"
 
-#: ../actions/openidsettings.php:140
+#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
 msgid "That OpenID does not belong to you."
 msgstr "Ese OpenID no es tuyo."
 
-#: ../actions/confirmaddress.php:52
+#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
 msgid "That address has already been confirmed."
 msgstr "Esa dirección ya fue confirmada."
 
-#: ../actions/confirmaddress.php:43
+#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
 msgid "That confirmation code is not for you!"
 msgstr "¡Ese código de confirmación no es para ti!"
 
-#: ../actions/avatar.php:80
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:214
+msgid "That email address already belongs to another user."
+msgstr ""
+
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: actions/profilesettings.php:346
 msgid "That file is too big."
 msgstr "Ese archivo es demasiado grande."
 
-#: ../actions/imsettings.php:161
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
 msgid "That is already your Jabber ID."
 msgstr "Ese ya es tu Jabber ID."
 
-#: ../actions/imsettings.php:224
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:211
+msgid "That is already your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+msgid "That is already your phone number."
+msgstr ""
+
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
 msgid "That is not your Jabber ID."
 msgstr "Ese no es tu Jabber ID."
 
-#: ../actions/imsettings.php:201
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+#: actions/emailsettings.php:270
+msgid "That is not your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+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:247
 msgid "That is the wrong IM address."
 msgstr "Esa dirección de mensajería instantánea es incorrecta."
 
-#: ../actions/newnotice.php:52
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+msgid "That is the wrong confirmation number."
+msgstr ""
+
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+msgid "That phone number already belongs to another user."
+msgstr ""
+
+#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: actions/newnotice.php:49 actions/twitapistatuses.php:330
+#: actions/newnotice.php:61 actions/twitapistatuses.php:271
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "Demasiado largo. La longitud máxima es de 140 caracteres. "
 
-#: ../actions/confirmaddress.php:86
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+#: actions/twitapiaccount.php:55
+msgid "That's too long. Max notice size is 255 chars."
+msgstr ""
+
+#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "La dirección \"%s\" fue confirmada para tu cuenta."
 
-#: ../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:285
 msgid "The address was removed."
 msgstr "La dirección fue eliminada."
 
-#: ../actions/userauthorization.php:311
+#: ../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 ""
 "Se ha autorizado la suscripción, pero no se ha enviado un URL de retorno. "
-"Lee de nuevo las instrucciones para saber cómo autorizar la suscripción. "
-"Tu identificador de suscripción es:"
+"Lee de nuevo las instrucciones para saber cómo autorizar la suscripción. Tu "
+"identificador de suscripción es:"
 
-#: ../actions/userauthorization.php:321
+#: ../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 ""
-"Se ha rechazado la suscripción, pero no se ha enviado un URL de retorno. "
-"Lee de nuevo las instrucciones para saber cómo rechazar la suscripción "
+"Se ha rechazado la suscripción, pero no se ha enviado un URL de retorno. Lee "
+"de nuevo las instrucciones para saber cómo rechazar la suscripción "
 "completamente."
 
-#: ../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 "Estas son las personas que escuchan los avisos de %s."
 
-#: ../actions/subscribers.php:33
+#: ../actions/subscribers.php:33 actions/subscribers.php:33
 msgid "These are the people who listen to your notices."
 msgstr "Estas son las personas que escuchan tus avisos."
 
-#: ../actions/subscriptions.php:35
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Estas son las personas que %s escucha."
 
-#: ../actions/subscriptions.php:33
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
 msgid "These are the people whose notices you listen to."
 msgstr "Estas son las personas que escuchas."
 
-#: ../actions/recoverpassword.php:87
+#: ../actions/invite.php:89 actions/invite.php:96
+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 ""
-"Este código de confirmación es demasiado viejo. Por favor empieza de "
-"nuevo."
+"Este código de confirmación es demasiado viejo. Por favor empieza de nuevo."
 
 #: ../lib/openid.php:195
 msgid ""
@@ -1267,7 +2101,7 @@ msgstr ""
 "Este formulario debería enviarse automáticamente. En caso contrario, haz "
 "clic en el botón de envío para ir a tu proveedor de OpenID."
 
-#: ../actions/finishopenidlogin.php:56
+#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -1278,44 +2112,86 @@ msgstr ""
 "OpenID a una cuenta local. Puedes crear una nueva o conectarte con la tuya, "
 "si la tienes."
 
-#: ../lib/util.php:147
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:94
+#: actions/twitapifriendships.php:82 actions/twitapistatuses.php:428
+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:46
+#: actions/twitapidirect_messages.php:117 actions/twitapifriendships.php:30
+#: actions/twitapistatuses.php:239
+msgid "This method requires a POST."
+msgstr ""
+
+#: ../lib/util.php:164 lib/util.php:246 lib/util.php:257
 msgid "This page is not available in a media type you accept"
 msgstr "Esta página no está disponible en un tipo de media que aceptes."
 
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
+msgid "Timezone"
+msgstr ""
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr ""
+
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"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 ""
 "Para suscribirte, puedes [iniciar una sesión](%%action.login%%), o "
 "[registrar](%%action.register%%) una nueva cuenta. Si ya tienes una en un "
 "[servicio de microblogueo compatible](%%doc.openmublog%%), escribe el URL de "
 "tu perfil debajo."
 
-#: ../actions/profilesettings.php:51
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: actions/twitapifriendships.php:128
+msgid "Two user ids or screen_names must be supplied."
+msgstr ""
+
+#: ../actions/profilesettings.php:48 ../actions/register.php:169
+#: actions/profilesettings.php:81 actions/register.php:183
+#: actions/profilesettings.php:83 actions/register.php:210
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "El URL de tu página personal, blog o perfil en otro sitio"
 
-#: ../actions/remotesubscribe.php:74
+#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "El URL de tu perfil en otro servicio de microblogueo compatible"
 
-#: ../actions/imsettings.php:105 ../actions/recoverpassword.php:39
+#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
+#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
+#: actions/emailsettings.php:144 actions/imsettings.php:118
+#: actions/recoverpassword.php:39 actions/smssettings.php:143
+#: actions/twittersettings.php:108 actions/emailsettings.php:147
+#: actions/othersettings.php:146 actions/twittersettings.php:199
 msgid "Unexpected form submission."
 msgstr "Envío de formulario inesperado."
 
-#: ../actions/recoverpassword.php:237
+#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
 msgid "Unexpected password reset."
 msgstr "Restablecimiento de contraseña inesperado."
 
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:58
+#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:59
 msgid "Unknown version of OMB protocol."
 msgstr "Versión desconocida del protocolo OMB."
 
-#: ../lib/util.php:245
+#: ../lib/util.php:269 lib/util.php:285 lib/util.php:296
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
@@ -1323,24 +2199,50 @@ msgstr ""
 "A menos que se especifique lo contrario, el contenido de este sitio es "
 "propiedad de sus colaboradores y está disponible bajo la"
 
-#: ../actions/confirmaddress.php:48
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr "Tipo de dirección %s desconocida"
 
-#: ../actions/showstream.php:193
+#: ../actions/showstream.php:209 actions/showstream.php:219
+#: actions/showstream.php:267 lib/util.php:2094
 msgid "Unsubscribe"
 msgstr "Cancelar suscripción"
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
+#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
+#: actions/postnotice.php:45 actions/updateprofile.php:46
 msgid "Unsupported OMB version"
 msgstr "Versión OMB no soportada"
 
-#: ../actions/avatar.php:105
+#: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: actions/profilesettings.php:371
 msgid "Unsupported image file format."
 msgstr "Formato de imagen no soportado."
 
-#: ../actions/avatar.php:68
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: actions/deleteprofile.php:251
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: actions/deleteprofile.php:254
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/twitapistatuses.php:126
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:198
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
+
+#: ../actions/avatar.php:68 actions/profilesettings.php:161
+#: actions/profilesettings.php:166
 msgid "Upload"
 msgstr "Cargar"
 
@@ -1353,114 +2255,205 @@ msgid ""
 msgstr ""
 "Carga un nuevo \"avatar\" (imagen de usuario) aquí. No puedes editar la "
 "imagen una vez cargada, por lo que antes debes asegurarte que sea más o "
-"menos cuadrada. Además, debe estar bajo la misma licencia del sitio. Usa "
-"una foto que te pertenezca y que quieras compartir."
+"menos cuadrada. Además, debe estar bajo la misma licencia del sitio. Usa una "
+"foto que te pertenezca y que quieras compartir."
+
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr ""
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:182
+#: ../actions/invite.php:114 actions/invite.php:121
+msgid ""
+"Use this form to invite your friends and colleagues to use this service."
+msgstr ""
+
+#: ../actions/register.php:159 ../actions/register.php:162
+#: actions/register.php:173 actions/register.php:176 actions/register.php:200
+#: actions/register.php:203
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
-"Usado sólo para actualizaciones, anuncios y recuperación de "
-"contraseñas"
+"Usado sólo para actualizaciones, anuncios y recuperación de contraseñas"
 
 #: ../actions/finishremotesubscribe.php:86
+#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:92
 msgid "User being listened to doesn't exist."
 msgstr "El usuario al que quieres seguir no existe."
 
 #: ../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/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/showstream.php:57
+#: actions/twitapiaccount.php:63 actions/twitapifavorites.php:40
+#: actions/twitapistatuses.php:163 actions/twitapistatuses.php:492
+#: lib/twitterapi.php:590
 msgid "User has no profile."
 msgstr "El usuario no tiene un perfil."
 
-#: ../actions/remotesubscribe.php:71
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
 msgid "User nickname"
 msgstr "Apodo del usuario"
 
-#: ../lib/util.php:969
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../lib/util.php:1159 lib/util.php:1293 lib/util.php:1630
 #, php-format
 msgid "What's up, %s?"
 msgstr "¿Qué tal, %s?"
 
-#: ../actions/profilesettings.php:57
+#: ../actions/profilesettings.php:54 ../actions/register.php:175
+#: actions/profilesettings.php:87 actions/register.php:189
+#: actions/profilesettings.php:89 actions/register.php:216
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Dónde estás, por ejemplo \"Ciudad, Estado (o Región), País\""
 
-#: ../actions/updateprofile.php:127
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Tipo de imagen incorrecto para '%s'"
 
-#: ../actions/updateprofile.php:122
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Tamaño de imagen incorrecto para '%s'"
 
-#: ../actions/finishaddopenid.php:64
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+#: actions/block.php:105
+msgid "Yes"
+msgstr ""
+
+#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
 msgid "You already have this OpenID!"
 msgstr "¡Ya tienes este OpenID!"
 
-#: ../actions/recoverpassword.php:31
+#: ../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
 msgid "You are already logged in!"
 msgstr "¡Ya te has conectado!"
 
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:102
+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 "Puedes cambiar tu contraseña aquí. ¡Elige una buena!"
 
-#: ../actions/register.php:164
+#: ../actions/register.php:135 actions/register.php:145
 msgid "You can create a new account to start posting notices."
 msgstr "Puedes crear una nueva cuenta y empezar a enviar avisos."
 
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
 #: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr ""
-"Puedes eliminar un OpenID de tu cuenta haciendo clic en el botón "
-"\"Eliminar\"."
+"Puedes eliminar un OpenID de tu cuenta haciendo clic en el botón \"Eliminar"
+"\"."
 
-#: ../actions/imsettings.php:28
+#: ../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 ""
 "Puedes enviar y recibir avisos vía [mensajes instantáneos](%%doc.im%%) de "
 "Jabber/GTalk. Configura tu dirección y opciones debajo."
 
 #: ../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 ""
 "Puedes actualizar la información de tu perfil personal para que la gente "
 "sepa más sobre ti."
 
 #: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
+#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
+#: actions/finishremotesubscribe.php:83 actions/finishremotesubscribe.php:99
 msgid "You can use the local subscription!"
 msgstr "¡Puedes usar la suscripción local!"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:51
+#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
+#: actions/finishopenidlogin.php:38 actions/register.php:68
+#: actions/register.php:77
 msgid "You can't register if you don't agree to the license."
 msgstr "No puedes registrarte si no estás de acuerdo con la licencia."
 
-#: ../actions/updateprofile.php:62
+#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
 msgid "You did not send us that profile"
 msgstr "No nos enviaste ese perfil"
 
-#: ../actions/recoverpassword.php:134
+#: ../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 ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: actions/twitapistatuses.php:455
+msgid "You may not delete another user's status."
+msgstr ""
+
+#: ../actions/invite.php:31 actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+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!"
+msgstr ""
+
+#: ../actions/recoverpassword.php:149
 msgid "You've been identified. Enter a  new password below. "
 msgstr "Te has identificado. Escribe una nueva contraseña a continuación."
 
-#: ../actions/openidlogin.php:67
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:84
 msgid "Your OpenID URL"
 msgstr "El URL de tu OpenID"
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:164
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
-"Tu nombre de usuario en este servidor, o la dirección de correo "
-"electrónico registrada."
+"Tu nombre de usuario en este servidor, o la dirección de correo electrónico "
+"registrada."
 
 #: ../actions/openidsettings.php:28
 #, php-format
@@ -1471,784 +2464,85 @@ msgstr ""
 "[OpenID](%%doc.openid%%) te permite ingresar a muchos sitios con la misma "
 "cuenta de usuario. Puedes administrar tus OpenID asociados desde aquí."
 
-#: ../lib/util.php:814
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:1287
 msgid "a few seconds ago"
 msgstr "hace unos segundos"
 
-#: ../lib/util.php:826
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:1299
 #, php-format
 msgid "about %d days ago"
 msgstr "hace %d días"
 
-#: ../lib/util.php:822
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:1295
 #, php-format
 msgid "about %d hours ago"
 msgstr "hace %d horas"
 
-#: ../lib/util.php:818
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:1291
 #, php-format
 msgid "about %d minutes ago"
 msgstr "hace %d minutos"
 
-#: ../lib/util.php:830
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:1303
 #, php-format
 msgid "about %d months ago"
 msgstr "hace %d meses"
 
-#: ../lib/util.php:824
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:1297
 msgid "about a day ago"
 msgstr "hace un día"
 
-#: ../lib/util.php:816
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:1289
 msgid "about a minute ago"
 msgstr "hace un minuto"
 
-#: ../lib/util.php:828
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:1301
 msgid "about a month ago"
 msgstr "hace un mes"
 
-#: ../lib/util.php:832
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:1305
 msgid "about a year ago"
 msgstr "hace un año"
 
-#: ../lib/util.php:820
-msgid "about an hour ago"
-msgstr "hace una hora"
-
-#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
-#: ../lib/stream.php:101
-msgid "in reply to..."
-msgstr "en respuesta a..."
-
-#: ../actions/noticesearch.php:133 ../actions/showstream.php:390
-#: ../lib/stream.php:108
-msgid "reply"
-msgstr "responder"
-
-#: ../actions/password.php:44
-msgid "same as password above"
-msgstr "repita la contraseña anterior"
-
-#: ../lib/util.php:1127
-msgid "« After"
-msgstr "« Después"
-
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr ""
-
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
-
-#: ../actions/invite.php:168 actions/invite.php:176
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
-
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
-
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
-#, php-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#, php-format
-msgid "%s public timeline"
-msgstr ""
-
-#: ../lib/mail.php:206 lib/mail.php:212
-#, php-format
-msgid "%s status"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#, php-format
-msgid "%s timeline"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
-msgstr ""
-
-#: ../actions/register.php:213
-msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
-msgstr ""
-
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-
-#: ../actions/register.php:154 actions/register.php:168
-msgid "6 or more characters. Required."
-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 ""
-
-#: ../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/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!"
-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 ""
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-msgid "Add or remove OpenIDs"
-msgstr ""
-
-#: ../actions/invite.php:131 actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
-msgstr ""
-
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-msgid "Are you sure you want to delete this notice?"
-msgstr ""
-
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr ""
-
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
-msgid "Can't delete this notice."
-msgstr ""
-
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-msgid "Cannot normalize that email address"
-msgstr ""
-
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr ""
-
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
-msgstr ""
-
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-msgid "Change your profile settings"
-msgstr ""
-
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-msgid "Confirmation code"
-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/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
-msgstr ""
-
-#: ../lib/subs.php:54 lib/subs.php:61
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: ../lib/subs.php:46 lib/subs.php:46
-msgid "Could not subscribe."
-msgstr ""
-
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-msgid "Could not update user with confirmed email address."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-msgid "Couldn't find any statuses."
-msgstr ""
-
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-msgid "Couldn't update user for autosubscribe."
-msgstr ""
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-msgid "Couldn't update user record."
-msgstr ""
-
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-msgid "Current confirmed email address."
-msgstr ""
-
-#: ../classes/Notice.php:72 classes/Notice.php:86
-#, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr ""
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-msgid "Delete notice"
-msgstr ""
-
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-msgid "Email Address"
-msgstr ""
-
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-msgid "Email Settings"
-msgstr ""
-
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-msgid "Email address, like \"UserName@example.org\""
-msgstr ""
-
-#: ../actions/invite.php:129 actions/invite.php:137
-msgid "Email addresses"
-msgstr ""
-
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
-msgstr ""
-
-#: ../actions/tag.php:55 actions/tag.php:55
-#, php-format
-msgid "Feed for tag %s"
-msgstr ""
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr ""
-
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr ""
-
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-msgid "I want to post notices by email."
-msgstr ""
-
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
-msgstr ""
-
-#: ../actions/recoverpassword.php:137
-msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
-"email address you have stored  in your account."
-msgstr ""
-
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-msgid "Incoming email"
-msgstr ""
-
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-msgid "Incoming email address removed."
-msgstr ""
-
-#: ../actions/invite.php:55 actions/invite.php:62
-#, php-format
-msgid "Invalid email address: %s"
-msgstr ""
-
-#: ../actions/invite.php:79 actions/invite.php:86
-msgid "Invitation(s) sent"
-msgstr ""
-
-#: ../actions/invite.php:97 actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
-msgstr ""
-
-#: ../lib/util.php:306 lib/util.php:322
-msgid "Invite"
-msgstr ""
-
-#: ../actions/invite.php:123 actions/invite.php:130
-msgid "Invite new users"
-msgstr ""
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Language"
-msgstr ""
-
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-msgid "Language is too long (max 50 chars)."
-msgstr ""
-
-#: ../actions/register.php:166 actions/register.php:180
-msgid "Longer name, preferably your \"real\" name"
-msgstr ""
-
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-#: actions/emailsettings.php:81 actions/smssettings.php:89
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
-
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-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 ""
-
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-msgid "New"
-msgstr ""
-
-#: ../lib/mail.php:144 lib/mail.php:144
-#, php-format
-msgid "New email address for posting to %s"
-msgstr ""
-
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-msgid "New incoming email address added."
-msgstr ""
-
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-msgid "No"
-msgstr ""
-
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-msgid "No carrier selected."
-msgstr ""
-
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-msgid "No code entered"
-msgstr ""
-
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-msgid "No email address."
-msgstr ""
-
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-msgid "No incoming email address."
-msgstr ""
-
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-msgid "No phone number."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-msgid "No status found with that ID."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-msgid "No status with that ID found."
-msgstr ""
-
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-msgid "No user with that email address or username."
-msgstr ""
-
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-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
-msgid "Not a supported data format."
-msgstr ""
-
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-msgid "Not a valid email address"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-msgid "Not found"
-msgstr ""
-
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-msgid "Notice Search"
-msgstr ""
-
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81
-#, php-format
-msgid "Notices tagged with %s"
-msgstr ""
-
-#: ../actions/invite.php:135 actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-msgid "People"
-msgstr ""
-
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-msgid "People Search"
-msgstr ""
-
-#: ../actions/invite.php:133 actions/invite.php:141
-msgid "Personal message"
-msgstr ""
-
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Preferred language"
-msgstr ""
-
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
-
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-msgid "Publish a MicroID for my email address."
-msgstr ""
-
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr ""
-
-#: ../actions/register.php:28 actions/register.php:28
-msgid "Registration not allowed."
-msgstr ""
-
-#: ../actions/register.php:200 actions/register.php:214
-msgid "Registration successful"
-msgstr ""
-
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
-msgstr ""
-
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-msgid "SMS Phone number"
-msgstr ""
-
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-msgid "SMS Settings"
-msgstr ""
-
-#: ../lib/mail.php:219 lib/mail.php:225
-msgid "SMS confirmation"
-msgstr ""
-
-#: ../actions/register.php:156 actions/register.php:170
-msgid "Same as password above. Required."
-msgstr ""
-
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-msgid "Select a carrier"
-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."
-msgstr ""
-
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-msgid "Send me notices of new subscriptions through email."
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr ""
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
-msgstr ""
-
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317
-msgid "Tags"
-msgstr ""
-
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr ""
-
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr ""
-
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-msgid "That is already your email address."
-msgstr ""
-
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-msgid "That is already your phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-msgid "That is not your email address."
-msgstr ""
-
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-msgid "That is not your phone number."
-msgstr ""
-
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-msgid "That is the wrong confirmation number."
-msgstr ""
-
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-msgid "That phone number already belongs to another user."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-msgid "That's too long. Max notice size is 255 chars."
-msgstr ""
-
-#: ../actions/invite.php:89 actions/invite.php:96
-msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
-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."
-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."
-msgstr ""
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "Timezone"
-msgstr ""
-
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-msgid "Timezone not selected."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-msgid "Two user ids or screen_names must be supplied."
-msgstr ""
-
-#: ../index.php:57 index.php:57
-msgid "Unknown action"
-msgstr ""
-
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-msgid "Updates by SMS"
-msgstr ""
-
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr ""
-
-#: ../actions/invite.php:114 actions/invite.php:121
-msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
-msgstr ""
-
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr ""
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "What timezone are you normally in?"
-msgstr ""
-
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-msgid "Yes"
-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/invite.php:81 actions/invite.php:88
-msgid "You are already subscribed to these users:"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
-msgstr ""
-
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-msgid "You may not delete another user's status."
-msgstr ""
-
-#: ../actions/invite.php:31 actions/invite.php:31
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-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!"
-msgstr ""
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:1293
+msgid "about an hour ago"
+msgstr "hace una hora"
 
 #: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
+#: actions/showstream.php:441 lib/stream.php:99 lib/noticelist.php:211
 msgid "delete"
 msgstr ""
 
+#: ../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:135
+#: lib/facebookaction.php:202 lib/noticelist.php:189
+msgid "in reply to..."
+msgstr "en respuesta a..."
+
+#: ../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:142
+#: lib/noticelist.php:199
+msgid "reply"
+msgstr "responder"
+
+#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/profilesettings.php:188
+msgid "same as password above"
+msgstr "repita la contraseña anterior"
+
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+#: actions/twitapistatuses.php:543
 msgid "unsupported file type"
 msgstr ""
 
+#: ../lib/util.php:1309 lib/util.php:1443 lib/facebookaction.php:251
+#: lib/util.php:1783
+#, fuzzy
+msgid "« After"
+msgstr "« Después"
+
 #: actions/deletenotice.php:74 actions/disfavor.php:43
 #: actions/emailsettings.php:127 actions/favor.php:45
 #: actions/finishopenidlogin.php:33 actions/imsettings.php:105
@@ -2258,6 +2552,12 @@ msgstr ""
 #: 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:38 actions/deleteprofile.php:127 actions/disfavor.php:47
+#: actions/emailsettings.php:130 actions/favor.php:49 actions/login.php:45
+#: actions/newmessage.php:44 actions/newnotice.php:36 actions/nudge.php:47
+#: actions/othersettings.php:139 actions/profilesettings.php:49
+#: actions/subedit.php:38 actions/tagother.php:113
+#: actions/twittersettings.php:188 actions/unblock.php:38
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -2281,12 +2581,14 @@ msgstr ""
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142
+#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:54
+#: actions/twitapifavorites.php:115
 msgid "This notice is already a favorite!"
 msgstr ""
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
+#: classes/Command.php:132 actions/favor.php:61
+#: actions/twitapifavorites.php:122
 msgid "Could not create favorite."
 msgstr ""
 
@@ -2295,11 +2597,12 @@ msgid "Disfavor"
 msgstr ""
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:62
 #, php-format
 msgid "%s favorite notices"
 msgstr ""
 
-#: actions/favoritesrss.php:64
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:66
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr ""
@@ -2325,47 +2628,50 @@ msgid ""
 "\n"
 msgstr ""
 
-#: actions/login.php:104
+#: actions/login.php:104 actions/login.php:111 actions/openidlogin.php:86
 msgid "Automatically login in the future; "
 msgstr ""
 
-#: actions/login.php:122
+#: actions/login.php:122 actions/login.php:130
 msgid "For security reasons, please re-enter your "
 msgstr ""
 
-#: actions/login.php:126
+#: actions/login.php:126 actions/login.php:134
 msgid "Login with your username and password. "
 msgstr ""
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+#: actions/newmessage.php:60 actions/twitapidirect_messages.php:136
 msgid "That's too long. Max message size is 140 chars."
 msgstr ""
 
-#: actions/newmessage.php:65
+#: actions/newmessage.php:65 actions/newmessage.php:68
 msgid "No recipient specified."
 msgstr ""
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
+#: classes/Command.php:206 actions/newmessage.php:71
+#: actions/newmessage.php:116 classes/Command.php:211
 msgid "You can't send a message to this user."
 msgstr ""
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
+#: classes/Command.php:209 actions/newmessage.php:74
+#: actions/twitapidirect_messages.php:153 classes/Command.php:214
 msgid ""
-"Don't send a message to yourself; just say it to yourself quietly "
-"instead."
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: actions/newmessage.php:108
+#: actions/newmessage.php:108 actions/microsummary.php:32
+#: actions/newmessage.php:111
 msgid "No such user"
 msgstr ""
 
-#: actions/newmessage.php:117
+#: actions/newmessage.php:117 actions/newmessage.php:120
 msgid "New message"
 msgstr ""
 
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:95 actions/noticesearch.php:94
 msgid "Notice without matching profile"
 msgstr ""
 
@@ -2412,6 +2718,7 @@ msgstr ""
 
 #: actions/profilesettings.php:115 actions/remotesubscribe.php:320
 #: actions/userauthorization.php:159 actions/userrss.php:76
+#: actions/profilesettings.php:120 actions/remotesubscribe.php:333
 msgid "User without matching profile"
 msgstr ""
 
@@ -2439,18 +2746,18 @@ msgstr ""
 msgid "New password successfully saved. "
 msgstr ""
 
-#: actions/register.php:95
+#: actions/register.php:95 actions/register.php:104
 msgid "Password must be 6 or more characters."
 msgstr ""
 
-#: actions/register.php:216
+#: actions/register.php:216 actions/register.php:243
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to..."
 msgstr ""
 
-#: actions/register.php:227
+#: actions/register.php:227 actions/register.php:254
 msgid "(You should receive a message by email momentarily, with "
 msgstr ""
 
@@ -2465,6 +2772,7 @@ msgid "Feed for favorites of %s"
 msgstr ""
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:88 actions/twitapifavorites.php:57
 msgid "Could not retrieve favorite notices."
 msgstr ""
 
@@ -2486,7 +2794,7 @@ msgstr ""
 msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: actions/showstream.php:154
+#: actions/showstream.php:154 lib/util.php:2105
 msgid "Send a message"
 msgstr ""
 
@@ -2495,73 +2803,78 @@ msgstr ""
 msgid "Mobile carrier for your phone. "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:64
 #, php-format
 msgid "Direct messages to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:65
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:69
 msgid "Direct Messages You've Sent"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:70
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:132
 msgid "No message text!"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:145
 msgid "Recipient user not found."
 msgstr ""
 
 #: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:148
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
-#: actions/twitapifavorites.php:92
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:64
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
-#: actions/twitapifavorites.php:95
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:67
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
+#: actions/twitapifavorites.php:158 lib/mail.php:303
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr ""
 
 #: actions/twitapifavorites.php:188 lib/mail.php:276
+#: actions/twitapifavorites.php:159 lib/mail.php:304
 #, php-format
 msgid ""
 "%1$s just added your notice from %2$s as one of their favorites.\n"
 "\n"
 msgstr ""
 
-#: actions/twittersettings.php:27
+#: actions/twittersettings.php:27 actions/twittersettings.php:29
 msgid ""
 "Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 
-#: actions/twittersettings.php:41
+#: actions/twittersettings.php:41 actions/twittersettings.php:43
 msgid "Twitter settings"
 msgstr ""
 
-#: actions/twittersettings.php:48
+#: actions/twittersettings.php:48 actions/twittersettings.php:50
 msgid "Twitter Account"
 msgstr ""
 
-#: actions/twittersettings.php:56
+#: actions/twittersettings.php:56 actions/twittersettings.php:58
 msgid "Current verified Twitter account."
 msgstr ""
 
@@ -2589,46 +2902,50 @@ msgstr ""
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:216
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr ""
 
-#: actions/twittersettings.php:128
+#: actions/twittersettings.php:128 actions/twittersettings.php:221
 msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: actions/twittersettings.php:137 actions/twittersettings.php:228
 #, php-format
 msgid "Unable to retrieve account information for \"%s\" from Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:234 actions/twittersettings.php:253
 msgid "Unable to save your Twitter settings!"
 msgstr ""
 
-#: actions/twittersettings.php:174
+#: actions/twittersettings.php:174 actions/twittersettings.php:261
 msgid "Twitter settings saved."
 msgstr ""
 
-#: actions/twittersettings.php:192
+#: actions/twittersettings.php:192 actions/twittersettings.php:272
 msgid "That is not your Twitter account."
 msgstr ""
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:280
 msgid "Couldn't remove Twitter user."
 msgstr ""
 
-#: actions/twittersettings.php:212
+#: actions/twittersettings.php:212 actions/twittersettings.php:284
 msgid "Twitter account removed."
 msgstr ""
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
+#: actions/twittersettings.php:299 actions/twittersettings.php:310
+#: actions/twittersettings.php:322
 msgid "Couldn't save Twitter preferences."
 msgstr ""
 
-#: actions/twittersettings.php:245
+#: actions/twittersettings.php:245 actions/twittersettings.php:330
 msgid "Twitter preferences saved."
 msgstr ""
 
@@ -2644,15 +2961,15 @@ msgstr ""
 msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#: classes/Channel.php:113
+#: classes/Channel.php:113 classes/Channel.php:129
 msgid "Command results"
 msgstr ""
 
-#: classes/Channel.php:148
+#: classes/Channel.php:148 classes/Channel.php:175
 msgid "Command complete"
 msgstr ""
 
-#: classes/Channel.php:158
+#: classes/Channel.php:158 classes/Channel.php:185
 msgid "Command failed"
 msgstr ""
 
@@ -2665,7 +2982,7 @@ msgstr ""
 msgid "Subscriptions: %1$s\n"
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:247
 msgid "User has no last notice"
 msgstr ""
 
@@ -2698,59 +3015,60 @@ msgstr ""
 msgid "About: %s"
 msgstr ""
 
-#: classes/Command.php:200
+#: classes/Command.php:200 classes/Command.php:202
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: classes/Command.php:214
+#: classes/Command.php:214 classes/Command.php:219
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: classes/Command.php:216
+#: classes/Command.php:216 classes/Command.php:221
 msgid "Error sending direct message."
 msgstr ""
 
-#: classes/Command.php:263
+#: classes/Command.php:263 classes/Command.php:268
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: classes/Command.php:270
+#: classes/Command.php:270 classes/Command.php:275
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: classes/Command.php:288
+#: classes/Command.php:288 classes/Command.php:293
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: classes/Command.php:295
+#: classes/Command.php:295 classes/Command.php:300
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330
+#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:315
+#: classes/Command.php:335
 msgid "Command not yet implemented."
 msgstr ""
 
-#: classes/Command.php:313
+#: classes/Command.php:313 classes/Command.php:318
 msgid "Notification off."
 msgstr ""
 
-#: classes/Command.php:315
+#: classes/Command.php:315 classes/Command.php:320
 msgid "Can't turn off notification."
 msgstr ""
 
-#: classes/Command.php:333
+#: classes/Command.php:333 classes/Command.php:338
 msgid "Notification on."
 msgstr ""
 
-#: classes/Command.php:335
+#: classes/Command.php:335 classes/Command.php:340
 msgid "Can't turn on notification."
 msgstr ""
 
-#: classes/Command.php:344
+#: classes/Command.php:344 classes/Command.php:349
 msgid "Commands:\n"
 msgstr ""
 
@@ -2762,23 +3080,23 @@ msgstr ""
 msgid "Could not update message with new URI."
 msgstr ""
 
-#: lib/gallery.php:46
+#: lib/gallery.php:46 lib/gallery.php:55
 msgid "User without matching profile in system."
 msgstr ""
 
-#: lib/mail.php:147
+#: lib/mail.php:147 lib/mail.php:141
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:249
+#: lib/mail.php:249 lib/mail.php:275
 #, php-format
 msgid "New private message from %s"
 msgstr ""
 
-#: lib/mail.php:253
+#: lib/mail.php:253 lib/mail.php:279
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -2822,18 +3140,458 @@ msgstr ""
 msgid "Your sent messages"
 msgstr ""
 
-#: lib/settingsaction.php:99
+#: lib/settingsaction.php:99 actions/deleteprofile.php:256
 msgid "Twitter"
 msgstr ""
 
-#: lib/settingsaction.php:100
+#: lib/settingsaction.php:100 actions/deleteprofile.php:257
 msgid "Twitter integration options"
 msgstr ""
 
-#: lib/util.php:1718
+#: lib/util.php:1718 lib/util.php:2145
 msgid "To"
 msgstr ""
 
 #: scripts/maildaemon.php:45
 msgid "Could not parse message."
 msgstr ""
+
+#: actions/block.php:45 actions/subedit.php:45 actions/unblock.php:45
+msgid "No profile specified."
+msgstr ""
+
+#: actions/block.php:52 actions/subedit.php:52 actions/tagother.php:45
+#: actions/unblock.php:52
+msgid "No profile with that ID."
+msgstr ""
+
+#: actions/block.php:78
+#, fuzzy
+msgid "Block user"
+msgstr "No existe ese usuario."
+
+#: actions/block.php:81
+msgid "Are you sure you want to block this user? "
+msgstr ""
+
+#: actions/block.php:117
+#, fuzzy
+msgid "You have already blocked this user."
+msgstr "¡Ya te has conectado!"
+
+#: actions/block.php:124
+msgid "Failed to save block information."
+msgstr ""
+
+#: actions/deleteprofile.php:25
+msgid "Code not yet ready."
+msgstr ""
+
+#: actions/deleteprofile.php:36
+msgid "Export and delete your user information."
+msgstr ""
+
+#: actions/deleteprofile.php:88 actions/deleteprofile.php:119
+#, fuzzy
+msgid "Delete my account"
+msgstr "Crear una nueva cuenta"
+
+#: actions/deleteprofile.php:89
+#, fuzzy
+msgid "Delete my account confirmation"
+msgstr "No se pudo eliminar la confirmación de correo electrónico."
+
+#: actions/deleteprofile.php:117
+msgid "Check if you are sure you want to delete your account."
+msgstr ""
+
+#: actions/deleteprofile.php:259 lib/settingsaction.php:102
+msgid "Other"
+msgstr ""
+
+#: actions/deleteprofile.php:260 lib/settingsaction.php:103
+msgid "Other options"
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Add to favorites"
+msgstr ""
+
+#: actions/emailsettings.php:98
+msgid "Allow friends to nudge me and send me an email."
+msgstr ""
+
+#: actions/facebookremove.php:54
+#, fuzzy
+msgid "Couldn't remove Facebook user."
+msgstr "No se pudo actualizar el usuario."
+
+#: actions/favor.php:71
+msgid "Disfavor favorite"
+msgstr ""
+
+#: actions/favorited.php:31 lib/stream.php:45
+#, fuzzy
+msgid "Popular notices"
+msgstr "No existe ese aviso."
+
+#: actions/favorited.php:54
+msgid "Showing recently popular notices"
+msgstr ""
+
+#: actions/featured.php:32 actions/featured.php:54 lib/stream.php:41
+msgid "Featured users"
+msgstr ""
+
+#: actions/finishremotesubscribe.php:186
+msgid "That user has blocked you from subscribing."
+msgstr ""
+
+#: actions/microsummary.php:39
+msgid "No current status"
+msgstr ""
+
+#: actions/newnotice.php:93
+#, fuzzy
+msgid "Notice posted"
+msgstr "Avisos"
+
+#: actions/newnotice.php:116 classes/Channel.php:140
+msgid "Ajax Error"
+msgstr ""
+
+#: actions/nudge.php:52
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
+
+#: actions/nudge.php:61
+msgid "Nudge sent"
+msgstr ""
+
+#: actions/othersettings.php:27
+msgid "Manage various other options."
+msgstr ""
+
+#: actions/othersettings.php:33
+#, fuzzy
+msgid "Other Settings"
+msgstr "Configuración"
+
+#: actions/othersettings.php:35
+msgid "URL Auto-shortening"
+msgstr ""
+
+#: actions/othersettings.php:54
+#, fuzzy
+msgid "Service"
+msgstr "Buscar"
+
+#: actions/othersettings.php:54
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/othersettings.php:155
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "La ubicación es demasiado larga (máx. 255 caracteres)."
+
+#: actions/peopletag.php:33
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "Correo electrónico no válido"
+
+#: actions/peopletag.php:45
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr ""
+
+#: actions/peopletag.php:87
+#, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+msgstr ""
+
+#: actions/profilesettings.php:92
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+
+#: actions/profilesettings.php:246 actions/tagother.php:131
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "El sitio '%s' es inválido"
+
+#: actions/profilesettings.php:328
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "No se pudo guardar el perfil."
+
+#: actions/public.php:68
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
+msgstr ""
+
+#: actions/public.php:90
+msgid "Could not retrieve public stream."
+msgstr ""
+
+#: actions/register.php:67 actions/register.php:177
+msgid "Sorry, only invited people can register."
+msgstr ""
+
+#: actions/register.php:156
+msgid "With this form you can create a new account. "
+msgstr ""
+
+#: actions/remotesubscribe.php:136 actions/remotesubscribe.php:141
+msgid "That's a local profile! Login to subscribe."
+msgstr ""
+
+#: actions/subedit.php:68
+#, fuzzy
+msgid "You are not subscribed to that profile."
+msgstr "No nos enviaste ese perfil"
+
+#: actions/subedit.php:81
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "No se pudo crear la suscripción."
+
+#: actions/subscribe.php:53
+#, fuzzy
+msgid "Not a local user."
+msgstr "No existe ese usuario."
+
+#: actions/subscribe.php:67
+#, fuzzy
+msgid "Subscribed"
+msgstr "Suscribirse"
+
+#: actions/subscriptions.php:72
+#, fuzzy
+msgid "Jabber"
+msgstr "Ningún Jabber ID."
+
+#: actions/tagother.php:31
+#, fuzzy
+msgid "Not logged in"
+msgstr "No conectado."
+
+#: actions/tagother.php:40
+#, fuzzy
+msgid "No id argument."
+msgstr "No existe ese documento."
+
+#: actions/tagother.php:56
+msgid "Tag a person"
+msgstr ""
+
+#: actions/tagother.php:98
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
+msgstr ""
+
+#: actions/tagother.php:120
+#, fuzzy
+msgid "No such profile."
+msgstr "No existe ese aviso."
+
+#: actions/tagother.php:146
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+
+#: actions/tagother.php:153
+#, fuzzy
+msgid "Could not save tags."
+msgstr "No se pudo guardar la información del avatar"
+
+#: actions/tagother.php:188
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
+
+#: actions/tagrss.php:33
+#, fuzzy
+msgid "No such tag."
+msgstr "No existe ese aviso."
+
+#: actions/tagrss.php:62
+#, fuzzy, php-format
+msgid "Microblog tagged with %s"
+msgstr "Microblog por %s"
+
+#: actions/twitapiblocks.php:45
+msgid "Block user failed."
+msgstr ""
+
+#: actions/twitapiblocks.php:66
+msgid "Unblock user failed."
+msgstr ""
+
+#: actions/twitapiusers.php:45
+#, fuzzy
+msgid "Not found."
+msgstr "¡Ninguna petición encontrada!"
+
+#: actions/twittersettings.php:63
+msgid "Twitter user name"
+msgstr ""
+
+#: actions/twittersettings.php:67
+#, fuzzy
+msgid "Twitter password"
+msgstr "Nueva contraseña"
+
+#: actions/twittersettings.php:129
+msgid "Twitter Friends"
+msgstr ""
+
+#: actions/unblock.php:73
+#, fuzzy
+msgid "Error removing the block."
+msgstr "Error al guardar el usuario."
+
+#: actions/unsubscribe.php:48
+#, fuzzy
+msgid "No profile id in request."
+msgstr "Ningun URL de perfil devuelto por el servidor."
+
+#: actions/unsubscribe.php:55
+#, fuzzy
+msgid "No profile with that id."
+msgstr "Perfil remoto sin perfil coincidente"
+
+#: actions/unsubscribe.php:69
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Cancelar suscripción"
+
+#: classes/Notice.php:100
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "Hubo un problema al guardar el aviso."
+
+#: classes/Notice.php:105
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+
+#: classes/Notice.php:112
+msgid "You are banned from posting notices on this site."
+msgstr ""
+
+#: lib/gallery.php:98
+msgid "Filter tags"
+msgstr ""
+
+#: lib/gallery.php:104
+msgid "All"
+msgstr ""
+
+#: lib/gallery.php:108
+msgid "Tag"
+msgstr ""
+
+#: lib/gallery.php:109
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/gallery.php:110
+msgid "Go"
+msgstr ""
+
+#: lib/gallery.php:264
+#, fuzzy
+msgid "Subscriptions navigation"
+msgstr "Suscripciones"
+
+#: lib/gallery.php:270 lib/gallery.php:292
+msgid "List"
+msgstr ""
+
+#: lib/gallery.php:280 lib/gallery.php:294
+msgid "Icons"
+msgstr ""
+
+#: lib/mail.php:92
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:242
+#, php-format
+msgid "You've been nudged by %s"
+msgstr ""
+
+#: lib/mail.php:246
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+msgstr ""
+
+#: lib/profilelist.php:146
+msgid "(none)"
+msgstr ""
+
+#: lib/stream.php:33
+msgid "Public"
+msgstr "Público"
+
+#: lib/stream.php:36 lib/stream.php:37
+msgid "Recent tags"
+msgstr ""
+
+#: lib/stream.php:40
+msgid "Featured"
+msgstr ""
+
+#: lib/stream.php:44
+#, fuzzy
+msgid "Popular"
+msgstr "Buscador de gente"
+
+#: lib/subs.php:51
+#, fuzzy
+msgid "User has blocked you."
+msgstr "El usuario no tiene un perfil."
+
+#: lib/util.php:2059
+msgid "Send a nudge"
+msgstr ""
+
+#: lib/util.php:2063
+msgid "Nudge sent!"
+msgstr ""
+
+#: lib/util.php:2194
+msgid "Block"
+msgstr ""
+
+#: lib/util.php:2198
+msgid "Unblock"
+msgstr ""
+
+#~ msgid "Couldn't confirm email."
+#~ msgstr "No se pudo confirmar el correo electrónico."
+
+#~ msgid "Email address"
+#~ msgstr "Dirección de correo electrónico"
+
+#~ msgid "Error inserting notice"
+#~ msgstr "Error al insertar aviso"
+
+#~ 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 ""
+#~ "Si olvidaste o perdiste tu contraseña, puedes recibir una nueva en la "
+#~ "dirección de correo electrónico que usaste para registrar tu cuenta."
diff --git a/fr_FR/LC_MESSAGES/laconica.po b/fr_FR/LC_MESSAGES/laconica.po
index eba0e8a3c9..154e2a3fc7 100644
--- a/fr_FR/LC_MESSAGES/laconica.po
+++ b/fr_FR/LC_MESSAGES/laconica.po
@@ -17,1014 +17,1181 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Project-Id-Version: 0.43\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-17 11:01-0400\n"
-"PO-Revision-Date: 2008-07-13 22:49+0200\n"
-"Last-Translator: Florian Birée <florian@biree.name>\n"
-"Language-Team: French\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"POT-Creation-Date: 2009-01-12 12:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/noticesearchrss.php:64
+#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:61
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr " Flux de recherche pour « %s »"
 
-#: ../actions/shownotice.php:45
-#, php-format
-msgid "%1$s's status on %2$s"
-msgstr "Statut de %1$s sur %2$s"
-
-#: ../actions/publicrss.php:60
-#, php-format
-msgid "%s Public Stream"
-msgstr "Flux public de %s"
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: actions/finishopenidlogin.php:88 actions/register.php:205
+#: actions/register.php:232
+msgid ""
+" except this private data: password, email address, IM address, phone number."
+msgstr ""
 
-#: ../actions/openidsettings.php:43
-msgid "Add OpenID"
-msgstr "Ajouter un OpenID"
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+#: lib/facebookaction.php:195 lib/noticelist.php:160
+msgid " from "
+msgstr ""
 
-#: ../actions/publicrss.php:62
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: actions/twitapistatuses.php:341
 #, php-format
-msgid "All updates for %s"
-msgstr "Toutes les mises à jour pour %s"
+msgid "%1$s / Updates replying to %2$s"
+msgstr ""
 
-#: ../actions/noticesearchrss.php:66
+#: ../actions/invite.php:168 actions/invite.php:176
 #, php-format
-msgid "All updates matching search term \"%s\""
-msgstr "Toutes les mises à jour correspondantes aux termes cherchés « %s »"
-
-#: ../actions/avatar.php:113
-msgid "Avatar updated."
-msgstr "Avatar mis à jour."
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
 
-#: ../actions/imsettings.php:55
+#: ../actions/invite.php:170
 #, 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?)"
+"%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 ""
-"En attente d'une confirmation pour cette adresse. Vérifiez votre "
-"compteJabber/GTalk pour recevoir un message avec les instructions "
-"suivantes.(Avez-vous ajouté %s à votre liste de contacts ?)"
-
-#: ../lib/openid.php:121
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "Impossible d'instancier l'objet client pour OpenID"
-
-#: ../actions/password.php:45
-msgid "Change"
-msgstr "Changer"
-
-#: ../actions/password.php:32
-msgid "Change password"
-msgstr "Changer de mot de passe"
-
-#: ../actions/confirmaddress.php:38
-msgid "Confirmation code not found."
-msgstr "Code de confirmation non trouvé."
 
-#: ../actions/finishopenidlogin.php:91
-msgid "Connect"
-msgstr "Connecter"
-
-#: ../actions/finishopenidlogin.php:86
-msgid "Connect existing account"
-msgstr "Connecté à un compte existant"
-
-#: ../lib/openid.php:178
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:115
+#: lib/mail.php:117
 #, php-format
-msgid "Could not create OpenID form: %s"
-msgstr "Impossible de créer le formulaire OpenID : %s"
+msgid "%1$s is now listening to your notices on %2$s."
+msgstr ""
 
-#: ../lib/openid.php:160
+#: ../lib/mail.php:126
 #, php-format
-msgid "Could not redirect to server: %s"
-msgstr "Impossible de rediriger vers le serveur : %s"
-
-#: ../actions/profilesettings.php:146
-msgid "Couldn't confirm email."
-msgstr "Impossible de confirmer l'email"
-
-#: ../actions/finishremotesubscribe.php:99
-msgid "Couldn't convert request tokens to access tokens."
-msgstr "Impossible de convertir les jetons de requête en jetons d'accès"
-
-#: ../actions/subscribe.php:59
-msgid "Couldn't create subscription."
-msgstr "Impossible de créer l'inscription."
-
-#: ../actions/remotesubscribe.php:125
-msgid "Couldn't get a request token."
-msgstr "Impossible d'obtenir le jeton de requête."
-
-#: ../actions/finishremotesubscribe.php:180
-msgid "Couldn't insert new subscription."
-msgstr "Impossible d'insérer une nouvelle inscription."
-
-#: ../actions/finishopenidlogin.php:84
-msgid "Create"
-msgstr "Créer"
-
-#: ../actions/finishopenidlogin.php:70
-msgid "Create a new user with this nickname."
-msgstr "Créer un nouvel utilisateur avec ce surnom."
-
-#: ../actions/finishopenidlogin.php:68
-msgid "Create new account"
-msgstr "Créer un nouveau compte"
-
-#: ../actions/finishopenidlogin.php:191
-msgid "Creating new account for OpenID that already has a user."
-msgstr "Création d'un nouveau compte pour un OpenID qui a déjà un utilisateur."
-
-#: ../actions/imsettings.php:45
-msgid "Current confirmed Jabber/GTalk address."
-msgstr "Adresse Jabber/GTalk actuellement confirmée."
-
-#: ../actions/profilesettings.php:46
-msgid "Email address"
-msgstr "Adresse email"
-
-#: ../actions/finishaddopenid.php:78
-msgid "Error connecting user."
-msgstr "Erreur de connexion d'utilisateur."
-
-#: ../actions/finishremotesubscribe.php:151
-msgid "Error inserting avatar"
-msgstr "Erreur lors de l'insertion d'un avatar"
-
-#: ../actions/finishremotesubscribe.php:143
-msgid "Error inserting new profile"
-msgstr "Erreur lors de l'insertion d'un nouveau profil"
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s.\n"
+msgstr ""
 
-#: ../actions/postnotice.php:88
-msgid "Error inserting notice"
-msgstr "Erreur lors de l'insertion d'un message"
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#: actions/twitapistatuses.php:344
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:167
-msgid "Error inserting remote profile"
-msgstr "Erreur lors de l'insertion d'un profil distant"
+#: ../actions/shownotice.php:45 actions/shownotice.php:45
+#: actions/shownotice.php:73
+#, php-format
+msgid "%1$s's status on %2$s"
+msgstr "Statut de %1$s sur %2$s"
 
-#: ../lib/openid.php:237
-msgid "Error saving the user."
-msgstr "Erreur lors de l'enregistrement de l'utilisateur."
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr ""
 
-#: ../actions/password.php:80
-msgid "Error saving user; invalid."
-msgstr "Erreur lors de l'enregistrement de l'utilisateur ; invalide."
+#: ../actions/publicrss.php:62 actions/publicrss.php:48
+#, php-format
+msgid "%s Public Stream"
+msgstr "Flux public de %s"
 
-#: ../actions/finishaddopenid.php:83
-msgid "Error updating profile"
-msgstr "Erreur lors de la mise à jour du profil"
+#: ../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/twitapistatuses.php:123
+#, php-format
+msgid "%s and friends"
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:161
-msgid "Error updating remote profile"
-msgstr "Erreur lors de la mise à jour du profil distant"
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:31
+#, fuzzy, php-format
+msgid "%s public timeline"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Évolution publique\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/finishopenidlogin.php:89
-msgid "Existing nickname"
-msgstr "Surnom existant"
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:217
+#, fuzzy, php-format
+msgid "%s status"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Statut de %1$s sur %2$s\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/avatar.php:115
-msgid "Failed updating avatar."
-msgstr "La mise à jour de l'avatar a échoué."
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:195
+#, fuzzy, php-format
+msgid "%s timeline"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Évolution publique\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/imsettings.php:33
-msgid "IM Settings"
-msgstr "Paramètres de messagerie instantanée"
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:34
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:88
+#: ../actions/register.php:213
 msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your OpenID."
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
 msgstr ""
-"Si vous avez déjà un compte, connectez-vous avec votre nom d'utilisateur "
-"et votre mot de passe pour les relier à votre OpenID."
 
-#: ../actions/openidsettings.php:45
+#: ../lib/util.php:257 lib/util.php:273 lib/util.php:284
+#, php-format
 msgid ""
-"If you want to add an OpenID to your account, enter it in the box below and "
-"click \"Add\"."
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
-"Si vous voulez ajouter un OpenID à votre compte, entrez-le dans le champ "
-"ci-dessous et cliquez sur « Ajouter »."
 
-#: ../actions/password.php:69
-msgid "Incorrect old password"
-msgstr "Ancien mot de passe incorrect"
+#: ../lib/util.php:259 lib/util.php:275 lib/util.php:286
+#, php-format
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr ""
 
-#: ../actions/postnotice.php:61
-msgid "Invalid notice content"
-msgstr "Contenu du message invalide"
+#: ../lib/util.php:274 lib/util.php:290 lib/util.php:301
+msgid ". Contributors should be attributed by full name or nickname."
+msgstr ""
 
-#: ../actions/postnotice.php:67
-msgid "Invalid notice uri"
-msgstr "URI du message invalide"
+#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
+#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
+#: actions/profilesettings.php:78
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr ""
 
-#: ../actions/postnotice.php:72
-msgid "Invalid notice url"
-msgstr "URL du message invalide"
+#: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:193
+#, fuzzy
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/remotesubscribe.php:96
-msgid "Invalid profile URL (bad format)"
-msgstr "URL du profil invalide (mauvais format)"
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/profilesettings.php:186
+msgid "6 or more characters"
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:77
-msgid "Invalid profile URL returned by server."
-msgstr "URL du profil retourné par le serveur invalide."
+#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
+msgid "6 or more characters, and don't forget it!"
+msgstr ""
 
-#: ../actions/avatarbynickname.php:37
-msgid "Invalid size."
-msgstr "Taille invalide."
+#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:195
+#, fuzzy
+msgid "6 or more characters. Required."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"6 caractères ou plus\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../lib/util.php:237
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, 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)."
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
 msgstr ""
-"Il utilise le logiciel de microblog [Laconica](http://laconi.ca/), version "
-"%s, disponible sous la licence [GNU Affero General Public License] "
-"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
-
-#: ../actions/openidlogin.php:44
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "Se connecter avec un compte [OpenID](%%doc.openid%%)."
 
-#: ../actions/userrss.php:70
-#, php-format
-msgid "Microblog by %s"
-msgstr "Microblog par %s"
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:234
+#, fuzzy
+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 ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Un code de confirmation a été envoyé à l'adresse que vous avez ajouté. "
+"Vousdevez approuver %s pour qu'il vous envoie des messages.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/finishopenidlogin.php:71
-msgid "New nickname"
-msgstr "Nouveau surnom"
+#: ../actions/smssettings.php:216 actions/smssettings.php:224
+#, fuzzy
+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 ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Un code de confirmation a été envoyé à l'adresse que vous avez ajouté. "
+"Vousdevez approuver %s pour qu'il vous envoie des messages.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/finishopenidlogin.php:170
-msgid "Nickname not allowed."
-msgstr "Surnom non-autorisé."
+#: ../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:30
+#: actions/twitapidirect_messages.php:107 actions/twitapifavorites.php:83
+#: actions/twitapifavorites.php:99 actions/twitapifriendships.php:117
+#: actions/twitapihelp.php:42 actions/twitapistatuses.php:77
+#: actions/twitapistatuses.php:144 actions/twitapistatuses.php:224
+#: actions/twitapistatuses.php:234 actions/twitapistatuses.php:386
+#: actions/twitapistatuses.php:395 actions/twitapistatuses.php:421
+#: actions/twitapiusers.php:30
+msgid "API method not found!"
+msgstr ""
 
-#: ../actions/remotesubscribe.php:72
-msgid "Nickname of the user you want to follow"
-msgstr "Surnom de l'utilisateur à surveiller"
+#: ../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:39
+#: actions/twitapiaccount.php:89 actions/twitapiaccount.php:94
+#: actions/twitapidirect_messages.php:178 actions/twitapifavorites.php:139
+#: actions/twitapihelp.php:49 actions/twitapistatuses.php:549
+msgid "API method under construction."
+msgstr ""
 
-#: ../actions/confirmaddress.php:33
-msgid "No confirmation code."
-msgstr "Pas de code de confirmation."
+#: ../lib/util.php:324 lib/util.php:340 lib/util.php:352
+msgid "About"
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:65
-msgid "No nickname provided by remote server."
-msgstr "Pas de surnom proposé par le serveur distant."
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
+msgid "Accept"
+msgstr ""
 
-#: ../actions/avatarbynickname.php:27
-msgid "No nickname."
-msgstr "Pas de surnom."
+#: ../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/twittersettings.php:84
+msgid "Add"
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:72
-msgid "No profile URL returned by server."
-msgstr "Pas d'URL de profil retourné par le serveur."
+#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
+msgid "Add OpenID"
+msgstr "Ajouter un OpenID"
 
-#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
-msgid "No results"
-msgstr "Pas de résultats"
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: actions/deleteprofile.php:248
+#, fuzzy
+msgid "Add or remove OpenIDs"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Enlever l'OpenID\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/avatarbynickname.php:32
-msgid "No size."
-msgstr "Pas de taille."
+#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
+msgid "Address"
+msgstr ""
 
-#: ../actions/openidsettings.php:135
-msgid "No such OpenID."
-msgstr "Il n'y a pas cet OpenID."
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
 
-#: ../actions/doc.php:29
-msgid "No such document."
-msgstr "Il n'y a pas ce document.'"
+#: ../actions/showstream.php:273 actions/showstream.php:288
+#: actions/showstream.php:336
+msgid "All subscriptions"
+msgstr ""
 
-#: ../actions/recoverpassword.php:56
-msgid "No such recovery code."
-msgstr "Il n'y a pas ce code de récupération."
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
+#, php-format
+msgid "All updates for %s"
+msgstr "Toutes les mises à jour pour %s"
 
-#: ../actions/postnotice.php:56
-msgid "No such subscription"
-msgstr "Il n'y a pas cette inscription'"
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:63
+#, php-format
+msgid "All updates matching search term \"%s\""
+msgstr "Toutes les mises à jour correspondantes aux termes cherchés « %s »"
 
-#: ../actions/recoverpassword.php:60
-msgid "Not a recovery code."
-msgstr "Pas de code de récupération."
+#: ../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
+msgid "Already logged in."
+msgstr ""
 
-#: ../lib/openid.php:131
-msgid "Not a valid OpenID."
-msgstr "Ce n'est pas un OpenID valide."
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:47
+msgid "Already subscribed!."
+msgstr ""
 
-#: ../actions/remotesubscribe.php:118
-msgid "Not a valid profile URL (incorrect services)."
-msgstr "Ce n'est pas un URL de profil valide (services incorrects)."
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+msgid "Are you sure you want to delete this notice?"
+msgstr ""
 
-#: ../actions/remotesubscribe.php:111
-msgid "Not a valid profile URL (no XRDS defined)."
-msgstr "Ce n'est pas un URL de profil valide (pas de XRDS défini)."
+#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
+msgid "Authorize subscription"
+msgstr ""
 
-#: ../actions/remotesubscribe.php:104
-msgid "Not a valid profile URL (no YADIS document)."
-msgstr "Ce n'est pas un URL de profil valide (pas de document YADIS)."
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192 actions/register.php:219
+msgid "Automatically login in the future; not for shared computers!"
+msgstr ""
 
-#: ../actions/avatar.php:95
-msgid "Not an image or corrupt file."
-msgstr "Ce n'est pas une image, ou c'est un fichier corrompu."
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:103
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:51
-msgid "Not authorized."
-msgstr "Non autorisé."
+#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: actions/profilesettings.php:34
+msgid "Avatar"
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:38
-msgid "Not expecting this response!"
-msgstr "Cette réponse n'était pas attendue !"
+#: ../actions/avatar.php:113 actions/profilesettings.php:350
+#: actions/profilesettings.php:379
+msgid "Avatar updated."
+msgstr "Avatar mis à jour."
 
-#: ../actions/showstream.php:82
+#: ../actions/imsettings.php:55 actions/imsettings.php:56
 #, php-format
-msgid "Notice feed for %s"
-msgstr "Fil des messages de %s"
-
-#: ../actions/shownotice.php:39
-msgid "Notice has no profile"
-msgstr "Le message n'a pas de profil"
+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 ""
+"En attente d'une confirmation pour cette adresse. Vérifiez votre "
+"compteJabber/GTalk pour recevoir un message avec les instructions suivantes."
+"(Avez-vous ajouté %s à votre liste de contacts ?)"
 
-#: ../actions/password.php:39
-msgid "Old password"
-msgstr "Ancien mot de passe"
+#: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#, fuzzy
+msgid ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"En attente d'une confirmation pour cette adresse. Vérifiez votre "
+"compteJabber/GTalk pour recevoir un message avec les instructions suivantes."
+"(Avez-vous ajouté %s à votre liste de contacts ?)\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/finishopenidlogin.php:61
-msgid "OpenID Account Setup"
-msgstr "Mise en place du compte OpenID"
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+msgid "Awaiting confirmation on this phone number."
+msgstr ""
 
-#: ../lib/openid.php:180
-msgid "OpenID Auto-Submit"
-msgstr "Soumission automatique OpenID"
+#: ../lib/util.php:1318 lib/util.php:1452 lib/facebookaction.php:259
+#: lib/util.php:1792
+msgid "Before »"
+msgstr ""
 
-#: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60
-msgid "OpenID Login"
-msgstr "Connexion OpenID"
+#: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: actions/profilesettings.php:82 actions/register.php:184
+#: actions/profilesettings.php:84 actions/register.php:211
+msgid "Bio"
+msgstr ""
 
-#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
-msgid "OpenID URL"
-msgstr "URL OpenID"
+#: ../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:222 actions/register.php:98
+msgid "Bio is too long (max 140 chars)."
+msgstr ""
 
-#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
-msgid "OpenID authentication cancelled."
-msgstr "Authentification OpenID annulée."
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+#, fuzzy
+msgid "Can't delete this notice."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Impossible de supprimer la confirmation d'email.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
+#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
 #, php-format
-msgid "OpenID authentication failed: %s"
-msgstr "L'authentification OpenID a échouée : %s'"
+msgid "Can't read avatar URL '%s'"
+msgstr ""
 
-#: ../lib/openid.php:133
-#, php-format
-msgid "OpenID failure: %s"
-msgstr "Erreur OpenID : %s"
+#: ../actions/password.php:85 ../actions/recoverpassword.php:300
+#: actions/profilesettings.php:404 actions/recoverpassword.php:313
+#: actions/profilesettings.php:433
+msgid "Can't save new password."
+msgstr ""
 
-#: ../actions/openidsettings.php:144
-msgid "OpenID removed."
-msgstr "OpenID enlevé."
+#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
+#: ../actions/smssettings.php:62 actions/emailsettings.php:58
+#: actions/imsettings.php:59 actions/smssettings.php:62
+msgid "Cancel"
+msgstr ""
 
-#: ../actions/openidsettings.php:37
-msgid "OpenID settings"
-msgstr "Paramètres OpenID"
+#: ../lib/openid.php:121 lib/openid.php:121
+msgid "Cannot instantiate OpenID consumer object."
+msgstr "Impossible d'instancier l'objet client pour OpenID"
 
-#: ../actions/avatar.php:84
-msgid "Partial upload."
-msgstr "Transfert partiel."
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
+msgid "Cannot normalize that Jabber ID"
+msgstr ""
 
-#: ../actions/peoplesearch.php:33
-msgid "People search"
-msgstr "Rechercher des personnes"
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:204
+#, fuzzy
+msgid "Cannot normalize that email address"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Impossible de normaliser cet identifiant Jabber\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/remotesubscribe.php:73
-msgid "Profile URL"
-msgstr "URL du profil"
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/profilesettings.php:189
+msgid "Change"
+msgstr "Changer"
 
-#: ../actions/profilesettings.php:34
-msgid "Profile settings"
-msgstr "Paramètres du profil"
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: actions/deleteprofile.php:245
+msgid "Change email handling"
+msgstr ""
 
-#: ../lib/util.php:276
-msgid "Public"
-msgstr "Public"
+#: ../actions/password.php:32 actions/profilesettings.php:36
+msgid "Change password"
+msgstr "Changer de mot de passe"
 
-#: ../actions/public.php:54
-msgid "Public Stream Feed"
-msgstr "Fil du flux public"
+#: ../lib/settingsaction.php:94
+#, fuzzy
+msgid "Change your password"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Changer de mot de passe\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/public.php:33
-msgid "Public timeline"
-msgstr "Évolution publique"
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#: actions/deleteprofile.php:242
+#, fuzzy
+msgid "Change your profile settings"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Paramètres du profil\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/recoverpassword.php:67
-msgid "Recovery code for unknown user."
-msgstr "Code de récupération d'un utilisateur inconnu."
+#: ../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/profilesettings.php:187 actions/register.php:196
+msgid "Confirm"
+msgstr ""
 
-#: ../actions/remotesubscribe.php:65
-msgid "Remote subscribe"
-msgstr "Inscription distante"
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
+msgid "Confirm Address"
+msgstr ""
 
-#: ../actions/openidsettings.php:68
-msgid "Remove OpenID"
-msgstr "Enlever l'OpenID"
+#: ../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:259
+msgid "Confirmation cancelled."
+msgstr ""
 
-#: ../actions/openidsettings.php:73
-msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+#, fuzzy
+msgid "Confirmation code"
 msgstr ""
-"Enlever votre seul OpenID vous empêcherai de vous connecter ! Si vous avez "
-"besoin de l'enlever, ajoutez un autre OpenID d'abord."
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Pas de code de confirmation.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/noticesearch.php:80
-msgid "Search Stream Feed"
-msgstr "Fil du flux de recherche"
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
+msgid "Confirmation code not found."
+msgstr "Code de confirmation non trouvé."
 
-#: ../actions/noticesearch.php:30
+#: ../actions/register.php:202
 #, php-format
 msgid ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
+"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 ""
-"Recherche des messages sur %%site.name%% par leur contenu. Séparez les "
-"termes de la recherches par des espaces ; ils doivent être de 3 caractères "
-"ou plus."
 
-#: ../actions/peoplesearch.php:28
+#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
+msgid "Connect"
+msgstr "Connecter"
+
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
+msgid "Connect existing account"
+msgstr "Connecté à un compte existant"
+
+#: ../lib/util.php:332 lib/util.php:348 lib/util.php:360
+msgid "Contact"
+msgstr ""
+
+#: ../lib/openid.php:178 lib/openid.php:178
 #, php-format
-msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
-"Separate the terms by spaces; they must be 3 characters or more."
+msgid "Could not create OpenID form: %s"
+msgstr "Impossible de créer le formulaire OpenID : %s"
+
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:46 actions/twitapifriendships.php:62
+#, php-format
+msgid "Could not follow user: %s is already on your list."
 msgstr ""
-"Recherche de personne sur %%site.name%% par leur nom, localisation ou "
-"intérêt. Séparez les termes de la recherches par des espaces ; ils "
-"doivent être de 3 caractères ou plus."
 
-#: ../actions/finishaddopenid.php:66
-msgid "Someone else already has this OpenID."
-msgstr "Quelqu'un d'autre a déjà cet OpenID."
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+#: actions/twitapifriendships.php:39
+msgid "Could not follow user: User not found."
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
-msgid "Something weird happened."
-msgstr "Quelque chose de bizarre est arrivé."
+#: ../lib/openid.php:160 lib/openid.php:160
+#, php-format
+msgid "Could not redirect to server: %s"
+msgstr "Impossible de rediriger vers le serveur : %s"
 
-#: ../actions/avatar.php:87
-msgid "System error uploading file."
-msgstr "Erreur système en transférant le fichier."
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
+msgid "Could not save avatar info"
+msgstr ""
 
-#: ../actions/noticesearch.php:34
-msgid "Text search"
-msgstr "Texte cherché"
+#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
+msgid "Could not save new profile info"
+msgstr ""
 
-#: ../actions/openidsettings.php:140
-msgid "That OpenID does not belong to you."
-msgstr "Cet OpenID ne vous appartient pas."
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:70
+msgid "Could not subscribe other to you."
+msgstr ""
 
-#: ../actions/confirmaddress.php:52
-msgid "That address has already been confirmed."
-msgstr "Cette adresse a déjà été confirmée."
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:55
+#, fuzzy
+msgid "Could not subscribe."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Non inscrit !\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/confirmaddress.php:43
-msgid "That confirmation code is not for you!"
-msgstr "Ce code de confirmation n'est pas pour vous !"
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+#, fuzzy
+msgid "Could not update user with confirmed email address."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Adresse Jabber/GTalk actuellement confirmée.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/avatar.php:80
-msgid "That file is too big."
-msgstr "Ce fichier est trop gros."
+#: ../actions/finishremotesubscribe.php:99
+#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:112
+msgid "Couldn't convert request tokens to access tokens."
+msgstr "Impossible de convertir les jetons de requête en jetons d'accès"
+
+#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
+#: ../actions/imsettings.php:218 ../actions/smssettings.php:241
+#: actions/confirmaddress.php:84 actions/emailsettings.php:252
+#: actions/imsettings.php:226 actions/smssettings.php:249
+#: actions/emailsettings.php:255
+msgid "Couldn't delete email confirmation."
+msgstr ""
+
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:129
+msgid "Couldn't delete subscription."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+#: actions/twitapistatuses.php:82
+msgid "Couldn't find any statuses."
+msgstr ""
+
+#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
+#: actions/remotesubscribe.php:148
+msgid "Couldn't get a request token."
+msgstr "Impossible d'obtenir le jeton de requête."
+
+#: ../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:228
+msgid "Couldn't insert confirmation code."
+msgstr ""
+
+#: ../actions/finishremotesubscribe.php:180
+#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:216
+msgid "Couldn't insert new subscription."
+msgstr "Impossible d'insérer une nouvelle inscription."
+
+#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
+#: actions/profilesettings.php:319 actions/twitapiaccount.php:74
+msgid "Couldn't save profile."
+msgstr ""
+
+#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
+#: actions/profilesettings.php:296
+#, fuzzy
+msgid "Couldn't update user for autosubscribe."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Impossible de mettre à jour l'utilisateur.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+#: actions/emailsettings.php:301 actions/emailsettings.php:315
+#, fuzzy
+msgid "Couldn't update user record."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Impossible de mettre à jour l'utilisateur.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../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/emailsettings.php:179 actions/emailsettings.php:280
+#: actions/othersettings.php:173 actions/profilesettings.php:276
+msgid "Couldn't update user."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
+msgid "Create"
+msgstr "Créer"
+
+#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
+msgid "Create a new user with this nickname."
+msgstr "Créer un nouvel utilisateur avec ce surnom."
+
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
+msgid "Create new account"
+msgstr "Créer un nouveau compte"
+
+#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+#: actions/finishopenidlogin.php:208
+msgid "Creating new account for OpenID that already has a user."
+msgstr "Création d'un nouveau compte pour un OpenID qui a déjà un utilisateur."
+
+#: ../actions/imsettings.php:45 actions/imsettings.php:46
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "Adresse Jabber/GTalk actuellement confirmée."
 
-#: ../actions/subscribers.php:35
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+#, fuzzy
+msgid "Current confirmed email address."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Adresse Jabber/GTalk actuellement confirmée.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/showstream.php:356 actions/showstream.php:367
+#: actions/showstream.php:418
+msgid "Currently"
+msgstr ""
+
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:87
+#, fuzzy, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Erreur de base de donnée en insérant la réponse : %s\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../lib/util.php:1061 lib/util.php:1110 lib/util.php:1417
 #, php-format
-msgid "These are the people who listen to %s's notices."
-msgstr "Ce sont les personnes qui suivent les messages de %s."
+msgid "DB error inserting reply: %s"
+msgstr ""
 
-#: ../actions/subscribers.php:33
-msgid "These are the people who listen to your notices."
-msgstr "Ce sont les personnes qui suivent vos messages."
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+#, fuzzy
+msgid "Delete notice"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Nouveau message\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/subscriptions.php:35
-#, php-format
-msgid "These are the people whose notices %s listens to."
-msgstr "Ce sont les personnes dont les messages sont suivis par %s."
+#: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: actions/profilesettings.php:84 actions/register.php:186
+#: actions/profilesettings.php:86 actions/register.php:213
+msgid "Describe yourself and your interests in 140 chars"
+msgstr ""
 
-#: ../actions/subscriptions.php:33
-msgid "These are the people whose notices you listen to."
-msgstr "Ce sont les personnes dont vous suivez les messages."
+#: ../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/deleteprofile.php:244 actions/register.php:199
+#: actions/register.php:202
+msgid "Email"
+msgstr ""
 
-#: ../lib/openid.php:195
-msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+#, fuzzy
+msgid "Email Address"
 msgstr ""
-"Ce formulaire devrait se transmettre automatiquement. Si ce n'est pas le "
-"cas, cliquez sur le bouton de soumission pour aller chez votre fournisseur "
-"OpenID."
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Adresse email\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/finishopenidlogin.php:56
-#, 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."
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+#, fuzzy
+msgid "Email Settings"
 msgstr ""
-"Ce la première fois que vous vous êtes connectés à %s, donc nous devons "
-"connecter votre OpenID à un compte local. Vous pouvez soit créer un "
-"nouveau compte, soit vous connectez avec un compte existant, si vous en avez "
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Paramètres\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/remotesubscribe.php:43
-#, php-format
-msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:89
+msgid "Email address already exists."
 msgstr ""
-"Pour s'inscrire, vous pouvez [vous connecter](%%action.login%%), ou [créer "
-"unnouveau compte](%%action.register%%). Si vous avez déjà un compte sur un "
-"[site de microblog compatible](%%doc.openmublog%%), entrez l'URL de votre "
-"profil ci-dessous."
 
-#: ../actions/remotesubscribe.php:74
-msgid "URL of your profile on another compatible microblogging service"
-msgstr "URL de votre profil sur un autre service de microblog compatible"
+#: ../lib/mail.php:90 lib/mail.php:90
+msgid "Email address confirmation"
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:58
-msgid "Unknown version of OMB protocol."
-msgstr "Version inconnue du protocole OMB"
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
 
-#: ../actions/confirmaddress.php:48
-#, php-format
-msgid "Unrecognized address type %s"
-msgstr "Type d'adresse non reconnu : %s"
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr ""
 
-#: ../actions/avatar.php:105
-msgid "Unsupported image file format."
-msgstr "Format de fichier d'image non-supporté."
+#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
+msgid "Enter a nickname or email address."
+msgstr ""
 
-#: ../actions/avatar.php:68
-msgid "Upload"
-msgstr "Transfert."
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+msgid "Enter the code you received on your phone."
+msgstr ""
 
-#: ../actions/avatar.php:27
-msgid ""
-"Upload a new \"avatar\" (user image) here. You can't edit the picture after "
-"you upload it, so make sure it's more or less square. It must be under the "
-"site license, also. Use a picture that belongs to you and that you want to "
-"share."
+#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
+msgid "Error authorizing token"
 msgstr ""
-"Transférez ici un nouvel « avatar » (image utilisateur). Vous ne pouvez "
-"modifier l'image après l'envoi, alors faites en sorte qu'elle soit plus ou "
-"moins carrée. Elle doit aussi être soumise à la licence du site. Utilisez "
-"une image qui vous appartient et que vous voulez partager."
 
-#: ../actions/finishremotesubscribe.php:86
-msgid "User being listened to doesn't exist."
-msgstr "L'utilisateur à suivre n'existe pas."
+#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
+#: actions/finishopenidlogin.php:274
+msgid "Error connecting user to OpenID."
+msgstr ""
 
-#: ../actions/remotesubscribe.php:71
-msgid "User nickname"
-msgstr "Surnom de l'utilisateur"
+#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
+msgid "Error connecting user."
+msgstr "Erreur de connexion d'utilisateur."
 
-#: ../actions/finishaddopenid.php:64
-msgid "You already have this OpenID!"
-msgstr "Vous avez déjà cet OpenID !"
+#: ../actions/finishremotesubscribe.php:151
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:164
+msgid "Error inserting avatar"
+msgstr "Erreur lors de l'insertion d'un avatar"
 
-#: ../actions/recoverpassword.php:31
-msgid "You are already logged in!"
-msgstr "Vous êtes déjà connecté !"
+#: ../actions/finishremotesubscribe.php:143
+#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:156
+msgid "Error inserting new profile"
+msgstr "Erreur lors de l'insertion d'un nouveau profil"
 
-#: ../actions/password.php:27
-msgid "You can change your password here. Choose a good one!"
-msgstr "Vous pouvez changer ici votre mot de passe. Choisissez-en un bon !"
+#: ../actions/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:180
+msgid "Error inserting remote profile"
+msgstr "Erreur lors de l'insertion d'un profil distant"
 
-#: ../actions/openidsettings.php:86
-msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
+msgid "Error saving address confirmation."
 msgstr ""
-"Vous pouvez enlever un OpenID de votre compte en cliquant sur le bouton « "
-"Enlever »."
 
-#: ../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."
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
+msgid "Error saving remote profile"
 msgstr ""
-"Vous pouvez envoyer et recevoir des messages via [la messagerie "
-"instantanée](%%doc.im%%)Jabber/GTalk. Configurez votre adresse et vos "
-"paramètres ci-dessous."
 
-#: ../actions/profilesettings.php:27
-msgid ""
-"You can update your personal profile info here so people know more about "
-"you."
+#: ../lib/openid.php:226 lib/openid.php:226
+msgid "Error saving the profile."
 msgstr ""
-"Vous pouvez mettre à jour les informations de votre profil personnel pour "
-"que l'on en sache plus sur vous."
 
-#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
-msgid "You can use the local subscription!"
-msgstr "Vous pouvez utiliser l'inscription locale !"
+#: ../lib/openid.php:237 lib/openid.php:237
+msgid "Error saving the user."
+msgstr "Erreur lors de l'enregistrement de l'utilisateur."
 
-#: ../actions/openidlogin.php:67
-msgid "Your OpenID URL"
-msgstr "Votre URL OpenID"
+#: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/profilesettings.php:428
+msgid "Error saving user; invalid."
+msgstr "Erreur lors de l'enregistrement de l'utilisateur ; invalide."
 
-#: ../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."
+#: ../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:54 actions/login.php:80
+#: actions/register.php:117
+msgid "Error setting user."
 msgstr ""
-"[OpenID](%%doc.openid%%) vous permet de vous connecter à différents sites "
-"avec le même compte utilisateur. Gérez vos OpenID associés d'ici."
 
-#: ../actions/password.php:44
-msgid "same as password above"
-msgstr "identique au mot de passe ci-dessus"
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
+msgid "Error updating profile"
+msgstr "Erreur lors de la mise à jour du profil"
 
-#: ../actions/showstream.php:400 ../lib/stream.php:105 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr ""
+#: ../actions/finishremotesubscribe.php:161
+#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:174
+msgid "Error updating remote profile"
+msgstr "Erreur lors de la mise à jour du profil distant"
 
-#: ../actions/twitapistatuses.php:470 ../actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:412
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
+#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
+msgid "Error with confirmation code."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:474 ../actions/twitapistatuses.php:482
-#: actions/twitapistatuses.php:415
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
+msgid "Existing nickname"
+msgstr "Surnom existant"
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#, php-format
-#, fuzzy
-msgid "%s public timeline"
+#: ../lib/util.php:326 lib/util.php:342 lib/util.php:354
+msgid "FAQ"
 msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Évolution publique\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../lib/mail.php:202 ../lib/mail.php:206 lib/mail.php:212
-#, php-format
-#, fuzzy
-msgid "%s status"
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Statut de %1$s sur %2$s\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/profilesettings.php:381
+msgid "Failed updating avatar."
+msgstr "La mise à jour de l'avatar a échoué."
 
-#: ../actions/twitapistatuses.php:335 ../actions/twitapistatuses.php:338
-#: actions/twitapistatuses.php:265
+#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
+#: actions/allrss.php:64
 #, php-format
-#, fuzzy
-msgid "%s timeline"
+msgid "Feed for friends of %s"
 msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Évolution publique\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: ../actions/replies.php:65 ../actions/repliesrss.php:80
+#: actions/replies.php:65 actions/repliesrss.php:66
 #, php-format
-msgid "%s updates from everyone!"
-msgstr ""
-
-#: ../actions/register.php:199 ../actions/register.php:213
-msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+msgid "Feed for replies to %s"
 msgstr ""
 
-#: ../actions/register.php:143 ../actions/register.php:152
-#: actions/register.php:166
-#, fuzzy
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:54
+#, fuzzy, php-format
+msgid "Feed for tag %s"
 msgstr ""
 "#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces\n"
+"Fil des réponses à %s\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/register.php:145 ../actions/register.php:154
-#: actions/register.php:168
-#, fuzzy
-msgid "6 or more characters. Required."
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+msgid "Find content of notices"
 msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"6 caractères ou plus\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
-#, fuzzy
-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."
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+msgid "Find people on this site"
 msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Un code de confirmation a été envoyé à l'adresse que vous avez ajouté. "
-"Vousdevez approuver %s pour qu'il vous envoie des messages.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/smssettings.php:216 actions/smssettings.php:224
-#, fuzzy
+#: ../actions/login.php:122
 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."
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
 msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Un code de confirmation a été envoyé à l'adresse que vous avez ajouté. "
-"Vousdevez approuver %s pour qu'il vous envoie des messages.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-#, fuzzy
-msgid "Add or remove OpenIDs"
+#: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: actions/profilesettings.php:77 actions/register.php:178
+#: actions/profilesettings.php:79 actions/register.php:205
+msgid "Full name"
 msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Enlever l'OpenID\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-msgid "Are you sure you want to delete this notice?"
+#: ../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/profilesettings.php:219 actions/register.php:95
+msgid "Full name is too long (max 255 chars)."
 msgstr ""
 
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
-msgstr ""
+#: ../lib/util.php:322 lib/util.php:338 lib/util.php:343 lib/util.php:350
+msgid "Help"
+msgstr "Aide"
 
-#: ../actions/emailsettings.php:54 actions/emailsettings.php:55
-#, fuzzy
-msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
+#: ../lib/util.php:298 lib/util.php:314 lib/util.php:325
+msgid "Home"
 msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"En attente d'une confirmation pour cette adresse. Vérifiez votre "
-"compteJabber/GTalk pour recevoir un message avec les instructions "
-"suivantes.(Avez-vous ajouté %s à votre liste de contacts ?)\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
+#: ../actions/profilesettings.php:46 ../actions/register.php:167
+#: actions/profilesettings.php:79 actions/register.php:181
+#: actions/profilesettings.php:81 actions/register.php:208
+msgid "Homepage"
 msgstr ""
 
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
-#, fuzzy
-msgid "Can't delete this notice."
+#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: actions/profilesettings.php:210 actions/register.php:83
+#: actions/profilesettings.php:216 actions/register.php:92
+msgid "Homepage is not a valid URL."
 msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Impossible de supprimer la confirmation d'email.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#, fuzzy
-msgid "Cannot normalize that email address"
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+#: actions/emailsettings.php:101
+msgid "I want to post notices by email."
 msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Impossible de normaliser cet identifiant Jabber\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+#: actions/deleteprofile.php:253
+msgid "IM"
 msgstr ""
 
-#: ../lib/settingsaction.php:94
-#, fuzzy
-msgid "Change your password"
+#: ../actions/imsettings.php:60 actions/imsettings.php:61
+msgid "IM Address"
 msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Changer de mot de passe\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#, fuzzy
-msgid "Change your profile settings"
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Paramètres du profil\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
+msgid "IM Settings"
+msgstr "Paramètres de messagerie instantanée"
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-#, fuzzy
-msgid "Confirmation code"
+#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your OpenID."
 msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Pas de code de confirmation.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Si vous avez déjà un compte, connectez-vous avec votre nom d'utilisateur et "
+"votre mot de passe pour les relier à votre OpenID."
 
-#: ../actions/register.php:188 ../actions/register.php:202
-#, php-format
+#: ../actions/openidsettings.php:45
 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."
+"If you want to add an OpenID to your account, enter it in the box below and "
+"click \"Add\"."
 msgstr ""
+"Si vous voulez ajouter un OpenID à votre compte, entrez-le dans le champ ci-"
+"dessous et cliquez sur « Ajouter »."
 
-#: ../actions/twitapifriendships.php:48 ../actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
+#: ../actions/recoverpassword.php:137
+msgid ""
+"If you've forgotten or lost your password, you can get a new one sent to the "
+"email address you have stored  in your account."
 msgstr ""
 
-#: ../actions/subscribe.php:62 ../lib/subs.php:54 lib/subs.php:61
-msgid "Could not subscribe other to you."
+#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
+#: actions/emailsettings.php:68 actions/smssettings.php:76
+msgid "Incoming email"
 msgstr ""
 
-#: ../actions/subscribe.php:54 ../lib/subs.php:46 lib/subs.php:46
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+#: actions/emailsettings.php:304
 #, fuzzy
-msgid "Could not subscribe."
+msgid "Incoming email address removed."
 msgstr ""
 "#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Non inscrit !\n"
+"L'adresse a été enlevée.\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-#, fuzzy
-msgid "Could not update user with confirmed email address."
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Adresse Jabber/GTalk actuellement confirmée.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+#: ../actions/password.php:69 actions/profilesettings.php:388
+#: actions/profilesettings.php:417
+msgid "Incorrect old password"
+msgstr "Ancien mot de passe incorrect"
 
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#, fuzzy
-msgid "Couldn't update user for autosubscribe."
+#: ../actions/login.php:67 actions/login.php:67 actions/login.php:74
+msgid "Incorrect username or password."
 msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Impossible de mettre à jour l'utilisateur.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-#, fuzzy
-msgid "Couldn't update user record."
+#: ../actions/recoverpassword.php:265
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
 msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Impossible de mettre à jour l'utilisateur.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
+#, php-format
+msgid "Invalid avatar URL '%s'"
 msgstr ""
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#, fuzzy
-msgid "Current confirmed email address."
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
 msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Adresse Jabber/GTalk actuellement confirmée.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../classes/Notice.php:72 classes/Notice.php:86
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
 #, php-format
-#, fuzzy
-msgid "DB error inserting hashtag: %s"
+msgid "Invalid homepage '%s'"
 msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Erreur de base de donnée en insérant la réponse : %s\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#, fuzzy
-msgid "Delete notice"
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
+#, php-format
+msgid "Invalid license URL '%s'"
 msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Nouveau message\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#, fuzzy
-msgid "Email Address"
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Adresse email\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+#: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:63
+msgid "Invalid notice content"
+msgstr "Contenu du message invalide"
 
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-#, fuzzy
-msgid "Email Settings"
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:69
+msgid "Invalid notice uri"
+msgstr "URI du message invalide"
+
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:74
+msgid "Invalid notice url"
+msgstr "URL du message invalide"
+
+#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
+#, php-format
+msgid "Invalid profile URL '%s'."
 msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Paramètres\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-msgid "Email address, like \"UserName@example.org\""
+#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
+msgid "Invalid profile URL (bad format)"
+msgstr "URL du profil invalide (mauvais format)"
+
+#: ../actions/finishremotesubscribe.php:77
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:78
+msgid "Invalid profile URL returned by server."
+msgstr "URL du profil retourné par le serveur invalide."
+
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
+msgid "Invalid size."
+msgstr "Taille invalide."
+
+#: ../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:256 actions/register.php:112
+#: actions/register.php:130
+msgid "Invalid username or password."
 msgstr ""
 
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
 msgstr ""
 
-#: ../actions/tag.php:55 actions/tag.php:55
-#, php-format
-#, fuzzy
-msgid "Feed for tag %s"
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
 msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Fil des réponses à %s\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-msgid "Find content of notices"
+#: ../lib/util.php:306 lib/util.php:322 lib/util.php:332
+msgid "Invite"
 msgstr ""
 
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-msgid "Find people on this site"
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
 msgstr ""
 
-#: ../actions/login.php:122
+#: ../lib/util.php:261 lib/util.php:277 lib/util.php:288
+#, fuzzy, php-format
 msgid ""
-"For security reasons, please re-enter your user name and password before "
-"changing your settings."
+"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 ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Il utilise le logiciel de microblog [Laconica](http://laconi.ca/), version %"
+"s, disponible sous la licence [GNU Affero General Public License] (http://"
+"www.fsf.org/licensing/licenses/agpl-3.0.html).\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-msgid "I want to post notices by email."
+#: ../actions/imsettings.php:173 actions/imsettings.php:181
+msgid "Jabber ID already belongs to another user."
 msgstr ""
 
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
+#: ../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 ""
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-msgid "Incoming email"
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
+msgid "Language"
 msgstr ""
 
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+#: actions/profilesettings.php:234
 #, fuzzy
-msgid "Incoming email address removed."
+msgid "Language is too long (max 50 chars)."
 msgstr ""
 "#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"L'adresse a été enlevée.\n"
+"La localisation est trop longue (255 caractères maximum).\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../lib/util.php:260 ../lib/util.php:261 lib/util.php:277
+#: ../actions/profilesettings.php:52 ../actions/register.php:173
+#: actions/profilesettings.php:85 actions/register.php:187
+#: actions/profilesettings.php:87 actions/register.php:214
+msgid "Location"
+msgstr ""
+
+#: ../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/profilesettings.php:225 actions/register.php:101
+msgid "Location is too long (max 255 chars)."
+msgstr ""
+
+#: ../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/login.php:104 actions/login.php:113 actions/openidlogin.php:88
+#: lib/util.php:336
+msgid "Login"
+msgstr ""
+
+#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:60
+#, php-format
+msgid "Login with an [OpenID](%%doc.openid%%) account."
+msgstr "Se connecter avec un compte [OpenID](%%doc.openid%%)."
+
+#: ../actions/login.php:126
 #, php-format
-#, fuzzy
 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)."
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
+"%). "
 msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Il utilise le logiciel de microblog [Laconica](http://laconi.ca/), version "
-"%s, disponible sous la licence [GNU Affero General Public License] "
-"(http://www.fsf.org/licensing/licenses/agpl-3.0.html).\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Language"
+#: ../lib/util.php:308 lib/util.php:324 lib/util.php:334
+msgid "Logout"
 msgstr ""
 
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#, fuzzy
-msgid "Language is too long (max 50 chars)."
+#: ../actions/register.php:166 actions/register.php:180
+#: actions/register.php:207
+msgid "Longer name, preferably your \"real\" name"
 msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"La localisation est trop longue (255 caractères maximum).\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/register.php:152 ../actions/register.php:166
-#: actions/register.php:180
-msgid "Longer name, preferably your \"real\" name"
+#: ../actions/login.php:110 actions/login.php:110 actions/login.php:118
+msgid "Lost or forgotten password?"
 msgstr ""
 
 #: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
@@ -1037,6 +1204,16 @@ msgstr ""
 msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
+#: ../actions/showstream.php:300 actions/showstream.php:315
+#: actions/showstream.php:363
+msgid "Member since"
+msgstr ""
+
+#: ../actions/userrss.php:70 actions/userrss.php:67
+#, php-format
+msgid "Microblog by %s"
+msgstr "Microblog par %s"
+
 #: ../actions/smssettings.php:304
 #, php-format
 msgid ""
@@ -1044,14 +1221,19 @@ msgid ""
 "email but isn't listed here, send email to let us know at %s."
 msgstr ""
 
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php:85 actions/register.php:202
+#: actions/register.php:229
+msgid "My text and files are available under "
+msgstr ""
+
 #: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
 #: actions/emailsettings.php:83 actions/smssettings.php:91
 msgid "New"
 msgstr ""
 
-#: ../lib/mail.php:140 ../lib/mail.php:144 lib/mail.php:144
-#, php-format
-#, fuzzy
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:138
+#, fuzzy, php-format
 msgid "New email address for posting to %s"
 msgstr ""
 "#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
@@ -1059,6 +1241,7 @@ msgstr ""
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+#: actions/emailsettings.php:318
 #, fuzzy
 msgid "New incoming email address added."
 msgstr ""
@@ -1066,10 +1249,76 @@ msgstr ""
 "Ce n'est pas une adresse email valide.\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
+#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
+msgid "New nickname"
+msgstr "Nouveau surnom"
+
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:141
+msgid "New notice"
+msgstr ""
+
+#: ../actions/password.php:41 ../actions/recoverpassword.php:179
+#: actions/profilesettings.php:180 actions/recoverpassword.php:185
+#: actions/profilesettings.php:185
+msgid "New password"
+msgstr ""
+
+#: ../actions/recoverpassword.php:314
+msgid "New password successfully saved. You are now logged in."
+msgstr ""
+
+#: ../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:108 actions/profilesettings.php:76
+#: actions/register.php:192
+msgid "Nickname"
+msgstr ""
+
+#: ../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/finishopenidlogin.php:192 actions/profilesettings.php:231
+#: actions/register.php:85
+msgid "Nickname already in use. Try another one."
+msgstr ""
+
+#: ../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:182 actions/profilesettings.php:209
+#: actions/register.php:83
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:187
+msgid "Nickname not allowed."
+msgstr "Surnom non-autorisé."
+
+#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
+msgid "Nickname of the user you want to follow"
+msgstr "Surnom de l'utilisateur à surveiller"
+
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
+msgid "Nickname or email"
+msgstr ""
+
 #: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:104
 msgid "No"
 msgstr ""
 
+#: ../actions/imsettings.php:156 actions/imsettings.php:164
+msgid "No Jabber ID."
+msgstr ""
+
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
+msgid "No authorization request!"
+msgstr ""
+
 #: ../actions/smssettings.php:181 actions/smssettings.php:189
 msgid "No carrier selected."
 msgstr ""
@@ -1082,7 +1331,18 @@ msgstr ""
 "Pas de contenu !\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
+#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
+msgid "No confirmation code."
+msgstr "Pas de code de confirmation."
+
+#: ../actions/newnotice.php:44 actions/newmessage.php:53
+#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:52
+#: actions/newnotice.php:53
+msgid "No content!"
+msgstr ""
+
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+#: actions/emailsettings.php:197
 #, fuzzy
 msgid "No email address."
 msgstr ""
@@ -1090,7 +1350,12 @@ msgstr ""
 "Adresse email\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
+#: ../actions/userbyid.php:32 actions/userbyid.php:32
+msgid "No id."
+msgstr ""
+
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+#: actions/emailsettings.php:292
 #, fuzzy
 msgid "No incoming email address."
 msgstr ""
@@ -1098,6 +1363,22 @@ msgstr ""
 "Ce n'est pas une adresse email valide.\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
+#: ../actions/finishremotesubscribe.php:65
+#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:66
+msgid "No nickname provided by remote server."
+msgstr "Pas de surnom proposé par le serveur distant."
+
+#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
+msgid "No nickname."
+msgstr "Pas de surnom."
+
+#: ../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:243
+msgid "No pending confirmation to cancel."
+msgstr ""
+
 #: ../actions/smssettings.php:176 actions/smssettings.php:184
 #, fuzzy
 msgid "No phone number."
@@ -1106,6 +1387,84 @@ msgstr ""
 "Il n'y a pas cet utilisateur.'\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
+#: ../actions/finishremotesubscribe.php:72
+#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:73
+msgid "No profile URL returned by server."
+msgstr "Pas d'URL de profil retourné par le serveur."
+
+#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
+msgid "No registered email address for that user."
+msgstr ""
+
+#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
+msgid "No request found!"
+msgstr ""
+
+#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
+#: actions/noticesearch.php:69 actions/peoplesearch.php:69
+#: actions/noticesearch.php:68 actions/peoplesearch.php:59
+msgid "No results"
+msgstr "Pas de résultats"
+
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
+msgid "No size."
+msgstr "Pas de taille."
+
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:109
+#: actions/twitapistatuses.php:438
+msgid "No status found with that ID."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:411
+msgid "No status with that ID found."
+msgstr ""
+
+#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
+msgid "No such OpenID."
+msgstr "Il n'y a pas cet OpenID."
+
+#: ../actions/doc.php:29 actions/doc.php:29
+msgid "No such document."
+msgstr "Il n'y a pas ce document.'"
+
+#: ../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:38
+#: actions/shownotice.php:114
+msgid "No such notice."
+msgstr ""
+
+#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
+msgid "No such recovery code."
+msgstr "Il n'y a pas ce code de récupération."
+
+#: ../actions/postnotice.php:56 actions/postnotice.php:57
+msgid "No such subscription"
+msgstr "Il n'y a pas cette inscription'"
+
+#: ../actions/all.php:34 ../actions/allrss.php:35
+#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:40
+#: ../actions/remotesubscribe.php:84 ../actions/remotesubscribe.php:91
+#: ../actions/replies.php:57 ../actions/repliesrss.php:35
+#: ../actions/showstream.php:110 ../actions/userbyid.php:36
+#: ../actions/userrss.php:35 ../actions/xrds.php:35 ../lib/gallery.php:57
+#: ../lib/subs.php:33 ../lib/subs.php:82 actions/all.php:34
+#: actions/allrss.php:35 actions/avatarbynickname.php:43
+#: actions/favoritesrss.php:35 actions/foaf.php:40 actions/ical.php:31
+#: actions/remotesubscribe.php:93 actions/remotesubscribe.php:100
+#: actions/replies.php:57 actions/repliesrss.php:35
+#: actions/showfavorites.php:34 actions/showstream.php:110
+#: actions/userbyid.php:36 actions/userrss.php:35 actions/xrds.php:35
+#: classes/Command.php:120 classes/Command.php:162 classes/Command.php:203
+#: classes/Command.php:237 lib/gallery.php:62 lib/mailbox.php:36
+#: lib/subs.php:33 lib/subs.php:95 actions/showstream.php:157
+#: classes/Command.php:208 classes/Command.php:242 lib/gallery.php:85
+#: lib/subs.php:105
+msgid "No such user."
+msgstr ""
+
 #: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
 #, fuzzy
 msgid "No user with that email address or username."
@@ -1114,6 +1473,14 @@ msgstr ""
 "Pas d'adresse email définie pour cet utilisateur.\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
+#: ../lib/gallery.php:80 lib/gallery.php:85
+msgid "Nobody to show!"
+msgstr ""
+
+#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
+msgid "Not a recovery code."
+msgstr "Pas de code de récupération."
+
 #: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
 #, fuzzy
 msgid "Not a registered user."
@@ -1122,7 +1489,23 @@ msgstr ""
 "Pas de code de récupération.\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
+#: ../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:423 lib/twitterapi.php:450
+#: lib/twitterapi.php:534
+msgid "Not a supported data format."
+msgstr ""
+
+#: ../actions/imsettings.php:167 actions/imsettings.php:175
+msgid "Not a valid Jabber ID"
+msgstr ""
+
+#: ../lib/openid.php:131 lib/openid.php:131
+msgid "Not a valid OpenID."
+msgstr "Ce n'est pas un OpenID valide."
+
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+#: actions/emailsettings.php:208
 #, fuzzy
 msgid "Not a valid email address"
 msgstr ""
@@ -1130,2078 +1513,2314 @@ msgstr ""
 "Ce n'est pas une adresse email valide.\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-#, fuzzy
-msgid "Notice Search"
+#: ../actions/register.php:63 actions/register.php:70 actions/register.php:79
+msgid "Not a valid email address."
+msgstr ""
+
+#: ../actions/profilesettings.php:91 ../actions/register.php:71
+#: actions/profilesettings.php:206 actions/register.php:78
+#: actions/profilesettings.php:212 actions/register.php:87
+msgid "Not a valid nickname."
+msgstr ""
+
+#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
+msgid "Not a valid profile URL (incorrect services)."
+msgstr "Ce n'est pas un URL de profil valide (services incorrects)."
+
+#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
+msgid "Not a valid profile URL (no XRDS defined)."
+msgstr "Ce n'est pas un URL de profil valide (pas de XRDS défini)."
+
+#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
+msgid "Not a valid profile URL (no YADIS document)."
+msgstr "Ce n'est pas un URL de profil valide (pas de document YADIS)."
+
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: actions/profilesettings.php:361
+msgid "Not an image or corrupt file."
+msgstr "Ce n'est pas une image, ou c'est un fichier corrompu."
+
+#: ../actions/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:52
+msgid "Not authorized."
+msgstr "Non autorisé."
+
+#: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38
+msgid "Not expecting this response!"
+msgstr "Cette réponse n'était pas attendue !"
+
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+#: actions/twitapistatuses.php:304
+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:31 actions/newnotice.php:30
+#: actions/nudge.php:30 actions/subedit.php:31 actions/unblock.php:31
+msgid "Not logged in."
+msgstr ""
+
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:117
+msgid "Not subscribed!."
+msgstr ""
+
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+#, fuzzy
+msgid "Notice Search"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Recherche\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/showstream.php:82 actions/showstream.php:82
+#: actions/showstream.php:111 actions/showstream.php:118
+#: actions/showstream.php:123
+#, php-format
+msgid "Notice feed for %s"
+msgstr "Fil des messages de %s"
+
+#: ../actions/shownotice.php:39 actions/shownotice.php:39
+#: actions/shownotice.php:45
+msgid "Notice has no profile"
+msgstr "Le message n'a pas de profil"
+
+#: ../actions/showstream.php:316 actions/showstream.php:331
+#: actions/showstream.php:379
+msgid "Notices"
 msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Recherche\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
 #: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
 #: actions/tag.php:81
-#, php-format
-#, fuzzy
+#, fuzzy, php-format
 msgid "Notices tagged with %s"
 msgstr ""
 "#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
 "Fil des messages de %s\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-#, fuzzy
-msgid "People"
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Rechercher des personnes\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+#: ../actions/password.php:39 actions/profilesettings.php:178
+#: actions/profilesettings.php:183
+msgid "Old password"
+msgstr "Ancien mot de passe"
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-#, fuzzy
-msgid "People Search"
+#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
+#: lib/util.php:330 actions/deleteprofile.php:247 lib/util.php:340
+msgid "OpenID"
 msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Rechercher des personnes\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
+msgid "OpenID Account Setup"
+msgstr "Mise en place du compte OpenID"
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#, fuzzy
-msgid "Preferred language"
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Préférences\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+#: ../lib/openid.php:180 lib/openid.php:180
+msgid "OpenID Auto-Submit"
+msgstr "Soumission automatique OpenID"
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-#, fuzzy
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Adresse Jabber/GTalk actuellement confirmée.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+#: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
+#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
+#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
+#: actions/finishopenidlogin.php:150 actions/openidlogin.php:76
+msgid "OpenID Login"
+msgstr "Connexion OpenID"
 
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#, fuzzy
-msgid "Publish a MicroID for my email address."
+#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
+#: actions/openidlogin.php:74 actions/openidsettings.php:50
+#: actions/openidlogin.php:82
+msgid "OpenID URL"
+msgstr "URL OpenID"
+
+#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
+#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
+msgid "OpenID authentication cancelled."
+msgstr "Authentification OpenID annulée."
+
+#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
+#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
+#, php-format
+msgid "OpenID authentication failed: %s"
+msgstr "L'authentification OpenID a échouée : %s'"
+
+#: ../lib/openid.php:133 lib/openid.php:133
+#, php-format
+msgid "OpenID failure: %s"
+msgstr "Erreur OpenID : %s"
+
+#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
+msgid "OpenID removed."
+msgstr "OpenID enlevé."
+
+#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
+msgid "OpenID settings"
+msgstr "Paramètres OpenID"
+
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
 msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Entrez un surnom ou une adresse email.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: actions/profilesettings.php:350
+msgid "Partial upload."
+msgstr "Transfert partiel."
+
+#: ../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/login.php:109 actions/register.php:194
+msgid "Password"
 msgstr ""
 
-#: ../actions/register.php:28 actions/register.php:28
-#, fuzzy
-msgid "Registration not allowed."
+#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
+msgid "Password and confirmation do not match."
 msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Surnom non-autorisé.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/register.php:186 ../actions/register.php:200
-#: actions/register.php:214
-msgid "Registration successful"
+#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
+msgid "Password must be 6 chars or more."
 msgstr ""
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
+#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
+msgid "Password recovery requested"
 msgstr ""
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-msgid "SMS Phone number"
+#: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: actions/profilesettings.php:408 actions/recoverpassword.php:326
+#: actions/profilesettings.php:437
+msgid "Password saved."
 msgstr ""
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-#, fuzzy
-msgid "SMS Settings"
+#: ../actions/password.php:61 ../actions/register.php:88
+#: actions/profilesettings.php:380 actions/register.php:98
+#: actions/profilesettings.php:409 actions/register.php:107
+msgid "Passwords don't match."
 msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Paramètres de messagerie instantanée\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../lib/mail.php:215 ../lib/mail.php:219 lib/mail.php:225
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
 #, fuzzy
-msgid "SMS confirmation"
+msgid "People"
 msgstr ""
 "#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Pas de code de confirmation.\n"
+"Rechercher des personnes\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/register.php:147 ../actions/register.php:156
-#: actions/register.php:170
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
 #, fuzzy
-msgid "Same as password above. Required."
+msgid "People Search"
 msgstr ""
 "#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Identique au mot de passe ci-dessus\n"
+"Rechercher des personnes\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-msgid "Select a carrier"
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
+msgid "People search"
+msgstr "Rechercher des personnes"
+
+#: ../lib/stream.php:50 lib/personal.php:50
+msgid "Personal"
 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/invite.php:133 actions/invite.php:141
+msgid "Personal message"
 msgstr ""
 
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
 #, fuzzy
-msgid "Send me notices of new subscriptions through email."
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 "#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"M'envoyer des messages par Jabber/GTalk.\n"
+"1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: ../actions/userauthorization.php:78
 msgid ""
-"Send me notices through SMS; I understand I may incur exorbitant charges "
-"from my carrier."
+"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 ""
 
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
-#, fuzzy
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#: ../actions/imsettings.php:73 actions/imsettings.php:74
+msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"M'envoyer des messages par Jabber/GTalk.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
+#: ../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
+msgid "Preferences"
 msgstr ""
 
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
+#: ../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:185 actions/othersettings.php:179
+msgid "Preferences saved."
 msgstr ""
 
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
 #, fuzzy
-msgid "Sorry, that is not your incoming email address."
+msgid "Preferred language"
 msgstr ""
 "#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"C'est la mauvaise adresse de messagerie instantanée.\n"
+"Préférences\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/tag.php:41 ../lib/util.php:300 ../lib/util.php:301
-#: actions/tag.php:41 lib/util.php:317
-msgid "Tags"
+#: ../lib/util.php:328 lib/util.php:344 lib/util.php:356
+msgid "Privacy"
 msgstr ""
 
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
+#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
+#: classes/Notice.php:119 classes/Notice.php:139 classes/Notice.php:149
+msgid "Problem saving notice."
 msgstr ""
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-#, fuzzy
-msgid "That email address already belongs to another user."
+#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
+#: lib/settingsaction.php:84 actions/deleteprofile.php:241
+msgid "Profile"
 msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Cet identifiant Jabber appartient déjà à un autre utilisateur.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#, fuzzy
-msgid "That is already your email address."
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"C'est déjà votre identifiant Jabber.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
+msgid "Profile URL"
+msgstr "URL du profil"
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-#, fuzzy
-msgid "That is already your phone number."
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"C'est déjà votre identifiant Jabber.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
+msgid "Profile settings"
+msgstr "Paramètres du profil"
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#, fuzzy
-msgid "That is not your email address."
+#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
+#: actions/postnotice.php:52 actions/updateprofile.php:53
+msgid "Profile unknown"
 msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"C'est la mauvaise adresse de messagerie instantanée.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-#, fuzzy
-msgid "That is not your phone number."
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Ce n'est pas votre identifiant Jabber.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:77
+msgid "Public Stream Feed"
+msgstr "Fil du flux public"
 
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
+#: ../actions/public.php:33 actions/public.php:33 lib/stream.php:34
+msgid "Public timeline"
+msgstr "Évolution publique"
+
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
 #, fuzzy
-msgid "That is the wrong confirmation number."
+msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 "#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"C'est la mauvaise adresse de messagerie instantanée.\n"
+"Adresse Jabber/GTalk actuellement confirmée.\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:104
 #, fuzzy
-msgid "That phone number already belongs to another user."
+msgid "Publish a MicroID for my email address."
 msgstr ""
 "#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Cet identifiant Jabber appartient déjà à un autre utilisateur.\n"
+"Entrez un surnom ou une adresse email.\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "Timezone"
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
 msgstr ""
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-msgid "Timezone not selected."
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
+msgid "Recover"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:150 ../actions/twitapifriendships.php:163
-#: actions/twitapifriendships.php:167
-msgid "Two user ids or screen_names must be supplied."
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
+msgid "Recover password"
 msgstr ""
 
-#: ../index.php:57 index.php:57
-msgid "Unknown action"
+#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
+msgid "Recovery code for unknown user."
+msgstr "Code de récupération d'un utilisateur inconnu."
+
+#: ../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:181 actions/register.php:234 lib/util.php:338
+msgid "Register"
 msgstr ""
 
-#: ../lib/twitterapi.php:248 ../lib/twitterapi.php:269
+#: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:173
 #, fuzzy
-msgid "Unsupported type"
-msgstr "Version OMB non-supportée"
-
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-msgid "Updates by SMS"
+msgid "Registration not allowed."
 msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Surnom non-autorisé.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-msgid "Updates by instant messenger (IM)"
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:241
+msgid "Registration successful"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:238 ../actions/twitapistatuses.php:241
-#: actions/twitapistatuses.php:158
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
+msgid "Reject"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:338 ../actions/twitapistatuses.php:341
-#: actions/twitapistatuses.php:268
-#, php-format
-msgid "Updates from %1$s on %2$s!"
+#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
+#: actions/register.php:190 actions/login.php:110 actions/openidlogin.php:85
+#: actions/register.php:217
+msgid "Remember me"
 msgstr ""
 
-#: ../lib/settingsaction.php:91
-#, fuzzy
-msgid "Upload a new profile image"
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
+msgid "Remote profile with no matching profile"
 msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Impossible d'enregistrer les informations du nouveau profil\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "What timezone are you normally in?"
-msgstr ""
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
+msgid "Remote subscribe"
+msgstr "Inscription distante"
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-msgid "Yes"
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
+#: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php:48 actions/emailsettings.php:76
+#: actions/imsettings.php:49 actions/openidsettings.php:108
+#: actions/smssettings.php:50 actions/smssettings.php:84
+#: actions/twittersettings.php:59 actions/twittersettings.php:61
+msgid "Remove"
 msgstr ""
 
-#: ../actions/deletenotice.php:37 actions/deletenotice.php:37
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
+msgid "Remove OpenID"
+msgstr "Enlever l'OpenID"
+
+#: ../actions/openidsettings.php:73
 msgid ""
-"You are about to permanently delete a notice.  Once this is done, it cannot "
-"be undone."
+"Removing your only OpenID would make it impossible to log in! If you need to "
+"remove it, add another OpenID first."
 msgstr ""
+"Enlever votre seul OpenID vous empêcherai de vous connecter ! Si vous avez "
+"besoin de l'enlever, ajoutez un autre OpenID d'abord."
 
-#: ../actions/twitapifriendships.php:115 ../actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
+#: ../lib/stream.php:55 lib/personal.php:55
+msgid "Replies"
 msgstr ""
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
+#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
+msgid "Replies to %s"
 msgstr ""
 
-#: ../lib/mail.php:143 ../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"
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
+msgid "Reset"
 msgstr ""
 
-#: ../actions/showstream.php:423 ../lib/stream.php:128 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
+msgid "Reset password"
 msgstr ""
 
-#: ../lib/twitterapi.php:354
-#, fuzzy
-msgid "not a supported data format"
-msgstr "Format de fichier d'image non-supporté."
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/deleteprofile.php:250 actions/subscriptions.php:73
+msgid "SMS"
+msgstr ""
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+msgid "SMS Phone number"
+msgstr ""
 
-#: ../actions/twitapistatuses.php:692 ../actions/twitapistatuses.php:755
-#: actions/twitapistatuses.php:678
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
 #, fuzzy
-msgid "unsupported file type"
+msgid "SMS Settings"
 msgstr ""
 "#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Format de fichier d'image non-supporté.\n"
+"Paramètres de messagerie instantanée\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
-#: actions/finishopenidlogin.php:88 actions/register.php:205
-msgid ""
-" except this private data: password, email address, IM address, phone "
-"number."
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:230
+#, fuzzy
+msgid "SMS confirmation"
 msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Pas de code de confirmation.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/invite.php:168 actions/invite.php:176
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
+msgid "Same as password above"
 msgstr ""
 
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
+#: ../actions/register.php:156 actions/register.php:170
+#: actions/register.php:197
+#, fuzzy
+msgid "Same as password above. Required."
 msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Identique au mot de passe ci-dessus\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
+#: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
+#: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
+#: actions/emailsettings.php:104 actions/imsettings.php:82
+#: actions/profilesettings.php:101 actions/smssettings.php:100
+#: actions/twittersettings.php:83 actions/emailsettings.php:107
+#: actions/othersettings.php:56 actions/profilesettings.php:106
+#: actions/subscriptions.php:74 actions/tagother.php:100
+#: actions/twittersettings.php:82
+msgid "Save"
 msgstr ""
 
-#: ../lib/mail.php:126
-#, php-format
-msgid ""
-"%1$s is now listening to your notices on %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Faithfully yours,\n"
-"%4$s.\n"
+#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
+#: lib/util.php:316 lib/util.php:327
+msgid "Search"
 msgstr ""
 
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
-#, php-format
-msgid "%s (%s)"
-msgstr ""
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:84
+msgid "Search Stream Feed"
+msgstr "Fil du flux de recherche"
 
-#: ../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/noticesearch.php:30 actions/noticesearch.php:30
+#: actions/noticesearch.php:29
 #, php-format
-msgid "%s and friends"
+msgid ""
+"Search for notices on %%site.name%% by their contents. Separate search terms "
+"by spaces; they must be 3 characters or more."
 msgstr ""
+"Recherche des messages sur %%site.name%% par leur contenu. Séparez les "
+"termes de la recherches par des espaces ; ils doivent être de 3 caractères "
+"ou plus."
 
-#: ../lib/util.php:257 lib/util.php:273
+#: ../actions/peoplesearch.php:28
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+"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 ""
+"Recherche de personne sur %%site.name%% par leur nom, localisation ou "
+"intérêt. Séparez les termes de la recherches par des espaces ; ils doivent "
+"être de 3 caractères ou plus."
 
-#: ../lib/util.php:259 lib/util.php:275
-#, php-format
-msgid "**%%site.name%%** is a microblogging service. "
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+msgid "Select a carrier"
 msgstr ""
 
-#: ../lib/util.php:274 lib/util.php:290
-msgid ". Contributors should be attributed by full name or nickname."
+#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
+#: lib/util.php:1306 lib/util.php:1731 lib/util.php:1646 lib/util.php:2158
+msgid "Send"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#: ../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."
 msgstr ""
 
-#: ../actions/password.php:42 actions/profilesettings.php:181
-msgid "6 or more characters"
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+#, fuzzy
+msgid "Send me notices of new subscriptions through email."
 msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"M'envoyer des messages par Jabber/GTalk.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-msgid "6 or more characters, and don't forget it!"
+#: ../actions/imsettings.php:70 actions/imsettings.php:71
+msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 
-#: ../actions/imsettings.php:197 actions/imsettings.php:205
-#, php-format
+#: ../actions/smssettings.php:97 actions/smssettings.php:97
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve "
-"%s for sending messages to you."
-msgstr ""
-
-#: ../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!"
-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 ""
-
-#: ../lib/util.php:324 lib/util.php:340
-msgid "About"
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
 msgstr ""
 
-#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-msgid "Accept"
+#: ../actions/imsettings.php:76 actions/imsettings.php:77
+#, fuzzy
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"M'envoyer des messages par Jabber/GTalk.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../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
-msgid "Add"
+#: ../lib/util.php:304 lib/util.php:320 lib/util.php:330
+msgid "Settings"
 msgstr ""
 
-#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39 actions/emailsettings.php:39
-#: actions/imsettings.php:40 actions/smssettings.php:39
-msgid "Address"
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:336
+msgid "Settings saved."
 msgstr ""
 
-#: ../actions/invite.php:131 actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
+#: ../actions/tag.php:60 actions/tag.php:60 actions/tag.php:59
+msgid "Showing most popular tags from the last week"
 msgstr ""
 
-#: ../actions/showstream.php:273 actions/showstream.php:288
-msgid "All subscriptions"
-msgstr ""
+#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
+msgid "Someone else already has this OpenID."
+msgstr "Quelqu'un d'autre a déjà cet OpenID."
 
-#: ../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
-msgid "Already logged in."
-msgstr ""
+#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
+#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
+msgid "Something weird happened."
+msgstr "Quelque chose de bizarre est arrivé."
 
-#: ../lib/subs.php:42 lib/subs.php:42
-msgid "Already subscribed!."
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
 msgstr ""
 
-#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-msgid "Authorize subscription"
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+#, fuzzy
+msgid "Sorry, that is not your incoming email address."
 msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"C'est la mauvaise adresse de messagerie instantanée.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
-msgid "Automatically login in the future; not for shared computers!"
+#: ../lib/util.php:330 lib/util.php:346 lib/util.php:358
+msgid "Source"
 msgstr ""
 
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
-#: actions/profilesettings.php:34
-msgid "Avatar"
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:359
+msgid "Statistics"
 msgstr ""
 
-#: ../lib/util.php:1318 lib/util.php:1452
-msgid "Before »"
+#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
+#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
+#: actions/finishopenidlogin.php:199 actions/finishopenidlogin.php:267
+msgid "Stored OpenID not found."
 msgstr ""
 
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
-#: actions/profilesettings.php:82 actions/register.php:184
-msgid "Bio"
+#: ../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:254 lib/util.php:2078
+msgid "Subscribe"
 msgstr ""
 
-#: ../actions/profilesettings.php:101 ../actions/register.php:82
-#: ../actions/updateprofile.php:103 actions/profilesettings.php:216
-#: actions/register.php:89 actions/updateprofile.php:104
-msgid "Bio is too long (max 140 chars)."
+#: ../actions/showstream.php:313 ../actions/subscribers.php:27
+#: actions/showstream.php:328 actions/subscribers.php:27
+#: actions/showstream.php:376 lib/gallery.php:136 lib/gallery.php:137
+msgid "Subscribers"
 msgstr ""
 
-#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#, php-format
-msgid "Can't read avatar URL '%s'"
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
+msgid "Subscription authorized"
 msgstr ""
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
-#: actions/profilesettings.php:404 actions/recoverpassword.php:313
-msgid "Can't save new password."
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
+msgid "Subscription rejected"
 msgstr ""
 
-#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62 actions/emailsettings.php:58
-#: actions/imsettings.php:59 actions/smssettings.php:62
-msgid "Cancel"
+#: ../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:288 actions/showstream.php:370 lib/gallery.php:131
+#: lib/gallery.php:132
+msgid "Subscriptions"
 msgstr ""
 
-#: ../actions/imsettings.php:163 actions/imsettings.php:171
-msgid "Cannot normalize that Jabber ID"
-msgstr ""
+#: ../actions/avatar.php:87 actions/profilesettings.php:324
+#: actions/profilesettings.php:353
+msgid "System error uploading file."
+msgstr "Erreur système en transférant le fichier."
 
-#: ../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
-msgid "Confirm"
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317 actions/profilesettings.php:90 actions/showstream.php:382
+#: actions/tag.php:40 actions/tagother.php:96 actions/tagother.php:162
+#: lib/profilelist.php:126 lib/profilelist.php:128
+msgid "Tags"
 msgstr ""
 
-#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
-msgid "Confirm Address"
+#: ../lib/searchaction.php:104 lib/searchaction.php:104
+msgid "Text"
 msgstr ""
 
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245 actions/emailsettings.php:256
-#: actions/imsettings.php:230 actions/smssettings.php:253
-msgid "Confirmation cancelled."
+#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
+#: actions/noticesearch.php:33
+msgid "Text search"
+msgstr "Texte cherché"
+
+#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
+msgid "That OpenID does not belong to you."
+msgstr "Cet OpenID ne vous appartient pas."
+
+#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
+msgid "That address has already been confirmed."
+msgstr "Cette adresse a déjà été confirmée."
+
+#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
+msgid "That confirmation code is not for you!"
+msgstr "Ce code de confirmation n'est pas pour vous !"
+
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:214
+#, fuzzy
+msgid "That email address already belongs to another user."
 msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Cet identifiant Jabber appartient déjà à un autre utilisateur.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../lib/util.php:332 lib/util.php:348
-msgid "Contact"
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: actions/profilesettings.php:346
+msgid "That file is too big."
+msgstr "Ce fichier est trop gros."
+
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
+msgid "That is already your Jabber ID."
 msgstr ""
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:211
+#, fuzzy
+msgid "That is already your email address."
 msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"C'est déjà votre identifiant Jabber.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-msgid "Could not save avatar info"
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+#, fuzzy
+msgid "That is already your phone number."
 msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"C'est déjà votre identifiant Jabber.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-msgid "Could not save new profile info"
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
+msgid "That is not your Jabber ID."
 msgstr ""
 
-#: ../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
-msgid "Couldn't delete email confirmation."
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+#: actions/emailsettings.php:270
+#, fuzzy
+msgid "That is not your email address."
 msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"C'est la mauvaise adresse de messagerie instantanée.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../lib/subs.php:103 lib/subs.php:116
-msgid "Couldn't delete subscription."
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+#, fuzzy
+msgid "That is not your phone number."
 msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Ce n'est pas votre identifiant Jabber.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-msgid "Couldn't find any statuses."
+#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
+#: actions/emailsettings.php:244 actions/imsettings.php:218
+#: actions/emailsettings.php:247
+msgid "That is the wrong IM address."
 msgstr ""
 
-#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206 actions/emailsettings.php:223
-#: actions/imsettings.php:195 actions/smssettings.php:214
-msgid "Couldn't insert confirmation code."
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+#, fuzzy
+msgid "That is the wrong confirmation number."
 msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"C'est la mauvaise adresse de messagerie instantanée.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
-#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
-msgid "Couldn't save profile."
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+#, fuzzy
+msgid "That phone number already belongs to another user."
 msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Cet identifiant Jabber appartient déjà à un autre utilisateur.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../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
-msgid "Couldn't update user."
+#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: actions/newnotice.php:49 actions/twitapistatuses.php:330
+#: actions/newnotice.php:61 actions/twitapistatuses.php:271
+msgid "That's too long. Max notice size is 140 chars."
 msgstr ""
 
-#: ../actions/showstream.php:356 actions/showstream.php:367
-msgid "Currently"
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+#: actions/twitapiaccount.php:55
+msgid "That's too long. Max notice size is 255 chars."
 msgstr ""
 
-#: ../lib/util.php:1061 lib/util.php:1110
+#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
-msgid "DB error inserting reply: %s"
+msgid "The address \"%s\" has been confirmed for your account."
 msgstr ""
 
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
-#: actions/profilesettings.php:84 actions/register.php:186
-msgid "Describe yourself and your interests in 140 chars"
+#: ../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:285
+msgid "The address was removed."
 msgstr ""
 
-#: ../actions/register.php:158 ../actions/register.php:161
-#: ../lib/settingsaction.php:87 actions/register.php:172
-#: actions/register.php:175 lib/settingsaction.php:87
-msgid "Email"
+#: ../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 ""
 
-#: ../actions/register.php:73 actions/register.php:80
-msgid "Email address already exists."
+#: ../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 ""
 
-#: ../lib/mail.php:90 lib/mail.php:90
-msgid "Email address confirmation"
-msgstr ""
+#: ../actions/subscribers.php:35 actions/subscribers.php:35
+#, php-format
+msgid "These are the people who listen to %s's notices."
+msgstr "Ce sont les personnes qui suivent les messages de %s."
 
-#: ../actions/invite.php:129 actions/invite.php:137
-msgid "Email addresses"
-msgstr ""
+#: ../actions/subscribers.php:33 actions/subscribers.php:33
+msgid "These are the people who listen to your notices."
+msgstr "Ce sont les personnes qui suivent vos messages."
 
-#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-msgid "Enter a nickname or email address."
-msgstr ""
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#, php-format
+msgid "These are the people whose notices %s listens to."
+msgstr "Ce sont les personnes dont les messages sont suivis par %s."
 
-#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-msgid "Error authorizing token"
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+msgid "These are the people whose notices you listen to."
+msgstr "Ce sont les personnes dont vous suivez les messages."
+
+#: ../actions/invite.php:89 actions/invite.php:96
+msgid ""
+"These people are already users and you were automatically subscribed to them:"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-msgid "Error connecting user to OpenID."
+#: ../actions/recoverpassword.php:88
+msgid "This confirmation code is too old. Please start again."
 msgstr ""
 
-#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-msgid "Error saving address confirmation."
+#: ../lib/openid.php:195
+msgid ""
+"This form should automatically submit itself. If not, click the submit "
+"button to go to your OpenID provider."
 msgstr ""
+"Ce formulaire devrait se transmettre automatiquement. Si ce n'est pas le "
+"cas, cliquez sur le bouton de soumission pour aller chez votre fournisseur "
+"OpenID."
 
-#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-msgid "Error saving remote profile"
+#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
+#, 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 ""
+"Ce la première fois que vous vous êtes connectés à %s, donc nous devons "
+"connecter votre OpenID à un compte local. Vous pouvez soit créer un nouveau "
+"compte, soit vous connectez avec un compte existant, si vous en avez "
 
-#: ../lib/openid.php:226 lib/openid.php:226
-msgid "Error saving the profile."
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:94
+#: actions/twitapifriendships.php:82 actions/twitapistatuses.php:428
+msgid "This method requires a POST or DELETE."
 msgstr ""
 
-#: ../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
-msgid "Error setting user."
+#: ../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:46
+#: actions/twitapidirect_messages.php:117 actions/twitapifriendships.php:30
+#: actions/twitapistatuses.php:239
+msgid "This method requires a POST."
 msgstr ""
 
-#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
-msgid "Error with confirmation code."
+#: ../lib/util.php:164 lib/util.php:246 lib/util.php:257
+msgid "This page is not available in a media type you accept"
 msgstr ""
 
-#: ../lib/util.php:326 lib/util.php:342
-msgid "FAQ"
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
+msgid "Timezone"
 msgstr ""
 
-#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
-#: actions/allrss.php:64
-#, php-format
-msgid "Feed for friends of %s"
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
 msgstr ""
 
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
-#: actions/replies.php:65 actions/repliesrss.php:66
+#: ../actions/remotesubscribe.php:43
 #, php-format
-msgid "Feed for replies to %s"
+msgid ""
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
+"Pour s'inscrire, vous pouvez [vous connecter](%%action.login%%), ou [créer "
+"unnouveau compte](%%action.register%%). Si vous avez déjà un compte sur un "
+"[site de microblog compatible](%%doc.openmublog%%), entrez l'URL de votre "
+"profil ci-dessous."
 
-#: ../actions/profilesettings.php:44 ../actions/register.php:164
-#: actions/profilesettings.php:77 actions/register.php:178
-msgid "Full name"
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: actions/twitapifriendships.php:128
+msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
-#: ../actions/profilesettings.php:98 ../actions/register.php:79
-#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
-#: actions/register.php:86 actions/updateprofile.php:94
-msgid "Full name is too long (max 255 chars)."
+#: ../actions/profilesettings.php:48 ../actions/register.php:169
+#: actions/profilesettings.php:81 actions/register.php:183
+#: actions/profilesettings.php:83 actions/register.php:210
+msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 
-#: ../lib/util.php:322 lib/util.php:338
-msgid "Help"
-msgstr "Aide"
+#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
+msgid "URL of your profile on another compatible microblogging service"
+msgstr "URL de votre profil sur un autre service de microblog compatible"
 
-#: ../lib/util.php:298 lib/util.php:314
-msgid "Home"
+#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
+#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
+#: actions/emailsettings.php:144 actions/imsettings.php:118
+#: actions/recoverpassword.php:39 actions/smssettings.php:143
+#: actions/twittersettings.php:108 actions/emailsettings.php:147
+#: actions/othersettings.php:146 actions/twittersettings.php:199
+msgid "Unexpected form submission."
 msgstr ""
 
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
-#: actions/profilesettings.php:79 actions/register.php:181
-msgid "Homepage"
+#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
+msgid "Unexpected password reset."
 msgstr ""
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
-#: actions/profilesettings.php:210 actions/register.php:83
-msgid "Homepage is not a valid URL."
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
 msgstr ""
 
-#: ../actions/imsettings.php:60 actions/imsettings.php:61
-msgid "IM Address"
-msgstr ""
+#: ../actions/finishremotesubscribe.php:58
+#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:59
+msgid "Unknown version of OMB protocol."
+msgstr "Version inconnue du protocole OMB"
 
-#: ../actions/recoverpassword.php:137
+#: ../lib/util.php:269 lib/util.php:285 lib/util.php:296
 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."
+"Unless otherwise specified, contents of this site are copyright by the "
+"contributors and available under the "
 msgstr ""
 
-#: ../actions/login.php:67 actions/login.php:67
-msgid "Incorrect username or password."
-msgstr ""
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
+#, php-format
+msgid "Unrecognized address type %s"
+msgstr "Type d'adresse non reconnu : %s"
 
-#: ../actions/recoverpassword.php:265
-msgid ""
-"Instructions for recovering your password have been sent to the email "
-"address registered to your account."
+#: ../actions/showstream.php:209 actions/showstream.php:219
+#: actions/showstream.php:267 lib/util.php:2094
+msgid "Unsubscribe"
 msgstr ""
 
-#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#, php-format
-msgid "Invalid avatar URL '%s'"
+#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
+#: actions/postnotice.php:45 actions/updateprofile.php:46
+msgid "Unsupported OMB version"
 msgstr ""
 
-#: ../actions/invite.php:55 actions/invite.php:62
-#, php-format
-msgid "Invalid email address: %s"
+#: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: actions/profilesettings.php:371
+msgid "Unsupported image file format."
+msgstr "Format de fichier d'image non-supporté."
+
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: actions/deleteprofile.php:251
+msgid "Updates by SMS"
 msgstr ""
 
-#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#, php-format
-msgid "Invalid homepage '%s'"
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: actions/deleteprofile.php:254
+msgid "Updates by instant messenger (IM)"
 msgstr ""
 
-#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/twitapistatuses.php:126
 #, php-format
-msgid "Invalid license URL '%s'"
+msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
-#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:198
 #, php-format
-msgid "Invalid profile URL '%s'."
+msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
-#: ../actions/register.php:111 actions/finishopenidlogin.php:241
-#: actions/register.php:103 actions/register.php:121
-msgid "Invalid username or password."
-msgstr ""
+#: ../actions/avatar.php:68 actions/profilesettings.php:161
+#: actions/profilesettings.php:166
+msgid "Upload"
+msgstr "Transfert."
 
-#: ../actions/invite.php:79 actions/invite.php:86
-msgid "Invitation(s) sent"
+#: ../actions/avatar.php:27
+msgid ""
+"Upload a new \"avatar\" (user image) here. You can't edit the picture after "
+"you upload it, so make sure it's more or less square. It must be under the "
+"site license, also. Use a picture that belongs to you and that you want to "
+"share."
 msgstr ""
+"Transférez ici un nouvel « avatar » (image utilisateur). Vous ne pouvez "
+"modifier l'image après l'envoi, alors faites en sorte qu'elle soit plus ou "
+"moins carrée. Elle doit aussi être soumise à la licence du site. Utilisez "
+"une image qui vous appartient et que vous voulez partager."
 
-#: ../actions/invite.php:97 actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
+#: ../lib/settingsaction.php:91
+#, fuzzy
+msgid "Upload a new profile image"
 msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Impossible d'enregistrer les informations du nouveau profil\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../lib/util.php:306 lib/util.php:322
-msgid "Invite"
+#: ../actions/invite.php:114 actions/invite.php:121
+msgid ""
+"Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 
-#: ../actions/invite.php:123 actions/invite.php:130
-msgid "Invite new users"
+#: ../actions/register.php:159 ../actions/register.php:162
+#: actions/register.php:173 actions/register.php:176 actions/register.php:200
+#: actions/register.php:203
+msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 
-#: ../actions/imsettings.php:173 actions/imsettings.php:181
-msgid "Jabber ID already belongs to another user."
-msgstr ""
+#: ../actions/finishremotesubscribe.php:86
+#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:92
+msgid "User being listened to doesn't exist."
+msgstr "L'utilisateur à suivre n'existe pas."
 
-#: ../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."
+#: ../actions/all.php:41 ../actions/avatarbynickname.php:48
+#: ../actions/foaf.php:47 ../actions/replies.php:41
+#: ../actions/showstream.php:44 ../actions/twitapiaccount.php:82
+#: ../actions/twitapistatuses.php:319 ../actions/twitapistatuses.php:685
+#: ../actions/twitapiusers.php:82 actions/all.php:41
+#: actions/avatarbynickname.php:48 actions/foaf.php:47 actions/replies.php:41
+#: actions/showfavorites.php:41 actions/showstream.php:44
+#: actions/twitapiaccount.php:80 actions/twitapifavorites.php:68
+#: actions/twitapistatuses.php:235 actions/twitapistatuses.php:609
+#: actions/twitapiusers.php:87 lib/mailbox.php:50 actions/showstream.php:57
+#: actions/twitapiaccount.php:63 actions/twitapifavorites.php:40
+#: actions/twitapistatuses.php:163 actions/twitapistatuses.php:492
+#: lib/twitterapi.php:590
+msgid "User has no profile."
 msgstr ""
 
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
-#: actions/profilesettings.php:85 actions/register.php:187
-msgid "Location"
-msgstr ""
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
+msgid "User nickname"
+msgstr "Surnom de l'utilisateur"
 
-#: ../actions/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
-#: actions/register.php:92 actions/updateprofile.php:109
-msgid "Location is too long (max 255 chars)."
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
 msgstr ""
 
-#: ../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
-msgid "Login"
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
+msgid "What timezone are you normally in?"
 msgstr ""
 
-#: ../actions/login.php:126
+#: ../lib/util.php:1159 lib/util.php:1293 lib/util.php:1630
 #, 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%%). "
+msgid "What's up, %s?"
 msgstr ""
 
-#: ../lib/util.php:308 lib/util.php:324
-msgid "Logout"
+#: ../actions/profilesettings.php:54 ../actions/register.php:175
+#: actions/profilesettings.php:87 actions/register.php:189
+#: actions/profilesettings.php:89 actions/register.php:216
+msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 
-#: ../actions/login.php:110 actions/login.php:110
-msgid "Lost or forgotten password?"
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
+#, php-format
+msgid "Wrong image type for '%s'"
 msgstr ""
 
-#: ../actions/showstream.php:300 actions/showstream.php:315
-msgid "Member since"
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
+#, php-format
+msgid "Wrong size image at '%s'"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
-#: actions/finishopenidlogin.php:85 actions/register.php:202
-msgid "My text and files are available under "
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+#: actions/block.php:105
+msgid "Yes"
 msgstr ""
 
-#: ../actions/newnotice.php:87 actions/newnotice.php:96
-msgid "New notice"
-msgstr ""
+#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
+msgid "You already have this OpenID!"
+msgstr "Vous avez déjà cet OpenID !"
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
-#: actions/profilesettings.php:180 actions/recoverpassword.php:185
-msgid "New password"
+#: ../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:314
-msgid "New password successfully saved. You are now logged in."
+#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
+msgid "You are already logged in!"
+msgstr "Vous êtes déjà connecté !"
+
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
 msgstr ""
 
-#: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:151 actions/login.php:101
-#: actions/profilesettings.php:74 actions/register.php:165
-msgid "Nickname"
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:102
+msgid "You are not friends with the specified user."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:69 actions/finishopenidlogin.php:181
-#: actions/profilesettings.php:225 actions/register.php:76
-msgid "Nickname already in use. Try another one."
-msgstr ""
+#: ../actions/password.php:27
+msgid "You can change your password here. Choose a good one!"
+msgstr "Vous pouvez changer ici votre mot de passe. Choisissez-en un bon !"
 
-#: ../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
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#: ../actions/register.php:135 actions/register.php:145
+msgid "You can create a new account to start posting notices."
 msgstr ""
 
-#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-msgid "Nickname or email"
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
-#: ../actions/imsettings.php:156 actions/imsettings.php:164
-msgid "No Jabber ID."
+#: ../actions/openidsettings.php:86
+msgid ""
+"You can remove an OpenID from your account by clicking the button marked "
+"\"Remove\"."
 msgstr ""
+"Vous pouvez enlever un OpenID de votre compte en cliquant sur le bouton « "
+"Enlever »."
 
-#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-msgid "No authorization request!"
+#: ../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."
 msgstr ""
+"Vous pouvez envoyer et recevoir des messages via [la messagerie instantanée]"
+"(%%doc.im%%)Jabber/GTalk. Configurez votre adresse et vos paramètres ci-"
+"dessous."
 
-#: ../actions/newnotice.php:44 actions/newmessage.php:53
-#: actions/newnotice.php:44 classes/Command.php:197
-msgid "No content!"
+#: ../actions/profilesettings.php:27
+msgid ""
+"You can update your personal profile info here so people know more about you."
 msgstr ""
+"Vous pouvez mettre à jour les informations de votre profil personnel pour "
+"que l'on en sache plus sur vous."
 
-#: ../actions/userbyid.php:32 actions/userbyid.php:32
-msgid "No id."
-msgstr ""
+#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
+#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
+#: actions/finishremotesubscribe.php:83 actions/finishremotesubscribe.php:99
+msgid "You can use the local subscription!"
+msgstr "Vous pouvez utiliser l'inscription locale !"
 
-#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229 actions/emailsettings.php:240
-#: actions/imsettings.php:214 actions/smssettings.php:237
-msgid "No pending confirmation to cancel."
+#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
+#: actions/finishopenidlogin.php:38 actions/register.php:68
+#: actions/register.php:77
+msgid "You can't register if you don't agree to the license."
 msgstr ""
 
-#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-msgid "No registered email address for that user."
+#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
+msgid "You did not send us that profile"
 msgstr ""
 
-#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
-msgid "No request found!"
+#: ../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 ""
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-msgid "No status found with that ID."
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: actions/twitapistatuses.php:455
+msgid "You may not delete another user's status."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-msgid "No status with that ID found."
+#: ../actions/invite.php:31 actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
 msgstr ""
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30 actions/shownotice.php:32
-#: actions/shownotice.php:83 lib/deleteaction.php:30
-msgid "No such notice."
+#: ../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!"
 msgstr ""
 
-#: ../actions/all.php:34 ../actions/allrss.php:35
-#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:40
-#: ../actions/remotesubscribe.php:84 ../actions/remotesubscribe.php:91
-#: ../actions/replies.php:57 ../actions/repliesrss.php:35
-#: ../actions/showstream.php:110 ../actions/userbyid.php:36
-#: ../actions/userrss.php:35 ../actions/xrds.php:35 ../lib/gallery.php:57
-#: ../lib/subs.php:33 ../lib/subs.php:82 actions/all.php:34
-#: actions/allrss.php:35 actions/avatarbynickname.php:43
-#: actions/favoritesrss.php:35 actions/foaf.php:40 actions/ical.php:31
-#: actions/remotesubscribe.php:93 actions/remotesubscribe.php:100
-#: actions/replies.php:57 actions/repliesrss.php:35
-#: actions/showfavorites.php:34 actions/showstream.php:110
-#: actions/userbyid.php:36 actions/userrss.php:35 actions/xrds.php:35
-#: classes/Command.php:120 classes/Command.php:162 classes/Command.php:203
-#: classes/Command.php:237 lib/gallery.php:62 lib/mailbox.php:36
-#: lib/subs.php:33 lib/subs.php:95
-msgid "No such user."
+#: ../actions/recoverpassword.php:149
+msgid "You've been identified. Enter a  new password below. "
 msgstr ""
 
-#: ../lib/gallery.php:80 lib/gallery.php:85
-msgid "Nobody to show!"
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:84
+msgid "Your OpenID URL"
+msgstr "Votre URL OpenID"
+
+#: ../actions/recoverpassword.php:164
+msgid "Your nickname on this server, or your registered email address."
 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/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%%) vous permet de vous connecter à différents sites "
+"avec le même compte utilisateur. Gérez vos OpenID associés d'ici."
 
-#: ../actions/imsettings.php:167 actions/imsettings.php:175
-msgid "Not a valid Jabber ID"
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:1287
+msgid "a few seconds ago"
 msgstr ""
 
-#: ../actions/register.php:63 actions/register.php:70
-msgid "Not a valid email address."
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:1299
+#, php-format
+msgid "about %d days ago"
 msgstr ""
 
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
-#: actions/profilesettings.php:206 actions/register.php:78
-msgid "Not a valid nickname."
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:1295
+#, php-format
+msgid "about %d hours ago"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-msgid "Not found"
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:1291
+#, php-format
+msgid "about %d minutes ago"
 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
-msgid "Not logged in."
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:1303
+#, php-format
+msgid "about %d months ago"
 msgstr ""
 
-#: ../lib/subs.php:91 lib/subs.php:104
-msgid "Not subscribed!."
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:1297
+msgid "about a day ago"
 msgstr ""
 
-#: ../actions/showstream.php:316 actions/showstream.php:331
-msgid "Notices"
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:1289
+msgid "about a minute ago"
 msgstr ""
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
-#: lib/util.php:330
-msgid "OpenID"
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:1301
+msgid "about a month ago"
 msgstr ""
 
-#: ../actions/invite.php:135 actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:1305
+msgid "about a year ago"
 msgstr ""
 
-#: ../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
-msgid "Password"
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:1293
+msgid "about an hour ago"
 msgstr ""
 
-#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-msgid "Password and confirmation do not match."
+#: ../actions/showstream.php:423 ../lib/stream.php:132
+#: actions/showstream.php:441 lib/stream.php:99 lib/noticelist.php:211
+msgid "delete"
 msgstr ""
 
-#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-msgid "Password must be 6 chars or more."
+#: ../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:135
+#: lib/facebookaction.php:202 lib/noticelist.php:189
+msgid "in reply to..."
 msgstr ""
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
-msgid "Password recovery requested"
+#: ../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:142
+#: lib/noticelist.php:199
+msgid "reply"
 msgstr ""
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
-#: actions/profilesettings.php:408 actions/recoverpassword.php:326
-msgid "Password saved."
+#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/profilesettings.php:188
+msgid "same as password above"
+msgstr "identique au mot de passe ci-dessus"
+
+#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+#: actions/twitapistatuses.php:543
+#, fuzzy
+msgid "unsupported file type"
 msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Format de fichier d'image non-supporté.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/password.php:61 ../actions/register.php:88
-#: actions/profilesettings.php:380 actions/register.php:98
-msgid "Passwords don't match."
+#: ../lib/util.php:1309 lib/util.php:1443 lib/facebookaction.php:251
+#: lib/util.php:1783
+msgid "« After"
 msgstr ""
 
-#: ../lib/stream.php:50 lib/personal.php:50
-msgid "Personal"
+#: 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:38 actions/deleteprofile.php:127 actions/disfavor.php:47
+#: actions/emailsettings.php:130 actions/favor.php:49 actions/login.php:45
+#: actions/newmessage.php:44 actions/newnotice.php:36 actions/nudge.php:47
+#: actions/othersettings.php:139 actions/profilesettings.php:49
+#: actions/subedit.php:38 actions/tagother.php:113
+#: actions/twittersettings.php:188 actions/unblock.php:38
+msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#: ../actions/invite.php:133 actions/invite.php:141
-msgid "Personal message"
+#: actions/disfavor.php:55
+msgid "This notice is not a favorite!"
 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\"."
+#: actions/disfavor.php:63
+msgid "Could not delete favorite."
 msgstr ""
 
-#: ../actions/imsettings.php:73 actions/imsettings.php:74
-msgid "Post a notice when my Jabber/GTalk status changes."
+#: actions/disfavor.php:72
+msgid "Favor"
 msgstr ""
 
-#: ../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
-msgid "Preferences"
+#: actions/emailsettings.php:92
+msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
-#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163 actions/emailsettings.php:180
-#: actions/imsettings.php:152 actions/smssettings.php:171
-msgid "Preferences saved."
+#: actions/emailsettings.php:95
+msgid "Send me email when someone sends me a private message."
 msgstr ""
 
-#: ../lib/util.php:328 lib/util.php:344
-msgid "Privacy"
+#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:54
+#: actions/twitapifavorites.php:115
+msgid "This notice is already a favorite!"
 msgstr ""
 
-#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119
-msgid "Problem saving notice."
+#: actions/favor.php:60 actions/twitapifavorites.php:151
+#: classes/Command.php:132 actions/favor.php:61
+#: actions/twitapifavorites.php:122
+msgid "Could not create favorite."
 msgstr ""
 
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
-#: lib/settingsaction.php:84
-msgid "Profile"
+#: actions/favor.php:70
+msgid "Disfavor"
 msgstr ""
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
-#: actions/postnotice.php:52 actions/updateprofile.php:53
-msgid "Profile unknown"
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:62
+#, php-format
+msgid "%s favorite notices"
 msgstr ""
 
-#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-msgid "Recover"
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:66
+#, php-format
+msgid "Feed of favorite notices of %s"
 msgstr ""
 
-#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-msgid "Recover password"
+#: actions/inbox.php:28
+#, php-format
+msgid "Inbox for %s - page %d"
 msgstr ""
 
-#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
-#: actions/register.php:152 actions/register.php:207 lib/util.php:328
-msgid "Register"
+#: actions/inbox.php:30
+#, php-format
+msgid "Inbox for %s"
 msgstr ""
 
-#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-msgid "Reject"
+#: actions/inbox.php:53
+msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 
-#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
-#: actions/register.php:190
-msgid "Remember me"
+#: actions/invite.php:178
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
 msgstr ""
 
-#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-msgid "Remote profile with no matching profile"
+#: actions/login.php:104 actions/login.php:111 actions/openidlogin.php:86
+msgid "Automatically login in the future; "
 msgstr ""
 
-#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
-#: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
-#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
-#: actions/emailsettings.php:48 actions/emailsettings.php:76
-#: actions/imsettings.php:49 actions/openidsettings.php:108
-#: actions/smssettings.php:50 actions/smssettings.php:84
-#: actions/twittersettings.php:59
-msgid "Remove"
+#: actions/login.php:122 actions/login.php:130
+msgid "For security reasons, please re-enter your "
 msgstr ""
 
-#: ../lib/stream.php:55 lib/personal.php:55
-msgid "Replies"
+#: actions/login.php:126 actions/login.php:134
+msgid "Login with your username and password. "
 msgstr ""
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
-#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
-#, php-format
-msgid "Replies to %s"
+#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+#: actions/newmessage.php:60 actions/twitapidirect_messages.php:136
+msgid "That's too long. Max message size is 140 chars."
 msgstr ""
 
-#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-msgid "Reset"
+#: actions/newmessage.php:65 actions/newmessage.php:68
+msgid "No recipient specified."
 msgstr ""
 
-#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-msgid "Reset password"
+#: actions/newmessage.php:68 actions/newmessage.php:113
+#: classes/Command.php:206 actions/newmessage.php:71
+#: actions/newmessage.php:116 classes/Command.php:211
+msgid "You can't send a message to this user."
 msgstr ""
 
-#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-msgid "Same as password above"
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209 actions/newmessage.php:74
+#: actions/twitapidirect_messages.php:153 classes/Command.php:214
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly instead."
 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/twittersettings.php:83
-msgid "Save"
+#: actions/newmessage.php:108 actions/microsummary.php:32
+#: actions/newmessage.php:111
+msgid "No such user"
 msgstr ""
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316
-msgid "Search"
+#: actions/newmessage.php:117 actions/newmessage.php:120
+msgid "New message"
 msgstr ""
 
-#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
-#: lib/util.php:1306 lib/util.php:1731
-msgid "Send"
+#: actions/noticesearch.php:95 actions/noticesearch.php:94
+msgid "Notice without matching profile"
 msgstr ""
 
-#: ../actions/imsettings.php:70 actions/imsettings.php:71
-msgid "Send me notices through Jabber/GTalk."
+#: actions/openidsettings.php:28
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
 msgstr ""
 
-#: ../lib/util.php:304 lib/util.php:320
-msgid "Settings"
+#: actions/openidsettings.php:46
+msgid "If you want to add an OpenID to your account, "
 msgstr ""
 
-#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-msgid "Settings saved."
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
 msgstr ""
 
-#: ../lib/util.php:330 lib/util.php:346
-msgid "Source"
+#: actions/openidsettings.php:87
+msgid "You can remove an OpenID from your account "
 msgstr ""
 
-#: ../actions/showstream.php:296 actions/showstream.php:311
-msgid "Statistics"
+#: actions/outbox.php:28
+#, php-format
+msgid "Outbox for %s - page %d"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
-#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
-msgid "Stored OpenID not found."
+#: actions/outbox.php:30
+#, php-format
+msgid "Outbox for %s"
 msgstr ""
 
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197 actions/remotesubscribe.php:84
-#: actions/showstream.php:197 actions/showstream.php:206
-msgid "Subscribe"
+#: actions/outbox.php:53
+msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
-#: actions/showstream.php:328 actions/subscribers.php:27
-msgid "Subscribers"
+#: actions/peoplesearch.php:28
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
 msgstr ""
 
-#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-msgid "Subscription authorized"
+#: actions/profilesettings.php:27
+msgid "You can update your personal profile info here "
 msgstr ""
 
-#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-msgid "Subscription rejected"
+#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
+#: actions/userauthorization.php:159 actions/userrss.php:76
+#: actions/profilesettings.php:120 actions/remotesubscribe.php:333
+msgid "User without matching profile"
 msgstr ""
 
-#: ../actions/showstream.php:230 ../actions/showstream.php:307
-#: ../actions/subscriptions.php:27 actions/showstream.php:240
-#: actions/showstream.php:322 actions/subscriptions.php:27
-msgid "Subscriptions"
+#: actions/recoverpassword.php:91
+msgid "This confirmation code is too old. "
 msgstr ""
 
-#: ../actions/imsettings.php:170 actions/imsettings.php:178
-msgid "That is already your Jabber ID."
+#: actions/recoverpassword.php:141
+msgid "If you've forgotten or lost your"
 msgstr ""
 
-#: ../actions/imsettings.php:233 actions/imsettings.php:241
-msgid "That is not your Jabber ID."
+#: actions/recoverpassword.php:154
+msgid "You've been identified. Enter a "
 msgstr ""
 
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
-#: actions/emailsettings.php:244 actions/imsettings.php:218
-msgid "That is the wrong IM address."
+#: actions/recoverpassword.php:169
+msgid "Your nickname on this server, "
 msgstr ""
 
-#: ../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/recoverpassword.php:271
+msgid "Instructions for recovering your password "
 msgstr ""
 
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-msgid "That's too long. Max notice size is 255 chars."
+#: actions/recoverpassword.php:327
+msgid "New password successfully saved. "
 msgstr ""
 
-#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
-#, php-format
-msgid "The address \"%s\" has been confirmed for your account."
+#: actions/register.php:95 actions/register.php:104
+msgid "Password must be 6 or more characters."
 msgstr ""
 
-#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
-#: ../actions/smssettings.php:274 actions/emailsettings.php:282
-#: actions/imsettings.php:258 actions/smssettings.php:282
-msgid "The address was removed."
+#: actions/register.php:216 actions/register.php:243
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to..."
 msgstr ""
 
-#: ../actions/userauthorization.php:312
-msgid ""
-"The subscription has been authorized, but no callback URL was passed. Check "
-"with the site's instructions for details on how to authorize the "
-"subscription. Your subscription token is:"
+#: actions/register.php:227 actions/register.php:254
+msgid "(You should receive a message by email momentarily, with "
 msgstr ""
 
-#: ../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."
+#: actions/remotesubscribe.php:51
+#, php-format
+msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr ""
 
-#: ../actions/invite.php:89 actions/invite.php:96
-msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
+#: actions/showfavorites.php:61
+#, php-format
+msgid "Feed for favorites of %s"
 msgstr ""
 
-#: ../actions/recoverpassword.php:88
-msgid "This confirmation code is too old. Please start again."
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:88 actions/twitapifavorites.php:57
+msgid "Could not retrieve favorite notices."
 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/showmessage.php:33
+msgid "No such message."
 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/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
 msgstr ""
 
-#: ../lib/util.php:164 lib/util.php:246
-msgid "This page is not available in a media type you accept"
+#: actions/showmessage.php:61
+#, php-format
+msgid "Message to %1$s on %2$s"
 msgstr ""
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
-#: actions/profilesettings.php:81 actions/register.php:183
-msgid "URL of your homepage, blog, or profile on another site"
+#: actions/showmessage.php:66
+#, php-format
+msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
-#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
-#: actions/emailsettings.php:144 actions/imsettings.php:118
-#: actions/recoverpassword.php:39 actions/smssettings.php:143
-#: actions/twittersettings.php:108
-msgid "Unexpected form submission."
+#: actions/showstream.php:154 lib/util.php:2105
+msgid "Send a message"
 msgstr ""
 
-#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-msgid "Unexpected password reset."
+#: actions/smssettings.php:312
+#, php-format
+msgid "Mobile carrier for your phone. "
 msgstr ""
 
-#: ../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 "
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:64
+#, php-format
+msgid "Direct messages to %s"
 msgstr ""
 
-#: ../actions/showstream.php:209 actions/showstream.php:219
-msgid "Unsubscribe"
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:65
+#, php-format
+msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
-#: actions/postnotice.php:45 actions/updateprofile.php:46
-msgid "Unsupported OMB version"
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:69
+msgid "Direct Messages You've Sent"
 msgstr ""
 
-#: ../actions/invite.php:114 actions/invite.php:121
-msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:70
+#, php-format
+msgid "All the direct messages sent from %s"
 msgstr ""
 
-#: ../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"
+#: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:132
+msgid "No message text!"
 msgstr ""
 
-#: ../actions/all.php:41 ../actions/avatarbynickname.php:48
-#: ../actions/foaf.php:47 ../actions/replies.php:41
-#: ../actions/showstream.php:44 ../actions/twitapiaccount.php:82
-#: ../actions/twitapistatuses.php:319 ../actions/twitapistatuses.php:685
-#: ../actions/twitapiusers.php:82 actions/all.php:41
-#: actions/avatarbynickname.php:48 actions/foaf.php:47 actions/replies.php:41
-#: actions/showfavorites.php:41 actions/showstream.php:44
-#: actions/twitapiaccount.php:80 actions/twitapifavorites.php:68
-#: actions/twitapistatuses.php:235 actions/twitapistatuses.php:609
-#: actions/twitapiusers.php:87 lib/mailbox.php:50
-msgid "User has no profile."
+#: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:145
+msgid "Recipient user not found."
 msgstr ""
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
+#: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:148
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
-#: ../lib/util.php:1159 lib/util.php:1293
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:64
 #, php-format
-msgid "What's up, %s?"
+msgid "%s / Favorites from %s"
 msgstr ""
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
-#: actions/profilesettings.php:87 actions/register.php:189
-msgid "Where you are, like \"City, State (or Region), Country\""
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:67
+#, php-format
+msgid "%s updates favorited by %s / %s."
 msgstr ""
 
-#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
+#: actions/twitapifavorites.php:187 lib/mail.php:275
+#: actions/twitapifavorites.php:158 lib/mail.php:303
 #, php-format
-msgid "Wrong image type for '%s'"
+msgid "%s added your notice as a favorite"
 msgstr ""
 
-#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
+#: actions/twitapifavorites.php:188 lib/mail.php:276
+#: actions/twitapifavorites.php:159 lib/mail.php:304
 #, php-format
-msgid "Wrong size image at '%s'"
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
 msgstr ""
 
-#: ../actions/invite.php:81 actions/invite.php:88
-msgid "You are already subscribed to these users:"
+#: actions/twittersettings.php:27 actions/twittersettings.php:29
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 
-#: ../actions/register.php:135 actions/register.php:145
-msgid "You can create a new account to start posting notices."
+#: actions/twittersettings.php:41 actions/twittersettings.php:43
+msgid "Twitter settings"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
-#: actions/finishopenidlogin.php:38 actions/register.php:68
-msgid "You can't register if you don't agree to the license."
+#: actions/twittersettings.php:48 actions/twittersettings.php:50
+msgid "Twitter Account"
 msgstr ""
 
-#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-msgid "You did not send us that profile"
+#: actions/twittersettings.php:56 actions/twittersettings.php:58
+msgid "Current verified Twitter account."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-msgid "You may not delete another user's status."
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
 msgstr ""
 
-#: ../actions/invite.php:31 actions/invite.php:31
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
+#: actions/twittersettings.php:65
+msgid "No spaces, please."
 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/twittersettings.php:67
+msgid "Twitter Password"
 msgstr ""
 
-#: ../actions/recoverpassword.php:149
-msgid "You've been identified. Enter a  new password below. "
+#: actions/twittersettings.php:72
+msgid "Automatically send my notices to Twitter."
 msgstr ""
 
-#: ../actions/recoverpassword.php:164
-msgid "Your nickname on this server, or your registered email address."
+#: actions/twittersettings.php:75
+msgid "Send local \"@\" replies to Twitter."
 msgstr ""
 
-#: ../lib/util.php:943 lib/util.php:992
-msgid "a few seconds ago"
+#: actions/twittersettings.php:78
+msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: ../lib/util.php:955 lib/util.php:1004
-#, php-format
-msgid "about %d days ago"
+#: actions/twittersettings.php:122 actions/twittersettings.php:216
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
 msgstr ""
 
-#: ../lib/util.php:951 lib/util.php:1000
-#, php-format
-msgid "about %d hours ago"
+#: actions/twittersettings.php:128 actions/twittersettings.php:221
+msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
-#: ../lib/util.php:947 lib/util.php:996
+#: actions/twittersettings.php:137 actions/twittersettings.php:228
 #, php-format
-msgid "about %d minutes ago"
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
 msgstr ""
 
-#: ../lib/util.php:959 lib/util.php:1008
-#, php-format
-msgid "about %d months ago"
+#: actions/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:234 actions/twittersettings.php:253
+msgid "Unable to save your Twitter settings!"
 msgstr ""
 
-#: ../lib/util.php:953 lib/util.php:1002
-msgid "about a day ago"
+#: actions/twittersettings.php:174 actions/twittersettings.php:261
+msgid "Twitter settings saved."
 msgstr ""
 
-#: ../lib/util.php:945 lib/util.php:994
-msgid "about a minute ago"
+#: actions/twittersettings.php:192 actions/twittersettings.php:272
+msgid "That is not your Twitter account."
 msgstr ""
 
-#: ../lib/util.php:957 lib/util.php:1006
-msgid "about a month ago"
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:280
+msgid "Couldn't remove Twitter user."
 msgstr ""
 
-#: ../lib/util.php:961 lib/util.php:1010
-msgid "about a year ago"
+#: actions/twittersettings.php:212 actions/twittersettings.php:284
+msgid "Twitter account removed."
 msgstr ""
 
-#: ../lib/util.php:949 lib/util.php:998
-msgid "about an hour ago"
+#: actions/twittersettings.php:225 actions/twittersettings.php:239
+#: actions/twittersettings.php:299 actions/twittersettings.php:310
+#: actions/twittersettings.php:322
+msgid "Couldn't save Twitter preferences."
 msgstr ""
 
-#: ../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/twittersettings.php:245 actions/twittersettings.php:330
+msgid "Twitter preferences saved."
 msgstr ""
 
-#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
-#: ../lib/stream.php:124 actions/noticesearch.php:143
-#: actions/showstream.php:433 lib/stream.php:91
-msgid "reply"
+#: actions/userauthorization.php:84
+msgid "Please check these details to make sure "
 msgstr ""
 
-#: ../lib/util.php:1309 lib/util.php:1443
-msgid "« After"
+#: actions/userauthorization.php:324
+msgid "The subscription has been authorized, but no "
 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/userauthorization.php:334
+msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#: actions/disfavor.php:55
-msgid "This notice is not a favorite!"
+#: classes/Channel.php:113 classes/Channel.php:129
+msgid "Command results"
 msgstr ""
 
-#: actions/disfavor.php:63
-msgid "Could not delete favorite."
+#: classes/Channel.php:148 classes/Channel.php:175
+msgid "Command complete"
 msgstr ""
 
-#: actions/disfavor.php:72
-msgid "Favor"
+#: classes/Channel.php:158 classes/Channel.php:185
+msgid "Command failed"
 msgstr ""
 
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
+#: classes/Command.php:39
+msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: actions/emailsettings.php:95
-msgid "Send me email when someone sends me a private message."
+#: classes/Command.php:96
+#, php-format
+msgid "Subscriptions: %1$s\n"
 msgstr ""
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142
-msgid "This notice is already a favorite!"
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:247
+msgid "User has no last notice"
 msgstr ""
 
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
-msgid "Could not create favorite."
+#: classes/Command.php:146
+msgid "Notice marked as fave."
 msgstr ""
 
-#: actions/favor.php:70
-msgid "Disfavor"
+#: classes/Command.php:166
+#, php-format
+msgid "%1$s (%2$s)"
 msgstr ""
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: classes/Command.php:169
 #, php-format
-msgid "%s favorite notices"
+msgid "Fullname: %s"
 msgstr ""
 
-#: actions/favoritesrss.php:64
+#: classes/Command.php:172
 #, php-format
-msgid "Feed of favorite notices of %s"
+msgid "Location: %s"
 msgstr ""
 
-#: actions/inbox.php:28
+#: classes/Command.php:175
 #, php-format
-msgid "Inbox for %s - page %d"
+msgid "Homepage: %s"
 msgstr ""
 
-#: actions/inbox.php:30
+#: classes/Command.php:178
 #, php-format
-msgid "Inbox for %s"
+msgid "About: %s"
 msgstr ""
 
-#: actions/inbox.php:53
-msgid "This is your inbox, which lists your incoming private messages."
+#: classes/Command.php:200 classes/Command.php:202
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: actions/invite.php:178
+#: classes/Command.php:214 classes/Command.php:219
 #, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
+msgid "Direct message to %s sent"
 msgstr ""
 
-#: actions/login.php:104
-msgid "Automatically login in the future; "
+#: classes/Command.php:216 classes/Command.php:221
+msgid "Error sending direct message."
 msgstr ""
 
-#: actions/login.php:122
-msgid "For security reasons, please re-enter your "
+#: classes/Command.php:263 classes/Command.php:268
+msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: actions/login.php:126
-msgid "Login with your username and password. "
+#: classes/Command.php:270 classes/Command.php:275
+#, php-format
+msgid "Subscribed to %s"
 msgstr ""
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-msgid "That's too long. Max message size is 140 chars."
+#: classes/Command.php:288 classes/Command.php:293
+msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: actions/newmessage.php:65
-msgid "No recipient specified."
+#: classes/Command.php:295 classes/Command.php:300
+#, php-format
+msgid "Unsubscribed from %s"
 msgstr ""
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
-msgid "You can't send a message to this user."
+#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:315
+#: classes/Command.php:335
+msgid "Command not yet implemented."
 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."
+#: classes/Command.php:313 classes/Command.php:318
+msgid "Notification off."
 msgstr ""
 
-#: actions/newmessage.php:108
-msgid "No such user"
+#: classes/Command.php:315 classes/Command.php:320
+msgid "Can't turn off notification."
 msgstr ""
 
-#: actions/newmessage.php:117
-msgid "New message"
+#: classes/Command.php:333 classes/Command.php:338
+msgid "Notification on."
 msgstr ""
 
-#: actions/noticesearch.php:95
-msgid "Notice without matching profile"
+#: classes/Command.php:335 classes/Command.php:340
+msgid "Can't turn on notification."
 msgstr ""
 
-#: actions/openidsettings.php:28
-#, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+#: classes/Command.php:344 classes/Command.php:349
+msgid "Commands:\n"
 msgstr ""
 
-#: actions/openidsettings.php:46
-msgid "If you want to add an OpenID to your account, "
+#: classes/Message.php:53
+msgid "Could not insert message."
 msgstr ""
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
+#: classes/Message.php:63
+msgid "Could not update message with new URI."
 msgstr ""
 
-#: actions/openidsettings.php:87
-msgid "You can remove an OpenID from your account "
+#: lib/gallery.php:46 lib/gallery.php:55
+msgid "User without matching profile in system."
 msgstr ""
 
-#: actions/outbox.php:28
+#: lib/mail.php:147 lib/mail.php:141
 #, php-format
-msgid "Outbox for %s - page %d"
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
 msgstr ""
 
-#: actions/outbox.php:30
+#: lib/mail.php:249 lib/mail.php:275
 #, php-format
-msgid "Outbox for %s"
-msgstr ""
-
-#: actions/outbox.php:53
-msgid "This is your outbox, which lists private messages you have sent."
+msgid "New private message from %s"
 msgstr ""
 
-#: actions/peoplesearch.php:28
+#: lib/mail.php:253 lib/mail.php:279
 #, php-format
 msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
 msgstr ""
 
-#: actions/profilesettings.php:27
-msgid "You can update your personal profile info here "
+#: lib/mailbox.php:43
+msgid "Only the user can read their own mailboxes."
 msgstr ""
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-msgid "User without matching profile"
+#: lib/openid.php:195
+msgid "This form should automatically submit itself. "
 msgstr ""
 
-#: actions/recoverpassword.php:91
-msgid "This confirmation code is too old. "
+#: lib/personal.php:65
+msgid "Favorites"
 msgstr ""
 
-#: actions/recoverpassword.php:141
-msgid "If you've forgotten or lost your"
+#: lib/personal.php:66
+#, php-format
+msgid "%s's favorite notices"
 msgstr ""
 
-#: actions/recoverpassword.php:154
-msgid "You've been identified. Enter a "
+#: lib/personal.php:66
+msgid "User"
 msgstr ""
 
-#: actions/recoverpassword.php:169
-msgid "Your nickname on this server, "
+#: lib/personal.php:75
+msgid "Inbox"
 msgstr ""
 
-#: actions/recoverpassword.php:271
-msgid "Instructions for recovering your password "
+#: lib/personal.php:76
+msgid "Your incoming messages"
 msgstr ""
 
-#: actions/recoverpassword.php:327
-msgid "New password successfully saved. "
+#: lib/personal.php:80
+msgid "Outbox"
 msgstr ""
 
-#: actions/register.php:95
-msgid "Password must be 6 or more characters."
+#: lib/personal.php:81
+msgid "Your sent messages"
 msgstr ""
 
-#: actions/register.php:216
-#, php-format
-msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
+#: lib/settingsaction.php:99 actions/deleteprofile.php:256
+msgid "Twitter"
 msgstr ""
 
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
+#: lib/settingsaction.php:100 actions/deleteprofile.php:257
+msgid "Twitter integration options"
 msgstr ""
 
-#: actions/remotesubscribe.php:51
-#, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
+#: lib/util.php:1718 lib/util.php:2145
+msgid "To"
+msgstr ""
+
+#: scripts/maildaemon.php:45
+msgid "Could not parse message."
+msgstr ""
+
+#: actions/block.php:45 actions/subedit.php:45 actions/unblock.php:45
+msgid "No profile specified."
+msgstr ""
+
+#: actions/block.php:52 actions/subedit.php:52 actions/tagother.php:45
+#: actions/unblock.php:52
+msgid "No profile with that ID."
 msgstr ""
 
-#: actions/showfavorites.php:61
-#, php-format
-msgid "Feed for favorites of %s"
+#: actions/block.php:78
+msgid "Block user"
 msgstr ""
 
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-msgid "Could not retrieve favorite notices."
+#: actions/block.php:81
+msgid "Are you sure you want to block this user? "
 msgstr ""
 
-#: actions/showmessage.php:33
-msgid "No such message."
+#: actions/block.php:117
+#, fuzzy
+msgid "You have already blocked this user."
+msgstr "Vous êtes déjà connecté !"
+
+#: actions/block.php:124
+msgid "Failed to save block information."
 msgstr ""
 
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
+#: actions/deleteprofile.php:25
+msgid "Code not yet ready."
 msgstr ""
 
-#: actions/showmessage.php:61
-#, php-format
-msgid "Message to %1$s on %2$s"
+#: actions/deleteprofile.php:36
+msgid "Export and delete your user information."
 msgstr ""
 
-#: actions/showmessage.php:66
-#, php-format
-msgid "Message from %1$s on %2$s"
+#: actions/deleteprofile.php:88 actions/deleteprofile.php:119
+#, fuzzy
+msgid "Delete my account"
+msgstr "Créer un nouveau compte"
+
+#: actions/deleteprofile.php:89
+msgid "Delete my account confirmation"
 msgstr ""
 
-#: actions/showstream.php:154
-msgid "Send a message"
+#: actions/deleteprofile.php:117
+msgid "Check if you are sure you want to delete your account."
 msgstr ""
 
-#: actions/smssettings.php:312
-#, php-format
-msgid "Mobile carrier for your phone. "
+#: actions/deleteprofile.php:259 lib/settingsaction.php:102
+msgid "Other"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76
-#, php-format
-msgid "Direct messages to %s"
+#: actions/deleteprofile.php:260 lib/settingsaction.php:103
+msgid "Other options"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77
-#, php-format
-msgid "All the direct messages sent to %s"
+#: actions/disfavor.php:72
+msgid "Add to favorites"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81
-msgid "Direct Messages You've Sent"
+#: actions/emailsettings.php:98
+msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82
-#, php-format
-msgid "All the direct messages sent from %s"
+#: actions/facebookremove.php:54
+#, fuzzy
+msgid "Couldn't remove Facebook user."
+msgstr "Impossible de créer l'inscription."
+
+#: actions/favor.php:71
+msgid "Disfavor favorite"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:128
-msgid "No message text!"
+#: actions/favorited.php:31 lib/stream.php:45
+msgid "Popular notices"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:138
-msgid "Recipient user not found."
+#: actions/favorited.php:54
+msgid "Showing recently popular notices"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:141
-msgid "Can't send direct messages to users who aren't your friend."
+#: actions/featured.php:32 actions/featured.php:54 lib/stream.php:41
+msgid "Featured users"
 msgstr ""
 
-#: actions/twitapifavorites.php:92
-#, php-format
-msgid "%s / Favorites from %s"
+#: actions/finishremotesubscribe.php:186
+msgid "That user has blocked you from subscribing."
 msgstr ""
 
-#: actions/twitapifavorites.php:95
-#, php-format
-msgid "%s updates favorited by %s / %s."
+#: actions/microsummary.php:39
+msgid "No current status"
 msgstr ""
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
-#, php-format
-msgid "%s added your notice as a favorite"
+#: actions/newnotice.php:93
+#, fuzzy
+msgid "Notice posted"
 msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Recherche\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: 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"
+#: actions/newnotice.php:116 classes/Channel.php:140
+msgid "Ajax Error"
 msgstr ""
 
-#: actions/twittersettings.php:27
+#: actions/nudge.php:52
 msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
 
-#: actions/twittersettings.php:41
-msgid "Twitter settings"
+#: actions/nudge.php:61
+msgid "Nudge sent"
 msgstr ""
 
-#: actions/twittersettings.php:48
-msgid "Twitter Account"
+#: actions/othersettings.php:27
+msgid "Manage various other options."
 msgstr ""
 
-#: actions/twittersettings.php:56
-msgid "Current verified Twitter account."
+#: actions/othersettings.php:33
+#, fuzzy
+msgid "Other Settings"
+msgstr "Paramètres de messagerie instantanée"
+
+#: actions/othersettings.php:35
+msgid "URL Auto-shortening"
 msgstr ""
 
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
+#: actions/othersettings.php:54
+msgid "Service"
 msgstr ""
 
-#: actions/twittersettings.php:65
-msgid "No spaces, please."
+#: actions/othersettings.php:54
+msgid "Automatic shortening service to use."
 msgstr ""
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
+#: actions/othersettings.php:155
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
 msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"La localisation est trop longue (255 caractères maximum).\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: actions/twittersettings.php:72
-msgid "Automatically send my notices to Twitter."
+#: actions/peopletag.php:33
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
 msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Ce n'est pas une adresse email valide.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: actions/twittersettings.php:75
-msgid "Send local \"@\" replies to Twitter."
+#: actions/peopletag.php:45
+#, php-format
+msgid "Users self-tagged with %s - page %d"
 msgstr ""
 
-#: actions/twittersettings.php:78
-msgid "Subscribe to my Twitter friends here."
+#: actions/peopletag.php:87
+#, php-format
+msgid "These are users who have tagged themselves \"%s\" "
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: actions/profilesettings.php:92
 msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 
-#: actions/twittersettings.php:128
-msgid "Could not verify your Twitter credentials!"
+#: actions/profilesettings.php:246 actions/tagother.php:131
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Taille invalide."
+
+#: actions/profilesettings.php:328
+msgid "Couldn't save tags."
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: actions/public.php:68
 #, php-format
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
 msgstr ""
 
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-msgid "Unable to save your Twitter settings!"
+#: actions/public.php:90
+#, fuzzy
+msgid "Could not retrieve public stream."
 msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Non inscrit !\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: actions/twittersettings.php:174
-msgid "Twitter settings saved."
+#: actions/register.php:67 actions/register.php:177
+msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/twittersettings.php:192
-msgid "That is not your Twitter account."
+#: actions/register.php:156
+msgid "With this form you can create a new account. "
 msgstr ""
 
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-msgid "Couldn't remove Twitter user."
+#: actions/remotesubscribe.php:136 actions/remotesubscribe.php:141
+msgid "That's a local profile! Login to subscribe."
 msgstr ""
 
-#: actions/twittersettings.php:212
-msgid "Twitter account removed."
+#: actions/subedit.php:68
+msgid "You are not subscribed to that profile."
 msgstr ""
 
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-msgid "Couldn't save Twitter preferences."
-msgstr ""
+#: actions/subedit.php:81
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "Impossible de créer l'inscription."
 
-#: actions/twittersettings.php:245
-msgid "Twitter preferences saved."
+#: actions/subscribe.php:53
+#, fuzzy
+msgid "Not a local user."
 msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Pas de code de récupération.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: actions/userauthorization.php:84
-msgid "Please check these details to make sure "
-msgstr ""
+#: actions/subscribe.php:67
+#, fuzzy
+msgid "Subscribed"
+msgstr "Inscription distante"
 
-#: actions/userauthorization.php:324
-msgid "The subscription has been authorized, but no "
+#: actions/subscriptions.php:72
+msgid "Jabber"
 msgstr ""
 
-#: actions/userauthorization.php:334
-msgid "The subscription has been rejected, but no "
+#: actions/tagother.php:31
+msgid "Not logged in"
 msgstr ""
 
-#: classes/Channel.php:113
-msgid "Command results"
-msgstr ""
+#: actions/tagother.php:40
+#, fuzzy
+msgid "No id argument."
+msgstr "Il n'y a pas ce document.'"
 
-#: classes/Channel.php:148
-msgid "Command complete"
+#: actions/tagother.php:56
+msgid "Tag a person"
 msgstr ""
 
-#: classes/Channel.php:158
-msgid "Command failed"
+#: actions/tagother.php:98
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
 msgstr ""
 
-#: classes/Command.php:39
-msgid "Sorry, this command is not yet implemented."
-msgstr ""
+#: actions/tagother.php:120
+#, fuzzy
+msgid "No such profile."
+msgstr "Il n'y a pas cet OpenID."
 
-#: classes/Command.php:96
-#, php-format
-msgid "Subscriptions: %1$s\n"
+#: actions/tagother.php:146
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242
-msgid "User has no last notice"
+#: actions/tagother.php:153
+#, fuzzy
+msgid "Could not save tags."
 msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Non inscrit !\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: classes/Command.php:146
-msgid "Notice marked as fave."
+#: actions/tagother.php:188
+msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
-#: classes/Command.php:166
-#, php-format
-msgid "%1$s (%2$s)"
-msgstr ""
+#: actions/tagrss.php:33
+#, fuzzy
+msgid "No such tag."
+msgstr "Il n'y a pas ce document.'"
 
-#: classes/Command.php:169
-#, php-format
-msgid "Fullname: %s"
+#: actions/tagrss.php:62
+#, fuzzy, php-format
+msgid "Microblog tagged with %s"
 msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Fil des messages de %s\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: classes/Command.php:172
-#, php-format
-msgid "Location: %s"
+#: actions/twitapiblocks.php:45
+msgid "Block user failed."
 msgstr ""
 
-#: classes/Command.php:175
-#, php-format
-msgid "Homepage: %s"
+#: actions/twitapiblocks.php:66
+msgid "Unblock user failed."
 msgstr ""
 
-#: classes/Command.php:178
-#, php-format
-msgid "About: %s"
+#: actions/twitapiusers.php:45
+msgid "Not found."
 msgstr ""
 
-#: classes/Command.php:200
-#, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
+#: actions/twittersettings.php:63
+msgid "Twitter user name"
 msgstr ""
 
-#: classes/Command.php:214
-#, php-format
-msgid "Direct message to %s sent"
-msgstr ""
+#: actions/twittersettings.php:67
+#, fuzzy
+msgid "Twitter password"
+msgstr "Changer de mot de passe"
 
-#: classes/Command.php:216
-msgid "Error sending direct message."
+#: actions/twittersettings.php:129
+msgid "Twitter Friends"
 msgstr ""
 
-#: classes/Command.php:263
-msgid "Specify the name of the user to subscribe to"
-msgstr ""
+#: actions/unblock.php:73
+#, fuzzy
+msgid "Error removing the block."
+msgstr "Erreur lors de l'enregistrement de l'utilisateur."
 
-#: classes/Command.php:270
-#, php-format
-msgid "Subscribed to %s"
-msgstr ""
+#: actions/unsubscribe.php:48
+#, fuzzy
+msgid "No profile id in request."
+msgstr "Pas d'URL de profil retourné par le serveur."
 
-#: classes/Command.php:288
-msgid "Specify the name of the user to unsubscribe from"
+#: actions/unsubscribe.php:55
+msgid "No profile with that id."
 msgstr ""
 
-#: classes/Command.php:295
-#, php-format
-msgid "Unsubscribed from %s"
+#: actions/unsubscribe.php:69
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Inscription distante"
+
+#: classes/Notice.php:100
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "Erreur lors de l'enregistrement de l'utilisateur."
+
+#: classes/Notice.php:105
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330
-msgid "Command not yet implemented."
+#: classes/Notice.php:112
+msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: classes/Command.php:313
-msgid "Notification off."
+#: lib/gallery.php:98
+#, fuzzy
+msgid "Filter tags"
 msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Fil des réponses à %s\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: classes/Command.php:315
-msgid "Can't turn off notification."
+#: lib/gallery.php:104
+msgid "All"
 msgstr ""
 
-#: classes/Command.php:333
-msgid "Notification on."
+#: lib/gallery.php:108
+msgid "Tag"
 msgstr ""
 
-#: classes/Command.php:335
-msgid "Can't turn on notification."
+#: lib/gallery.php:109
+msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: classes/Command.php:344
-msgid "Commands:\n"
+#: lib/gallery.php:110
+msgid "Go"
 msgstr ""
 
-#: classes/Message.php:53
-msgid "Could not insert message."
+#: lib/gallery.php:264
+msgid "Subscriptions navigation"
 msgstr ""
 
-#: classes/Message.php:63
-msgid "Could not update message with new URI."
+#: lib/gallery.php:270 lib/gallery.php:292
+msgid "List"
 msgstr ""
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
+#: lib/gallery.php:280 lib/gallery.php:294
+msgid "Icons"
 msgstr ""
 
-#: lib/mail.php:147
+#: lib/mail.php:92
 #, php-format
 msgid ""
-"You have a new posting address on %1$s.\n"
+"Hey, %s.\n"
+"\n"
+"Someone just entered this email address on %s.\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:249
+#: lib/mail.php:242
 #, php-format
-msgid "New private message from %s"
+msgid "You've been nudged by %s"
 msgstr ""
 
-#: lib/mail.php:253
+#: lib/mail.php:246
 #, php-format
 msgid ""
-"%1$s (%2$s) sent you a private message:\n"
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
 "\n"
 msgstr ""
 
-#: lib/mailbox.php:43
-msgid "Only the user can read their own mailboxes."
+#: lib/profilelist.php:146
+msgid "(none)"
 msgstr ""
 
-#: lib/openid.php:195
-msgid "This form should automatically submit itself. "
-msgstr ""
+#: lib/stream.php:33
+msgid "Public"
+msgstr "Public"
 
-#: lib/personal.php:65
-msgid "Favorites"
+#: lib/stream.php:36 lib/stream.php:37
+msgid "Recent tags"
 msgstr ""
 
-#: lib/personal.php:66
-#, php-format
-msgid "%s's favorite notices"
+#: lib/stream.php:40
+msgid "Featured"
 msgstr ""
 
-#: lib/personal.php:66
-msgid "User"
+#: lib/stream.php:44
+#, fuzzy
+msgid "Popular"
 msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Rechercher des personnes\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: lib/personal.php:75
-msgid "Inbox"
+#: lib/subs.php:51
+msgid "User has blocked you."
 msgstr ""
 
-#: lib/personal.php:76
-msgid "Your incoming messages"
+#: lib/util.php:2059
+msgid "Send a nudge"
 msgstr ""
 
-#: lib/personal.php:80
-msgid "Outbox"
+#: lib/util.php:2063
+msgid "Nudge sent!"
 msgstr ""
 
-#: lib/personal.php:81
-msgid "Your sent messages"
+#: lib/util.php:2194
+msgid "Block"
 msgstr ""
 
-#: lib/settingsaction.php:99
-msgid "Twitter"
+#: lib/util.php:2198
+msgid "Unblock"
 msgstr ""
 
-#: lib/settingsaction.php:100
-msgid "Twitter integration options"
-msgstr ""
+#~ msgid "Couldn't confirm email."
+#~ msgstr "Impossible de confirmer l'email"
 
-#: lib/util.php:1718
-msgid "To"
-msgstr ""
+#~ msgid "Email address"
+#~ msgstr "Adresse email"
 
-#: scripts/maildaemon.php:45
-msgid "Could not parse message."
-msgstr ""
+#~ msgid "Error inserting notice"
+#~ msgstr "Erreur lors de l'insertion d'un message"
+
+#~ 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)."
+#~ msgstr ""
+#~ "Il utilise le logiciel de microblog [Laconica](http://laconi.ca/), "
+#~ "version %s, disponible sous la licence [GNU Affero General Public "
+#~ "License] (http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+
+#, fuzzy
+#~ msgid "Unsupported type"
+#~ msgstr "Version OMB non-supportée"
+
+#, fuzzy
+#~ msgid "not a supported data format"
+#~ msgstr "Format de fichier d'image non-supporté."
diff --git a/he_IL/LC_MESSAGES/laconica.po b/he_IL/LC_MESSAGES/laconica.po
index b30da8437b..18434d6e60 100644
--- a/he_IL/LC_MESSAGES/laconica.po
+++ b/he_IL/LC_MESSAGES/laconica.po
@@ -16,46 +16,86 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-14 21:07+1200\n"
-"PO-Revision-Date: 2008-09-17 23:59 GMT+3\n"
-"Last-Translator: Hezy Amiel <open@hezyamiel.com>\n"
-"Language-Team: Hebrew \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"
-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"POT-Creation-Date: 2009-01-12 12:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/noticesearchrss.php:64
+#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:61
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr "חיפוש ברצף אחרי \"%s\""
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
-#: ../actions/register.php:191 actions/finishopenidlogin.php:88
-#: actions/register.php:205
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: actions/finishopenidlogin.php:88 actions/register.php:205
+#: actions/register.php:232
+msgid ""
+" except this private data: password, email address, IM address, phone number."
+msgstr ""
+
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+#: lib/facebookaction.php:195 lib/noticelist.php:160
+msgid " from "
+msgstr ""
+
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: actions/twitapistatuses.php:341
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr ""
+
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
+
+#: ../actions/invite.php:170
+#, php-format
 msgid ""
-" except this private data: password, email address, IM address, phone "
-"number."
-msgstr "מלבד מידע פרטי זה: סיסמה, כתובת דוא"ל, כתובת מסרים מידיים, מספר טלפון."
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
 
-#: ../actions/subscribe.php:84
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:115
+#: lib/mail.php:117
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s כעת מאזין להודעות שלך ב-%2$s"
 
-#: ../actions/subscribe.php:86
+#: ../lib/mail.php:126
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -67,983 +107,1624 @@ msgid ""
 msgstr ""
 "%1$s מאזין כעת להודעות שלך ב %2$s. \n"
 "\n"
-"\t%3$s\n שלך,\n %4$s.\n"
+"\t%3$s\n"
+" שלך,\n"
+" %4$s.\n"
+
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#: actions/twitapistatuses.php:344
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
 
-#: ../actions/shownotice.php:45
+#: ../actions/shownotice.php:45 actions/shownotice.php:45
+#: actions/shownotice.php:73
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "הסטטוס של %1$s ב-%2$s "
 
-#: ../actions/publicrss.php:60
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../actions/publicrss.php:62 actions/publicrss.php:48
 #, php-format
 msgid "%s Public Stream"
 msgstr "רצף ציבורי ב-%s"
 
-#: ../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/twitapistatuses.php:123
 #, php-format
 msgid "%s and friends"
 msgstr "%s וחברים"
 
-#: ../lib/util.php:233
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:31
+#, php-format
+msgid "%s public timeline"
+msgstr ""
+
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:217
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:195
+#, php-format
+msgid "%s timeline"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:34
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+
+#: ../lib/util.php:257 lib/util.php:273 lib/util.php:284
 #, 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%%** הוא שרות ביקרובלוג הניתן על ידי "
-"[%%site.broughtby%%](%%site.broughtbyurl%%)."
+"**%%site.name%%** הוא שרות ביקרובלוג הניתן על ידי [%%site.broughtby%%](%%"
+"site.broughtbyurl%%)."
 
-#: ../lib/util.php:235
+#: ../lib/util.php:259 lib/util.php:275 lib/util.php:286
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** הוא שרות ביקרובלוג."
 
-#: ../lib/util.php:250
+#: ../lib/util.php:274 lib/util.php:290 lib/util.php:301
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr "תנו קרדיט מלא לכותבים בשמם המלא או בכינויים."
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: ../actions/register.php:176
+#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
+#: actions/profilesettings.php:78
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1 עד 64 אותיות אנגליות קטנות או מספרים, ללא סימני פיסוק או רווחים."
 
-#: ../actions/password.php:42 ../actions/register.php:178
+#: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:193
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/profilesettings.php:186
 msgid "6 or more characters"
 msgstr "לפחות 6 אותיות"
 
-#: ../actions/recoverpassword.php:165
+#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
 msgid "6 or more characters, and don't forget it!"
 msgstr "לפחות 6 אותיות, אל תשכח!"
 
-#: ../actions/imsettings.php:188
+#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:195
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, 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 ""
+"קוד אישור נשלח אל כתובת המסרים המידיים שהוספת. עליך לאשר את %s לשליחת מסרים "
+"מידיים אליך."
+
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:234
+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 ""
+
+#: ../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/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:30
+#: actions/twitapidirect_messages.php:107 actions/twitapifavorites.php:83
+#: actions/twitapifavorites.php:99 actions/twitapifriendships.php:117
+#: actions/twitapihelp.php:42 actions/twitapistatuses.php:77
+#: actions/twitapistatuses.php:144 actions/twitapistatuses.php:224
+#: actions/twitapistatuses.php:234 actions/twitapistatuses.php:386
+#: actions/twitapistatuses.php:395 actions/twitapistatuses.php:421
+#: actions/twitapiusers.php:30
+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:39
+#: actions/twitapiaccount.php:89 actions/twitapiaccount.php:94
+#: actions/twitapidirect_messages.php:178 actions/twitapifavorites.php:139
+#: actions/twitapihelp.php:49 actions/twitapistatuses.php:549
+msgid "API method under construction."
 msgstr ""
-"קוד אישור נשלח אל כתובת המסרים המידיים "
-"שהוספת. עליך לאשר את %s לשליחת מסרים מידיים אליך."
 
-#: ../lib/util.php:296
+#: ../lib/util.php:324 lib/util.php:340 lib/util.php:352
 msgid "About"
 msgstr "אודות"
 
-#: ../actions/userauthorization.php:118
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
 msgid "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/twittersettings.php:84
 msgid "Add"
 msgstr "הוסף"
 
-#: ../actions/openidsettings.php:43
+#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
 msgid "Add OpenID"
 msgstr "הוסף OpenID"
 
-#: ../actions/imsettings.php:39
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: actions/deleteprofile.php:248
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
 msgid "Address"
 msgstr "כתבות"
 
-#: ../actions/showstream.php:254
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
+
+#: ../actions/showstream.php:273 actions/showstream.php:288
+#: actions/showstream.php:336
 msgid "All subscriptions"
 msgstr "כל המנויים"
 
-#: ../actions/publicrss.php:62
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
 #, php-format
 msgid "All updates for %s"
 msgstr "כל העדכונים עבור %s"
 
-#: ../actions/noticesearchrss.php:66
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:63
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "כל העידכונים התואמים את החיפוש אחרי \"%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
 msgid "Already logged in."
 msgstr "כבר מחובר."
 
-#: ../actions/subscribe.php:48
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:47
 msgid "Already subscribed!."
 msgstr "כבר מנוי!"
 
-#: ../actions/userauthorization.php:76
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+msgid "Are you sure you want to delete this notice?"
+msgstr ""
+
+#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
 msgid "Authorize subscription"
 msgstr "אשר מנוי"
 
-#: ../actions/login.php:100 ../actions/register.php:184
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192 actions/register.php:219
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "בעתיד התחבר אוטומטית; לא לשימוש במחשבים ציבוריים!"
 
-#: ../actions/avatar.php:32
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:103
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
+
+#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: actions/profilesettings.php:34
 msgid "Avatar"
 msgstr "תמונה"
 
-#: ../actions/avatar.php:113
+#: ../actions/avatar.php:113 actions/profilesettings.php:350
+#: actions/profilesettings.php:379
 msgid "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 ""
-"מחכה לאישור כתובת זו. בדוק את חשבון "
-"ה-Jabber/GTalk שלך לקבלת מסר עם הוראות נוספותץ (האם הוספת את %s לרשימת החברים שלך?)"
+"מחכה לאישור כתובת זו. בדוק את חשבון ה-Jabber/GTalk שלך לקבלת מסר עם הוראות "
+"נוספותץ (האם הוספת את %s לרשימת החברים שלך?)"
+
+#: ../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 ""
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+msgid "Awaiting confirmation on this phone number."
+msgstr ""
 
-#: ../lib/util.php:1136
-msgid "Before »"
+#: ../lib/util.php:1318 lib/util.php:1452 lib/facebookaction.php:259
+#: lib/util.php:1792
+#, fuzzy
+msgid "Before »"
 msgstr "לפני >>"
 
-#: ../actions/profilesettings.php:52
+#: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: actions/profilesettings.php:82 actions/register.php:184
+#: actions/profilesettings.php:84 actions/register.php:211
 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:222 actions/register.php:98
 msgid "Bio is too long (max 140 chars)."
 msgstr "הביוגרפיה ארוכה מידי (לכל היותר 140 אותיות)"
 
-#: ../actions/updateprofile.php:118
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+msgid "Can't delete this notice."
+msgstr ""
+
+#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "לא ניתן לקרוא את ה-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/profilesettings.php:433
 msgid "Can't save new password."
 msgstr "לא ניתן לשמור את הסיסמה"
 
-#: ../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
 msgid "Cancel"
 msgstr "בטל"
 
-#: ../lib/openid.php:121
+#: ../lib/openid.php:121 lib/openid.php:121
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "לא ניתן להפעיל את אובייקט הלקוח של OpenID."
 
-#: ../actions/imsettings.php:154
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
 msgid "Cannot normalize that Jabber ID"
 msgstr "לא ניתן לנרמל את זהות ה-Jabber הזה"
 
-#: ../actions/password.php:45
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:204
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/profilesettings.php:189
 msgid "Change"
 msgstr "שנה"
 
-#: ../actions/password.php:32
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: actions/deleteprofile.php:245
+msgid "Change email handling"
+msgstr ""
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
 msgid "Change password"
 msgstr "שנה סיסמה"
 
-#: ../actions/password.php:43 ../actions/recoverpassword.php:166
-#: ../actions/register.php:179
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr ""
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#: actions/deleteprofile.php:242
+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/profilesettings.php:187 actions/register.php:196
 msgid "Confirm"
 msgstr "אשר"
 
-#: ../actions/confirmaddress.php:84
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
 msgid "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:259
 msgid "Confirmation cancelled."
 msgstr "האישור בוטל."
 
-#: ../actions/confirmaddress.php:38
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+msgid "Confirmation code"
+msgstr ""
+
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
 msgid "Confirmation code not found."
 msgstr "קוד האישור לא נמצא."
 
-#: ../actions/finishopenidlogin.php:91
+#: ../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:97
 msgid "Connect"
 msgstr "התחבר"
 
-#: ../actions/finishopenidlogin.php:86
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
 msgid "Connect existing account"
 msgstr "התחבר לחשבון קיים"
 
-#: ../lib/util.php:304
+#: ../lib/util.php:332 lib/util.php:348 lib/util.php:360
 msgid "Contact"
 msgstr "צור קשר"
 
-#: ../lib/openid.php:178
+#: ../lib/openid.php:178 lib/openid.php:178
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "נכשלה יצירת OpenID מתוך: %s"
 
-#: ../lib/openid.php:160
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:46 actions/twitapifriendships.php:62
+#, 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:39
+msgid "Could not follow user: User not found."
+msgstr ""
+
+#: ../lib/openid.php:160 lib/openid.php:160
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "נכשלה ההפניה לשרת: %s"
 
-#: ../actions/updateprofile.php:161
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
 msgid "Could not save avatar info"
 msgstr "שמירת מידע התמונה נכשל"
 
-#: ../actions/updateprofile.php:154
+#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
 msgid "Could not save new profile info"
 msgstr "שמירת מידע הפרופיל החדש נכשלה"
 
-#: ../actions/profilesettings.php:146
-msgid "Couldn't confirm email."
-msgstr "לא ניתן לאשר את הדוא"ל."
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:70
+msgid "Could not subscribe other to you."
+msgstr ""
+
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:55
+msgid "Could not subscribe."
+msgstr ""
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr ""
 
 #: ../actions/finishremotesubscribe.php:99
+#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:112
 msgid "Couldn't convert request tokens to access tokens."
 msgstr "המרת אסימון הבקשה לאסימון גישה לא הצליחה."
 
-#: ../actions/subscribe.php:59
-msgid "Couldn't create subscription."
-msgstr "יצירת המנוי נכשלה."
-
-#: ../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/emailsettings.php:255
 msgid "Couldn't delete email confirmation."
-msgstr "מחיקת אישור הדוא"ל נכשלה."
+msgstr ""
 
-#: ../actions/unsubscribe.php:56
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:129
 msgid "Couldn't delete subscription."
 msgstr "מחיקת המנוי לא הצליחה."
 
-#: ../actions/remotesubscribe.php:125
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+#: actions/twitapistatuses.php:82
+msgid "Couldn't find any statuses."
+msgstr ""
+
+#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
+#: actions/remotesubscribe.php:148
 msgid "Couldn't get a request token."
 msgstr "אסימון הבקשה לא התקבל."
 
-#: ../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:228
 msgid "Couldn't insert confirmation code."
 msgstr "הכנסת קוד האישור נכשלה."
 
 #: ../actions/finishremotesubscribe.php:180
+#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:216
 msgid "Couldn't insert new subscription."
 msgstr "הכנסת מנוי חדש נכשלה."
 
-#: ../actions/profilesettings.php:175
+#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
+#: actions/profilesettings.php:319 actions/twitapiaccount.php:74
 msgid "Couldn't save profile."
 msgstr "שמירת הפרופיל נכשלה."
 
-#: ../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:296
+msgid "Couldn't update user for autosubscribe."
+msgstr ""
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+#: actions/emailsettings.php:301 actions/emailsettings.php:315
+msgid "Couldn't update user record."
+msgstr ""
+
+#: ../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/emailsettings.php:179 actions/emailsettings.php:280
+#: actions/othersettings.php:173 actions/profilesettings.php:276
 msgid "Couldn't update user."
 msgstr "עידכון המשתמש נכשל."
 
-#: ../actions/finishopenidlogin.php:84
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
 msgid "Create"
 msgstr "צור"
 
-#: ../actions/finishopenidlogin.php:70
+#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
 msgid "Create a new user with this nickname."
 msgstr "צור משתמש חדש עם הכינוי הזה."
 
-#: ../actions/finishopenidlogin.php:68
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
 msgid "Create new account"
 msgstr "צור חשבון חדש"
 
-#: ../actions/finishopenidlogin.php:191
+#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+#: actions/finishopenidlogin.php:208
 msgid "Creating new account for OpenID that already has a user."
 msgstr "יצירת חשבון חדש עבור OpenID שכבר משוייך למשתמש."
 
-#: ../actions/imsettings.php:45
+#: ../actions/imsettings.php:45 actions/imsettings.php:46
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "כתובת מאושרת נוכחית של Jabber/GTalk."
 
-#: ../actions/showstream.php:337
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+msgid "Current confirmed email address."
+msgstr ""
+
+#: ../actions/showstream.php:356 actions/showstream.php:367
+#: actions/showstream.php:418
 msgid "Currently"
 msgstr "כרגע"
 
-#: ../lib/util.php:893
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:87
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: ../lib/util.php:1061 lib/util.php:1110 lib/util.php:1417
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "שגיאת מסד נתונים בהכנסת התגובה: %s"
 
-#: ../actions/profilesettings.php:54
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+msgid "Delete notice"
+msgstr ""
+
+#: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: actions/profilesettings.php:84 actions/register.php:186
+#: actions/profilesettings.php:86 actions/register.php:213
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "תאר את עצמך ואת נושאי העניין שלך ב-140 אותיות"
 
-#: ../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/deleteprofile.php:244 actions/register.php:199
+#: actions/register.php:202
 msgid "Email"
-msgstr "דוא"ל"
+msgstr ""
+
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+msgid "Email Address"
+msgstr ""
 
-#: ../actions/profilesettings.php:46
-msgid "Email address"
-msgstr "כתובת דוא"ל"
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+msgid "Email Settings"
+msgstr ""
 
-#: ../actions/profilesettings.php:102 ../actions/register.php:63
-#: ../actions/register.php:73 actions/register.php:80
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:89
 msgid "Email address already exists."
-msgstr "כתובת דוא"ל זו כבר קיימת."
+msgstr ""
 
-#: ../lib/mail.php:82 ../lib/mail.php:90 lib/mail.php:90
+#: ../lib/mail.php:90 lib/mail.php:90
 msgid "Email address confirmation"
-msgstr "אישור כתובת הדוא"ל"
+msgstr ""
+
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
+
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr ""
 
-#: ../actions/recoverpassword.php:176 ../actions/recoverpassword.php:191
-#: actions/recoverpassword.php:197
+#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
 msgid "Enter a nickname or email address."
-msgstr "הכנס כינוי או כתובת דוא"ל."
+msgstr ""
+
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+msgid "Enter the code you received on your phone."
+msgstr ""
 
-#: ../actions/userauthorization.php:136
+#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
 msgid "Error authorizing token"
 msgstr "שגיאה באישור האסימון"
 
-#: ../actions/finishopenidlogin.php:282
+#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
+#: actions/finishopenidlogin.php:274
 msgid "Error connecting user to OpenID."
 msgstr "שגיאה בקישור המשתמש ל-OpenID."
 
-#: ../actions/finishaddopenid.php:78
+#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
 msgid "Error connecting user."
 msgstr "שגיאת חיבור משתמש."
 
 #: ../actions/finishremotesubscribe.php:151
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:164
 msgid "Error inserting avatar"
 msgstr "שגיאה בהכנסת התמונה."
 
 #: ../actions/finishremotesubscribe.php:143
+#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:156
 msgid "Error inserting new profile"
 msgstr "שגיאה בהכנסת הפרופיל"
 
-#: ../actions/postnotice.php:88
-msgid "Error inserting notice"
-msgstr "שגיאה בהכנסת ההודאה"
-
 #: ../actions/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:180
 msgid "Error inserting remote profile"
 msgstr "שגיאה בהכנסת פרופיל מרוחק"
 
-#: ../actions/recoverpassword.php:201
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
 msgid "Error saving address confirmation."
 msgstr "שגיאה בשמירת אישור הכתובת."
 
-#: ../actions/userauthorization.php:139
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
 msgid "Error saving remote profile"
 msgstr "שגיאה בשמירת פרופיל מרוחק"
 
-#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
+#: ../lib/openid.php:226 lib/openid.php:226
 msgid "Error saving the profile."
 msgstr "שגיאה בשמירת הפרופיל."
 
-#: ../lib/openid.php:237
+#: ../lib/openid.php:237 lib/openid.php:237
 msgid "Error saving the user."
 msgstr "שגיאה בשמירת המשתמש."
 
-#: ../actions/password.php:80
+#: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/profilesettings.php:428
 msgid "Error saving user; invalid."
 msgstr "שגיאה בשמירת שם המשתמש, לא עומד בכללים."
 
-#: ../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:54 actions/login.php:80
+#: actions/register.php:117
 msgid "Error setting user."
 msgstr "שגיאה ביצירת שם המשתמש."
 
-#: ../actions/finishaddopenid.php:83
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
 msgid "Error updating profile"
 msgstr "שגיאה בעידכון הפרופיל"
 
 #: ../actions/finishremotesubscribe.php:161
+#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:174
 msgid "Error updating remote profile"
 msgstr "שגיאה בעדכון פרופיל מרוחק"
 
-#: ../actions/recoverpassword.php:79
+#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
 msgid "Error with confirmation code."
 msgstr "שגיאה באישור הקוד."
 
-#: ../actions/finishopenidlogin.php:89
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
 msgid "Existing nickname"
 msgstr "כינוי זה כבר קיים"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:326 lib/util.php:342 lib/util.php:354
 msgid "FAQ"
 msgstr "רשימת שאלות נפוצות"
 
-#: ../actions/avatar.php:115
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/profilesettings.php:381
 msgid "Failed updating avatar."
 msgstr "עדכון התמונה נכשל."
 
-#: ../actions/all.php:61 ../actions/allrss.php:74
+#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
+#: actions/allrss.php:64
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "הזנות החברים של %s"
 
-#: ../actions/replies.php:61 ../actions/repliesrss.php:80
+#: ../actions/replies.php:65 ../actions/repliesrss.php:80
+#: actions/replies.php:65 actions/repliesrss.php:66
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "הזנת התגובות ל-%s"
 
-#: ../actions/login.php:118
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:54
+#, php-format
+msgid "Feed for tag %s"
+msgstr ""
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+msgid "Find content of notices"
+msgstr ""
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+msgid "Find people on this site"
+msgstr ""
+
+#: ../actions/login.php:122
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr "לצרכי אבטחה, הכנס מחדש את שם המשתמש והסיסמה לפני שתשנה את ההגדרות."
 
-#: ../actions/profilesettings.php:44
+#: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: actions/profilesettings.php:77 actions/register.php:178
+#: actions/profilesettings.php:79 actions/register.php:205
 msgid "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/profilesettings.php:219 actions/register.php:95
 msgid "Full name is too long (max 255 chars)."
 msgstr "השם המלא ארוך מידי (מותרות 255 אותיות בלבד)"
 
-#: ../lib/util.php:279
+#: ../lib/util.php:322 lib/util.php:338 lib/util.php:343 lib/util.php:350
 msgid "Help"
 msgstr "עזרה"
 
-#: ../lib/util.php:274
+#: ../lib/util.php:298 lib/util.php:314 lib/util.php:325
 msgid "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:81 actions/register.php:208
 msgid "Homepage"
 msgstr "אתר בית"
 
-#: ../actions/profilesettings.php:87
+#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: actions/profilesettings.php:210 actions/register.php:83
+#: actions/profilesettings.php:216 actions/register.php:92
 msgid "Homepage is not a valid URL."
 msgstr "לאתר הבית יש כתובת לא חוקית."
 
-#: ../actions/imsettings.php:61
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+#: actions/emailsettings.php:101
+msgid "I want to post notices by email."
+msgstr ""
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+#: actions/deleteprofile.php:253
+msgid "IM"
+msgstr ""
+
+#: ../actions/imsettings.php:60 actions/imsettings.php:61
 msgid "IM Address"
 msgstr "כתובת מסרים מידיים"
 
-#: ../actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
 msgid "IM Settings"
 msgstr "הגדרות מסרים מידיים"
 
-#: ../actions/finishopenidlogin.php:88
+#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
 msgstr ""
-"אם יש לך כבר חשבון, התחבר עם שם המשתמש "
-"והסיסמה שלך וקשר אותו אל ה-OpenID שלך."
+"אם יש לך כבר חשבון, התחבר עם שם המשתמש והסיסמה שלך וקשר אותו אל ה-OpenID שלך."
 
 #: ../actions/openidsettings.php:45
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
 msgstr ""
-"אם אתה רוצה להוסיף OpenID לחשבון שלך, הכנס "
-"אותו לתיבה שלמטה ולחץ \"הוסף\""
+"אם אתה רוצה להוסיף OpenID לחשבון שלך, הכנס אותו לתיבה שלמטה ולחץ \"הוסף\""
 
-#: ../actions/recoverpassword.php:122
+#: ../actions/recoverpassword.php:137
 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 ""
-"אם שכחת או איבדת את סיסמתך, תוכל לקבל חדשה "
-"שתישלח אליך לכתובת הדוא"ל הרשומה בחשבונך."
 
-#: ../actions/password.php:69
+#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
+#: actions/emailsettings.php:68 actions/smssettings.php:76
+msgid "Incoming email"
+msgstr ""
+
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+#: actions/emailsettings.php:304
+msgid "Incoming email address removed."
+msgstr ""
+
+#: ../actions/password.php:69 actions/profilesettings.php:388
+#: actions/profilesettings.php:417
 msgid "Incorrect old password"
 msgstr "הסיסמה הישנה לא נכונה"
 
-#: ../actions/login.php:63
+#: ../actions/login.php:67 actions/login.php:67 actions/login.php:74
 msgid "Incorrect username or password."
 msgstr "שם משתמש או סיסמה לא נכונים."
 
-#: ../actions/recoverpassword.php:226 ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:265
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
-msgstr "הוראות לשיחזור הסיסמה שלך נשלחו לכתובת הדוא"ל הרשומה בחשבונך."
+msgstr ""
 
-#: ../actions/updateprofile.php:113
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "כתובת התמונה '%s' אינה חוקית"
 
-#: ../actions/updateprofile.php:97
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "כתובת אתר הבית '%s' אינה חוקית"
 
-#: ../actions/updateprofile.php:81
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "כתובת הרשיון '%s' איה חוקית"
 
-#: ../actions/postnotice.php:61
+#: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:63
 msgid "Invalid notice content"
 msgstr "תוכן ההודעה לא חוקי"
 
-#: ../actions/postnotice.php:67
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:69
 msgid "Invalid notice uri"
 msgstr "כתובת לא חוקית"
 
-#: ../actions/postnotice.php:72
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:74
 msgid "Invalid notice url"
 msgstr "כתובת לא חוקית"
 
-#: ../actions/updateprofile.php:86
+#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "כתובת הפרופיל '%s' לא חוקית."
 
-#: ../actions/remotesubscribe.php:96
+#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
 msgid "Invalid profile URL (bad format)"
 msgstr "כתובת פרופיל לא חוקית (פורמט לא תקין)"
 
 #: ../actions/finishremotesubscribe.php:77
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:78
 msgid "Invalid profile URL returned by server."
 msgstr "השרת החזיר כתובת פרופיל לא חוקית"
 
-#: ../actions/avatarbynickname.php:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
 msgid "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:256 actions/register.php:112
+#: actions/register.php:130
 msgid "Invalid username or password."
 msgstr "שם המשתמש או הסיסמה לא חוקיים"
 
-#: ../lib/util.php:237
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr ""
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
+
+#: ../lib/util.php:306 lib/util.php:322 lib/util.php:332
+msgid "Invite"
+msgstr ""
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr ""
+
+#: ../lib/util.php:261 lib/util.php:277 lib/util.php:288
 #, 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 ""
-"הוא פועל על תוכנת המיקרובלוג "
-"[](http://laconi.caלאקוניקה/) לאקוניקה, גירסה %s, "
-"המופצת תחת רשיון [GNU Affero General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)"
+"הוא פועל על תוכנת המיקרובלוג [](http://laconi.caלאקוניקה/) לאקוניקה, גירסה %"
+"s, המופצת תחת רשיון [GNU Affero General Public License](http://www.fsf.org/"
+"licensing/licenses/agpl-3.0.html)"
 
-#: ../actions/imsettings.php:164
+#: ../actions/imsettings.php:173 actions/imsettings.php:181
 msgid "Jabber ID already belongs to another user."
 msgstr "זיהוי ה-Jabber כבר שייך למשתמש אחר."
 
-#: ../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 ""
-"כתובת Jabber או GTalk, כגון \"UserName@example.org\". הוסף "
-"את %s אל רשימת החברים בתוכנת ההמסרים המידיים או GTalk שלך."
+"כתובת Jabber או GTalk, כגון \"UserName@example.org\". הוסף את %s אל רשימת "
+"החברים בתוכנת ההמסרים המידיים או GTalk שלך."
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
+msgid "Language"
+msgstr "שפה"
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+#: actions/profilesettings.php:234
+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:87 actions/register.php:214
 msgid "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/profilesettings.php:225 actions/register.php:101
 msgid "Location is too long (max 255 chars)."
 msgstr "שם המיקום ארוך מידי (מותר עד 255 אותיות)."
 
-#: ../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/login.php:104 actions/login.php:113 actions/openidlogin.php:88
+#: lib/util.php:336
 msgid "Login"
 msgstr "היכנס"
 
-#: ../actions/openidlogin.php:44
+#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:60
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "התחבר לחשבון [OpenID](%%doc.openid%%). "
 
-#: ../actions/login.php:122
+#: ../actions/login.php:126
 #, 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 ""
-"היכנס בעזרת שם המשתמש והסיסמה שלך. עדיין "
-"אין לך שם משתמש? [הרשם](%%action.register%%) לחשבון "
+"היכנס בעזרת שם המשתמש והסיסמה שלך. עדיין אין לך שם משתמש? [הרשם](%%action."
+"register%%) לחשבון "
 
-#: ../lib/util.php:284
+#: ../lib/util.php:308 lib/util.php:324 lib/util.php:334
 msgid "Logout"
 msgstr "צא"
 
-#: ../actions/login.php:106
+#: ../actions/register.php:166 actions/register.php:180
+#: actions/register.php:207
+msgid "Longer name, preferably your \"real\" name"
+msgstr ""
+
+#: ../actions/login.php:110 actions/login.php:110 actions/login.php:118
 msgid "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 ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr ""
+
+#: ../actions/showstream.php:300 actions/showstream.php:315
+#: actions/showstream.php:363
 msgid "Member since"
 msgstr "חבר מאז"
 
-#: ../actions/userrss.php:70
+#: ../actions/userrss.php:70 actions/userrss.php:67
 #, php-format
 msgid "Microblog by %s"
 msgstr "מיקרובלוג מאת %s"
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
+#: ../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 ""
+
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php:85 actions/register.php:202
+#: actions/register.php:229
 msgid "My text and files are available under "
 msgstr "הטקסטים והקבצים שלי מופצים תחת רשיון"
 
-#: ../actions/finishopenidlogin.php:71
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+msgid "New"
+msgstr "חדש"
+
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:138
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+#: actions/emailsettings.php:318
+msgid "New incoming email address added."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
 msgid "New nickname"
 msgstr "כינוי חדש"
 
-#: ../actions/newnotice.php:100
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:141
 msgid "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/profilesettings.php:185
 msgid "New password"
 msgstr "סיסמה חדשה"
 
-#: ../actions/recoverpassword.php:275
+#: ../actions/recoverpassword.php:314
 msgid "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:108 actions/profilesettings.php:76
+#: actions/register.php:192
 msgid "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/finishopenidlogin.php:192 actions/profilesettings.php:231
+#: actions/register.php:85
 msgid "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:182 actions/profilesettings.php:209
+#: actions/register.php:83
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "כינוי יכול להכיל רק אותיות אנגליות קטנות ומספרים, וללא רווחים."
 
-#: ../actions/finishopenidlogin.php:170
+#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:187
 msgid "Nickname not allowed."
 msgstr "כינוי זה אסור."
 
-#: ../actions/remotesubscribe.php:72
+#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
 msgid "Nickname of the user you want to follow"
 msgstr "כינויו של המשתמש אחריו אתה רוצה לעקוב"
 
-#: ../actions/recoverpassword.php:147 ../actions/recoverpassword.php:162
-#: actions/recoverpassword.php:167
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
 msgid "Nickname or email"
-msgstr "כינוי או דוא"ל"
+msgstr ""
+
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:104
+msgid "No"
+msgstr "לא"
 
-#: ../actions/imsettings.php:147
+#: ../actions/imsettings.php:156 actions/imsettings.php:164
 msgid "No Jabber ID."
 msgstr "אין זיהוי Jabber כזה."
 
-#: ../actions/userauthorization.php:128
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
 msgid "No authorization request!"
 msgstr "לא התבקש אישור!"
 
-#: ../actions/confirmaddress.php:33
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+msgid "No carrier selected."
+msgstr ""
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+msgid "No code entered"
+msgstr ""
+
+#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
 msgid "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:52
+#: actions/newnotice.php:53
 msgid "No content!"
 msgstr "אין תוכן!"
 
-#: ../actions/userbyid.php:27
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+#: actions/emailsettings.php:197
+msgid "No email address."
+msgstr ""
+
+#: ../actions/userbyid.php:32 actions/userbyid.php:32
 msgid "No id."
 msgstr "אין זיהוי."
 
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+#: actions/emailsettings.php:292
+msgid "No incoming email address."
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:65
+#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:66
 msgid "No nickname provided by remote server."
 msgstr "השרת הרחוק לא מספק כינוי"
 
-#: ../actions/avatarbynickname.php:27
+#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 msgid "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:243
 msgid "No pending confirmation to cancel."
 msgstr "אין אישור ממתין שניתן לבטל."
 
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+msgid "No phone number."
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:72
+#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:73
 msgid "No profile URL returned by server."
 msgstr "השרת לא החזיר כתובת פרופיל"
 
-#: ../actions/recoverpassword.php:189 ../actions/recoverpassword.php:226
-#: actions/recoverpassword.php:232
+#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
 msgid "No registered email address for that user."
-msgstr "אין דוא"ל רשום עבור משתמש זה."
+msgstr ""
 
-#: ../actions/userauthorization.php:48
+#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
 msgid "No request found!"
 msgstr "לא נמצאה בקשה!"
 
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
+#: actions/noticesearch.php:69 actions/peoplesearch.php:69
+#: actions/noticesearch.php:68 actions/peoplesearch.php:59
 msgid "No results"
 msgstr "אין תוצאות"
 
-#: ../actions/avatarbynickname.php:32
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
 msgid "No size."
 msgstr "אין גודל."
 
-#: ../actions/openidsettings.php:135
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:109
+#: actions/twitapistatuses.php:438
+msgid "No status found with that ID."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:411
+msgid "No status with that ID found."
+msgstr ""
+
+#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
 msgid "No such OpenID."
 msgstr "אין OpenID כזה."
 
-#: ../actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29
 msgid "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:38
+#: actions/shownotice.php:114
 msgid "No such notice."
 msgstr "אין הודעה כזו."
 
-#: ../actions/recoverpassword.php:56
+#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
 msgid "No such recovery code."
 msgstr "אין קוד שיחזור כזה."
 
-#: ../actions/postnotice.php:56
+#: ../actions/postnotice.php:56 actions/postnotice.php:57
 msgid "No such subscription"
 msgstr "אין מנוי כזה"
 
 #: ../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/showstream.php:157
+#: classes/Command.php:208 classes/Command.php:242 lib/gallery.php:85
+#: lib/subs.php:105
 msgid "No such user."
 msgstr "אין משתמש כזה."
 
-#: ../lib/gallery.php:76
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr ""
+
+#: ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
 msgstr "אין את מי להציג!"
 
-#: ../actions/recoverpassword.php:60
+#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
 msgid "Not a recovery code."
 msgstr "זהו לא קוד אישור."
 
-#: ../actions/imsettings.php:158
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+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:423 lib/twitterapi.php:450
+#: lib/twitterapi.php:534
+msgid "Not a supported data format."
+msgstr ""
+
+#: ../actions/imsettings.php:167 actions/imsettings.php:175
 msgid "Not a valid Jabber ID"
 msgstr "לא עומד בכללים לזיהוי Jabber"
 
-#: ../lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131
 msgid "Not a valid OpenID."
 msgstr "לא עומד בכללים ל-OpenID."
 
-#: ../actions/profilesettings.php:75 ../actions/register.php:53
-#: ../actions/register.php:63 actions/register.php:70
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+#: actions/emailsettings.php:208
+msgid "Not a valid email address"
+msgstr ""
+
+#: ../actions/register.php:63 actions/register.php:70 actions/register.php:79
 msgid "Not a valid email address."
-msgstr "כתובת דוא"ל לא חוקית."
+msgstr ""
 
-#: ../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/profilesettings.php:212 actions/register.php:87
 msgid "Not a valid nickname."
 msgstr "שם משתמש לא חוקי."
 
-#: ../actions/remotesubscribe.php:118
+#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
 msgid "Not a valid profile URL (incorrect services)."
 msgstr "Not a valid profile URL (incorrect services)."
 
-#: ../actions/remotesubscribe.php:111
+#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr "Not a valid profile URL (no XRDS defined)."
 
-#: ../actions/remotesubscribe.php:104
+#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
 msgid "Not a valid profile URL (no YADIS document)."
 msgstr "Not a valid profile URL (no YADIS document)."
 
-#: ../actions/avatar.php:95
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: actions/profilesettings.php:361
 msgid "Not an image or corrupt file."
 msgstr "זהו לא קובץ תמונה, או שחל בו שיבוש."
 
 #: ../actions/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:52
 msgid "Not authorized."
 msgstr "לא מורשה."
 
 #: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38
 msgid "Not expecting this response!"
 msgstr "זו תגובה לא צפויה!"
 
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
-#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+#: actions/twitapistatuses.php:304
+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:31 actions/newnotice.php:30
+#: actions/nudge.php:30 actions/subedit.php:31 actions/unblock.php:31
 msgid "Not logged in."
 msgstr "לא מחובר."
 
-#: ../actions/unsubscribe.php:43
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:117
 msgid "Not subscribed!."
 msgstr "לא מנוי!"
 
-#: ../actions/showstream.php:82
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+msgid "Notice Search"
+msgstr ""
+
+#: ../actions/showstream.php:82 actions/showstream.php:82
+#: actions/showstream.php:111 actions/showstream.php:118
+#: actions/showstream.php:123
 #, php-format
 msgid "Notice feed for %s"
 msgstr "הזנת הודעות של %s"
 
-#: ../actions/shownotice.php:39
+#: ../actions/shownotice.php:39 actions/shownotice.php:39
+#: actions/shownotice.php:45
 msgid "Notice has no profile"
 msgstr "להודעה אין פרופיל"
 
-#: ../actions/showstream.php:297
+#: ../actions/showstream.php:316 actions/showstream.php:331
+#: actions/showstream.php:379
 msgid "Notices"
 msgstr "הודעות"
 
-#: ../actions/password.php:39
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
+#, php-format
+msgid "Notices tagged with %s"
+msgstr ""
+
+#: ../actions/password.php:39 actions/profilesettings.php:178
+#: actions/profilesettings.php:183
 msgid "Old password"
 msgstr "סיסמה ישנה"
 
-#: ../lib/util.php:288
+#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
+#: lib/util.php:330 actions/deleteprofile.php:247 lib/util.php:340
 msgid "OpenID"
 msgstr "OpenID"
 
-#: ../actions/finishopenidlogin.php:61
+#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
 msgid "OpenID Account Setup"
 msgstr "הגדרת חשבון OpenID"
 
-#: ../lib/openid.php:180
+#: ../lib/openid.php:180 lib/openid.php:180
 msgid "OpenID Auto-Submit"
 msgstr "הגשה אוטומטית של OpenID"
 
 #: ../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/finishopenidlogin.php:150 actions/openidlogin.php:76
 msgid "OpenID Login"
 msgstr "כניסת OpenId"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
+#: actions/openidlogin.php:74 actions/openidsettings.php:50
+#: actions/openidlogin.php:82
 msgid "OpenID URL"
 msgstr "כתובת ה-OpenID"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
+#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 msgid "OpenID authentication cancelled."
 msgstr "אישור ה-OpenID בוטל."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
+#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "אישור ה-OpenID נכשל: %s"
 
-#: ../lib/openid.php:133
+#: ../lib/openid.php:133 lib/openid.php:133
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "כשל OpenID: %s"
 
-#: ../actions/openidsettings.php:144
+#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
 msgid "OpenID removed."
 msgstr "OpenID הוסר."
 
-#: ../actions/openidsettings.php:37
+#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
 msgid "OpenID settings"
 msgstr "הגדרות OpenID"
 
-#: ../actions/avatar.php:84
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: actions/profilesettings.php:350
 msgid "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/login.php:109 actions/register.php:194
 msgid "Password"
 msgstr "סיסמה"
 
-#: ../actions/recoverpassword.php:249
+#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
 msgid "Password and confirmation do not match."
 msgstr "הסיסמה ואישורה אינן תואמות."
 
-#: ../actions/recoverpassword.php:245
+#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
 msgid "Password must be 6 chars or more."
 msgstr "הסיסמה חייבת להיות בת לפחות 6 אותיות."
 
-#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
+#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 msgid "Password recovery requested"
 msgstr "התבקש שיחזור סיסמה"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:274
+#: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: actions/profilesettings.php:408 actions/recoverpassword.php:326
+#: actions/profilesettings.php:437
 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/profilesettings.php:409 actions/register.php:107
 msgid "Passwords don't match."
 msgstr "הסיסמאות לא תואמות."
 
-#: ../actions/peoplesearch.php:33
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+msgid "People"
+msgstr "אנשים"
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+msgid "People Search"
+msgstr "חיפוש אנשים"
+
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
 msgid "People search"
 msgstr "חיפוש סיסמה"
 
-#: ../lib/stream.php:44
+#: ../lib/stream.php:50 lib/personal.php:50
 msgid "Personal"
 msgstr "אישי"
 
-#: ../actions/userauthorization.php:77
+#: ../actions/invite.php:133 actions/invite.php:141
+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 ""
-"בדוק את הפרטים כדי לוודא שברצונך להירשם "
-"כמנוי להודעות משתמש זה. אם אינך רוצה להירשם, לחץ \"בטל\"."
+"בדוק את הפרטים כדי לוודא שברצונך להירשם כמנוי להודעות משתמש זה. אם אינך רוצה "
+"להירשם, לחץ \"בטל\"."
 
-#: ../actions/imsettings.php:74
+#: ../actions/imsettings.php:73 actions/imsettings.php:74
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "פרסם הודעה כששורת הסטטוס שלי ב-Jabber/GTalk מתעדכנת."
 
-#: ../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
 msgid "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:185 actions/othersettings.php:179
 msgid "Preferences saved."
 msgstr "העדפות נשמרו."
 
-#: ../lib/util.php:300
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
+msgid "Preferred language"
+msgstr ""
+
+#: ../lib/util.php:328 lib/util.php:344 lib/util.php:356
 msgid "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:139 classes/Notice.php:149
 msgid "Problem saving notice."
 msgstr "בעיה בשמירת ההודעה."
 
-#: ../lib/stream.php:54
+#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
+#: lib/settingsaction.php:84 actions/deleteprofile.php:241
 msgid "Profile"
 msgstr "פרופיל"
 
-#: ../actions/remotesubscribe.php:73
+#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
 msgid "Profile URL"
 msgstr "כתובת הפרופיל"
 
-#: ../actions/profilesettings.php:34
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
 msgid "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
 msgid "Profile unknown"
 msgstr "פרופיל לא מוכר"
 
-#: ../lib/util.php:276
-msgid "Public"
-msgstr "ציבורי"
-
-#: ../actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:77
 msgid "Public Stream Feed"
 msgstr "הזנת זרם הציבורי"
 
-#: ../actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 lib/stream.php:34
 msgid "Public timeline"
 msgstr "קו זמן ציבורי"
 
-#: ../actions/recoverpassword.php:151
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:104
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
 msgid "Recover"
 msgstr "שיחזור"
 
-#: ../actions/recoverpassword.php:141
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
 msgid "Recover password"
 msgstr "סיסמת שיחזור"
 
-#: ../actions/recoverpassword.php:67
+#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
 msgid "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:181 actions/register.php:234 lib/util.php:338
 msgid "Register"
 msgstr "הירשם"
 
-#: ../actions/userauthorization.php:119
+#: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:173
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:241
+msgid "Registration successful"
+msgstr ""
+
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
 msgid "Reject"
 msgstr "דחה"
 
-#: ../actions/login.php:99 ../actions/register.php:183
+#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
+#: actions/register.php:190 actions/login.php:110 actions/openidlogin.php:85
+#: actions/register.php:217
 msgid "Remember me"
 msgstr "זכור אותי"
 
-#: ../actions/updateprofile.php:69
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
 msgid "Remote profile with no matching profile"
 msgstr "אין פרופיל תואם לפרופיל המרוחק "
 
-#: ../actions/remotesubscribe.php:65
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
 msgid "Remote subscribe"
 msgstr "הרשמה מרוחקת"
 
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php:48 actions/emailsettings.php:76
+#: actions/imsettings.php:49 actions/openidsettings.php:108
+#: actions/smssettings.php:50 actions/smssettings.php:84
+#: actions/twittersettings.php:59 actions/twittersettings.php:61
 msgid "Remove"
 msgstr "הסר"
 
-#: ../actions/openidsettings.php:68
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
 msgid "Remove OpenID"
 msgstr "הסר OpenID"
 
@@ -1052,50 +1733,83 @@ msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
 msgstr ""
-"הסרת ה-OpenID היחיד שלך תגרום לכך שלא תוכל "
-"להתחבר למערכת. אם אתה צריך להסיר אותו, לפני כן הוסף OpenID אחר."
+"הסרת ה-OpenID היחיד שלך תגרום לכך שלא תוכל להתחבר למערכת. אם אתה צריך להסיר "
+"אותו, לפני כן הוסף OpenID אחר."
 
-#: ../lib/stream.php:49
+#: ../lib/stream.php:55 lib/personal.php:55
 msgid "Replies"
 msgstr "תגובות"
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:50
+#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
+#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #, php-format
 msgid "Replies to %s"
 msgstr "תגובת עבור %s"
 
-#: ../actions/recoverpassword.php:168
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
 msgid "Reset"
 msgstr "איפוס"
 
-#: ../actions/recoverpassword.php:158
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
 msgid "Reset password"
 msgstr "איפוס סיסמה"
 
-#: ../actions/recoverpassword.php:167 ../actions/register.php:180
-msgid "Same as password above"
-msgstr "זהה לסיסמה למעלה"
-
-#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
-msgid "Save"
-msgstr "שמור"
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/deleteprofile.php:250 actions/subscriptions.php:73
+msgid "SMS"
+msgstr "סמס"
 
-#: ../lib/searchaction.php:73 ../lib/util.php:277
-msgid "Search"
-msgstr "חיפוש"
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+msgid "SMS Phone number"
+msgstr ""
 
-#: ../actions/noticesearch.php:80
-msgid "Search Stream Feed"
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:230
+msgid "SMS confirmation"
+msgstr ""
+
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
+msgid "Same as password above"
+msgstr "זהה לסיסמה למעלה"
+
+#: ../actions/register.php:156 actions/register.php:170
+#: actions/register.php:197
+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/twittersettings.php:83 actions/emailsettings.php:107
+#: actions/othersettings.php:56 actions/profilesettings.php:106
+#: actions/subscriptions.php:74 actions/tagother.php:100
+#: actions/twittersettings.php:82
+msgid "Save"
+msgstr "שמור"
+
+#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
+#: lib/util.php:316 lib/util.php:327
+msgid "Search"
+msgstr "חיפוש"
+
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:84
+msgid "Search Stream Feed"
 msgstr "הזנת זרם החיפושים"
 
-#: ../actions/noticesearch.php:30
+#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
+#: actions/noticesearch.php:29
 #, 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 ""
-"חפש הודעות ב-%%site.name%% לפי תוכנן. הפרד בעזרת "
-"רווחים בין הביטויים; עליהם להיות בני לפחות 3 אותיות."
+"חפש הודעות ב-%%site.name%% לפי תוכנן. הפרד בעזרת רווחים בין הביטויים; עליהם "
+"להיות בני לפחות 3 אותיות."
 
 #: ../actions/peoplesearch.php:28
 #, php-format
@@ -1103,153 +1817,263 @@ 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 ""
-"חפש אנשים ב-%%site.name%% לפי שם, מיקום, או תחומי "
-"עניין. הפרד בעזרת רווחים בין הביטויים; עליהם להיות בני לפחות 3 אותיות."
+"חפש אנשים ב-%%site.name%% לפי שם, מיקום, או תחומי עניין. הפרד בעזרת רווחים "
+"בין הביטויים; עליהם להיות בני לפחות 3 אותיות."
+
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+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 lib/util.php:1646 lib/util.php:2158
 msgid "Send"
 msgstr "שלח"
 
-#: ../actions/imsettings.php:71
+#: ../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."
+msgstr ""
+
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+msgid "Send me notices of new subscriptions through email."
+msgstr ""
+
+#: ../actions/imsettings.php:70 actions/imsettings.php:71
 msgid "Send me notices through Jabber/GTalk."
 msgstr "שלח לי הודעות דרך Jabber/GTalk."
 
-#: ../lib/util.php:282
+#: ../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 ""
+
+#: ../lib/util.php:304 lib/util.php:320 lib/util.php:330
 msgid "Settings"
 msgstr "הגדרות"
 
-#: ../actions/profilesettings.php:183
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:336
 msgid "Settings saved."
 msgstr "ההגדרות נשמרו."
 
-#: ../actions/finishaddopenid.php:66
+#: ../actions/tag.php:60 actions/tag.php:60 actions/tag.php:59
+msgid "Showing most popular tags from the last week"
+msgstr ""
+
+#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
 msgid "Someone else already has this OpenID."
 msgstr "למישהו כבר יש את ה-OpenID הזה."
 
 #: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
+#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
 msgid "Something weird happened."
 msgstr "קרה משהו מוזר."
 
-#: ../lib/util.php:302
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr ""
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: ../lib/util.php:330 lib/util.php:346 lib/util.php:358
 msgid "Source"
 msgstr "מקור"
 
-#: ../actions/showstream.php:277
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:359
 msgid "Statistics"
 msgstr "סטטיסטיקה"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
+#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
+#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
+#: actions/finishopenidlogin.php:199 actions/finishopenidlogin.php:267
 msgid "Stored OpenID not found."
 msgstr "OpenID מאוכסן לא נמצא."
 
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:172
-#: ../actions/showstream.php:181
+#: ../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:254 lib/util.php:2078
 msgid "Subscribe"
 msgstr "הירשם כמנוי"
 
-#: ../actions/showstream.php:294 ../actions/subscribers.php:27
+#: ../actions/showstream.php:313 ../actions/subscribers.php:27
+#: actions/showstream.php:328 actions/subscribers.php:27
+#: actions/showstream.php:376 lib/gallery.php:136 lib/gallery.php:137
 msgid "Subscribers"
 msgstr "מנויים"
 
-#: ../actions/userauthorization.php:309
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
 msgid "Subscription authorized"
 msgstr "ההרשמה אושרה"
 
-#: ../actions/userauthorization.php:319
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
 msgid "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:288 actions/showstream.php:370 lib/gallery.php:131
+#: lib/gallery.php:132
 msgid "Subscriptions"
 msgstr "הרשמות"
 
-#: ../actions/avatar.php:87
+#: ../actions/avatar.php:87 actions/profilesettings.php:324
+#: actions/profilesettings.php:353
 msgid "System error uploading file."
 msgstr "שגיאת מערכת בהעלאת הקובץ."
 
-#: ../actions/noticesearch.php:34
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317 actions/profilesettings.php:90 actions/showstream.php:382
+#: actions/tag.php:40 actions/tagother.php:96 actions/tagother.php:162
+#: lib/profilelist.php:126 lib/profilelist.php:128
+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:33
 msgid "Text search"
 msgstr "חיפוש טקסט"
 
-#: ../actions/openidsettings.php:140
+#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
 msgid "That OpenID does not belong to you."
 msgstr "ה-OpenID הזה אינו שייך לך."
 
-#: ../actions/confirmaddress.php:52
+#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
 msgid "That address has already been confirmed."
 msgstr "כתובת זו כבר אושרה."
 
-#: ../actions/confirmaddress.php:43
+#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
 msgid "That confirmation code is not for you!"
 msgstr "קוד האישור הזה אינו מיועד לך!"
 
-#: ../actions/avatar.php:80
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:214
+msgid "That email address already belongs to another user."
+msgstr ""
+
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: actions/profilesettings.php:346
 msgid "That file is too big."
 msgstr "קובץ זה גדול מידי."
 
-#: ../actions/imsettings.php:161
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
 msgid "That is already your Jabber ID."
 msgstr "זהו כבר זיהוי ה-Jabber שלך."
 
-#: ../actions/imsettings.php:224
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:211
+msgid "That is already your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+msgid "That is already your phone number."
+msgstr ""
+
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
 msgid "That is not your Jabber ID."
 msgstr "זהו לא זיהוי ה-Jabber שלך."
 
-#: ../actions/imsettings.php:201
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+#: actions/emailsettings.php:270
+msgid "That is not your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+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:247
 msgid "That is the wrong IM address."
 msgstr "זוהי כתובת מסרים מידיים שגויה."
 
-#: ../actions/newnotice.php:52
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+msgid "That is the wrong confirmation number."
+msgstr ""
+
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+msgid "That phone number already belongs to another user."
+msgstr ""
+
+#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: actions/newnotice.php:49 actions/twitapistatuses.php:330
+#: actions/newnotice.php:61 actions/twitapistatuses.php:271
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "זה ארוך מידי. אורך מירבי להודעה הוא 140 אותיות."
 
-#: ../actions/confirmaddress.php:86
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+#: actions/twitapiaccount.php:55
+msgid "That's too long. Max notice size is 255 chars."
+msgstr ""
+
+#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "הכתובת \"%s\" אושרה עבור חשבונך."
 
-#: ../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:285
 msgid "The address was removed."
 msgstr "הכתובת הוסרה."
 
-#: ../actions/userauthorization.php:311
+#: ../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 ""
-"המנוי אושר, אבל לא התקבלה כתובת אליה ניתן "
-"לחזור. בדוק את הוראות האתר וחפש כיצד לאשר מנוי. אסימון המנוי שלך הוא:"
+"המנוי אושר, אבל לא התקבלה כתובת אליה ניתן לחזור. בדוק את הוראות האתר וחפש "
+"כיצד לאשר מנוי. אסימון המנוי שלך הוא:"
 
-#: ../actions/userauthorization.php:321
+#: ../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 ""
-"המנוי נדחה, אבל לא התקבלה כתובת לחזרה. "
-"בדוק את הוראות האתר וחפש כיצד להשלים דחיית מנוי."
+"המנוי נדחה, אבל לא התקבלה כתובת לחזרה. בדוק את הוראות האתר וחפש כיצד להשלים "
+"דחיית מנוי."
 
-#: ../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 "אלה האנשים במאזינים להודעות של %s."
 
-#: ../actions/subscribers.php:33
+#: ../actions/subscribers.php:33 actions/subscribers.php:33
 msgid "These are the people who listen to your notices."
 msgstr "אלה האנשים המאזינים להודעות שלך."
 
-#: ../actions/subscriptions.php:35
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "אלה האנשים ש%s מאזין להודעות שלהם."
 
-#: ../actions/subscriptions.php:33
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
 msgid "These are the people whose notices you listen to."
 msgstr "אלה האנשים שלהודעות שלהם אתה מאזין."
 
-#: ../actions/recoverpassword.php:87
+#: ../actions/invite.php:89 actions/invite.php:96
+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 "קוד אישור זה ישן מידי. אנא התחל מחדש."
 
@@ -1259,77 +2083,144 @@ msgid ""
 "button to go to your OpenID provider."
 msgstr "טופס אמור לשלוח את עצמו אוטומטית. אם לא, "
 
-#: ../actions/finishopenidlogin.php:56
+#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
 #, 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 ""
-"זו ההתחברות הראשונה שלך אל %s לכן עליך "
-"להתחבר לחשבון מקומי של OpenID. אתה יכול ליצור חשבון חדש, או להתחבר לחשבון קיים, אם יש לך."
+"זו ההתחברות הראשונה שלך אל %s לכן עליך להתחבר לחשבון מקומי של OpenID. אתה "
+"יכול ליצור חשבון חדש, או להתחבר לחשבון קיים, אם יש לך."
+
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:94
+#: actions/twitapifriendships.php:82 actions/twitapistatuses.php:428
+msgid "This method requires a POST or DELETE."
+msgstr ""
 
-#: ../lib/util.php:147
+#: ../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:46
+#: actions/twitapidirect_messages.php:117 actions/twitapifriendships.php:30
+#: actions/twitapistatuses.php:239
+msgid "This method requires a POST."
+msgstr ""
+
+#: ../lib/util.php:164 lib/util.php:246 lib/util.php:257
 msgid "This page is not available in a media type you accept"
 msgstr "עמוד זה אינו זמין בסוג מדיה שאתה יכול לקבל"
 
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
+msgid "Timezone"
+msgstr ""
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr ""
+
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"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 ""
+"כדי לעשות מנוי, עליך [להיכנס למערכת](%%action.login%%), או [להירשם](%%action."
+"register%%) לחשבון חדשה. אם יש לך כבר חשבון [במערכת מיקרובלוג תואמת](%%doc."
+"openmublog%%), הכנס את כתובת הפרופיל שלך למטה. "
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: actions/twitapifriendships.php:128
+msgid "Two user ids or screen_names must be supplied."
 msgstr ""
-"כדי לעשות מנוי, עליך [להיכנס "
-"למערכת](%%action.login%%), או [להירשם](%%action.register%%) "
-"לחשבון חדשה. אם יש לך כבר חשבון [במערכת "
-"מיקרובלוג תואמת](%%doc.openmublog%%), הכנס את כתובת הפרופיל שלך למטה. "
 
-#: ../actions/profilesettings.php:51
+#: ../actions/profilesettings.php:48 ../actions/register.php:169
+#: actions/profilesettings.php:81 actions/register.php:183
+#: actions/profilesettings.php:83 actions/register.php:210
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "הכתובת של אתר הבית שלך, בלוג, או פרופיל באתר אחר "
 
-#: ../actions/remotesubscribe.php:74
+#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
 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/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/emailsettings.php:147
+#: actions/othersettings.php:146 actions/twittersettings.php:199
 msgid "Unexpected form submission."
 msgstr "הגשת טופס לא צפויה."
 
-#: ../actions/recoverpassword.php:237
+#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
 msgid "Unexpected password reset."
 msgstr "איפוס סיסמה לא צפוי."
 
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:58
+#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:59
 msgid "Unknown version of OMB protocol."
 msgstr "גירסה לא מוכרת של פרוטוקול OMB"
 
-#: ../lib/util.php:245
+#: ../lib/util.php:269 lib/util.php:285 lib/util.php:296
 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:48
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr "סוג לא מזוהה של כתובת %s"
 
-#: ../actions/showstream.php:193
+#: ../actions/showstream.php:209 actions/showstream.php:219
+#: actions/showstream.php:267 lib/util.php:2094
 msgid "Unsubscribe"
 msgstr "בטל מנוי"
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
+#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
+#: actions/postnotice.php:45 actions/updateprofile.php:46
 msgid "Unsupported OMB version"
 msgstr "גירסה לא נתמכת של OMB"
 
-#: ../actions/avatar.php:105
+#: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: actions/profilesettings.php:371
 msgid "Unsupported image file format."
 msgstr "פורמט התמונה אינו נתמך."
 
-#: ../actions/avatar.php:68
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: actions/deleteprofile.php:251
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: actions/deleteprofile.php:254
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/twitapistatuses.php:126
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:198
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
+
+#: ../actions/avatar.php:68 actions/profilesettings.php:161
+#: actions/profilesettings.php:166
 msgid "Upload"
 msgstr "ההעלה"
 
@@ -1340,107 +2231,199 @@ msgid ""
 "site license, also. Use a picture that belongs to you and that you want to "
 "share."
 msgstr ""
-"העלה תמונת משתמש כאן. לאחר העלאת התמונה לא "
-"תוכל לערוך אותה, לכן וודא שהיא ריבועית "
-"(פחות או יותר). כמו כן, התמונה תפורסם תחת רשיון השימוש של האתר. השתמש בתמונה ששייכת לך ושאתה מוכן לשתף. "
+"העלה תמונת משתמש כאן. לאחר העלאת התמונה לא תוכל לערוך אותה, לכן וודא שהיא "
+"ריבועית (פחות או יותר). כמו כן, התמונה תפורסם תחת רשיון השימוש של האתר. "
+"השתמש בתמונה ששייכת לך ושאתה מוכן לשתף. "
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:182
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr ""
+
+#: ../actions/invite.php:114 actions/invite.php:121
+msgid ""
+"Use this form to invite your friends and colleagues to use this service."
+msgstr ""
+
+#: ../actions/register.php:159 ../actions/register.php:162
+#: actions/register.php:173 actions/register.php:176 actions/register.php:200
+#: actions/register.php:203
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "לשימוש רק במקרים של עידכונים, הודעות מערכת, ושיחזורי סיסמאות"
 
 #: ../actions/finishremotesubscribe.php:86
+#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:92
 msgid "User being listened to doesn't exist."
 msgstr "המשתמש אליו אתה מאזין אינו קיים."
 
 #: ../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/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/showstream.php:57
+#: actions/twitapiaccount.php:63 actions/twitapifavorites.php:40
+#: actions/twitapistatuses.php:163 actions/twitapistatuses.php:492
+#: lib/twitterapi.php:590
 msgid "User has no profile."
 msgstr "למשתמש אין פרופיל."
 
-#: ../actions/remotesubscribe.php:71
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
 msgid "User nickname"
 msgstr "כינוי משתמש"
 
-#: ../lib/util.php:969
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../lib/util.php:1159 lib/util.php:1293 lib/util.php:1630
 #, php-format
 msgid "What's up, %s?"
 msgstr "מה המצב %s?"
 
-#: ../actions/profilesettings.php:57
+#: ../actions/profilesettings.php:54 ../actions/register.php:175
+#: actions/profilesettings.php:87 actions/register.php:189
+#: actions/profilesettings.php:89 actions/register.php:216
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "מיקומך, למשל \"עיר, מדינה או מחוז, ארץ\""
 
-#: ../actions/updateprofile.php:127
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "סוג התמונה של '%s' אינו מתאים"
 
-#: ../actions/updateprofile.php:122
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "גודל התמונה של: '%s' לא מתאים."
 
-#: ../actions/finishaddopenid.php:64
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+#: actions/block.php:105
+msgid "Yes"
+msgstr "כן"
+
+#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
 msgid "You already have this OpenID!"
 msgstr "כבר יש לך את ה-OpenID הזה!"
 
-#: ../actions/recoverpassword.php:31
+#: ../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
 msgid "You are already logged in!"
 msgstr "כבר נכנסת למערכת!"
 
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:102
+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/register.php:164
+#: ../actions/register.php:135 actions/register.php:145
 msgid "You can create a new account to start posting notices."
 msgstr "ניתן ליצור חשבון חדש ולהתחיל לפרסם הודעות."
 
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
 #: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr "הסיר OpenID מחשבונך על ידי לחיצה על הכפתור המסומן \"הסר\"."
 
-#: ../actions/imsettings.php:28
+#: ../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 ""
-"אפשר לשלוח ולקבל בודעות דרך Jabber/GTalk [instant "
-"messages](%%doc.im%%) הגדר את כתובתך והעדפותיך למטה."
+"אפשר לשלוח ולקבל בודעות דרך Jabber/GTalk [instant messages](%%doc.im%%) הגדר "
+"את כתובתך והעדפותיך למטה."
 
 #: ../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
+#: actions/finishremotesubscribe.php:83 actions/finishremotesubscribe.php:99
 msgid "You can use the local subscription!"
 msgstr "ניתן להשתמש במנוי המקומי!"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:51
+#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
+#: actions/finishopenidlogin.php:38 actions/register.php:68
+#: actions/register.php:77
 msgid "You can't register if you don't agree to the license."
 msgstr "לא ניתן להירשם ללא הסכמה לרשיון"
 
-#: ../actions/updateprofile.php:62
+#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
 msgid "You did not send us that profile"
 msgstr "לא שלחנו אלינו את הפרופיל הזה"
 
-#: ../actions/recoverpassword.php:134
+#: ../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 ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: actions/twitapistatuses.php:455
+msgid "You may not delete another user's status."
+msgstr ""
+
+#: ../actions/invite.php:31 actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+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!"
+msgstr ""
+
+#: ../actions/recoverpassword.php:149
 msgid "You've been identified. Enter a  new password below. "
 msgstr "זוהית. הכנס סיסמה חדשה למטה."
 
-#: ../actions/openidlogin.php:67
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:84
 msgid "Your OpenID URL"
 msgstr "כתובת ה-OpenID שלך"
 
-#: ../actions/recoverpassword.php:149 ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:164
 msgid "Your nickname on this server, or your registered email address."
-msgstr "כינויך על שרת זה, או כתובת הדוא"ל הרשומה שלך."
+msgstr ""
 
 #: ../actions/openidsettings.php:28
 #, php-format
@@ -1448,787 +2431,88 @@ msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
-"מאפשר לך להיכנס להרבה אתרים בעזרת חשבון "
-"משתמש אחד. נהל את שיוך ה-OpenID מכאן. [OpenID](%%doc.openid%%)"
+"מאפשר לך להיכנס להרבה אתרים בעזרת חשבון משתמש אחד. נהל את שיוך ה-OpenID "
+"מכאן. [OpenID](%%doc.openid%%)"
 
-#: ../lib/util.php:814
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:1287
 msgid "a few seconds ago"
 msgstr "לפני מספר שניות"
 
-#: ../lib/util.php:826
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:1299
 #, php-format
 msgid "about %d days ago"
 msgstr "לפני כ-%d ימים"
 
-#: ../lib/util.php:822
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:1295
 #, php-format
 msgid "about %d hours ago"
 msgstr "לפני כ-%d שעות"
 
-#: ../lib/util.php:818
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:1291
 #, php-format
 msgid "about %d minutes ago"
 msgstr "לפני כ-%d דקות"
 
-#: ../lib/util.php:830
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:1303
 #, php-format
 msgid "about %d months ago"
 msgstr "לפני כ-%d חודשים"
 
-#: ../lib/util.php:824
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:1297
 msgid "about a day ago"
 msgstr "לפני כיום"
 
-#: ../lib/util.php:816
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:1289
 msgid "about a minute ago"
 msgstr "לפני כדקה"
 
-#: ../lib/util.php:828
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:1301
 msgid "about a month ago"
 msgstr "לפני כחודש"
 
-#: ../lib/util.php:832
-msgid "about a year ago"
-msgstr "לפני כשנה"
-
-#: ../lib/util.php:820
-msgid "about an hour ago"
-msgstr "לפני כשעה"
-
-#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
-#: ../lib/stream.php:101
-msgid "in reply to..."
-msgstr "בתגובה ל..."
-
-#: ../actions/noticesearch.php:133 ../actions/showstream.php:390
-#: ../lib/stream.php:108
-msgid "reply"
-msgstr "הגב"
-
-#: ../actions/password.php:44
-msgid "same as password above"
-msgstr "זהה לסיסמה למעלה"
-
-#: ../lib/util.php:1127
-msgid "« After"
-msgstr "<< אחרי"
-
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr ""
-
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
-
-#: ../actions/invite.php:168 actions/invite.php:176
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
-
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
-
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
-#, php-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#, php-format
-msgid "%s public timeline"
-msgstr ""
-
-#: ../lib/mail.php:206 lib/mail.php:212
-#, php-format
-msgid "%s status"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#, php-format
-msgid "%s timeline"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
-msgstr ""
-
-#: ../actions/register.php:213
-msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
-msgstr ""
-
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-
-#: ../actions/register.php:154 actions/register.php:168
-msgid "6 or more characters. Required."
-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 ""
-
-#: ../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/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!"
-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 ""
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-msgid "Add or remove OpenIDs"
-msgstr ""
-
-#: ../actions/invite.php:131 actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
-msgstr ""
-
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-msgid "Are you sure you want to delete this notice?"
-msgstr ""
-
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr ""
-
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
-msgid "Can't delete this notice."
-msgstr ""
-
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-msgid "Cannot normalize that email address"
-msgstr ""
-
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr ""
-
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
-msgstr ""
-
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-msgid "Change your profile settings"
-msgstr ""
-
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-msgid "Confirmation code"
-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/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
-msgstr ""
-
-#: ../lib/subs.php:54 lib/subs.php:61
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: ../lib/subs.php:46 lib/subs.php:46
-msgid "Could not subscribe."
-msgstr ""
-
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-msgid "Could not update user with confirmed email address."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-msgid "Couldn't find any statuses."
-msgstr ""
-
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-msgid "Couldn't update user for autosubscribe."
-msgstr ""
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-msgid "Couldn't update user record."
-msgstr ""
-
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-msgid "Current confirmed email address."
-msgstr ""
-
-#: ../classes/Notice.php:72 classes/Notice.php:86
-#, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr ""
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-msgid "Delete notice"
-msgstr ""
-
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-msgid "Email Address"
-msgstr ""
-
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-msgid "Email Settings"
-msgstr ""
-
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-msgid "Email address, like \"UserName@example.org\""
-msgstr ""
-
-#: ../actions/invite.php:129 actions/invite.php:137
-msgid "Email addresses"
-msgstr ""
-
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
-msgstr ""
-
-#: ../actions/tag.php:55 actions/tag.php:55
-#, php-format
-msgid "Feed for tag %s"
-msgstr ""
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr ""
-
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr ""
-
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-msgid "I want to post notices by email."
-msgstr ""
-
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
-msgstr ""
-
-#: ../actions/recoverpassword.php:137
-msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
-"email address you have stored  in your account."
-msgstr ""
-
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-msgid "Incoming email"
-msgstr ""
-
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-msgid "Incoming email address removed."
-msgstr ""
-
-#: ../actions/invite.php:55 actions/invite.php:62
-#, php-format
-msgid "Invalid email address: %s"
-msgstr ""
-
-#: ../actions/invite.php:79 actions/invite.php:86
-msgid "Invitation(s) sent"
-msgstr ""
-
-#: ../actions/invite.php:97 actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
-msgstr ""
-
-#: ../lib/util.php:306 lib/util.php:322
-msgid "Invite"
-msgstr ""
-
-#: ../actions/invite.php:123 actions/invite.php:130
-msgid "Invite new users"
-msgstr ""
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Language"
-msgstr "שפה"
-
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-msgid "Language is too long (max 50 chars)."
-msgstr ""
-
-#: ../actions/register.php:166 actions/register.php:180
-msgid "Longer name, preferably your \"real\" name"
-msgstr ""
-
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-#: actions/emailsettings.php:81 actions/smssettings.php:89
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
-
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-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 ""
-
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-msgid "New"
-msgstr "חדש"
-
-#: ../lib/mail.php:144 lib/mail.php:144
-#, php-format
-msgid "New email address for posting to %s"
-msgstr ""
-
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-msgid "New incoming email address added."
-msgstr ""
-
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-msgid "No"
-msgstr "לא"
-
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-msgid "No carrier selected."
-msgstr ""
-
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-msgid "No code entered"
-msgstr ""
-
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-msgid "No email address."
-msgstr ""
-
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-msgid "No incoming email address."
-msgstr ""
-
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-msgid "No phone number."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-msgid "No status found with that ID."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-msgid "No status with that ID found."
-msgstr ""
-
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-msgid "No user with that email address or username."
-msgstr ""
-
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-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
-msgid "Not a supported data format."
-msgstr ""
-
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-msgid "Not a valid email address"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-msgid "Not found"
-msgstr "לא נמצא"
-
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-msgid "Notice Search"
-msgstr ""
-
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81
-#, php-format
-msgid "Notices tagged with %s"
-msgstr ""
-
-#: ../actions/invite.php:135 actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-msgid "People"
-msgstr "אנשים"
-
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-msgid "People Search"
-msgstr "חיפוש אנשים"
-
-#: ../actions/invite.php:133 actions/invite.php:141
-msgid "Personal message"
-msgstr ""
-
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Preferred language"
-msgstr ""
-
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
-
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-msgid "Publish a MicroID for my email address."
-msgstr ""
-
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr ""
-
-#: ../actions/register.php:28 actions/register.php:28
-msgid "Registration not allowed."
-msgstr ""
-
-#: ../actions/register.php:200 actions/register.php:214
-msgid "Registration successful"
-msgstr ""
-
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
-msgstr "סמס"
-
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-msgid "SMS Phone number"
-msgstr ""
-
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-msgid "SMS Settings"
-msgstr ""
-
-#: ../lib/mail.php:219 lib/mail.php:225
-msgid "SMS confirmation"
-msgstr ""
-
-#: ../actions/register.php:156 actions/register.php:170
-msgid "Same as password above. Required."
-msgstr ""
-
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-msgid "Select a carrier"
-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."
-msgstr ""
-
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-msgid "Send me notices of new subscriptions through email."
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr ""
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
-msgstr ""
-
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317
-msgid "Tags"
-msgstr ""
-
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr "טקסט"
-
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr ""
-
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-msgid "That is already your email address."
-msgstr ""
-
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-msgid "That is already your phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-msgid "That is not your email address."
-msgstr ""
-
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-msgid "That is not your phone number."
-msgstr ""
-
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-msgid "That is the wrong confirmation number."
-msgstr ""
-
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-msgid "That phone number already belongs to another user."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-msgid "That's too long. Max notice size is 255 chars."
-msgstr ""
-
-#: ../actions/invite.php:89 actions/invite.php:96
-msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
-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."
-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."
-msgstr ""
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "Timezone"
-msgstr ""
-
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-msgid "Timezone not selected."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-msgid "Two user ids or screen_names must be supplied."
-msgstr ""
-
-#: ../index.php:57 index.php:57
-msgid "Unknown action"
-msgstr ""
-
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-msgid "Updates by SMS"
-msgstr ""
-
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr ""
-
-#: ../actions/invite.php:114 actions/invite.php:121
-msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
-msgstr ""
-
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr ""
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "What timezone are you normally in?"
-msgstr ""
-
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-msgid "Yes"
-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/invite.php:81 actions/invite.php:88
-msgid "You are already subscribed to these users:"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
-msgstr ""
-
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-msgid "You may not delete another user's status."
-msgstr ""
-
-#: ../actions/invite.php:31 actions/invite.php:31
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-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!"
-msgstr ""
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:1305
+msgid "about a year ago"
+msgstr "לפני כשנה"
+
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:1293
+msgid "about an hour ago"
+msgstr "לפני כשעה"
 
 #: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
+#: actions/showstream.php:441 lib/stream.php:99 lib/noticelist.php:211
 msgid "delete"
 msgstr "מחק"
 
+#: ../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:135
+#: lib/facebookaction.php:202 lib/noticelist.php:189
+msgid "in reply to..."
+msgstr "בתגובה ל..."
+
+#: ../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:142
+#: lib/noticelist.php:199
+msgid "reply"
+msgstr "הגב"
+
+#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/profilesettings.php:188
+msgid "same as password above"
+msgstr "זהה לסיסמה למעלה"
+
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+#: actions/twitapistatuses.php:543
 msgid "unsupported file type"
 msgstr ""
 
+#: ../lib/util.php:1309 lib/util.php:1443 lib/facebookaction.php:251
+#: lib/util.php:1783
+#, fuzzy
+msgid "« After"
+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
@@ -2238,6 +2522,12 @@ msgstr ""
 #: 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:38 actions/deleteprofile.php:127 actions/disfavor.php:47
+#: actions/emailsettings.php:130 actions/favor.php:49 actions/login.php:45
+#: actions/newmessage.php:44 actions/newnotice.php:36 actions/nudge.php:47
+#: actions/othersettings.php:139 actions/profilesettings.php:49
+#: actions/subedit.php:38 actions/tagother.php:113
+#: actions/twittersettings.php:188 actions/unblock.php:38
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -2261,12 +2551,14 @@ msgstr ""
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142
+#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:54
+#: actions/twitapifavorites.php:115
 msgid "This notice is already a favorite!"
 msgstr ""
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
+#: classes/Command.php:132 actions/favor.php:61
+#: actions/twitapifavorites.php:122
 msgid "Could not create favorite."
 msgstr ""
 
@@ -2275,11 +2567,12 @@ msgid "Disfavor"
 msgstr ""
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:62
 #, php-format
 msgid "%s favorite notices"
 msgstr ""
 
-#: actions/favoritesrss.php:64
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:66
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr ""
@@ -2305,47 +2598,50 @@ msgid ""
 "\n"
 msgstr ""
 
-#: actions/login.php:104
+#: actions/login.php:104 actions/login.php:111 actions/openidlogin.php:86
 msgid "Automatically login in the future; "
 msgstr ""
 
-#: actions/login.php:122
+#: actions/login.php:122 actions/login.php:130
 msgid "For security reasons, please re-enter your "
 msgstr ""
 
-#: actions/login.php:126
+#: actions/login.php:126 actions/login.php:134
 msgid "Login with your username and password. "
 msgstr ""
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+#: actions/newmessage.php:60 actions/twitapidirect_messages.php:136
 msgid "That's too long. Max message size is 140 chars."
 msgstr ""
 
-#: actions/newmessage.php:65
+#: actions/newmessage.php:65 actions/newmessage.php:68
 msgid "No recipient specified."
 msgstr ""
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
+#: classes/Command.php:206 actions/newmessage.php:71
+#: actions/newmessage.php:116 classes/Command.php:211
 msgid "You can't send a message to this user."
 msgstr ""
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
+#: classes/Command.php:209 actions/newmessage.php:74
+#: actions/twitapidirect_messages.php:153 classes/Command.php:214
 msgid ""
-"Don't send a message to yourself; just say it to yourself quietly "
-"instead."
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: actions/newmessage.php:108
+#: actions/newmessage.php:108 actions/microsummary.php:32
+#: actions/newmessage.php:111
 msgid "No such user"
 msgstr ""
 
-#: actions/newmessage.php:117
+#: actions/newmessage.php:117 actions/newmessage.php:120
 msgid "New message"
 msgstr "הודעה חדשה"
 
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:95 actions/noticesearch.php:94
 msgid "Notice without matching profile"
 msgstr ""
 
@@ -2392,6 +2688,7 @@ msgstr ""
 
 #: actions/profilesettings.php:115 actions/remotesubscribe.php:320
 #: actions/userauthorization.php:159 actions/userrss.php:76
+#: actions/profilesettings.php:120 actions/remotesubscribe.php:333
 msgid "User without matching profile"
 msgstr ""
 
@@ -2419,18 +2716,18 @@ msgstr ""
 msgid "New password successfully saved. "
 msgstr ""
 
-#: actions/register.php:95
+#: actions/register.php:95 actions/register.php:104
 msgid "Password must be 6 or more characters."
 msgstr ""
 
-#: actions/register.php:216
+#: actions/register.php:216 actions/register.php:243
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to..."
 msgstr ""
 
-#: actions/register.php:227
+#: actions/register.php:227 actions/register.php:254
 msgid "(You should receive a message by email momentarily, with "
 msgstr ""
 
@@ -2445,6 +2742,7 @@ msgid "Feed for favorites of %s"
 msgstr ""
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:88 actions/twitapifavorites.php:57
 msgid "Could not retrieve favorite notices."
 msgstr ""
 
@@ -2466,7 +2764,7 @@ msgstr ""
 msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: actions/showstream.php:154
+#: actions/showstream.php:154 lib/util.php:2105
 msgid "Send a message"
 msgstr ""
 
@@ -2475,73 +2773,78 @@ msgstr ""
 msgid "Mobile carrier for your phone. "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:64
 #, php-format
 msgid "Direct messages to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:65
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:69
 msgid "Direct Messages You've Sent"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:70
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:132
 msgid "No message text!"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:145
 msgid "Recipient user not found."
 msgstr ""
 
 #: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:148
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
-#: actions/twitapifavorites.php:92
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:64
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
-#: actions/twitapifavorites.php:95
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:67
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
+#: actions/twitapifavorites.php:158 lib/mail.php:303
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr ""
 
 #: actions/twitapifavorites.php:188 lib/mail.php:276
+#: actions/twitapifavorites.php:159 lib/mail.php:304
 #, php-format
 msgid ""
 "%1$s just added your notice from %2$s as one of their favorites.\n"
 "\n"
 msgstr ""
 
-#: actions/twittersettings.php:27
+#: actions/twittersettings.php:27 actions/twittersettings.php:29
 msgid ""
 "Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 
-#: actions/twittersettings.php:41
+#: actions/twittersettings.php:41 actions/twittersettings.php:43
 msgid "Twitter settings"
 msgstr ""
 
-#: actions/twittersettings.php:48
+#: actions/twittersettings.php:48 actions/twittersettings.php:50
 msgid "Twitter Account"
 msgstr ""
 
-#: actions/twittersettings.php:56
+#: actions/twittersettings.php:56 actions/twittersettings.php:58
 msgid "Current verified Twitter account."
 msgstr ""
 
@@ -2569,46 +2872,50 @@ msgstr ""
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:216
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr ""
 
-#: actions/twittersettings.php:128
+#: actions/twittersettings.php:128 actions/twittersettings.php:221
 msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: actions/twittersettings.php:137 actions/twittersettings.php:228
 #, php-format
 msgid "Unable to retrieve account information for \"%s\" from Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:234 actions/twittersettings.php:253
 msgid "Unable to save your Twitter settings!"
 msgstr ""
 
-#: actions/twittersettings.php:174
+#: actions/twittersettings.php:174 actions/twittersettings.php:261
 msgid "Twitter settings saved."
 msgstr ""
 
-#: actions/twittersettings.php:192
+#: actions/twittersettings.php:192 actions/twittersettings.php:272
 msgid "That is not your Twitter account."
 msgstr ""
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:280
 msgid "Couldn't remove Twitter user."
 msgstr ""
 
-#: actions/twittersettings.php:212
+#: actions/twittersettings.php:212 actions/twittersettings.php:284
 msgid "Twitter account removed."
 msgstr ""
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
+#: actions/twittersettings.php:299 actions/twittersettings.php:310
+#: actions/twittersettings.php:322
 msgid "Couldn't save Twitter preferences."
 msgstr ""
 
-#: actions/twittersettings.php:245
+#: actions/twittersettings.php:245 actions/twittersettings.php:330
 msgid "Twitter preferences saved."
 msgstr ""
 
@@ -2624,15 +2931,15 @@ msgstr ""
 msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#: classes/Channel.php:113
+#: classes/Channel.php:113 classes/Channel.php:129
 msgid "Command results"
 msgstr ""
 
-#: classes/Channel.php:148
+#: classes/Channel.php:148 classes/Channel.php:175
 msgid "Command complete"
 msgstr ""
 
-#: classes/Channel.php:158
+#: classes/Channel.php:158 classes/Channel.php:185
 msgid "Command failed"
 msgstr ""
 
@@ -2645,7 +2952,7 @@ msgstr ""
 msgid "Subscriptions: %1$s\n"
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:247
 msgid "User has no last notice"
 msgstr ""
 
@@ -2678,59 +2985,60 @@ msgstr ""
 msgid "About: %s"
 msgstr "אודות: %s"
 
-#: classes/Command.php:200
+#: classes/Command.php:200 classes/Command.php:202
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: classes/Command.php:214
+#: classes/Command.php:214 classes/Command.php:219
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: classes/Command.php:216
+#: classes/Command.php:216 classes/Command.php:221
 msgid "Error sending direct message."
 msgstr ""
 
-#: classes/Command.php:263
+#: classes/Command.php:263 classes/Command.php:268
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: classes/Command.php:270
+#: classes/Command.php:270 classes/Command.php:275
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: classes/Command.php:288
+#: classes/Command.php:288 classes/Command.php:293
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: classes/Command.php:295
+#: classes/Command.php:295 classes/Command.php:300
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330
+#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:315
+#: classes/Command.php:335
 msgid "Command not yet implemented."
 msgstr ""
 
-#: classes/Command.php:313
+#: classes/Command.php:313 classes/Command.php:318
 msgid "Notification off."
 msgstr ""
 
-#: classes/Command.php:315
+#: classes/Command.php:315 classes/Command.php:320
 msgid "Can't turn off notification."
 msgstr ""
 
-#: classes/Command.php:333
+#: classes/Command.php:333 classes/Command.php:338
 msgid "Notification on."
 msgstr ""
 
-#: classes/Command.php:335
+#: classes/Command.php:335 classes/Command.php:340
 msgid "Can't turn on notification."
 msgstr ""
 
-#: classes/Command.php:344
+#: classes/Command.php:344 classes/Command.php:349
 msgid "Commands:\n"
 msgstr ""
 
@@ -2742,23 +3050,23 @@ msgstr ""
 msgid "Could not update message with new URI."
 msgstr ""
 
-#: lib/gallery.php:46
+#: lib/gallery.php:46 lib/gallery.php:55
 msgid "User without matching profile in system."
 msgstr ""
 
-#: lib/mail.php:147
+#: lib/mail.php:147 lib/mail.php:141
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:249
+#: lib/mail.php:249 lib/mail.php:275
 #, php-format
 msgid "New private message from %s"
 msgstr ""
 
-#: lib/mail.php:253
+#: lib/mail.php:253 lib/mail.php:279
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -2802,18 +3110,445 @@ msgstr ""
 msgid "Your sent messages"
 msgstr ""
 
-#: lib/settingsaction.php:99
+#: lib/settingsaction.php:99 actions/deleteprofile.php:256
 msgid "Twitter"
 msgstr ""
 
-#: lib/settingsaction.php:100
+#: lib/settingsaction.php:100 actions/deleteprofile.php:257
 msgid "Twitter integration options"
 msgstr ""
 
-#: lib/util.php:1718
+#: lib/util.php:1718 lib/util.php:2145
 msgid "To"
 msgstr "אל"
 
 #: scripts/maildaemon.php:45
 msgid "Could not parse message."
 msgstr ""
+
+#: actions/block.php:45 actions/subedit.php:45 actions/unblock.php:45
+msgid "No profile specified."
+msgstr ""
+
+#: actions/block.php:52 actions/subedit.php:52 actions/tagother.php:45
+#: actions/unblock.php:52
+msgid "No profile with that ID."
+msgstr ""
+
+#: actions/block.php:78
+#, fuzzy
+msgid "Block user"
+msgstr "אין משתמש כזה."
+
+#: actions/block.php:81
+msgid "Are you sure you want to block this user? "
+msgstr ""
+
+#: actions/block.php:117
+#, fuzzy
+msgid "You have already blocked this user."
+msgstr "כבר נכנסת למערכת!"
+
+#: actions/block.php:124
+msgid "Failed to save block information."
+msgstr ""
+
+#: actions/deleteprofile.php:25
+msgid "Code not yet ready."
+msgstr ""
+
+#: actions/deleteprofile.php:36
+msgid "Export and delete your user information."
+msgstr ""
+
+#: actions/deleteprofile.php:88 actions/deleteprofile.php:119
+#, fuzzy
+msgid "Delete my account"
+msgstr "צור חשבון חדש"
+
+#: actions/deleteprofile.php:89
+msgid "Delete my account confirmation"
+msgstr ""
+
+#: actions/deleteprofile.php:117
+msgid "Check if you are sure you want to delete your account."
+msgstr ""
+
+#: actions/deleteprofile.php:259 lib/settingsaction.php:102
+msgid "Other"
+msgstr ""
+
+#: actions/deleteprofile.php:260 lib/settingsaction.php:103
+msgid "Other options"
+msgstr ""
+
+#: actions/disfavor.php:72
+#, fuzzy
+msgid "Add to favorites"
+msgstr "מועדפים"
+
+#: actions/emailsettings.php:98
+msgid "Allow friends to nudge me and send me an email."
+msgstr ""
+
+#: actions/facebookremove.php:54
+#, fuzzy
+msgid "Couldn't remove Facebook user."
+msgstr "עידכון המשתמש נכשל."
+
+#: actions/favor.php:71
+msgid "Disfavor favorite"
+msgstr ""
+
+#: actions/favorited.php:31 lib/stream.php:45
+#, fuzzy
+msgid "Popular notices"
+msgstr "אין הודעה כזו."
+
+#: actions/favorited.php:54
+msgid "Showing recently popular notices"
+msgstr ""
+
+#: actions/featured.php:32 actions/featured.php:54 lib/stream.php:41
+msgid "Featured users"
+msgstr ""
+
+#: actions/finishremotesubscribe.php:186
+msgid "That user has blocked you from subscribing."
+msgstr ""
+
+#: actions/microsummary.php:39
+msgid "No current status"
+msgstr ""
+
+#: actions/newnotice.php:93
+#, fuzzy
+msgid "Notice posted"
+msgstr "הודעות"
+
+#: actions/newnotice.php:116 classes/Channel.php:140
+msgid "Ajax Error"
+msgstr ""
+
+#: actions/nudge.php:52
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
+
+#: actions/nudge.php:61
+msgid "Nudge sent"
+msgstr ""
+
+#: actions/othersettings.php:27
+msgid "Manage various other options."
+msgstr ""
+
+#: actions/othersettings.php:33
+#, fuzzy
+msgid "Other Settings"
+msgstr "הגדרות"
+
+#: actions/othersettings.php:35
+msgid "URL Auto-shortening"
+msgstr ""
+
+#: actions/othersettings.php:54
+#, fuzzy
+msgid "Service"
+msgstr "חיפוש"
+
+#: actions/othersettings.php:54
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/othersettings.php:155
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "שם המיקום ארוך מידי (מותר עד 255 אותיות)."
+
+#: actions/peopletag.php:33
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "לא עומד בכללים ל-OpenID."
+
+#: actions/peopletag.php:45
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr ""
+
+#: actions/peopletag.php:87
+#, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+msgstr ""
+
+#: actions/profilesettings.php:92
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+
+#: actions/profilesettings.php:246 actions/tagother.php:131
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "כתובת אתר הבית '%s' אינה חוקית"
+
+#: actions/profilesettings.php:328
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "שמירת הפרופיל נכשלה."
+
+#: actions/public.php:68
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
+msgstr ""
+
+#: actions/public.php:90
+msgid "Could not retrieve public stream."
+msgstr ""
+
+#: actions/register.php:67 actions/register.php:177
+msgid "Sorry, only invited people can register."
+msgstr ""
+
+#: actions/register.php:156
+msgid "With this form you can create a new account. "
+msgstr ""
+
+#: actions/remotesubscribe.php:136 actions/remotesubscribe.php:141
+msgid "That's a local profile! Login to subscribe."
+msgstr ""
+
+#: actions/subedit.php:68
+#, fuzzy
+msgid "You are not subscribed to that profile."
+msgstr "לא שלחנו אלינו את הפרופיל הזה"
+
+#: actions/subedit.php:81
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "יצירת המנוי נכשלה."
+
+#: actions/subscribe.php:53
+#, fuzzy
+msgid "Not a local user."
+msgstr "אין משתמש כזה."
+
+#: actions/subscribe.php:67
+#, fuzzy
+msgid "Subscribed"
+msgstr "הירשם כמנוי"
+
+#: actions/subscriptions.php:72
+#, fuzzy
+msgid "Jabber"
+msgstr "אין זיהוי Jabber כזה."
+
+#: actions/tagother.php:31
+#, fuzzy
+msgid "Not logged in"
+msgstr "לא מחובר."
+
+#: actions/tagother.php:40
+#, fuzzy
+msgid "No id argument."
+msgstr "אין מסמך כזה."
+
+#: actions/tagother.php:56
+msgid "Tag a person"
+msgstr ""
+
+#: actions/tagother.php:98
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
+msgstr ""
+
+#: actions/tagother.php:120
+#, fuzzy
+msgid "No such profile."
+msgstr "אין הודעה כזו."
+
+#: actions/tagother.php:146
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+
+#: actions/tagother.php:153
+#, fuzzy
+msgid "Could not save tags."
+msgstr "שמירת מידע התמונה נכשל"
+
+#: actions/tagother.php:188
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
+
+#: actions/tagrss.php:33
+#, fuzzy
+msgid "No such tag."
+msgstr "אין הודעה כזו."
+
+#: actions/tagrss.php:62
+#, fuzzy, php-format
+msgid "Microblog tagged with %s"
+msgstr "מיקרובלוג מאת %s"
+
+#: actions/twitapiblocks.php:45
+msgid "Block user failed."
+msgstr ""
+
+#: actions/twitapiblocks.php:66
+msgid "Unblock user failed."
+msgstr ""
+
+#: actions/twitapiusers.php:45
+#, fuzzy
+msgid "Not found."
+msgstr "לא נמצא"
+
+#: actions/twittersettings.php:63
+msgid "Twitter user name"
+msgstr ""
+
+#: actions/twittersettings.php:67
+#, fuzzy
+msgid "Twitter password"
+msgstr "סיסמה חדשה"
+
+#: actions/twittersettings.php:129
+msgid "Twitter Friends"
+msgstr ""
+
+#: actions/unblock.php:73
+#, fuzzy
+msgid "Error removing the block."
+msgstr "שגיאה בשמירת המשתמש."
+
+#: actions/unsubscribe.php:48
+#, fuzzy
+msgid "No profile id in request."
+msgstr "השרת לא החזיר כתובת פרופיל"
+
+#: actions/unsubscribe.php:55
+#, fuzzy
+msgid "No profile with that id."
+msgstr "אין פרופיל תואם לפרופיל המרוחק "
+
+#: actions/unsubscribe.php:69
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "בטל מנוי"
+
+#: classes/Notice.php:100
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "בעיה בשמירת ההודעה."
+
+#: classes/Notice.php:105
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+
+#: classes/Notice.php:112
+msgid "You are banned from posting notices on this site."
+msgstr ""
+
+#: lib/gallery.php:98
+msgid "Filter tags"
+msgstr ""
+
+#: lib/gallery.php:104
+msgid "All"
+msgstr ""
+
+#: lib/gallery.php:108
+msgid "Tag"
+msgstr ""
+
+#: lib/gallery.php:109
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/gallery.php:110
+msgid "Go"
+msgstr ""
+
+#: lib/gallery.php:264
+#, fuzzy
+msgid "Subscriptions navigation"
+msgstr "הרשמות"
+
+#: lib/gallery.php:270 lib/gallery.php:292
+msgid "List"
+msgstr ""
+
+#: lib/gallery.php:280 lib/gallery.php:294
+msgid "Icons"
+msgstr ""
+
+#: lib/mail.php:92
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:242
+#, php-format
+msgid "You've been nudged by %s"
+msgstr ""
+
+#: lib/mail.php:246
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+msgstr ""
+
+#: lib/profilelist.php:146
+msgid "(none)"
+msgstr ""
+
+#: lib/stream.php:33
+msgid "Public"
+msgstr "ציבורי"
+
+#: lib/stream.php:36 lib/stream.php:37
+msgid "Recent tags"
+msgstr ""
+
+#: lib/stream.php:40
+msgid "Featured"
+msgstr ""
+
+#: lib/stream.php:44
+#, fuzzy
+msgid "Popular"
+msgstr "אנשים"
+
+#: lib/subs.php:51
+#, fuzzy
+msgid "User has blocked you."
+msgstr "למשתמש אין פרופיל."
+
+#: lib/util.php:2059
+msgid "Send a nudge"
+msgstr ""
+
+#: lib/util.php:2063
+msgid "Nudge sent!"
+msgstr ""
+
+#: lib/util.php:2194
+msgid "Block"
+msgstr ""
+
+#: lib/util.php:2198
+msgid "Unblock"
+msgstr ""
+
+#~ msgid "Error inserting notice"
+#~ msgstr "שגיאה בהכנסת ההודאה"
diff --git a/it_IT/LC_MESSAGES/laconica.po b/it_IT/LC_MESSAGES/laconica.po
index 83d13b13e0..a59cdc426c 100644
--- a/it_IT/LC_MESSAGES/laconica.po
+++ b/it_IT/LC_MESSAGES/laconica.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: laconica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-14 21:07+1200\n"
+"POT-Creation-Date: 2009-01-12 12:10+0000\n"
 "PO-Revision-Date: 2008-12-24 17:46+0100\n"
 "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -16,25 +16,106 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../actions/noticesearchrss.php:64
+#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:61
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr "Ricerca \"%s\" nel flusso"
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: actions/finishopenidlogin.php:88 actions/register.php:205
+#: actions/register.php:232
 msgid ""
-" except this private data: password, email address, IM address, phone "
-"number."
+" except this private data: password, email address, IM address, phone number."
 msgstr ""
 "a eccezione di questi dati personali: password, indirizzo email, indirizzo "
 "messaggistica istantanea, numero di telefono."
 
-#: ../actions/subscribe.php:84
+#  Non ne sono sicuro, ma dovrebbe essere quello che si vede come descrizione da dove si è inviato il messaggio. Mettere 'da' non suona bene ('da web', 'da api'...), 'via' mi pare la soluzione migliore ('via web', 'via api', 'via Twhirl'...).
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+#: lib/facebookaction.php:195 lib/noticelist.php:160
+msgid " from "
+msgstr "via"
+
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: actions/twitapistatuses.php:341
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr "%1$s / Aggiornamenti in risposta a %2$s"
+
+#  %USERNAME has invited you to join THEM on %site. You start with a singular and end with a plural???
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "%1$s ti invita a seguirlo su %2$s"
+
+#  link -> collegamento
+#  micro-blogging -> micro-blog
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+"%1$s ti invita a seguirlo su %2$s (%3$s).\n"
+"\n"
+"%2$s è un servizio di micro-blog che ti consente di rimanere aggiornato "
+"sulle persone che conosci e che ti interessano.\n"
+"\n"
+"Puoi anche condividere notizie che ti riguardano, i tuoi pensieri o la tua "
+"vita in rete con le persone che ti conoscono. È anche un ottimo strumento "
+"per conoscere nuove persone che condividono i tuoi stessi interessi.\n"
+"\n"
+"%1$s ha scritto:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Puoi vedere il profilo di %1$s su %2$s qui:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Se vuoi provare il servizio, fai clic sul collegamento qui sotto per "
+"accettare l'invito:\n"
+"\n"
+"%6$s\n"
+"\n"
+"Se non è ciò che vuoi, ignora semplicemente questo messaggio. Grazie per "
+"aver letto questo invito e per il tuo tempo!\n"
+"\n"
+"Cordiali saluti, %2$s\n"
+
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:115
+#: lib/mail.php:117
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s sta ora seguendo i tuoi messaggi su %2$s."
 
-#: ../actions/subscribe.php:86
+#: ../lib/mail.php:126
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -51,198 +132,442 @@ msgstr ""
 "Cordiali saluti,\n"
 "%4$s.\n"
 
-#: ../actions/shownotice.php:45
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#: actions/twitapistatuses.php:344
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr "%1$s aggiornamenti in risposta agli aggiornamenti da %2$s / %3$s"
+
+#: ../actions/shownotice.php:45 actions/shownotice.php:45
+#: actions/shownotice.php:73
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "Stato di %1$s su %2$s"
 
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
 #  Solo una prova, se non sta bene si ripristina la versione vecchia, giusto per avere l'interfaccia il più tradotta possibile
-#: ../actions/publicrss.php:60 ../actions/publicrss.php:62
-#: actions/publicrss.php:48
+#: ../actions/publicrss.php:62 actions/publicrss.php:48
 #, php-format
 msgid "%s Public Stream"
 msgstr "Attività pubblica di %s"
 
-#: ../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/twitapistatuses.php:123
 #, php-format
 msgid "%s and friends"
 msgstr "%s e amici"
 
-#: ../lib/util.php:233
+#  Solo una prova, se non sta bene si ripristina la versione vecchia, giusto per avere l'interfaccia il più tradotta possibile
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:31
+#, php-format
+msgid "%s public timeline"
+msgstr "attività pubblica di %s"
+
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:217
+#, php-format
+msgid "%s status"
+msgstr "stato di %s"
+
+#  Solo una prova, se non sta bene si ripristina la versione vecchia, giusto per avere l'interfaccia il più tradotta possibile
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:195
+#, php-format
+msgid "%s timeline"
+msgstr "Attività di %s"
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:34
+#, php-format
+msgid "%s updates from everyone!"
+msgstr "Aggiornamenti di %s da tutti!"
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+"(Dovresti ricevere, entro breve, un messaggio email con istruzioni su come "
+"confermare il tuo indirizzo email.)"
+
+#: ../lib/util.php:257 lib/util.php:273 lib/util.php:284
 #, 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%%** è un servizio di micro-blog offerto da "
-"[%%site.broughtby%%](%%site.broughtbyurl%%)."
+"**%%site.name%%** è un servizio di micro-blog offerto da [%%site.broughtby%%]"
+"(%%site.broughtbyurl%%)."
 
-#: ../lib/util.php:235
+#: ../lib/util.php:259 lib/util.php:275 lib/util.php:286
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** è un servizio di micro-blog."
 
-#: ../lib/util.php:250
+#: ../lib/util.php:274 lib/util.php:290 lib/util.php:301
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ""
-". I collaboratori devono essere indicati col loro nome completo o "
-"soprannome."
+". I collaboratori devono essere indicati col loro nome completo o soprannome."
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: ../actions/register.php:176
+#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
+#: actions/profilesettings.php:78
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
-"1-64 lettere minuscole o numeri, senza spazi o simboli di "
-"punteggiatura"
+"1-64 lettere minuscole o numeri, senza spazi o simboli di punteggiatura"
+
+#: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:193
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+"1-64 lettere minuscole o numeri, niente punteggiatura o spazi. Richiesto."
 
-#: ../actions/password.php:42 ../actions/register.php:178
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/profilesettings.php:186
 msgid "6 or more characters"
 msgstr "6 o più caratteri"
 
 #  messa al femminile... dovrebbe essere la password
-#: ../actions/recoverpassword.php:165
+#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 o più caratteri, e non dimenticarla!"
 
-#: ../actions/imsettings.php:188
+#  Femminile, è la password
+#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:195
+msgid "6 or more characters. Required."
+msgstr "6 o più caratteri. Richiesta."
+
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, 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 ""
 "Un codice di conferma è stato inviato all'indirizzo di messaggistica "
-"istantanea che hai aggiunto. Devi approvare %s affinché ti invii "
-"messaggi."
+"istantanea che hai aggiunto. Devi approvare %s affinché ti invii messaggi."
+
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:234
+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 ""
+"Un codice di conferma è stato inviato all'indirizzo di posta da te aggiunto. "
+"Controlla la tua casella di posta (e anche la posta indesiderata!) per il "
+"codice e le istruzioni su come usarlo."
+
+#: ../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 ""
+"Un codice di conferma è stato inviato al numero di telefono da te aggiunto. "
+"Controlla la tua casella di posta (e anche la posta indesiderata!) per il "
+"codice e le istruzioni su come usarlo."
+
+#: ../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:30
+#: actions/twitapidirect_messages.php:107 actions/twitapifavorites.php:83
+#: actions/twitapifavorites.php:99 actions/twitapifriendships.php:117
+#: actions/twitapihelp.php:42 actions/twitapistatuses.php:77
+#: actions/twitapistatuses.php:144 actions/twitapistatuses.php:224
+#: actions/twitapistatuses.php:234 actions/twitapistatuses.php:386
+#: actions/twitapistatuses.php:395 actions/twitapistatuses.php:421
+#: actions/twitapiusers.php:30
+msgid "API method not found!"
+msgstr "Metodo delle API non trovato!"
+
+#: ../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:39
+#: actions/twitapiaccount.php:89 actions/twitapiaccount.php:94
+#: actions/twitapidirect_messages.php:178 actions/twitapifavorites.php:139
+#: actions/twitapihelp.php:49 actions/twitapistatuses.php:549
+msgid "API method under construction."
+msgstr "Metodo delle API in lavorazione."
 
-#: ../lib/util.php:296 ../lib/util.php:324 lib/util.php:340
+#: ../lib/util.php:324 lib/util.php:340 lib/util.php:352
 msgid "About"
 msgstr "Informazioni"
 
-#: ../actions/userauthorization.php:118
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
 msgid "Accept"
 msgstr "Accetta"
 
-#: ../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/twittersettings.php:84
 msgid "Add"
 msgstr "Aggiungi"
 
-#: ../actions/openidsettings.php:43
+#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
 msgid "Add OpenID"
 msgstr "Aggiungi OpenID"
 
-#: ../actions/imsettings.php:39
+#  we don't use 's' in plurals even from english words.
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: actions/deleteprofile.php:248
+msgid "Add or remove OpenIDs"
+msgstr "Aggiungi o rimuovi OpenID"
+
+#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
 msgid "Address"
 msgstr "Indirizzo"
 
-#: ../actions/showstream.php:254
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr "Indirizzi email di amici da invitare (uno per riga)"
+
+#: ../actions/showstream.php:273 actions/showstream.php:288
+#: actions/showstream.php:336
 msgid "All subscriptions"
 msgstr "Tutti gli abbonamenti"
 
-#: ../actions/publicrss.php:62
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
 #, php-format
 msgid "All updates for %s"
 msgstr "Tutti gli aggiornamenti di %s"
 
-#: ../actions/noticesearchrss.php:66
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:63
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "Tutti gli aggiornamenti corrispondenti al termine di ricerca \"%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
 msgid "Already logged in."
 msgstr "Accesso già effettuato."
 
-#: ../actions/subscribe.php:48
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:47
 msgid "Already subscribed!."
 msgstr "Già abbonato!"
 
-#: ../actions/userauthorization.php:76
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+msgid "Are you sure you want to delete this notice?"
+msgstr "Sei sicuro di voler eliminare questo messaggio?"
+
+#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
 msgid "Authorize subscription"
 msgstr "Autorizza abbonamento"
 
-#: ../actions/login.php:100 ../actions/register.php:184
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192 actions/register.php:219
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Accedi automaticamente in futuro; non per computer condivisi!"
 
-#: ../actions/avatar.php:32
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:103
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
+"Abbonami automaticamente a chi si abbona ai miei messaggi (utile per i non-"
+"umani)"
+
+#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: actions/profilesettings.php:34
 msgid "Avatar"
 msgstr "Immagine"
 
-#: ../actions/avatar.php:113
+#: ../actions/avatar.php:113 actions/profilesettings.php:350
+#: actions/profilesettings.php:379
 msgid "Avatar updated."
 msgstr "Immagine aggiornata."
 
-#: ../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 ""
-"In attesa di conferma per questo indirizzo. Controlla il tuo account "
-"Jabber/GTalk per un messaggio con ulteriori istruzioni (hai aggiunto %s al "
-"tuo elenco contatti?)."
+"In attesa di conferma per questo indirizzo. Controlla il tuo account Jabber/"
+"GTalk per un messaggio con ulteriori istruzioni (hai aggiunto %s al tuo "
+"elenco contatti?)."
+
+#: ../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 ""
+"Attesa la conferma per questo indirizzo. Controlla la tua casella di posta "
+"(e anche la posta indesiderata!) per un messaggio con ulteriori istruzioni."
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+msgid "Awaiting confirmation on this phone number."
+msgstr "Attesa la conferma per questo numero di telefono."
 
-#: ../lib/util.php:1136
-msgid "Before »"
+#: ../lib/util.php:1318 lib/util.php:1452 lib/facebookaction.php:259
+#: lib/util.php:1792
+#, fuzzy
+msgid "Before »"
 msgstr "Precedenti »"
 
-#: ../actions/profilesettings.php:52
+#: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: actions/profilesettings.php:82 actions/register.php:184
+#: actions/profilesettings.php:84 actions/register.php:211
 msgid "Bio"
 msgstr "Biografia"
 
-#: ../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:222 actions/register.php:98
 msgid "Bio is too long (max 140 chars)."
 msgstr "La biografia è troppo lunga (max 140 caratteri)."
 
-#: ../actions/updateprofile.php:118 ../actions/updateprofile.php:119
-#: actions/updateprofile.php:120
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+msgid "Can't delete this notice."
+msgstr "Impossibile eliminare questo messaggio."
+
+#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "Impossibile leggere l'URL \"%s\" dell'immagine"
 
-#: ../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/profilesettings.php:433
 msgid "Can't save new password."
 msgstr "Impossibile salvare la nuova 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
 msgid "Cancel"
 msgstr "Annulla"
 
-#: ../lib/openid.php:121
+#: ../lib/openid.php:121 lib/openid.php:121
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Impossibile creare l'oggetto OpenID consumer."
 
-#: ../actions/imsettings.php:154
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
 msgid "Cannot normalize that Jabber ID"
 msgstr "Impossibile normalizzare quell'ID Jabber"
 
-#: ../actions/password.php:45
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:204
+msgid "Cannot normalize that email address"
+msgstr "Impossibile normalizzare l'indirizzo email"
+
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/profilesettings.php:189
 msgid "Change"
 msgstr "Modifica"
 
-#: ../actions/password.php:32
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: actions/deleteprofile.php:245
+msgid "Change email handling"
+msgstr "Modifica la gestione dell'email"
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
 msgid "Change password"
 msgstr "Modifica password"
 
-#: ../actions/password.php:43 ../actions/recoverpassword.php:166
-#: ../actions/register.php:179
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr "Modifica la tua password"
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#: actions/deleteprofile.php:242
+msgid "Change your profile settings"
+msgstr "Modifica le impostazioni del tuo profilo"
+
+#: ../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/profilesettings.php:187 actions/register.php:196
 msgid "Confirm"
 msgstr "Conferma"
 
-#: ../actions/confirmaddress.php:84
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
 msgid "Confirm Address"
 msgstr "Conferma indirizzo"
 
-#: ../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:259
 msgid "Confirmation cancelled."
 msgstr "Conferma annullata."
 
-#: ../actions/confirmaddress.php:38
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+msgid "Confirmation code"
+msgstr "Codice di conferma"
+
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
 msgid "Confirmation code not found."
 msgstr "Codice di conferma non trovato."
 
-#: ../actions/finishopenidlogin.php:91
+#: ../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 ""
+"Congratulazioni %s! Benvenuto/a in %%%%site.name%%%%. Da qui ora puoi...\n"
+"\n"
+"* Visitare il [tuo profilo](%s) e inviare il tuo primo messaggio.\n"
+"*Aggiungere un [indirizzo Jabber/GTalk](%%%%action.imsettings%%%%) per usare "
+"quel servizio per inviare messaggi.\n"
+"*[Ricercare persone](%%%%action.peoplesearch%%%%) che potresti conoscere o "
+"che condividono i tuoi stessi interessi.\n"
+"* Aggiornare le [tue impostazioni](%%%%action.profilesettings%%%%) per "
+"fornire agli altri più informazioni su di te.\n"
+"* Leggere la [documentazione in rete](%%%%doc.help%%%%) per le "
+"caratteristiche che magari non hai ancora visto.\n"
+"\n"
+"Grazie per esserti iscritto/a e speriamo tu possa divertiti usando questo "
+"servizio."
+
+#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
 msgid "Connect"
 msgstr "Connetti"
 
@@ -250,188 +575,283 @@ msgstr "Connetti"
 msgid "Connect existing account"
 msgstr "Collega a un account esistente"
 
-#: ../lib/util.php:304
+#: ../lib/util.php:332 lib/util.php:348 lib/util.php:360
 msgid "Contact"
 msgstr "Contatti"
 
-#: ../lib/openid.php:178
+#: ../lib/openid.php:178 lib/openid.php:178
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "Impossibile creare il modulo OpenID: %s"
 
-#: ../lib/openid.php:160
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:46 actions/twitapifriendships.php:62
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr "Impossibile seguire l'utente: %s è già nel tuo elenco."
+
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+#: actions/twitapifriendships.php:39
+msgid "Could not follow user: User not found."
+msgstr "Impossibile seguire l'utente: utente non trovato."
+
+#: ../lib/openid.php:160 lib/openid.php:160
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "Impossibile redirigere al server: %s"
 
-#: ../actions/updateprofile.php:161
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
 msgid "Could not save avatar info"
 msgstr "Impossibile salvare le informazioni dell'immagine"
 
-#: ../actions/updateprofile.php:154
+#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
 msgid "Could not save new profile info"
 msgstr "Impossibile salvare le nuove informazioni del profilo"
 
-#: ../actions/profilesettings.php:146
-msgid "Couldn't confirm email."
-msgstr "Impossibile confermare l'email."
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:70
+msgid "Could not subscribe other to you."
+msgstr "Impossibile abbonare altri a te."
+
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:55
+msgid "Could not subscribe."
+msgstr "Impossibile abbonarsi."
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr "Impossibile aggiornare l'utente con l'indirizzo email confermato."
 
 #: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101
+#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:112
 msgid "Couldn't convert request tokens to access tokens."
 msgstr ""
-"Impossibile convertire le credenziali di richiesta in credenziali di "
-"accesso."
-
-#: ../actions/subscribe.php:59
-msgid "Couldn't create subscription."
-msgstr "Impossibile creare l'abbonamento."
+"Impossibile convertire le credenziali di richiesta in credenziali di accesso."
 
-#: ../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/emailsettings.php:255
 msgid "Couldn't delete email confirmation."
 msgstr "Impossibile eliminare l'email di conferma."
 
-#: ../actions/unsubscribe.php:56
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:129
 msgid "Couldn't delete subscription."
 msgstr "Impossibile eliminare l'abbonamento."
 
-#: ../actions/remotesubscribe.php:125
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+#: actions/twitapistatuses.php:82
+msgid "Couldn't find any statuses."
+msgstr "Impossibile trovare un qualsiasi stato."
+
+#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
+#: actions/remotesubscribe.php:148
 msgid "Couldn't get a request token."
 msgstr "Impossibile ottenere un token di richiesta."
 
-#: ../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:228
 msgid "Couldn't insert confirmation code."
 msgstr "Impossibile inserire il codice di conferma."
 
 #: ../actions/finishremotesubscribe.php:180
+#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:216
 msgid "Couldn't insert new subscription."
 msgstr "Impossibile inserire un nuovo abbonamento."
 
-#: ../actions/profilesettings.php:175
+#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
+#: actions/profilesettings.php:319 actions/twitapiaccount.php:74
 msgid "Couldn't save profile."
 msgstr "Impossibile salvare il profilo."
 
-#: ../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:296
+msgid "Couldn't update user for autosubscribe."
+msgstr "Impossibile aggiornare l'utente per auto-abbonarsi."
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+#: actions/emailsettings.php:301 actions/emailsettings.php:315
+msgid "Couldn't update user record."
+msgstr "Impossibile aggiornare i record dell'utente."
+
+#: ../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/emailsettings.php:179 actions/emailsettings.php:280
+#: actions/othersettings.php:173 actions/profilesettings.php:276
 msgid "Couldn't update user."
 msgstr "Impossibile aggiornare l'utente."
 
-#: ../actions/finishopenidlogin.php:84
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
 msgid "Create"
 msgstr "Crea"
 
-#: ../actions/finishopenidlogin.php:70
+#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
 msgid "Create a new user with this nickname."
 msgstr "Crea un nuovo utente con questo soprannome."
 
-#: ../actions/finishopenidlogin.php:68
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
 msgid "Create new account"
 msgstr "Crea un nuovo account"
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+#: actions/finishopenidlogin.php:208
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Creazione nuovo account per OpenID che ha già un utente."
 
-#: ../actions/imsettings.php:45
+#: ../actions/imsettings.php:45 actions/imsettings.php:46
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Indirizzo Jabber/GTalk attualmente confermato."
 
-#: ../actions/showstream.php:337
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+msgid "Current confirmed SMS-enabled phone number."
+msgstr "Numero di telefono attualmente confermato per gli SMS."
+
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+msgid "Current confirmed email address."
+msgstr "Indirizzo email attualmente confermato."
+
+#: ../actions/showstream.php:356 actions/showstream.php:367
+#: actions/showstream.php:418
 msgid "Currently"
 msgstr "Attualmente"
 
-#: ../lib/util.php:893
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:87
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr "Errore del DB nell'inserire un hastag: %s"
+
+#: ../lib/util.php:1061 lib/util.php:1110 lib/util.php:1417
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Errore nel DB nell'inserire la risposta: %s"
 
-#: ../actions/profilesettings.php:54
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+msgid "Delete notice"
+msgstr "Elimina messaggio"
+
+#: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: actions/profilesettings.php:84 actions/register.php:186
+#: actions/profilesettings.php:86 actions/register.php:213
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Descrivi te stesso e i tuoi interessi in 140 caratteri"
 
-#: ../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/deleteprofile.php:244 actions/register.php:199
+#: actions/register.php:202
 msgid "Email"
 msgstr "Email"
 
-#: ../actions/profilesettings.php:46
-msgid "Email address"
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+msgid "Email Address"
 msgstr "Indirizzo email"
 
-#: ../actions/profilesettings.php:102 ../actions/register.php:63
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+msgid "Email Settings"
+msgstr "Impostazioni email"
+
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:89
 msgid "Email address already exists."
 msgstr "Indirizzo email già esistente."
 
-#: ../lib/mail.php:82
+#: ../lib/mail.php:90 lib/mail.php:90
 msgid "Email address confirmation"
 msgstr "Conferma indirizzo email"
 
-#: ../actions/recoverpassword.php:176 ../actions/recoverpassword.php:191
-#: actions/recoverpassword.php:197
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+msgid "Email address, like \"UserName@example.org\""
+msgstr "Indirizzo email, del tipo \"NomeUtente@example.org\""
+
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr "Indirizzi email"
+
+#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
 msgid "Enter a nickname or email address."
 msgstr "Inserisci un soprannome o un indirizzo email."
 
-#: ../actions/userauthorization.php:136
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+msgid "Enter the code you received on your phone."
+msgstr "Inserisci il codice che hai ricevuto sul tuo telefono."
+
+#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
 msgid "Error authorizing token"
 msgstr "Errore nell'autorizzare il token"
 
-#: ../actions/finishopenidlogin.php:282
+#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
+#: actions/finishopenidlogin.php:274
 msgid "Error connecting user to OpenID."
 msgstr "Errore nel collegare l'utente a OpenID."
 
-#: ../actions/finishaddopenid.php:78
+#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
 msgid "Error connecting user."
 msgstr "Errore nel connettere l'utente."
 
 #: ../actions/finishremotesubscribe.php:151
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:164
 msgid "Error inserting avatar"
 msgstr "Errore nell'inserire l'immagine"
 
 #: ../actions/finishremotesubscribe.php:143
+#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:156
 msgid "Error inserting new profile"
 msgstr "Errore nell'inserire il nuovo profilo"
 
-#: ../actions/postnotice.php:88
-msgid "Error inserting notice"
-msgstr "Errore nell'inserire un messaggio"
-
 #: ../actions/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:180
 msgid "Error inserting remote profile"
 msgstr "Errore nell'inserire un profilo remoto"
 
-#: ../actions/recoverpassword.php:201
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
 msgid "Error saving address confirmation."
 msgstr "Errore nel salvare la conferma dell'indirizzo."
 
-#: ../actions/userauthorization.php:139
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
 msgid "Error saving remote profile"
 msgstr "Errore nel salvare il profilo remoto"
 
-#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
+#: ../lib/openid.php:226 lib/openid.php:226
 msgid "Error saving the profile."
 msgstr "Errore nel salvare il profilo."
 
-#: ../lib/openid.php:237
+#: ../lib/openid.php:237 lib/openid.php:237
 msgid "Error saving the user."
 msgstr "Errore nel salvare l'utente."
 
-#: ../actions/password.php:80
+#: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/profilesettings.php:428
 msgid "Error saving user; invalid."
 msgstr "Errore nel salvare l'utente; non valido."
 
-#: ../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:54 actions/login.php:80
+#: actions/register.php:117
 msgid "Error setting user."
 msgstr "Errore nell'impostare l'utente."
 
-#: ../actions/finishaddopenid.php:83
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
 msgid "Error updating profile"
 msgstr "Errore nell'aggiornare il profilo"
 
 #: ../actions/finishremotesubscribe.php:161
+#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:174
 msgid "Error updating remote profile"
 msgstr "Errore nell'aggiornare il profilo remoto"
 
-#: ../actions/recoverpassword.php:79
+#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
 msgid "Error with confirmation code."
 msgstr "Errore con il codice di conferma."
 
@@ -439,25 +859,41 @@ msgstr "Errore con il codice di conferma."
 msgid "Existing nickname"
 msgstr "Soprannome esistente"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:326 lib/util.php:342 lib/util.php:354
 msgid "FAQ"
 msgstr "FAQ"
 
-#: ../actions/avatar.php:115
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/profilesettings.php:381
 msgid "Failed updating avatar."
 msgstr "Errore nell'aggiornare l'immagine."
 
-#: ../actions/all.php:61 ../actions/allrss.php:74
+#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
+#: actions/allrss.php:64
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Feed per gli amici di %s"
 
-#: ../actions/replies.php:61 ../actions/repliesrss.php:80
+#: ../actions/replies.php:65 ../actions/repliesrss.php:80
+#: actions/replies.php:65 actions/repliesrss.php:66
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Feed per le risposte a %s"
 
-#: ../actions/login.php:118
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:54
+#, php-format
+msgid "Feed for tag %s"
+msgstr "Feed per l'etichetta %s"
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+msgid "Find content of notices"
+msgstr "Ricerca contenuto dei messaggi"
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+msgid "Find people on this site"
+msgstr "Ricerca persone in questo sito"
+
+#: ../actions/login.php:122
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -465,39 +901,59 @@ msgstr ""
 "Per motivi di sicurezza è necessario reinserire il proprio nome utente e la "
 "propria password prima di modificare le impostazioni."
 
-#: ../actions/profilesettings.php:44
+#: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: actions/profilesettings.php:77 actions/register.php:178
+#: actions/profilesettings.php:79 actions/register.php:205
 msgid "Full name"
 msgstr "Nome"
 
-#: ../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/profilesettings.php:219 actions/register.php:95
 msgid "Full name is too long (max 255 chars)."
 msgstr "Nome troppo lungo (max 255 caratteri)"
 
-#: ../lib/util.php:279
+#: ../lib/util.php:322 lib/util.php:338 lib/util.php:343 lib/util.php:350
 msgid "Help"
 msgstr "Aiuto"
 
-#: ../lib/util.php:274 ../lib/util.php:298 lib/util.php:314
+#: ../lib/util.php:298 lib/util.php:314 lib/util.php:325
 msgid "Home"
 msgstr "Home"
 
-#: ../actions/profilesettings.php:49
+#: ../actions/profilesettings.php:46 ../actions/register.php:167
+#: actions/profilesettings.php:79 actions/register.php:181
+#: actions/profilesettings.php:81 actions/register.php:208
 msgid "Homepage"
 msgstr "Pagina web"
 
-#: ../actions/profilesettings.php:87
+#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: actions/profilesettings.php:210 actions/register.php:83
+#: actions/profilesettings.php:216 actions/register.php:92
 msgid "Homepage is not a valid URL."
 msgstr "L'URL della pagina web non è valido."
 
-#: ../actions/imsettings.php:61
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+#: actions/emailsettings.php:101
+msgid "I want to post notices by email."
+msgstr "Voglio inviare i messaggi via email"
+
+#  Non è il massimo (Messaggistica Istantanea), ma non lo è nemmeno in inglese, questo tipo di abbreviazioni sarebbe da evitare sempre...
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+#: actions/deleteprofile.php:253
+msgid "IM"
+msgstr "MI"
+
+#: ../actions/imsettings.php:60 actions/imsettings.php:61
 msgid "IM Address"
 msgstr "Indirizzo di messaggistica istantanea"
 
-#: ../actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
 msgid "IM Settings"
 msgstr "Impostazioni messaggistica istantanea"
 
-#: ../actions/finishopenidlogin.php:88
+#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -513,23 +969,34 @@ msgstr ""
 "Se vuoi aggiungere un OpenID al tuo account, inseriscilo nel riquadro "
 "sottostante e fai clic su \"Aggiungi\"."
 
-#: ../actions/recoverpassword.php:122
+#: ../actions/recoverpassword.php:137
 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 ""
-"Se hai dimenticato o perso la tua password, puoi riceverne una nuova "
-"all'indirizzo email memorizzato nel tuo account."
+"Se hai dimenticato o perso la tua password, puoi fartene inviare una nuova "
+"per email all'indirizzo indicato nel tuo profilo."
+
+#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
+#: actions/emailsettings.php:68 actions/smssettings.php:76
+msgid "Incoming email"
+msgstr "Email di ricezione"
+
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+#: actions/emailsettings.php:304
+msgid "Incoming email address removed."
+msgstr "Indirizzo email di ricezione rimosso."
 
-#: ../actions/password.php:69
+#: ../actions/password.php:69 actions/profilesettings.php:388
+#: actions/profilesettings.php:417
 msgid "Incorrect old password"
 msgstr "Vecchia password non corretta"
 
-#: ../actions/login.php:63
+#: ../actions/login.php:67 actions/login.php:67 actions/login.php:74
 msgid "Incorrect username or password."
 msgstr "Nome utente o password non corretto."
 
-#: ../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."
@@ -537,74 +1004,99 @@ msgstr ""
 "Le istruzioni per recuperare la tua password sono state inviate "
 "all'indirizzo email registrato nel tuo account."
 
-#: ../actions/updateprofile.php:113 ../actions/updateprofile.php:114
-#: actions/updateprofile.php:115
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "URL \"%s\" dell'immagine non valido"
 
-#: ../actions/updateprofile.php:97 ../actions/updateprofile.php:98
-#: actions/updateprofile.php:99
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr "Indirizzo email non valido: %s"
+
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "Pagina web \"%s\" non valida"
 
-#: ../actions/updateprofile.php:81
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "URL \"%s\" della licenza non valido"
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:63
 msgid "Invalid notice content"
 msgstr "Contenuto del messaggio non valido"
 
 #: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:69
 msgid "Invalid notice uri"
 msgstr "URI del messaggio non valido"
 
 #: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:74
 msgid "Invalid notice url"
 msgstr "URL del messaggio non valido"
 
-#: ../actions/updateprofile.php:86 ../actions/updateprofile.php:87
-#: actions/updateprofile.php:88
+#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "URL \"%s\" del profilo non valido"
 
-#: ../actions/remotesubscribe.php:96
+#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
 msgid "Invalid profile URL (bad format)"
 msgstr "URL del profilo non valido (formato errato)"
 
 #: ../actions/finishremotesubscribe.php:77
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:78
 msgid "Invalid profile URL returned by server."
 msgstr "URL del profilo restituito dal server non valido."
 
-#: ../actions/avatarbynickname.php:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
 msgid "Invalid size."
 msgstr "Dimensione non valida."
 
-#: ../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:256 actions/register.php:112
+#: actions/register.php:130
 msgid "Invalid username or password."
 msgstr "Nome utente o password non valido."
 
-#: ../lib/util.php:237
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr "Inviti inviati"
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr "Inviti inviati ai seguenti indirizzi:"
+
+#: ../lib/util.php:306 lib/util.php:322 lib/util.php:332
+msgid "Invite"
+msgstr "Invita"
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr "Invita nuovi utenti"
+
+#: ../lib/util.php:261 lib/util.php:277 lib/util.php:288
 #, 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 ""
-" Gestito dal software di micro-blog [Laconica](http://laconi.ca/), versione "
-"%s, disponibile sotto licenza [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+" Gestito dal software di micro-blog [Laconica](http://laconi.ca/), versione %"
+"s, disponibile sotto licenza [GNU Affero General Public License](http://www."
+"fsf.org/licensing/licenses/agpl-3.0.html)."
 
-#: ../actions/imsettings.php:164
+#: ../actions/imsettings.php:173 actions/imsettings.php:181
 msgid "Jabber ID already belongs to another user."
 msgstr "ID Jabber già assegnato a un altro utente."
 
-#: ../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 "
@@ -614,99 +1106,167 @@ msgstr ""
 "cosa, assicurati di aggiungere %s all'elenco dei contatti nel tuo programma "
 "di messaggistica o su GTalk."
 
-#: ../actions/profilesettings.php:55
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
+msgid "Language"
+msgstr "Lingua"
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr "La lingua è troppo lunga (max 50 caratteri)"
+
+#: ../actions/profilesettings.php:52 ../actions/register.php:173
+#: actions/profilesettings.php:85 actions/register.php:187
+#: actions/profilesettings.php:87 actions/register.php:214
 msgid "Location"
 msgstr "Ubicazione"
 
-#: ../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/profilesettings.php:225 actions/register.php:101
 msgid "Location is too long (max 255 chars)."
 msgstr "Ubicazione troppo lunga (max 255 caratteri)."
 
-#: ../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/login.php:104 actions/login.php:113 actions/openidlogin.php:88
+#: lib/util.php:336
 msgid "Login"
 msgstr "Accedi"
 
-#: ../actions/openidlogin.php:44
+#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:60
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Accedi con un account [OpenID](%%doc.openid%%)."
 
-#: ../actions/login.php:122
+#: ../actions/login.php:126
 #, 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 ""
-"Accedi con nome utente e password. Non hai ancora un nome utente? "
-"[Registra](%%action.register%%) un nuovo account o prova "
-"[OpenID](%%action.openidlogin%%). "
+"Accedi con nome utente e password. Non hai ancora un nome utente? [Registra]"
+"(%%action.register%%) un nuovo account o prova [OpenID](%%action.openidlogin%"
+"%). "
 
-#: ../lib/util.php:284
+#: ../lib/util.php:308 lib/util.php:324 lib/util.php:334
 msgid "Logout"
 msgstr "Esci"
 
-#: ../actions/login.php:106
+#: ../actions/register.php:166 actions/register.php:180
+#: actions/register.php:207
+msgid "Longer name, preferably your \"real\" name"
+msgstr "Nome completo, preferibilmente il tuo \"vero\" nome"
+
+#: ../actions/login.php:110 actions/login.php:110 actions/login.php:118
 msgid "Lost or forgotten password?"
 msgstr "Password persa o dimenticata?"
 
-#: ../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 ""
+"Crea un nuovo indirizzo email a cui inviare i messaggi, rimuove quello "
+"vecchio."
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr "Gestisci la ricezione delle email da %%site.name%%."
+
+#: ../actions/showstream.php:300 actions/showstream.php:315
+#: actions/showstream.php:363
 msgid "Member since"
 msgstr "Membro dal "
 
-#: ../actions/userrss.php:70
+#: ../actions/userrss.php:70 actions/userrss.php:67
 #, php-format
 msgid "Microblog by %s"
 msgstr "Micro-blog di %s"
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
+#: ../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 ""
+"Operatore di telefonia mobile. Se conosci un operatore che accetta gli SMS "
+"via email, ma non è elencato qui, scrivici a %s."
+
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php:85 actions/register.php:202
+#: actions/register.php:229
 msgid "My text and files are available under "
 msgstr "I miei testi e file sono disponibili sotto"
 
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+msgid "New"
+msgstr "Nuovo"
+
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:138
+#, php-format
+msgid "New email address for posting to %s"
+msgstr "Nuovo indirizzo email per inviare messaggi a %s"
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+#: actions/emailsettings.php:318
+msgid "New incoming email address added."
+msgstr "Nuovo indirizzo email di ricezione aggiunto."
+
 #: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
 msgid "New nickname"
 msgstr "Nuovo soprannome"
 
-#: ../actions/newnotice.php:100 ../actions/newnotice.php:87
-#: actions/newnotice.php:96
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:141
 msgid "New notice"
 msgstr "Nuovo messaggio"
 
-#: ../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/profilesettings.php:185
 msgid "New password"
 msgstr "Nuova password"
 
-#: ../actions/recoverpassword.php:275 ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:314
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nuova password salvata con successo. Hai effettuato l'accesso."
 
-#: ../actions/login.php:97 ../actions/profilesettings.php:41
-#: ../actions/register.php:175 ../actions/login.php:101
+#: ../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:108 actions/profilesettings.php:76
+#: actions/register.php:192
 msgid "Nickname"
 msgstr "Soprannome"
 
-#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:99
-#: ../actions/register.php:59 ../actions/profilesettings.php:110
+#: ../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/finishopenidlogin.php:192 actions/profilesettings.php:231
+#: actions/register.php:85
 msgid "Nickname already in use. Try another one."
 msgstr "Soprannome già in uso. Prova con un altro."
 
-#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:80
-#: ../actions/register.php:57 ../actions/updateprofile.php:76
-#: ../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: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:182 actions/profilesettings.php:209
+#: actions/register.php:83
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "Il soprannome deve essere composto solo da lettere minuscole e numeri, senza "
 "spazi."
 
 #: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:187
 msgid "Nickname not allowed."
 msgstr "Soprannome non consentito."
 
@@ -714,338 +1274,515 @@ msgstr "Soprannome non consentito."
 msgid "Nickname of the user you want to follow"
 msgstr "Soprannome dell'utente che vuoi seguire"
 
-#: ../actions/recoverpassword.php:147 ../actions/recoverpassword.php:162
-#: actions/recoverpassword.php:167
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
 msgid "Nickname or email"
 msgstr "Soprannome o email"
 
-#: ../actions/imsettings.php:147
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:104
+msgid "No"
+msgstr "No"
+
+#: ../actions/imsettings.php:156 actions/imsettings.php:164
 msgid "No Jabber ID."
 msgstr "Nessun ID di Jabber."
 
-#: ../actions/userauthorization.php:128
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
 msgid "No authorization request!"
 msgstr "Nessuna richiesta di autorizzazione!"
 
-#: ../actions/confirmaddress.php:33
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+msgid "No carrier selected."
+msgstr "Nessun operatore selezionato."
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+msgid "No code entered"
+msgstr "Nessun codice inserito"
+
+#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
 msgid "No confirmation code."
 msgstr "Nessun codice di conferma."
 
-#: ../actions/newnotice.php:49
+#: ../actions/newnotice.php:44 actions/newmessage.php:53
+#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:52
+#: actions/newnotice.php:53
 msgid "No content!"
 msgstr "Nessun contenuto!"
 
-#: ../actions/userbyid.php:27
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+#: actions/emailsettings.php:197
+msgid "No email address."
+msgstr "Nessun indirizzo email."
+
+#: ../actions/userbyid.php:32 actions/userbyid.php:32
 msgid "No id."
 msgstr "Nessun id."
 
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+#: actions/emailsettings.php:292
+msgid "No incoming email address."
+msgstr "Nessun indirizzo email di ricezione."
+
 #: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67
+#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:66
 msgid "No nickname provided by remote server."
 msgstr "Nessun soprannome fornito dal server remoto."
 
-#: ../actions/avatarbynickname.php:27
+#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 msgid "No nickname."
 msgstr "Nessun soprannome."
 
-#: ../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:243
 msgid "No pending confirmation to cancel."
 msgstr "Nessuna conferma da annullare."
 
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+msgid "No phone number."
+msgstr "Nessun numero di telefono."
+
 #: ../actions/finishremotesubscribe.php:72
+#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:73
 msgid "No profile URL returned by server."
 msgstr "Nessun URL di profilo restituito dal server."
 
-#: ../actions/recoverpassword.php:189
+#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
 msgid "No registered email address for that user."
 msgstr "Nessun indirizzo email registrato per quell'utente."
 
-#: ../actions/userauthorization.php:48
+#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
 msgid "No request found!"
 msgstr "Nessuna richiesta trovata!"
 
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
+#: actions/noticesearch.php:69 actions/peoplesearch.php:69
+#: actions/noticesearch.php:68 actions/peoplesearch.php:59
 msgid "No results"
 msgstr "Nessun risultato"
 
-#: ../actions/avatarbynickname.php:32
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
 msgid "No size."
 msgstr "Nessuna dimensione."
 
-#: ../actions/openidsettings.php:135
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:109
+#: actions/twitapistatuses.php:438
+msgid "No status found with that ID."
+msgstr "Nessuno stato trovato con quel ID."
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:411
+msgid "No status with that ID found."
+msgstr "Nessuno stato con quel ID trovato."
+
+#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
 msgid "No such OpenID."
 msgstr "Nessun tale OpenID."
 
-#: ../actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29
 msgid "No such document."
 msgstr "Nessun tale documento."
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:65
-#: ../actions/shownotice.php:83 ../lib/deleteaction.php:30
-#: 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:32
+#: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:38
+#: actions/shownotice.php:114
 msgid "No such notice."
 msgstr "Nessun tale messaggio."
 
-#: ../actions/recoverpassword.php:56
+#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
 msgid "No such recovery code."
 msgstr "Nessun codice di ripristino."
 
-#: ../actions/postnotice.php:56
+#: ../actions/postnotice.php:56 actions/postnotice.php:57
 msgid "No such subscription"
 msgstr "Nessun tale abbonamento"
 
 #: ../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/showstream.php:157
+#: classes/Command.php:208 classes/Command.php:242 lib/gallery.php:85
+#: lib/subs.php:105
 msgid "No such user."
 msgstr "Nessun tale utente."
 
-#: ../lib/gallery.php:76
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr "Nessun utente con quell'email o nome utente."
+
+#: ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
 msgstr "Nessuno da mostrare!"
 
-#: ../actions/recoverpassword.php:60
+#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
 msgid "Not a recovery code."
 msgstr "Non è un codice di ripristino."
 
-#: ../actions/imsettings.php:158
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+msgid "Not a registered user."
+msgstr "Non è un utente registrato."
+
+#: ../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:423 lib/twitterapi.php:450
+#: lib/twitterapi.php:534
+msgid "Not a supported data format."
+msgstr "Non è un formato di dati supportato."
+
+#: ../actions/imsettings.php:167 actions/imsettings.php:175
 msgid "Not a valid Jabber ID"
 msgstr "Non è un ID Jabber valido"
 
-#: ../lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131
 msgid "Not a valid OpenID."
 msgstr "Non è un OpenID valido."
 
-#: ../actions/profilesettings.php:75 ../actions/register.php:53
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+#: actions/emailsettings.php:208
+msgid "Not a valid email address"
+msgstr "Non è un indirizzo email valido"
+
+#: ../actions/register.php:63 actions/register.php:70 actions/register.php:79
 msgid "Not a valid email address."
 msgstr "Non è un indirizzo email valido."
 
-#: ../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/profilesettings.php:212 actions/register.php:87
 msgid "Not a valid nickname."
 msgstr "Non è un soprannome valido."
 
-#: ../actions/remotesubscribe.php:118
+#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
 msgid "Not a valid profile URL (incorrect services)."
 msgstr "Non è un URL di profilo valido (servizio incorretto)."
 
-#: ../actions/remotesubscribe.php:111
+#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr "Non è un URL di profilo valido (nessun XRDS definito)."
 
-#: ../actions/remotesubscribe.php:104
+#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
 msgid "Not a valid profile URL (no YADIS document)."
 msgstr "Non è un URL di profilo valido (nessun documento YADIS)."
 
-#: ../actions/avatar.php:95
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: actions/profilesettings.php:361
 msgid "Not an image or corrupt file."
 msgstr "Non è un'immagine o il file è danneggiato."
 
 #: ../actions/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:52
 msgid "Not authorized."
 msgstr "Non autorizzato."
 
 #: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38
 msgid "Not expecting this response!"
 msgstr "Non aspettavo questa risposta!"
 
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
-#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+#: actions/twitapistatuses.php:304
+msgid "Not found"
+msgstr "Non trovato"
+
+#: ../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:31 actions/newnotice.php:30
+#: actions/nudge.php:30 actions/subedit.php:31 actions/unblock.php:31
 msgid "Not logged in."
 msgstr "Non connesso."
 
-#: ../actions/unsubscribe.php:43
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:117
 msgid "Not subscribed!."
 msgstr "Non abbonato!"
 
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+msgid "Notice Search"
+msgstr "Ricerca messaggi"
+
 #: ../actions/showstream.php:82 actions/showstream.php:82
+#: actions/showstream.php:111 actions/showstream.php:118
+#: actions/showstream.php:123
 #, php-format
 msgid "Notice feed for %s"
 msgstr "Feed dei messaggi per %s"
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
+#: actions/shownotice.php:45
 msgid "Notice has no profile"
 msgstr "Il messaggio non ha un profilo"
 
-#: ../actions/showstream.php:297 ../actions/showstream.php:316
-#: actions/showstream.php:331
+#: ../actions/showstream.php:316 actions/showstream.php:331
+#: actions/showstream.php:379
 msgid "Notices"
 msgstr "Messaggi"
 
-#: ../actions/password.php:39
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
+#, php-format
+msgid "Notices tagged with %s"
+msgstr "Messaggi etichettati con %s"
+
+#: ../actions/password.php:39 actions/profilesettings.php:178
+#: actions/profilesettings.php:183
 msgid "Old password"
 msgstr "Vecchia password"
 
-#: ../lib/util.php:288
+#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
+#: lib/util.php:330 actions/deleteprofile.php:247 lib/util.php:340
 msgid "OpenID"
 msgstr "OpenID"
 
-#: ../actions/finishopenidlogin.php:61
+#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
 msgid "OpenID Account Setup"
 msgstr "Configurazione account OpenID"
 
-#: ../lib/openid.php:180
+#: ../lib/openid.php:180 lib/openid.php:180
 msgid "OpenID Auto-Submit"
 msgstr "Auto-invio OpenID"
 
 #: ../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/finishopenidlogin.php:150 actions/openidlogin.php:76
 msgid "OpenID Login"
 msgstr "Accesso OpenID"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
+#: actions/openidlogin.php:74 actions/openidsettings.php:50
+#: actions/openidlogin.php:82
 msgid "OpenID URL"
 msgstr "URL OpenID"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
+#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 msgid "OpenID authentication cancelled."
 msgstr "Autenticazione OpenID annullata."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
+#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "Autenticazione OpenID non riuscita: %s"
 
-#: ../lib/openid.php:133
+#: ../lib/openid.php:133 lib/openid.php:133
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "Errore OpenID: %s"
 
-#: ../actions/openidsettings.php:144
+#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
 msgid "OpenID removed."
 msgstr "OpenID rimosso."
 
-#: ../actions/openidsettings.php:37
+#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
 msgid "OpenID settings"
 msgstr "Impostazioni OpenID"
 
-#: ../actions/avatar.php:84
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr "Puoi aggiungere un messaggio personale agli inviti."
+
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: actions/profilesettings.php:350
 msgid "Partial upload."
 msgstr "Caricamento parziale."
 
-#: ../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/login.php:109 actions/register.php:194
 msgid "Password"
 msgstr "Password"
 
-#: ../actions/recoverpassword.php:249
+#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
 msgid "Password and confirmation do not match."
 msgstr "La password e la conferma non corrispondono."
 
-#: ../actions/recoverpassword.php:245
+#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
 msgid "Password must be 6 chars or more."
 msgstr "La password dev'essere lunga almeno 6 caratteri."
 
-#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
+#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 msgid "Password recovery requested"
 msgstr "Richiesta password di ripristino"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:274
+#: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: actions/profilesettings.php:408 actions/recoverpassword.php:326
+#: actions/profilesettings.php:437
 msgid "Password saved."
 msgstr "Password salvata."
 
-#: ../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/profilesettings.php:409 actions/register.php:107
 msgid "Passwords don't match."
 msgstr "Le password non corrispondono."
 
-#: ../actions/peoplesearch.php:33
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+msgid "People"
+msgstr "Persone"
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+msgid "People Search"
+msgstr "Ricerca persone"
+
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
 msgid "People search"
 msgstr "Ricerca persone"
 
-#: ../lib/stream.php:44
+#: ../lib/stream.php:50 lib/personal.php:50
 msgid "Personal"
 msgstr "Personale"
 
-#: ../actions/userauthorization.php:77 ../actions/userauthorization.php:78
+#: ../actions/invite.php:133 actions/invite.php:141
+msgid "Personal message"
+msgstr "Messaggio personale"
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr "Numero di telefono, senza punteggiatura o spazi, con il prefisso"
+
+#: ../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 ""
 "Controlla i dettagli seguenti per essere sicuro di volerti abbonare ai "
-"messaggi di questo utente. Se non hai richiesto ciò, fai clic su "
-"\"Annulla\"."
+"messaggi di questo utente. Se non hai richiesto ciò, fai clic su \"Annulla\"."
 
-#: ../actions/imsettings.php:74
+#: ../actions/imsettings.php:73 actions/imsettings.php:74
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Pubblica un messaggio quando il mio stato Jabber/GTalk cambia"
 
-#: ../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
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: ../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:185 actions/othersettings.php:179
 msgid "Preferences saved."
 msgstr "Preferenze salvate."
 
-#: ../lib/util.php:300
-msgid "Privacy"
-msgstr "Privacy"
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
+msgid "Preferred language"
+msgstr "Lingua preferita"
+
+#: ../lib/util.php:328 lib/util.php:344 lib/util.php:356
+msgid "Privacy"
+msgstr "Privacy"
 
-#: ../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:139 classes/Notice.php:149
 msgid "Problem saving notice."
 msgstr "Problema nel salvare il messaggio."
 
-#: ../lib/stream.php:54
+#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
+#: lib/settingsaction.php:84 actions/deleteprofile.php:241
 msgid "Profile"
 msgstr "Profilo"
 
-#: ../actions/remotesubscribe.php:73
+#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
 msgid "Profile URL"
 msgstr "URL del profilo"
 
-#: ../actions/profilesettings.php:34
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
 msgid "Profile settings"
 msgstr "Impostazioni del profilo"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
+#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
+#: actions/postnotice.php:52 actions/updateprofile.php:53
 msgid "Profile unknown"
 msgstr "Profilo sconosciuto"
 
-#: ../lib/util.php:276
-msgid "Public"
-msgstr "Pubblico"
-
-#: ../actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:77
 msgid "Public Stream Feed"
 msgstr "Feed del flusso pubblico"
 
 #  Solo una prova, se non sta bene si ripristina la versione vecchia, giusto per avere l'interfaccia il più tradotta possibile
-#: ../actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 lib/stream.php:34
 msgid "Public timeline"
 msgstr "Attività pubblica"
 
-#: ../actions/recoverpassword.php:151
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr "Pubblica un MicroID per il mio indirizzo Jabber/GTalk"
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:104
+msgid "Publish a MicroID for my email address."
+msgstr "Pubblica un MicroID per il mio indirizzo email"
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr "Etichette recenti"
+
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
 msgid "Recover"
 msgstr "Recupero"
 
-#: ../actions/recoverpassword.php:141
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
 msgid "Recover password"
 msgstr "Recupero password"
 
-#: ../actions/recoverpassword.php:67
+#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
 msgid "Recovery code for unknown user."
 msgstr "Codice di recupero per utente sconosciuto."
 
-#: ../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:181 actions/register.php:234 lib/util.php:338
 msgid "Register"
 msgstr "Registra"
 
-#: ../actions/userauthorization.php:119
+#: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:173
+msgid "Registration not allowed."
+msgstr "Registrazione non consentita."
+
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:241
+msgid "Registration successful"
+msgstr "Registrazione riuscita"
+
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
 msgid "Reject"
 msgstr "Rifiuta"
 
-#: ../actions/login.php:99 ../actions/register.php:183
+#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
+#: actions/register.php:190 actions/login.php:110 actions/openidlogin.php:85
+#: actions/register.php:217
 msgid "Remember me"
 msgstr "Ricordami"
 
-#: ../actions/updateprofile.php:69
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
 msgid "Remote profile with no matching profile"
 msgstr "Profilo remoto senza profilo corrispondente"
 
@@ -1053,11 +1790,17 @@ msgstr "Profilo remoto senza profilo corrispondente"
 msgid "Remote subscribe"
 msgstr "Abbonamento remoto"
 
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php:48 actions/emailsettings.php:76
+#: actions/imsettings.php:49 actions/openidsettings.php:108
+#: actions/smssettings.php:50 actions/smssettings.php:84
+#: actions/twittersettings.php:59 actions/twittersettings.php:61
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: ../actions/openidsettings.php:68
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
 msgid "Remove OpenID"
 msgstr "Rimuovi OpenID"
 
@@ -1069,40 +1812,74 @@ msgstr ""
 "Rimuovere il tuo unico OpenID renderà impossibile effettuare l'accesso! Se "
 "vuoi rimuoverlo, prima aggiungi un altro OpenID."
 
-#: ../lib/stream.php:49
+#: ../lib/stream.php:55 lib/personal.php:55
 msgid "Replies"
 msgstr "Risposte"
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:50
+#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
+#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #, php-format
 msgid "Replies to %s"
 msgstr "Risposte a %s"
 
-#: ../actions/recoverpassword.php:168
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
 msgid "Reset"
 msgstr "Reimposta"
 
-#: ../actions/recoverpassword.php:158
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
 msgid "Reset password"
 msgstr "Reimposta password"
 
-#: ../actions/recoverpassword.php:167 ../actions/register.php:180
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/deleteprofile.php:250 actions/subscriptions.php:73
+msgid "SMS"
+msgstr "SMS"
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+msgid "SMS Phone number"
+msgstr "Numero di telefono per SMS"
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+msgid "SMS Settings"
+msgstr "Impostazioni SMS"
+
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:230
+msgid "SMS confirmation"
+msgstr "Conferma SMS"
+
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
 msgid "Same as password above"
 msgstr "Stessa password di sopra"
 
-#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
+#  Femminile, è la password
+#: ../actions/register.php:156 actions/register.php:170
+#: actions/register.php:197
+msgid "Same as password above. Required."
+msgstr "Stessa password di sopra. Richiesta."
+
+#: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
+#: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
+#: actions/emailsettings.php:104 actions/imsettings.php:82
+#: actions/profilesettings.php:101 actions/smssettings.php:100
+#: actions/twittersettings.php:83 actions/emailsettings.php:107
+#: actions/othersettings.php:56 actions/profilesettings.php:106
+#: actions/subscriptions.php:74 actions/tagother.php:100
+#: actions/twittersettings.php:82
 msgid "Save"
 msgstr "Salva"
 
-#: ../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/util.php:327
 msgid "Search"
 msgstr "Ricerca"
 
-#: ../actions/noticesearch.php:80
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:84
 msgid "Search Stream Feed"
 msgstr "Ricerca nel flusso dei feed"
 
 #: ../actions/noticesearch.php:30 actions/noticesearch.php:30
+#: actions/noticesearch.php:29
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -1120,118 +1897,224 @@ msgstr ""
 "Ricerca le persone su %%site.name%% per nome, ubicazione o interessi. Separa "
 "i termini di ricerca con degli spazi; lunghezza minima 3 caratteri."
 
-#: ../lib/util.php:982
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+msgid "Select a carrier"
+msgstr "Seleziona un operatore"
+
+#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
+#: lib/util.php:1306 lib/util.php:1731 lib/util.php:1646 lib/util.php:2158
 msgid "Send"
 msgstr "Invia"
 
-#: ../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
+msgid "Send email to this address to post new notices."
+msgstr "Invia le email a questo indirizzo per scrivere nuovi messaggi."
+
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+msgid "Send me notices of new subscriptions through email."
+msgstr "Inviami avvisi di nuovi abbonamenti via email"
+
+#: ../actions/imsettings.php:70 actions/imsettings.php:71
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Inviami le notifiche via Jabber/GTalk"
 
-#: ../lib/util.php:282
+#: ../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 ""
+"Inviami avvisi via SMS: comprendo che potrei incorrere in esorbitanti "
+"bollette da parte del mio operatore"
+
+#: ../actions/imsettings.php:76 actions/imsettings.php:77
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr "Inviami le risposte delle persone a cui sono abbonato via Jabber/GTalk"
+
+#: ../lib/util.php:304 lib/util.php:320 lib/util.php:330
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: ../actions/profilesettings.php:183
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:336
 msgid "Settings saved."
 msgstr "Impostazioni salvate."
 
-#: ../actions/finishaddopenid.php:66
+#: ../actions/tag.php:60 actions/tag.php:60 actions/tag.php:59
+msgid "Showing most popular tags from the last week"
+msgstr "Le etichette più popolari dell'ultima settimana"
+
+#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
 msgid "Someone else already has this OpenID."
 msgstr "Qualcun altro ha già questo OpenID."
 
 #: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
+#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
 msgid "Something weird happened."
 msgstr "È successo qualcosa di strano."
 
-#: ../lib/util.php:302
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr "Email di ricezione non consentita."
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr "Quella non è la tua email di ricezione."
+
+#: ../lib/util.php:330 lib/util.php:346 lib/util.php:358
 msgid "Source"
 msgstr "Sorgenti"
 
-#: ../actions/showstream.php:277
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:359
 msgid "Statistics"
 msgstr "Statistiche"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
+#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
+#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
+#: actions/finishopenidlogin.php:199 actions/finishopenidlogin.php:267
 msgid "Stored OpenID not found."
 msgstr "OpenID memorizzato non trovato."
 
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:172
-#: ../actions/showstream.php:181
+#: ../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:254 lib/util.php:2078
 msgid "Subscribe"
 msgstr "Abbonati"
 
-#: ../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:376 lib/gallery.php:136 lib/gallery.php:137
 msgid "Subscribers"
 msgstr "Abbonati"
 
-#: ../actions/userauthorization.php:309
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
 msgid "Subscription authorized"
 msgstr "Abbonamento autorizzato"
 
-#: ../actions/userauthorization.php:319
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
 msgid "Subscription rejected"
 msgstr "Abbonamento rifiutato"
 
-#: ../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:288 actions/showstream.php:370 lib/gallery.php:131
+#: lib/gallery.php:132
 msgid "Subscriptions"
 msgstr "Abbonamenti"
 
-#: ../actions/avatar.php:87
+#: ../actions/avatar.php:87 actions/profilesettings.php:324
+#: actions/profilesettings.php:353
 msgid "System error uploading file."
 msgstr "Errore di sistema nel caricare il file."
 
-#: ../actions/noticesearch.php:34
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317 actions/profilesettings.php:90 actions/showstream.php:382
+#: actions/tag.php:40 actions/tagother.php:96 actions/tagother.php:162
+#: lib/profilelist.php:126 lib/profilelist.php:128
+msgid "Tags"
+msgstr "Etichette"
+
+#: ../lib/searchaction.php:104 lib/searchaction.php:104
+msgid "Text"
+msgstr "Testo"
+
+#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
+#: actions/noticesearch.php:33
 msgid "Text search"
 msgstr "Ricerca testo"
 
-#: ../actions/openidsettings.php:140
+#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
 msgid "That OpenID does not belong to you."
 msgstr "Quel OpenID non ti appartiene."
 
-#: ../actions/confirmaddress.php:52
+#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
 msgid "That address has already been confirmed."
 msgstr "Quell'indirizzo è già stato confermato."
 
-#: ../actions/confirmaddress.php:43
+#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
 msgid "That confirmation code is not for you!"
 msgstr "Quel codice di conferma non è per te!"
 
-#: ../actions/avatar.php:80
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:214
+msgid "That email address already belongs to another user."
+msgstr "Qeull'indirizzo email appartiene già a un altro utente."
+
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: actions/profilesettings.php:346
 msgid "That file is too big."
 msgstr "Quel file è troppo grande."
 
-#: ../actions/imsettings.php:161
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
 msgid "That is already your Jabber ID."
 msgstr "Quello è già il tuo ID di Jabber."
 
-#: ../actions/imsettings.php:224
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:211
+msgid "That is already your email address."
+msgstr "Quello è già il tuo indirizzo email."
+
+#  previous suggestion missed the dot
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+msgid "That is already your phone number."
+msgstr "Quello è già il tuo numero di telefono."
+
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
 msgid "That is not your Jabber ID."
 msgstr "Quello non è il tuo ID di Jabber."
 
-#: ../actions/imsettings.php:201
+#  previous suggestion missed the dot
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+#: actions/emailsettings.php:270
+msgid "That is not your email address."
+msgstr "Quello non è il tuo indirizzo email."
+
+#  previous suggestion missed the dot
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+msgid "That is not your phone number."
+msgstr "Quello non è il tuo numero di telefono."
+
+#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
+#: actions/emailsettings.php:244 actions/imsettings.php:218
+#: actions/emailsettings.php:247
 msgid "That is the wrong IM address."
 msgstr "Quello è l'indirizzo di messaggistica sbagliato."
 
-#: ../actions/newnotice.php:52
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+msgid "That is the wrong confirmation number."
+msgstr "Quello è il numero di conferma errato."
+
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+msgid "That phone number already belongs to another user."
+msgstr "Quel numero di telefono appartiene già a un altro utente."
+
+#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: actions/newnotice.php:49 actions/twitapistatuses.php:330
+#: actions/newnotice.php:61 actions/twitapistatuses.php:271
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "Troppo lungo. Lunghezza massima 140 caratteri."
 
-#: ../actions/confirmaddress.php:86 ../actions/confirmaddress.php:92
-#: actions/confirmaddress.php:92
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+#: actions/twitapiaccount.php:55
+msgid "That's too long. Max notice size is 255 chars."
+msgstr "Troppo lungo. Massimo 255 caratteri."
+
+#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "L'indirizzo \"%s\" è stato confermato per il tuo 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:285
 msgid "The address was removed."
 msgstr "L'indirizzo è stato rimosso."
 
-#: ../actions/userauthorization.php:311
+#: ../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 "
@@ -1241,7 +2124,7 @@ msgstr ""
 "richiamo. Controlla le istruzioni del sito per i dettagli su come "
 "autorizzare l'abbonamento. Il tuo token per l'abbonamento è:"
 
-#: ../actions/userauthorization.php:321
+#: ../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 "
@@ -1260,16 +2143,22 @@ msgstr "Queste sono le persone che seguono %s."
 msgid "These are the people who listen to your notices."
 msgstr "Queste sono le persone che ti seguono."
 
-#: ../actions/subscriptions.php:35
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Queste sono le persone seguite da %s."
 
-#: ../actions/subscriptions.php:33
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
 msgid "These are the people whose notices you listen to."
 msgstr "Queste sono le persone che stai seguendo."
 
-#: ../actions/recoverpassword.php:87
+#: ../actions/invite.php:89 actions/invite.php:96
+msgid ""
+"These people are already users and you were automatically subscribed to them:"
+msgstr ""
+"Queste persone sono già utenti e sei stato automaticamente abbonato a loro:"
+
+#: ../actions/recoverpassword.php:88
 msgid "This confirmation code is too old. Please start again."
 msgstr "Questo codice di conferma è scaduto. Ricomincia da capo."
 
@@ -1281,55 +2170,97 @@ msgstr ""
 "Questo modulo dovrebbe inviarsi automaticamente. In caso contrario, fai clic "
 "sul pulsante per inviarlo al tuo servizio OpenID."
 
-#: ../actions/finishopenidlogin.php:56
+#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
 #, 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 ""
-"Questa è la prima volta in cui accedi a %s quindi è necessario collegare "
-"il tuo OpenID a un account locale. Puoi crearne uno nuovo o collegarlo con "
-"il tuo account esistente, se ne hai uno."
+"Questa è la prima volta in cui accedi a %s quindi è necessario collegare il "
+"tuo OpenID a un account locale. Puoi crearne uno nuovo o collegarlo con il "
+"tuo account esistente, se ne hai uno."
+
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:94
+#: actions/twitapifriendships.php:82 actions/twitapistatuses.php:428
+msgid "This method requires a POST or DELETE."
+msgstr "Questo metodo richiede POST o DELETE."
+
+#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
+#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
+#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
+#: actions/twitapistatuses.php:303 actions/twitapiaccount.php:46
+#: actions/twitapidirect_messages.php:117 actions/twitapifriendships.php:30
+#: actions/twitapistatuses.php:239
+msgid "This method requires a POST."
+msgstr "Questo metodo richiede POST."
 
-#: ../lib/util.php:147
+#: ../lib/util.php:164 lib/util.php:246 lib/util.php:257
 msgid "This page is not available in a media type you accept"
 msgstr "Questa pagina non è disponibile in un tipo di supporto che tu accetti"
 
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
+msgid "Timezone"
+msgstr "Fuso orario"
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr "Fuso orario non selezionato"
+
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"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 ""
-"Per abbonarti puoi [eseguire l'accesso](%%action.login%%) oppure "
-"[registrare](%%action.register%%) un nuovo account. Se ne possiedi già uno "
-"su un [sito di micro-blog compatibile](%%doc.openmublog%%), inserisci "
-"l'indirizzo del tuo profilo qui di seguito."
+"Per abbonarti puoi [eseguire l'accesso](%%action.login%%) oppure [registrare]"
+"(%%action.register%%) un nuovo account. Se ne possiedi già uno su un [sito "
+"di micro-blog compatibile](%%doc.openmublog%%), inserisci l'indirizzo del "
+"tuo profilo qui di seguito."
 
-#: ../actions/profilesettings.php:51
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: actions/twitapifriendships.php:128
+msgid "Two user ids or screen_names must be supplied."
+msgstr "Devono essere forniti due ID utente o nominativi."
+
+#: ../actions/profilesettings.php:48 ../actions/register.php:169
+#: actions/profilesettings.php:81 actions/register.php:183
+#: actions/profilesettings.php:83 actions/register.php:210
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL della tua pagina web, blog o profilo su un altro sito"
 
-#: ../actions/remotesubscribe.php:74
+#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL del tuo profilo su un altro servizio di micro-blog compatibile"
 
-#: ../actions/imsettings.php:105 ../actions/recoverpassword.php:39
+#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
+#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
+#: actions/emailsettings.php:144 actions/imsettings.php:118
+#: actions/recoverpassword.php:39 actions/smssettings.php:143
+#: actions/twittersettings.php:108 actions/emailsettings.php:147
+#: actions/othersettings.php:146 actions/twittersettings.php:199
 msgid "Unexpected form submission."
 msgstr "Invio del modulo inaspettato."
 
-#: ../actions/recoverpassword.php:237
+#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
 msgid "Unexpected password reset."
 msgstr "Ripristino della password inaspettato."
 
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr "Azione sconosciuta"
+
 #: ../actions/finishremotesubscribe.php:58
+#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:59
 msgid "Unknown version of OMB protocol."
 msgstr "Versione del protocollo OMB sconosciuta."
 
-#: ../lib/util.php:245 ../lib/util.php:269 lib/util.php:285
+#: ../lib/util.php:269 lib/util.php:285 lib/util.php:296
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
@@ -1337,25 +2268,50 @@ msgstr ""
 "Se non indicato diversamente, i diritti d'autore dei contenuti di questo "
 "sito sono dei singoli utenti e sono disponibili sotto"
 
-#: ../actions/confirmaddress.php:48
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr "Tipo di indirizzo non riconosciuto %s"
 
-#: ../actions/showstream.php:193 ../actions/showstream.php:209
-#: actions/showstream.php:219
+#: ../actions/showstream.php:209 actions/showstream.php:219
+#: actions/showstream.php:267 lib/util.php:2094
 msgid "Unsubscribe"
 msgstr "Annulla abbonamento"
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
+#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
+#: actions/postnotice.php:45 actions/updateprofile.php:46
 msgid "Unsupported OMB version"
 msgstr "Versione OMB non supportata"
 
-#: ../actions/avatar.php:105
+#: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: actions/profilesettings.php:371
 msgid "Unsupported image file format."
 msgstr "Formato file immagine non supportato."
 
-#: ../actions/avatar.php:68
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: actions/deleteprofile.php:251
+msgid "Updates by SMS"
+msgstr "Aggiornamenti via SMS"
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: actions/deleteprofile.php:254
+msgid "Updates by instant messenger (IM)"
+msgstr "Aggiornamenti via messaggistica istantanea (MI)"
+
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/twitapistatuses.php:126
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr "Aggiornamenti da %1$s e amici su %2$s!"
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:198
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr "Aggiornamenti da %1$s su %2$s!"
+
+#: ../actions/avatar.php:68 actions/profilesettings.php:161
+#: actions/profilesettings.php:166
 msgid "Upload"
 msgstr "Carica"
 
@@ -1371,18 +2327,42 @@ msgstr ""
 "rilasciata sotto la licenza del sito. Usa un'immagine che ti appartiene e "
 "che tu voglia condividere."
 
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr "Carica una nuova immagine per il profilo"
+
+#: ../actions/invite.php:114 actions/invite.php:121
+msgid ""
+"Use this form to invite your friends and colleagues to use this service."
+msgstr ""
+"Usa questo modulo per invitare i tuoi amici e colleghi a usare questo "
+"servizio."
+
 #  Femminile, è l'email
-#: ../actions/profilesettings.php:48 ../actions/register.php:182
+#: ../actions/register.php:159 ../actions/register.php:162
+#: actions/register.php:173 actions/register.php:176 actions/register.php:200
+#: actions/register.php:203
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Usata solo per aggiornamenti, annunci e recupero password"
 
 #: ../actions/finishremotesubscribe.php:86
+#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:92
 msgid "User being listened to doesn't exist."
 msgstr "L'utente che intendi seguire non esiste."
 
 #: ../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/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/showstream.php:57
+#: actions/twitapiaccount.php:63 actions/twitapifavorites.php:40
+#: actions/twitapistatuses.php:163 actions/twitapistatuses.php:492
+#: lib/twitterapi.php:590
 msgid "User has no profile."
 msgstr "L'utente non ha un profilo."
 
@@ -1390,42 +2370,81 @@ msgstr "L'utente non ha un profilo."
 msgid "User nickname"
 msgstr "Soprannome dell'utente"
 
-#: ../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 "Utente non trovato."
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
+msgid "What timezone are you normally in?"
+msgstr "In che fuso orario risiedi solitamente?"
+
+#: ../lib/util.php:1159 lib/util.php:1293 lib/util.php:1630
 #, php-format
 msgid "What's up, %s?"
 msgstr "Cosa succede %s?"
 
-#: ../actions/profilesettings.php:57
+#: ../actions/profilesettings.php:54 ../actions/register.php:175
+#: actions/profilesettings.php:87 actions/register.php:189
+#: actions/profilesettings.php:89 actions/register.php:216
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Dove ti trovi, tipo \"città, regione, stato\""
 
-#: ../actions/updateprofile.php:127
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Tipo di immagine errata per \"%s\""
 
-#: ../actions/updateprofile.php:122
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Dimensione dell'immagine sbagliata a \"%s\""
 
-#: ../actions/finishaddopenid.php:64
+#  "si" is the last musical note in the "do scale". "sì" is the correct Italian translation for "yes".
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+#: actions/block.php:105
+msgid "Yes"
+msgstr "Sì"
+
+#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
 msgid "You already have this OpenID!"
 msgstr "Hai già questo OpenID!"
 
+#: ../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 ""
+"Stai per eliminare definitivamente un messaggio. Una volta fatto non sarà "
+"possibile recuperarlo."
+
 #: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
 msgid "You are already logged in!"
 msgstr "Hai già effettuato l'accesso!"
 
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr "Sei già abbonato a questi utenti:"
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:102
+msgid "You are not friends with the specified user."
+msgstr "Non sei amico dell'utente specificato."
+
 #: ../actions/password.php:27
 msgid "You can change your password here. Choose a good one!"
 msgstr "Qui puoi cambiare la tua password. Scegline una buona!"
 
-#: ../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 "Puoi creare un nuovo account per iniziare a inviare messaggi."
 
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr "Puoi ricevere messaggi SMS attraverso l'email da %%site.name%%."
+
 #: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
@@ -1435,8 +2454,8 @@ msgstr "Puoi rimuovere un OpenID dal tuo account facendo clic su \"Rimuovi\"."
 #: ../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 ""
 "Puoi inviare e ricevere messaggi attraverso i servizi di [messaggistica "
 "istantanea](%%doc.im%%) Jabber/GTalk. Configura il tuo indirizzo e le "
@@ -1444,920 +2463,169 @@ 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 ""
 "Puoi aggiornare le informazioni del tuo profilo personale qui, così gli "
 "altri potranno conoscere qualcosa in più di te."
 
 #: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
+#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
+#: actions/finishremotesubscribe.php:83 actions/finishremotesubscribe.php:99
 msgid "You can use the local subscription!"
 msgstr "Puoi usare l'abbonamento locale!"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:51
+#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
+#: actions/finishopenidlogin.php:38 actions/register.php:68
+#: actions/register.php:77
 msgid "You can't register if you don't agree to the license."
 msgstr "Non puoi registrarti se non accetti la licenza."
 
-#: ../actions/updateprofile.php:62
+#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
 msgid "You did not send us that profile"
 msgstr "Non hai inviato quel profilo"
 
-#: ../actions/recoverpassword.php:134
-msgid "You've been identified. Enter a  new password below. "
-msgstr "Sei stato identificato. Inserisci una nuova password qui sotto."
-
-#: ../actions/openidlogin.php:67
-msgid "Your OpenID URL"
-msgstr "Il tuo URL OpenID"
-
-#: ../actions/recoverpassword.php:149 ../actions/recoverpassword.php:164
-msgid "Your nickname on this server, or your registered email address."
-msgstr ""
-"Il tuo soprannome su questo server o il tuo indirizzo email "
-"registrato."
-
-#: ../actions/openidsettings.php:28
+#: ../lib/mail.php:147
 #, php-format
 msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
-"account.  Manage your associated OpenIDs from here."
+"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 ""
-"[OpenID](%%doc.openid%%) ti permette di accedere a molti siti con lo stesso "
-"account. Gestisci i tuoi OpenID associati da qui."
+"Hai un nuovo indirizzo di invio su %1$s.\n"
+"\n"
+"Scrivi le email a %2$S per inviare nuovi messaggi.\n"
+"\n"
+"Puoi trovare maggiori informazioni presso %£4s.\n"
+"\n"
+"Cordiali saluti,\n"
+"%4$s"
 
-#: ../lib/util.php:814
-msgid "a few seconds ago"
-msgstr "pochi secondi fa"
-
-#: ../lib/util.php:826
-#, php-format
-msgid "about %d days ago"
-msgstr "circa %d giorni fa"
-
-#: ../lib/util.php:822
-#, php-format
-msgid "about %d hours ago"
-msgstr "circa %d ore fa"
-
-#: ../lib/util.php:818
-#, php-format
-msgid "about %d minutes ago"
-msgstr "circa %d minuti fa"
-
-#: ../lib/util.php:830
-#, php-format
-msgid "about %d months ago"
-msgstr "circa %d mesi fa"
-
-#: ../lib/util.php:824
-msgid "about a day ago"
-msgstr "circa un giorno fa"
-
-#: ../lib/util.php:816
-msgid "about a minute ago"
-msgstr "circa un minuto fa"
-
-#: ../lib/util.php:828
-msgid "about a month ago"
-msgstr "circa un mese fa"
-
-#: ../lib/util.php:832
-msgid "about a year ago"
-msgstr "circa un anno fa"
-
-#: ../lib/util.php:820
-msgid "about an hour ago"
-msgstr "circa un'ora fa"
-
-#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
-#: ../lib/stream.php:101
-msgid "in reply to..."
-msgstr "in risposta a..."
-
-#: ../actions/noticesearch.php:133 ../actions/showstream.php:390
-#: ../lib/stream.php:108
-msgid "reply"
-msgstr "rispondi"
-
-#: ../actions/password.php:44
-msgid "same as password above"
-msgstr "stessa password di sopra"
-
-#: ../lib/util.php:1127 ../lib/util.php:1309 lib/util.php:1443
-msgid "« After"
-msgstr "« Successivi"
-
-#  Non ne sono sicuro, ma dovrebbe essere quello che si vede come descrizione da dove si è inviato il messaggio. Mettere 'da' non suona bene ('da web', 'da api'...), 'via' mi pare la soluzione migliore ('via web', 'via api', 'via Twhirl'...).
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr "via"
-
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr "%1$s / Aggiornamenti in risposta a %2$s"
-
-#  %USERNAME has invited you to join THEM on %site. You start with a singular and end with a plural???
-#: ../actions/invite.php:168 actions/invite.php:176
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s ti invita a seguirlo su %2$s"
-
-#  link -> collegamento
-#  micro-blogging -> micro-blog
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-"%1$s ti invita a seguirlo su %2$s (%3$s).\n"
-"\n"
-"%2$s è un servizio di micro-blog che ti consente di rimanere aggiornato "
-"sulle persone che conosci e che ti interessano.\n"
-"\n"
-"Puoi anche condividere notizie che ti riguardano, i tuoi pensieri o la tua "
-"vita in rete con le persone che ti conoscono. È anche un ottimo strumento "
-"per conoscere nuove persone che condividono i tuoi stessi interessi.\n"
-"\n"
-"%1$s ha scritto:\n"
-"\n"
-"%4$s\n"
-"\n"
-"Puoi vedere il profilo di %1$s su %2$s qui:\n"
-"\n"
-"%5$s\n"
-"\n"
-"Se vuoi provare il servizio, fai clic sul collegamento qui sotto per "
-"accettare l'invito:\n"
-"\n"
-"%6$s\n"
-"\n"
-"Se non è ciò che vuoi, ignora semplicemente questo messaggio. Grazie per "
-"aver letto questo invito e per il tuo tempo!\n"
-"\n"
-"Cordiali saluti, %2$s\n"
-
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr "%1$s aggiornamenti in risposta agli aggiornamenti da %2$s / %3$s"
-
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
-#, php-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
-
-#  Solo una prova, se non sta bene si ripristina la versione vecchia, giusto per avere l'interfaccia il più tradotta possibile
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#, php-format
-msgid "%s public timeline"
-msgstr "attività pubblica di %s"
-
-#: ../lib/mail.php:206 lib/mail.php:212
-#, php-format
-msgid "%s status"
-msgstr "stato di %s"
-
-#  Solo una prova, se non sta bene si ripristina la versione vecchia, giusto per avere l'interfaccia il più tradotta possibile
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#, php-format
-msgid "%s timeline"
-msgstr "Attività di %s"
-
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
-msgstr "Aggiornamenti di %s da tutti!"
-
-#: ../actions/register.php:213
-msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
-msgstr ""
-"(Dovresti ricevere, entro breve, un messaggio email con istruzioni su come "
-"confermare il tuo indirizzo email.)"
-
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 lettere minuscole o numeri, niente punteggiatura o spazi. "
-"Richiesto."
-
-#  Femminile, è la password
-#: ../actions/register.php:154 actions/register.php:168
-msgid "6 or more characters. Required."
-msgstr "6 o più caratteri. Richiesta."
-
-#: ../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 ""
-"Un codice di conferma è stato inviato all'indirizzo di posta da te "
-"aggiunto. Controlla la tua casella di posta (e anche la posta indesiderata!) "
-"per il codice e le istruzioni su come usarlo."
-
-#: ../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 ""
-"Un codice di conferma è stato inviato al numero di telefono da te aggiunto. "
-"Controlla la tua casella di posta (e anche la posta indesiderata!) per il "
-"codice e le istruzioni su come usarlo."
-
-#: ../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!"
-msgstr "Metodo delle API non trovato!"
-
-#: ../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 "Metodo delle API in lavorazione."
-
-#  we don't use 's' in plurals even from english words.
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-msgid "Add or remove OpenIDs"
-msgstr "Aggiungi o rimuovi OpenID"
-
-#: ../actions/invite.php:131 actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
-msgstr "Indirizzi email di amici da invitare (uno per riga)"
-
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-msgid "Are you sure you want to delete this notice?"
-msgstr "Sei sicuro di voler eliminare questo messaggio?"
-
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
-msgstr ""
-"Abbonami automaticamente a chi si abbona ai miei messaggi (utile per i "
-"non-umani)"
-
-#: ../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 ""
-"Attesa la conferma per questo indirizzo. Controlla la tua casella di posta "
-"(e anche la posta indesiderata!) per un messaggio con ulteriori "
-"istruzioni."
-
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr "Attesa la conferma per questo numero di telefono."
-
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
-msgid "Can't delete this notice."
-msgstr "Impossibile eliminare questo messaggio."
-
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-msgid "Cannot normalize that email address"
-msgstr "Impossibile normalizzare l'indirizzo email"
-
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr "Modifica la gestione dell'email"
-
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
-msgstr "Modifica la tua password"
-
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-msgid "Change your profile settings"
-msgstr "Modifica le impostazioni del tuo profilo"
-
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-msgid "Confirmation code"
-msgstr "Codice di conferma"
-
-#: ../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 ""
-"Congratulazioni %s! Benvenuto/a in %%%%site.name%%%%. Da qui ora "
-"puoi...\n"
-"\n"
-"* Visitare il [tuo profilo](%s) e inviare il tuo primo messaggio.\n"
-"*Aggiungere un [indirizzo Jabber/GTalk](%%%%action.imsettings%%%%) per usare "
-"quel servizio per inviare messaggi.\n"
-"*[Ricercare persone](%%%%action.peoplesearch%%%%) che potresti conoscere o "
-"che condividono i tuoi stessi interessi.\n"
-"* Aggiornare le [tue impostazioni](%%%%action.profilesettings%%%%) per "
-"fornire agli altri più informazioni su di te.\n"
-"* Leggere la [documentazione in rete](%%%%doc.help%%%%) per le "
-"caratteristiche che magari non hai ancora visto.\n"
-"\n"
-"Grazie per esserti iscritto/a e speriamo tu possa divertiti usando questo "
-"servizio."
-
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr "Impossibile seguire l'utente: %s è già nel tuo elenco."
-
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
-msgstr "Impossibile seguire l'utente: utente non trovato."
-
-#: ../lib/subs.php:54 lib/subs.php:61
-msgid "Could not subscribe other to you."
-msgstr "Impossibile abbonare altri a te."
-
-#: ../lib/subs.php:46 lib/subs.php:46
-msgid "Could not subscribe."
-msgstr "Impossibile abbonarsi."
-
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-msgid "Could not update user with confirmed email address."
-msgstr "Impossibile aggiornare l'utente con l'indirizzo email confermato."
-
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-msgid "Couldn't find any statuses."
-msgstr "Impossibile trovare un qualsiasi stato."
-
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-msgid "Couldn't update user for autosubscribe."
-msgstr "Impossibile aggiornare l'utente per auto-abbonarsi."
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-msgid "Couldn't update user record."
-msgstr "Impossibile aggiornare i record dell'utente."
-
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
-msgstr "Numero di telefono attualmente confermato per gli SMS."
-
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-msgid "Current confirmed email address."
-msgstr "Indirizzo email attualmente confermato."
-
-#: ../classes/Notice.php:72 classes/Notice.php:86
-#, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr "Errore del DB nell'inserire un hastag: %s"
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-msgid "Delete notice"
-msgstr "Elimina messaggio"
-
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-msgid "Email Address"
-msgstr "Indirizzo email"
-
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-msgid "Email Settings"
-msgstr "Impostazioni email"
-
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-msgid "Email address, like \"UserName@example.org\""
-msgstr "Indirizzo email, del tipo \"NomeUtente@example.org\""
-
-#: ../actions/invite.php:129 actions/invite.php:137
-msgid "Email addresses"
-msgstr "Indirizzi email"
-
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
-msgstr "Inserisci il codice che hai ricevuto sul tuo telefono."
-
-#: ../actions/tag.php:55 actions/tag.php:55
-#, php-format
-msgid "Feed for tag %s"
-msgstr "Feed per l'etichetta %s"
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr "Ricerca contenuto dei messaggi"
-
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr "Ricerca persone in questo sito"
-
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-msgid "I want to post notices by email."
-msgstr "Voglio inviare i messaggi via email"
-
-#  Non è il massimo (Messaggistica Istantanea), ma non lo è nemmeno in inglese, questo tipo di abbreviazioni sarebbe da evitare sempre...
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
-msgstr "MI"
-
-#: ../actions/recoverpassword.php:137
-msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
-"email address you have stored  in your account."
-msgstr ""
-"Se hai dimenticato o perso la tua password, puoi fartene inviare una nuova "
-"per email all'indirizzo indicato nel tuo profilo."
-
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-msgid "Incoming email"
-msgstr "Email di ricezione"
-
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-msgid "Incoming email address removed."
-msgstr "Indirizzo email di ricezione rimosso."
-
-#: ../actions/invite.php:55 actions/invite.php:62
-#, php-format
-msgid "Invalid email address: %s"
-msgstr "Indirizzo email non valido: %s"
-
-#: ../actions/invite.php:79 actions/invite.php:86
-msgid "Invitation(s) sent"
-msgstr "Inviti inviati"
-
-#: ../actions/invite.php:97 actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
-msgstr "Inviti inviati ai seguenti indirizzi:"
-
-#: ../lib/util.php:306 lib/util.php:322
-msgid "Invite"
-msgstr "Invita"
-
-#: ../actions/invite.php:123 actions/invite.php:130
-msgid "Invite new users"
-msgstr "Invita nuovi utenti"
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Language"
-msgstr "Lingua"
-
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-msgid "Language is too long (max 50 chars)."
-msgstr "La lingua è troppo lunga (max 50 caratteri)"
-
-#: ../actions/register.php:166 actions/register.php:180
-msgid "Longer name, preferably your \"real\" name"
-msgstr "Nome completo, preferibilmente il tuo \"vero\" nome"
-
-#: ../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 ""
-"Crea un nuovo indirizzo email a cui inviare i messaggi, rimuove quello "
-"vecchio."
-
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr "Gestisci la ricezione delle email da %%site.name%%."
-
-#: ../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 ""
-"Operatore di telefonia mobile. Se conosci un operatore che accetta gli SMS "
-"via email, ma non è elencato qui, scrivici a %s."
-
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-msgid "New"
-msgstr "Nuovo"
-
-#: ../lib/mail.php:144 lib/mail.php:144
-#, php-format
-msgid "New email address for posting to %s"
-msgstr "Nuovo indirizzo email per inviare messaggi a %s"
-
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-msgid "New incoming email address added."
-msgstr "Nuovo indirizzo email di ricezione aggiunto."
-
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-msgid "No"
-msgstr "No"
-
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-msgid "No carrier selected."
-msgstr "Nessun operatore selezionato."
-
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-msgid "No code entered"
-msgstr "Nessun codice inserito"
-
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-msgid "No email address."
-msgstr "Nessun indirizzo email."
-
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-msgid "No incoming email address."
-msgstr "Nessun indirizzo email di ricezione."
-
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-msgid "No phone number."
-msgstr "Nessun numero di telefono."
-
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-msgid "No status found with that ID."
-msgstr "Nessuno stato trovato con quel ID."
-
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-msgid "No status with that ID found."
-msgstr "Nessuno stato con quel ID trovato."
-
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-msgid "No user with that email address or username."
-msgstr "Nessun utente con quell'email o nome utente."
-
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-msgid "Not a registered user."
-msgstr "Non è un utente registrato."
-
-#: ../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."
-msgstr "Non è un formato di dati supportato."
-
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-msgid "Not a valid email address"
-msgstr "Non è un indirizzo email valido"
-
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-msgid "Not found"
-msgstr "Non trovato"
-
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-msgid "Notice Search"
-msgstr "Ricerca messaggi"
-
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81
-#, php-format
-msgid "Notices tagged with %s"
-msgstr "Messaggi etichettati con %s"
-
-#: ../actions/invite.php:135 actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
-msgstr "Puoi aggiungere un messaggio personale agli inviti."
-
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-msgid "People"
-msgstr "Persone"
-
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-msgid "People Search"
-msgstr "Ricerca persone"
-
-#: ../actions/invite.php:133 actions/invite.php:141
-msgid "Personal message"
-msgstr "Messaggio personale"
-
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "Numero di telefono, senza punteggiatura o spazi, con il prefisso"
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Preferred language"
-msgstr "Lingua preferita"
-
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Pubblica un MicroID per il mio indirizzo Jabber/GTalk"
-
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-msgid "Publish a MicroID for my email address."
-msgstr "Pubblica un MicroID per il mio indirizzo email"
-
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr "Etichette recenti"
-
-#: ../actions/register.php:28 actions/register.php:28
-msgid "Registration not allowed."
-msgstr "Registrazione non consentita."
-
-#: ../actions/register.php:200 actions/register.php:214
-msgid "Registration successful"
-msgstr "Registrazione riuscita"
-
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
-msgstr "SMS"
-
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-msgid "SMS Phone number"
-msgstr "Numero di telefono per SMS"
-
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-msgid "SMS Settings"
-msgstr "Impostazioni SMS"
-
-#: ../lib/mail.php:219 lib/mail.php:225
-msgid "SMS confirmation"
-msgstr "Conferma SMS"
-
-#  Femminile, è la password
-#: ../actions/register.php:156 actions/register.php:170
-msgid "Same as password above. Required."
-msgstr "Stessa password di sopra. Richiesta."
-
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-msgid "Select a carrier"
-msgstr "Seleziona un operatore"
-
-#: ../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."
-msgstr "Invia le email a questo indirizzo per scrivere nuovi messaggi."
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: actions/twitapistatuses.php:455
+msgid "You may not delete another user's status."
+msgstr "Non puoi eliminare lo stato di un altro utente."
 
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-msgid "Send me notices of new subscriptions through email."
-msgstr "Inviami avvisi di nuovi abbonamenti via email"
+#: ../actions/invite.php:31 actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr "Devi eseguire l'accesso per invitare altri utenti a usare %s"
 
-#: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: ../actions/invite.php:103 actions/invite.php:110
 msgid ""
-"Send me notices through SMS; I understand I may incur exorbitant charges "
-"from my carrier."
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
 msgstr ""
-"Inviami avvisi via SMS: comprendo che potrei incorrere in esorbitanti "
-"bollette da parte del mio operatore"
-
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr "Inviami le risposte delle persone a cui sono abbonato via Jabber/GTalk"
-
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr "Le etichette più popolari dell'ultima settimana"
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr "Email di ricezione non consentita."
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
-msgstr "Quella non è la tua email di ricezione."
-
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317
-msgid "Tags"
-msgstr "Etichette"
-
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr "Testo"
-
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr "Qeull'indirizzo email appartiene già a un altro utente."
-
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-msgid "That is already your email address."
-msgstr "Quello è già il tuo indirizzo email."
-
-#  previous suggestion missed the dot
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-msgid "That is already your phone number."
-msgstr "Quello è già il tuo numero di telefono."
-
-#  previous suggestion missed the dot
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-msgid "That is not your email address."
-msgstr "Quello non è il tuo indirizzo email."
-
-#  previous suggestion missed the dot
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-msgid "That is not your phone number."
-msgstr "Quello non è il tuo numero di telefono."
-
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-msgid "That is the wrong confirmation number."
-msgstr "Quello è il numero di conferma errato."
+"Verrai avvisato quando i tuoi invitati accetteranno e si registreranno sul "
+"sito. Grazie per l'aiuto ad accrescere la comunità!"
 
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-msgid "That phone number already belongs to another user."
-msgstr "Quel numero di telefono appartiene già a un altro utente."
+#: ../actions/recoverpassword.php:149
+msgid "You've been identified. Enter a  new password below. "
+msgstr "Sei stato identificato. Inserisci una nuova password qui sotto."
 
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-msgid "That's too long. Max notice size is 255 chars."
-msgstr "Troppo lungo. Massimo 255 caratteri."
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:84
+msgid "Your OpenID URL"
+msgstr "Il tuo URL OpenID"
 
-#: ../actions/invite.php:89 actions/invite.php:96
-msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
+#: ../actions/recoverpassword.php:164
+msgid "Your nickname on this server, or your registered email address."
 msgstr ""
-"Queste persone sono già utenti e sei stato automaticamente abbonato a "
-"loro:"
-
-#: ../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."
-msgstr "Questo metodo richiede POST o DELETE."
-
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303
-msgid "This method requires a POST."
-msgstr "Questo metodo richiede POST."
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "Timezone"
-msgstr "Fuso orario"
-
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-msgid "Timezone not selected."
-msgstr "Fuso orario non selezionato"
-
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-msgid "Two user ids or screen_names must be supplied."
-msgstr "Devono essere forniti due ID utente o nominativi."
-
-#: ../index.php:57 index.php:57
-msgid "Unknown action"
-msgstr "Azione sconosciuta"
-
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-msgid "Updates by SMS"
-msgstr "Aggiornamenti via SMS"
-
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-msgid "Updates by instant messenger (IM)"
-msgstr "Aggiornamenti via messaggistica istantanea (MI)"
-
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr "Aggiornamenti da %1$s e amici su %2$s!"
+"Il tuo soprannome su questo server o il tuo indirizzo email registrato."
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: ../actions/openidsettings.php:28
 #, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr "Aggiornamenti da %1$s su %2$s!"
-
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr "Carica una nuova immagine per il profilo"
-
-#: ../actions/invite.php:114 actions/invite.php:121
-msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
-msgstr ""
-"Usa questo modulo per invitare i tuoi amici e colleghi a usare questo "
-"servizio."
-
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr "Utente non trovato."
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "What timezone are you normally in?"
-msgstr "In che fuso orario risiedi solitamente?"
-
-#  "si" is the last musical note in the "do scale". "sì" is the correct Italian translation for "yes".
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-msgid "Yes"
-msgstr "Sì"
-
-#: ../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."
+"[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
+"account.  Manage your associated OpenIDs from here."
 msgstr ""
-"Stai per eliminare definitivamente un messaggio. Una volta fatto non sarà "
-"possibile recuperarlo."
-
-#: ../actions/invite.php:81 actions/invite.php:88
-msgid "You are already subscribed to these users:"
-msgstr "Sei già abbonato a questi utenti:"
+"[OpenID](%%doc.openid%%) ti permette di accedere a molti siti con lo stesso "
+"account. Gestisci i tuoi OpenID associati da qui."
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
-msgstr "Non sei amico dell'utente specificato."
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:1287
+msgid "a few seconds ago"
+msgstr "pochi secondi fa"
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:1299
 #, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr "Puoi ricevere messaggi SMS attraverso l'email da %%site.name%%."
+msgid "about %d days ago"
+msgstr "circa %d giorni fa"
 
-#: ../lib/mail.php:147
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:1295
 #, 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 ""
-"Hai un nuovo indirizzo di invio su %1$s.\n"
-"\n"
-"Scrivi le email a %2$S per inviare nuovi messaggi.\n"
-"\n"
-"Puoi trovare maggiori informazioni presso %£4s.\n"
-"\n"
-"Cordiali saluti,\n"
-"%4$s"
+msgid "about %d hours ago"
+msgstr "circa %d ore fa"
 
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-msgid "You may not delete another user's status."
-msgstr "Non puoi eliminare lo stato di un altro utente."
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:1291
+#, php-format
+msgid "about %d minutes ago"
+msgstr "circa %d minuti fa"
 
-#: ../actions/invite.php:31 actions/invite.php:31
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:1303
 #, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr "Devi eseguire l'accesso per invitare altri utenti a usare %s"
+msgid "about %d months ago"
+msgstr "circa %d mesi fa"
 
-#: ../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!"
-msgstr ""
-"Verrai avvisato quando i tuoi invitati accetteranno e si registreranno sul "
-"sito. Grazie per l'aiuto ad accrescere la comunità!"
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:1297
+msgid "about a day ago"
+msgstr "circa un giorno fa"
+
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:1289
+msgid "about a minute ago"
+msgstr "circa un minuto fa"
+
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:1301
+msgid "about a month ago"
+msgstr "circa un mese fa"
+
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:1305
+msgid "about a year ago"
+msgstr "circa un anno fa"
+
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:1293
+msgid "about an hour ago"
+msgstr "circa un'ora fa"
 
 #: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
+#: actions/showstream.php:441 lib/stream.php:99 lib/noticelist.php:211
 msgid "delete"
 msgstr "elimina"
 
+#: ../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:135
+#: lib/facebookaction.php:202 lib/noticelist.php:189
+msgid "in reply to..."
+msgstr "in risposta a..."
+
+#: ../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:142
+#: lib/noticelist.php:199
+msgid "reply"
+msgstr "rispondi"
+
+#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/profilesettings.php:188
+msgid "same as password above"
+msgstr "stessa password di sopra"
+
 #  wrong capitalization in previous suggestion
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+#: actions/twitapistatuses.php:543
 msgid "unsupported file type"
 msgstr "tipo di file non supportato"
 
+#: ../lib/util.php:1309 lib/util.php:1443 lib/facebookaction.php:251
+#: lib/util.php:1783
+#, fuzzy
+msgid "« After"
+msgstr "« Successivi"
+
 #: actions/deletenotice.php:74 actions/disfavor.php:43
 #: actions/emailsettings.php:127 actions/favor.php:45
 #: actions/finishopenidlogin.php:33 actions/imsettings.php:105
@@ -2367,6 +2635,12 @@ msgstr "tipo di file non supportato"
 #: 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:38 actions/deleteprofile.php:127 actions/disfavor.php:47
+#: actions/emailsettings.php:130 actions/favor.php:49 actions/login.php:45
+#: actions/newmessage.php:44 actions/newnotice.php:36 actions/nudge.php:47
+#: actions/othersettings.php:139 actions/profilesettings.php:49
+#: actions/subedit.php:38 actions/tagother.php:113
+#: actions/twittersettings.php:188 actions/unblock.php:38
 msgid "There was a problem with your session token. Try again, please."
 msgstr "C'è stato un problema con il tuo token di sessione. Prova di nuovo."
 
@@ -2385,19 +2659,20 @@ msgstr "Preferito"
 #: actions/emailsettings.php:92
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
-"Inviami un'email quando qualcuno aggiunge un mio messaggio ai "
-"preferiti"
+"Inviami un'email quando qualcuno aggiunge un mio messaggio ai preferiti"
 
 #: actions/emailsettings.php:95
 msgid "Send me email when someone sends me a private message."
 msgstr "Inviami un'email quando qualcuno mi invia un messaggio privato"
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142
+#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:54
+#: actions/twitapifavorites.php:115
 msgid "This notice is already a favorite!"
 msgstr "Questo messaggio è già un preferito!"
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
+#: classes/Command.php:132 actions/favor.php:61
+#: actions/twitapifavorites.php:122
 msgid "Could not create favorite."
 msgstr "Impossibile creare preferito."
 
@@ -2406,11 +2681,12 @@ msgid "Disfavor"
 msgstr "Non preferito"
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:62
 #, php-format
 msgid "%s favorite notices"
 msgstr "Messaggi preferiti di %s"
 
-#: actions/favoritesrss.php:64
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:66
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr "Feed dei messaggi preferiti di %s"
@@ -2440,47 +2716,50 @@ msgstr ""
 "%1$s ti ha invitato a unirti a loro su %2$s (%3$s).\n"
 "\n"
 
-#: actions/login.php:104
+#: actions/login.php:104 actions/login.php:111 actions/openidlogin.php:86
 msgid "Automatically login in the future; "
 msgstr "Accesso automatico in futuro;"
 
-#: actions/login.php:122
+#: actions/login.php:122 actions/login.php:130
 msgid "For security reasons, please re-enter your "
 msgstr "Per motivi di sicurezza reinserire la propria"
 
-#: actions/login.php:126
+#: actions/login.php:126 actions/login.php:134
 msgid "Login with your username and password. "
 msgstr "Accedi con il tuo nome utente e password."
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+#: actions/newmessage.php:60 actions/twitapidirect_messages.php:136
 msgid "That's too long. Max message size is 140 chars."
 msgstr "Troppo lungo. Il massimo per un messaggio è 140 caratteri."
 
-#: actions/newmessage.php:65
+#: actions/newmessage.php:65 actions/newmessage.php:68
 msgid "No recipient specified."
 msgstr "Nessun destinatario specificato."
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
+#: classes/Command.php:206 actions/newmessage.php:71
+#: actions/newmessage.php:116 classes/Command.php:211
 msgid "You can't send a message to this user."
 msgstr "Non puoi inviare un messaggio a questo utente."
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
+#: classes/Command.php:209 actions/newmessage.php:74
+#: actions/twitapidirect_messages.php:153 classes/Command.php:214
 msgid ""
-"Don't send a message to yourself; just say it to yourself quietly "
-"instead."
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Non inviarti un messaggio, piuttosto ripetilo a voce dolcemente."
 
-#: actions/newmessage.php:108
+#: actions/newmessage.php:108 actions/microsummary.php:32
+#: actions/newmessage.php:111
 msgid "No such user"
 msgstr "Nessun tale utente"
 
-#: actions/newmessage.php:117
+#: actions/newmessage.php:117 actions/newmessage.php:120
 msgid "New message"
 msgstr "Nuovo messaggio"
 
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:95 actions/noticesearch.php:94
 msgid "Notice without matching profile"
 msgstr "Messaggi senza un profilo corrispondente"
 
@@ -2514,8 +2793,8 @@ msgstr "Casella posta inviata di %s"
 #: actions/outbox.php:53
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
-"Questa è la casella della tua posta inviata, contiene i messaggi privati "
-"che hai inviato."
+"Questa è la casella della tua posta inviata, contiene i messaggi privati che "
+"hai inviato."
 
 #: actions/peoplesearch.php:28
 #, php-format
@@ -2529,6 +2808,7 @@ msgstr "Qui puoi aggiornare il tuo profilo personale"
 
 #: actions/profilesettings.php:115 actions/remotesubscribe.php:320
 #: actions/userauthorization.php:159 actions/userrss.php:76
+#: actions/profilesettings.php:120 actions/remotesubscribe.php:333
 msgid "User without matching profile"
 msgstr "Utente senza profilo corrispondente"
 
@@ -2556,20 +2836,19 @@ msgstr "Istruzioni per il recupero della password"
 msgid "New password successfully saved. "
 msgstr "Nuova password salvata con successo."
 
-#: actions/register.php:95
+#: actions/register.php:95 actions/register.php:104
 msgid "Password must be 6 or more characters."
 msgstr "La password deve essere di 6 o più caratteri."
 
-#: actions/register.php:216
+#: actions/register.php:216 actions/register.php:243
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to..."
 msgstr ""
-"Congratulazioni, %s! Benvenuto su %%%%site.name%%%%. Ora potresti "
-"voler..."
+"Congratulazioni, %s! Benvenuto su %%%%site.name%%%%. Ora potresti voler..."
 
-#: actions/register.php:227
+#: actions/register.php:227 actions/register.php:254
 msgid "(You should receive a message by email momentarily, with "
 msgstr "(Dovresti ricevere, entro breve, un messaggio email con"
 
@@ -2584,6 +2863,7 @@ msgid "Feed for favorites of %s"
 msgstr "Feed dei preferiti di %s"
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:88 actions/twitapifavorites.php:57
 msgid "Could not retrieve favorite notices."
 msgstr "Impossibile recuperare i messaggi favoriti."
 
@@ -2605,7 +2885,7 @@ msgstr "Messaggio a %1$s su %2$s"
 msgid "Message from %1$s on %2$s"
 msgstr "Messaggio da %1$s su %2$s"
 
-#: actions/showstream.php:154
+#: actions/showstream.php:154 lib/util.php:2105
 msgid "Send a message"
 msgstr "Invia un messaggio"
 
@@ -2614,53 +2894,58 @@ msgstr "Invia un messaggio"
 msgid "Mobile carrier for your phone. "
 msgstr "Operatore mobile del tuo telefono."
 
-#: actions/twitapidirect_messages.php:76
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:64
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Messaggi diretti a %s"
 
-#: actions/twitapidirect_messages.php:77
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:65
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "Tutti i messaggi diretti inviati a %s"
 
-#: actions/twitapidirect_messages.php:81
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:69
 msgid "Direct Messages You've Sent"
 msgstr "Messaggi diretti inviati"
 
-#: actions/twitapidirect_messages.php:82
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:70
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "Tutti i messaggi diretti inviati da %s"
 
 #: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:132
 msgid "No message text!"
 msgstr "Nessun testo nel messaggio!"
 
 #: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:145
 msgid "Recipient user not found."
 msgstr "Utente destinatario non trovato."
 
 #: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:148
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr "Non puoi inviare messaggi diretti a utenti che non sono amici tuoi."
 
-#: actions/twitapifavorites.php:92
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:64
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s / Preferiti da %s"
 
-#: actions/twitapifavorites.php:95
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:67
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "%s aggiornamenti preferiti da %s / %s"
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
+#: actions/twitapifavorites.php:158 lib/mail.php:303
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr "%s ha aggiunto il tuo messaggio tra i suoi preferiti"
 
 #: actions/twitapifavorites.php:188 lib/mail.php:276
+#: actions/twitapifavorites.php:159 lib/mail.php:304
 #, php-format
 msgid ""
 "%1$s just added your notice from %2$s as one of their favorites.\n"
@@ -2669,22 +2954,22 @@ msgstr ""
 "%1$s ha appena aggiunto il tuo messaggio da %2$s tra i suoi preferiti.\n"
 "\n"
 
-#: actions/twittersettings.php:27
+#: actions/twittersettings.php:27 actions/twittersettings.php:29
 msgid ""
 "Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 "Aggiungi il tuo account Twitter per inviare automaticamente i tuoi messaggi "
 "su Twitter,"
 
-#: actions/twittersettings.php:41
+#: actions/twittersettings.php:41 actions/twittersettings.php:43
 msgid "Twitter settings"
 msgstr "Impostazioni Twitter"
 
-#: actions/twittersettings.php:48
+#: actions/twittersettings.php:48 actions/twittersettings.php:50
 msgid "Twitter Account"
 msgstr "Account Twitter"
 
-#: actions/twittersettings.php:56
+#: actions/twittersettings.php:56 actions/twittersettings.php:58
 msgid "Current verified Twitter account."
 msgstr "Account Twitter attualmente verificato."
 
@@ -2712,7 +2997,7 @@ msgstr "Invia le risposte \"@\" locali a Twitter"
 msgid "Subscribe to my Twitter friends here."
 msgstr "Abbonami ai miei amici di Twitter"
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:216
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
@@ -2720,40 +3005,44 @@ msgstr ""
 "Il nome utente deve contenere solo numeri, lettere maiuscole e minuscole e "
 "underscore (_) (max 15 caratteri)."
 
-#: actions/twittersettings.php:128
+#: actions/twittersettings.php:128 actions/twittersettings.php:221
 msgid "Could not verify your Twitter credentials!"
 msgstr "Impossibile verificare le tue credenziali di Twitter!"
 
-#: actions/twittersettings.php:137
+#: actions/twittersettings.php:137 actions/twittersettings.php:228
 #, php-format
 msgid "Unable to retrieve account information for \"%s\" from Twitter."
 msgstr "Impossibile ottenere informazioni sull'account \"%s\" da Twitter."
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:234 actions/twittersettings.php:253
 msgid "Unable to save your Twitter settings!"
 msgstr "Impossibile salvare le tue impostazioni di Twitter!"
 
-#: actions/twittersettings.php:174
+#: actions/twittersettings.php:174 actions/twittersettings.php:261
 msgid "Twitter settings saved."
 msgstr "Impostazioni di Twitter salvate."
 
-#: actions/twittersettings.php:192
+#: actions/twittersettings.php:192 actions/twittersettings.php:272
 msgid "That is not your Twitter account."
 msgstr "Quello non è il tuo account Twitter."
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:280
 msgid "Couldn't remove Twitter user."
 msgstr "Impossibile rimuovere l'utente Twitter."
 
-#: actions/twittersettings.php:212
+#: actions/twittersettings.php:212 actions/twittersettings.php:284
 msgid "Twitter account removed."
 msgstr "Account Twitter rimosso."
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
+#: actions/twittersettings.php:299 actions/twittersettings.php:310
+#: actions/twittersettings.php:322
 msgid "Couldn't save Twitter preferences."
 msgstr "Impossibile salvare le preferenze di Twitter."
 
-#: actions/twittersettings.php:245
+#: actions/twittersettings.php:245 actions/twittersettings.php:330
 msgid "Twitter preferences saved."
 msgstr "Preferenze di Twitter salvate."
 
@@ -2769,15 +3058,15 @@ msgstr "L'abbonamento è stato autorizzato, ma non"
 msgid "The subscription has been rejected, but no "
 msgstr "L'abbonamento è stato rifiutato, ma non"
 
-#: classes/Channel.php:113
+#: classes/Channel.php:113 classes/Channel.php:129
 msgid "Command results"
 msgstr "Risultati comando"
 
-#: classes/Channel.php:148
+#: classes/Channel.php:148 classes/Channel.php:175
 msgid "Command complete"
 msgstr "Comando completato"
 
-#: classes/Channel.php:158
+#: classes/Channel.php:158 classes/Channel.php:185
 msgid "Command failed"
 msgstr "Comando non riuscito"
 
@@ -2790,7 +3079,7 @@ msgstr "Questo comando non è ancora implementato"
 msgid "Subscriptions: %1$s\n"
 msgstr "Abbonamenti: %1$s\n"
 
-#: classes/Command.php:125 classes/Command.php:242
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:247
 msgid "User has no last notice"
 msgstr "L'utente non ha un ultimo messaggio"
 
@@ -2823,59 +3112,60 @@ msgstr "Pagina web: %s"
 msgid "About: %s"
 msgstr "Informazioni: %s"
 
-#: classes/Command.php:200
+#: classes/Command.php:200 classes/Command.php:202
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr "Messaggio troppo lungo - massimo 140 caratteri, inviati %d"
 
-#: classes/Command.php:214
+#: classes/Command.php:214 classes/Command.php:219
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "Messaggio diretto a %s inviato"
 
-#: classes/Command.php:216
+#: classes/Command.php:216 classes/Command.php:221
 msgid "Error sending direct message."
 msgstr "Errore nell'inviare il messaggio diretto."
 
-#: classes/Command.php:263
+#: classes/Command.php:263 classes/Command.php:268
 msgid "Specify the name of the user to subscribe to"
 msgstr "Specifica il nome dell'utente a cui abbonarti"
 
-#: classes/Command.php:270
+#: classes/Command.php:270 classes/Command.php:275
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Abbonato a %s"
 
-#: classes/Command.php:288
+#: classes/Command.php:288 classes/Command.php:293
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Specifica il nome dell'utente da cui annullare l'abbonamento"
 
-#: classes/Command.php:295
+#: classes/Command.php:295 classes/Command.php:300
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Abbonamento a %s annullato"
 
-#: classes/Command.php:310 classes/Command.php:330
+#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:315
+#: classes/Command.php:335
 msgid "Command not yet implemented."
 msgstr "Comando non ancora implementato."
 
-#: classes/Command.php:313
+#: classes/Command.php:313 classes/Command.php:318
 msgid "Notification off."
 msgstr "Notifiche disattivate."
 
-#: classes/Command.php:315
+#: classes/Command.php:315 classes/Command.php:320
 msgid "Can't turn off notification."
 msgstr "Impossibile disattivare le notifiche."
 
-#: classes/Command.php:333
+#: classes/Command.php:333 classes/Command.php:338
 msgid "Notification on."
 msgstr "Notifiche attivate."
 
-#: classes/Command.php:335
+#: classes/Command.php:335 classes/Command.php:340
 msgid "Can't turn on notification."
 msgstr "Impossibile attivare le notifiche."
 
-#: classes/Command.php:344
+#: classes/Command.php:344 classes/Command.php:349
 msgid "Commands:\n"
 msgstr "Comandi:\n"
 
@@ -2887,11 +3177,11 @@ msgstr "Impossibile inserire messaggio."
 msgid "Could not update message with new URI."
 msgstr "Impossibile aggiornare il messaggio con il nuovo URI."
 
-#: lib/gallery.php:46
+#: lib/gallery.php:46 lib/gallery.php:55
 msgid "User without matching profile in system."
 msgstr "Utente senza profilo corrispondente nel sistema."
 
-#: lib/mail.php:147
+#: lib/mail.php:147 lib/mail.php:141
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -2900,12 +3190,12 @@ msgstr ""
 "Hai un nuovo indirizzo di ricezione su %1$s.\n"
 "\n"
 
-#: lib/mail.php:249
+#: lib/mail.php:249 lib/mail.php:275
 #, php-format
 msgid "New private message from %s"
 msgstr "Nuovo messaggio privato da %s"
 
-#: lib/mail.php:253
+#: lib/mail.php:253 lib/mail.php:279
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -2951,18 +3241,476 @@ msgstr "Inviati"
 msgid "Your sent messages"
 msgstr "I tuoi messaggi inviati"
 
-#: lib/settingsaction.php:99
+#: lib/settingsaction.php:99 actions/deleteprofile.php:256
 msgid "Twitter"
 msgstr "Twitter"
 
-#: lib/settingsaction.php:100
+#: lib/settingsaction.php:100 actions/deleteprofile.php:257
 msgid "Twitter integration options"
 msgstr "Opzioni di integrazione Twitter"
 
-#: lib/util.php:1718
+#: lib/util.php:1718 lib/util.php:2145
 msgid "To"
 msgstr "A"
 
 #: scripts/maildaemon.php:45
 msgid "Could not parse message."
 msgstr "Impossibile analizzare il messaggio."
+
+#: actions/block.php:45 actions/subedit.php:45 actions/unblock.php:45
+#, fuzzy
+msgid "No profile specified."
+msgstr "Nessun destinatario specificato."
+
+#: actions/block.php:52 actions/subedit.php:52 actions/tagother.php:45
+#: actions/unblock.php:52
+#, fuzzy
+msgid "No profile with that ID."
+msgstr "Nessuno stato trovato con quel ID."
+
+#: actions/block.php:78
+#, fuzzy
+msgid "Block user"
+msgstr "Nessun tale utente"
+
+#: actions/block.php:81
+#, fuzzy
+msgid "Are you sure you want to block this user? "
+msgstr "Sei sicuro di voler eliminare questo messaggio?"
+
+#: actions/block.php:117
+#, fuzzy
+msgid "You have already blocked this user."
+msgstr "Sei già abbonato a questi utenti:"
+
+#: actions/block.php:124
+msgid "Failed to save block information."
+msgstr ""
+
+#: actions/deleteprofile.php:25
+#, fuzzy
+msgid "Code not yet ready."
+msgstr "Comando non ancora implementato."
+
+#: actions/deleteprofile.php:36
+msgid "Export and delete your user information."
+msgstr ""
+
+#: actions/deleteprofile.php:88 actions/deleteprofile.php:119
+#, fuzzy
+msgid "Delete my account"
+msgstr "Crea un nuovo account"
+
+#: actions/deleteprofile.php:89
+#, fuzzy
+msgid "Delete my account confirmation"
+msgstr "Impossibile eliminare l'email di conferma."
+
+#: actions/deleteprofile.php:117
+#, fuzzy
+msgid "Check if you are sure you want to delete your account."
+msgstr "Sei sicuro di voler eliminare questo messaggio?"
+
+#: actions/deleteprofile.php:259 lib/settingsaction.php:102
+msgid "Other"
+msgstr ""
+
+#: actions/deleteprofile.php:260 lib/settingsaction.php:103
+msgid "Other options"
+msgstr ""
+
+#: actions/disfavor.php:72
+#, fuzzy
+msgid "Add to favorites"
+msgstr "Feed dei preferiti di %s"
+
+#: actions/emailsettings.php:98
+msgid "Allow friends to nudge me and send me an email."
+msgstr ""
+
+#: actions/facebookremove.php:54
+#, fuzzy
+msgid "Couldn't remove Facebook user."
+msgstr "Impossibile rimuovere l'utente Twitter."
+
+#: actions/favor.php:71
+#, fuzzy
+msgid "Disfavor favorite"
+msgstr "Non preferito"
+
+#: actions/favorited.php:31 lib/stream.php:45
+#, fuzzy
+msgid "Popular notices"
+msgstr "Nessun tale messaggio."
+
+#: actions/favorited.php:54
+#, fuzzy
+msgid "Showing recently popular notices"
+msgstr "Ricerca contenuto dei messaggi"
+
+#: actions/featured.php:32 actions/featured.php:54 lib/stream.php:41
+msgid "Featured users"
+msgstr ""
+
+#: actions/finishremotesubscribe.php:186
+msgid "That user has blocked you from subscribing."
+msgstr ""
+
+#: actions/microsummary.php:39
+msgid "No current status"
+msgstr ""
+
+#: actions/newnotice.php:93
+#, fuzzy
+msgid "Notice posted"
+msgstr "Messaggi"
+
+#: actions/newnotice.php:116 classes/Channel.php:140
+msgid "Ajax Error"
+msgstr ""
+
+#: actions/nudge.php:52
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
+
+#: actions/nudge.php:61
+msgid "Nudge sent"
+msgstr ""
+
+#: actions/othersettings.php:27
+msgid "Manage various other options."
+msgstr ""
+
+#: actions/othersettings.php:33
+#, fuzzy
+msgid "Other Settings"
+msgstr "Impostazioni Twitter"
+
+#: actions/othersettings.php:35
+msgid "URL Auto-shortening"
+msgstr ""
+
+#: actions/othersettings.php:54
+#, fuzzy
+msgid "Service"
+msgstr "Ricerca"
+
+#: actions/othersettings.php:54
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/othersettings.php:155
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "La lingua è troppo lunga (max 50 caratteri)"
+
+#: actions/peopletag.php:33
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "Non è un indirizzo email valido"
+
+#: actions/peopletag.php:45
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr ""
+
+#: actions/peopletag.php:87
+#, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+msgstr ""
+
+#: actions/profilesettings.php:92
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+
+#: actions/profilesettings.php:246 actions/tagother.php:131
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Pagina web \"%s\" non valida"
+
+#: actions/profilesettings.php:328
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "Impossibile salvare il profilo."
+
+#: actions/public.php:68
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
+msgstr ""
+
+#: actions/public.php:90
+#, fuzzy
+msgid "Could not retrieve public stream."
+msgstr "Impossibile recuperare i messaggi favoriti."
+
+#: actions/register.php:67 actions/register.php:177
+msgid "Sorry, only invited people can register."
+msgstr ""
+
+#: actions/register.php:156
+msgid "With this form you can create a new account. "
+msgstr ""
+
+#: actions/remotesubscribe.php:136 actions/remotesubscribe.php:141
+msgid "That's a local profile! Login to subscribe."
+msgstr ""
+
+#: actions/subedit.php:68
+#, fuzzy
+msgid "You are not subscribed to that profile."
+msgstr "Non hai inviato quel profilo"
+
+#: actions/subedit.php:81
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "Impossibile creare l'abbonamento."
+
+#: actions/subscribe.php:53
+#, fuzzy
+msgid "Not a local user."
+msgstr "Nessun tale utente."
+
+#: actions/subscribe.php:67
+#, fuzzy
+msgid "Subscribed"
+msgstr "Abbonati"
+
+#: actions/subscriptions.php:72
+#, fuzzy
+msgid "Jabber"
+msgstr "Nessun ID di Jabber."
+
+#: actions/tagother.php:31
+#, fuzzy
+msgid "Not logged in"
+msgstr "Non connesso."
+
+#: actions/tagother.php:40
+#, fuzzy
+msgid "No id argument."
+msgstr "Nessun tale documento."
+
+#: actions/tagother.php:56
+msgid "Tag a person"
+msgstr ""
+
+#: actions/tagother.php:98
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
+msgstr ""
+
+#: actions/tagother.php:120
+#, fuzzy
+msgid "No such profile."
+msgstr "Nessun tale messaggio."
+
+#: actions/tagother.php:146
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+
+#: actions/tagother.php:153
+#, fuzzy
+msgid "Could not save tags."
+msgstr "Impossibile salvare le informazioni dell'immagine"
+
+#: actions/tagother.php:188
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
+
+#: actions/tagrss.php:33
+#, fuzzy
+msgid "No such tag."
+msgstr "Nessun tale messaggio."
+
+#: actions/tagrss.php:62
+#, fuzzy, php-format
+msgid "Microblog tagged with %s"
+msgstr "Messaggi etichettati con %s"
+
+#: actions/twitapiblocks.php:45
+msgid "Block user failed."
+msgstr ""
+
+#: actions/twitapiblocks.php:66
+msgid "Unblock user failed."
+msgstr ""
+
+#: actions/twitapiusers.php:45
+#, fuzzy
+msgid "Not found."
+msgstr "Non trovato"
+
+#: actions/twittersettings.php:63
+#, fuzzy
+msgid "Twitter user name"
+msgstr "Nome utente di Twitter"
+
+#: actions/twittersettings.php:67
+#, fuzzy
+msgid "Twitter password"
+msgstr "Password di Twitter"
+
+#: actions/twittersettings.php:129
+#, fuzzy
+msgid "Twitter Friends"
+msgstr "Impostazioni Twitter"
+
+#: actions/unblock.php:73
+#, fuzzy
+msgid "Error removing the block."
+msgstr "Errore nel salvare l'utente."
+
+#: actions/unsubscribe.php:48
+#, fuzzy
+msgid "No profile id in request."
+msgstr "Nessun URL di profilo restituito dal server."
+
+#: actions/unsubscribe.php:55
+#, fuzzy
+msgid "No profile with that id."
+msgstr "Nessuno stato trovato con quel ID."
+
+#: actions/unsubscribe.php:69
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Annulla abbonamento"
+
+#: classes/Notice.php:100
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "Problema nel salvare il messaggio."
+
+#: classes/Notice.php:105
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+
+#: classes/Notice.php:112
+#, fuzzy
+msgid "You are banned from posting notices on this site."
+msgstr ""
+"Hai un nuovo indirizzo di ricezione su %1$s.\n"
+"\n"
+
+#: lib/gallery.php:98
+#, fuzzy
+msgid "Filter tags"
+msgstr "Feed per l'etichetta %s"
+
+#: lib/gallery.php:104
+msgid "All"
+msgstr ""
+
+#: lib/gallery.php:108
+#, fuzzy
+msgid "Tag"
+msgstr "Etichette"
+
+#: lib/gallery.php:109
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/gallery.php:110
+msgid "Go"
+msgstr ""
+
+#: lib/gallery.php:264
+#, fuzzy
+msgid "Subscriptions navigation"
+msgstr "Abbonamenti"
+
+#: lib/gallery.php:270 lib/gallery.php:292
+msgid "List"
+msgstr ""
+
+#: lib/gallery.php:280 lib/gallery.php:294
+msgid "Icons"
+msgstr ""
+
+#: lib/mail.php:92
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:242
+#, fuzzy, php-format
+msgid "You've been nudged by %s"
+msgstr "Sei ora identificato. Inserisci un"
+
+#: lib/mail.php:246
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+msgstr ""
+
+#: lib/profilelist.php:146
+msgid "(none)"
+msgstr ""
+
+#: lib/stream.php:33
+msgid "Public"
+msgstr "Pubblico"
+
+#: lib/stream.php:36 lib/stream.php:37
+#, fuzzy
+msgid "Recent tags"
+msgstr "Etichette recenti"
+
+#: lib/stream.php:40
+msgid "Featured"
+msgstr ""
+
+#: lib/stream.php:44
+#, fuzzy
+msgid "Popular"
+msgstr "Persone"
+
+#: lib/subs.php:51
+#, fuzzy
+msgid "User has blocked you."
+msgstr "L'utente non ha un profilo."
+
+#: lib/util.php:2059
+#, fuzzy
+msgid "Send a nudge"
+msgstr "Invia un messaggio"
+
+#: lib/util.php:2063
+msgid "Nudge sent!"
+msgstr ""
+
+#: lib/util.php:2194
+msgid "Block"
+msgstr ""
+
+#: lib/util.php:2198
+msgid "Unblock"
+msgstr ""
+
+#~ msgid "Couldn't confirm email."
+#~ msgstr "Impossibile confermare l'email."
+
+#~ msgid "Email address"
+#~ msgstr "Indirizzo email"
+
+#~ msgid "Error inserting notice"
+#~ msgstr "Errore nell'inserire un messaggio"
+
+#~ 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 ""
+#~ "Se hai dimenticato o perso la tua password, puoi riceverne una nuova "
+#~ "all'indirizzo email memorizzato nel tuo account."
diff --git a/ja_JP/LC_MESSAGES/laconica.po b/ja_JP/LC_MESSAGES/laconica.po
index 835b9941c9..098c50a9cc 100644
--- a/ja_JP/LC_MESSAGES/laconica.po
+++ b/ja_JP/LC_MESSAGES/laconica.po
@@ -13,44 +13,86 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-14 21:07+1200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Toshiya TSURU <turutosiya@gmail.com>\n"
-"Language-Team: Japanese <turutosiya+laconica@gmail.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 7bit\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"POT-Creation-Date: 2009-01-12 12:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/noticesearchrss.php:64
+#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:61
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr "\"%s\" のストリームを検索"
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: actions/finishopenidlogin.php:88 actions/register.php:205
+#: actions/register.php:232
 msgid ""
-" except this private data: password, email address, IM address, phone "
-"number."
+" except this private data: password, email address, IM address, phone number."
 msgstr "個人情報を除く:パスワード、メールアドレス、IMアドレス、電話番号"
 
-#: ../actions/subscribe.php:84
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+#: lib/facebookaction.php:195 lib/noticelist.php:160
+msgid " from "
+msgstr ""
+
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: actions/twitapistatuses.php:341
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr ""
+
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
+
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:115
+#: lib/mail.php:117
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s は %2$s であなたの通知を聞いています。"
 
-#: ../actions/subscribe.php:86
+#: ../lib/mail.php:126
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -59,439 +101,804 @@ msgid ""
 "\n"
 "Faithfully yours,\n"
 "%4$s.\n"
-msgstr "%1$s は %2$s であなたの通知を聞いています。\n\n\t%3$s\n\n確かにあなたの,\n%4$s.\n"
+msgstr ""
+"%1$s は %2$s であなたの通知を聞いています。\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"確かにあなたの,\n"
+"%4$s.\n"
+
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#: actions/twitapistatuses.php:344
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
 
-#: ../actions/shownotice.php:45
+#: ../actions/shownotice.php:45 actions/shownotice.php:45
+#: actions/shownotice.php:73
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1$ のステータス %2$s"
 
-#: ../actions/publicrss.php:60
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../actions/publicrss.php:62 actions/publicrss.php:48
 #, php-format
 msgid "%s Public Stream"
 msgstr "%s パブリックストリーム"
 
-#: ../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/twitapistatuses.php:123
 #, php-format
 msgid "%s and friends"
 msgstr "%s & ともだち"
 
-#: ../lib/util.php:233
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:31
+#, php-format
+msgid "%s public timeline"
+msgstr ""
+
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:217
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:195
+#, php-format
+msgid "%s timeline"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:34
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+
+#: ../lib/util.php:257 lib/util.php:273 lib/util.php:284
 #, 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%%** は [%%site.broughtby%%](%%site.broughtbyurl%%) "
-"が提供するマイクロブロギングサービスです。 "
+"**%%site.name%%** は [%%site.broughtby%%](%%site.broughtbyurl%%) が提供するマ"
+"イクロブロギングサービスです。 "
 
-#: ../lib/util.php:235
+#: ../lib/util.php:259 lib/util.php:275 lib/util.php:286
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** はマイクロブロギングサービスです。"
 
-#: ../lib/util.php:250
+#: ../lib/util.php:274 lib/util.php:290 lib/util.php:301
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr "コントリビューターはニックネームかフルネームで記載されています。"
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: ../actions/register.php:176
+#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
+#: actions/profilesettings.php:78
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1～64字以内で、小文字アルファベット、数字、スペース。（句読点を除く）"
 
-#: ../actions/password.php:42 ../actions/register.php:178
+#: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:193
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/profilesettings.php:186
 msgid "6 or more characters"
 msgstr "6文字以上"
 
-#: ../actions/recoverpassword.php:165
+#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
 msgid "6 or more characters, and don't forget it!"
 msgstr "6文字以上。お忘れなく！"
 
-#: ../actions/imsettings.php:188
+#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:195
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve "
-"%s for sending messages to you."
-msgstr "確認用コードを入力されたIMアドレスに送信しました。メッセージを確認するには、%sを承認して下さい。"
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
+msgstr ""
+"確認用コードを入力されたIMアドレスに送信しました。メッセージを確認するには、%"
+"sを承認して下さい。"
+
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:234
+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 ""
+
+#: ../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/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:30
+#: actions/twitapidirect_messages.php:107 actions/twitapifavorites.php:83
+#: actions/twitapifavorites.php:99 actions/twitapifriendships.php:117
+#: actions/twitapihelp.php:42 actions/twitapistatuses.php:77
+#: actions/twitapistatuses.php:144 actions/twitapistatuses.php:224
+#: actions/twitapistatuses.php:234 actions/twitapistatuses.php:386
+#: actions/twitapistatuses.php:395 actions/twitapistatuses.php:421
+#: actions/twitapiusers.php:30
+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:39
+#: actions/twitapiaccount.php:89 actions/twitapiaccount.php:94
+#: actions/twitapidirect_messages.php:178 actions/twitapifavorites.php:139
+#: actions/twitapihelp.php:49 actions/twitapistatuses.php:549
+msgid "API method under construction."
+msgstr ""
 
-#: ../lib/util.php:296
+#: ../lib/util.php:324 lib/util.php:340 lib/util.php:352
 msgid "About"
 msgstr "About"
 
-#: ../actions/userauthorization.php:118
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
 msgid "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/twittersettings.php:84
 msgid "Add"
 msgstr "追加"
 
-#: ../actions/openidsettings.php:43
+#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
 msgid "Add OpenID"
 msgstr "OpenIDを追加"
 
-#: ../actions/imsettings.php:39
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: actions/deleteprofile.php:248
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
 msgid "Address"
 msgstr "住所"
 
-#: ../actions/showstream.php:254
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
+
+#: ../actions/showstream.php:273 actions/showstream.php:288
+#: actions/showstream.php:336
 msgid "All subscriptions"
 msgstr "全てのサブスクリプション"
 
-#: ../actions/publicrss.php:62
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
 #, php-format
 msgid "All updates for %s"
 msgstr "%sの全てのサブスクリプション"
 
-#: ../actions/noticesearchrss.php:66
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:63
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "\"%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
 msgid "Already logged in."
 msgstr "既にログインしています。"
 
-#: ../actions/subscribe.php:48
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:47
 msgid "Already subscribed!."
 msgstr "既に購読しています。"
 
-#: ../actions/userauthorization.php:76
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+msgid "Are you sure you want to delete this notice?"
+msgstr ""
+
+#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
 msgid "Authorize subscription"
 msgstr "購読を許可"
 
-#: ../actions/login.php:100 ../actions/register.php:184
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192 actions/register.php:219
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "将来的には非共用PCでの自動ログイン"
 
-#: ../actions/avatar.php:32
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:103
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
+
+#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: actions/profilesettings.php:34
 msgid "Avatar"
 msgstr "アバター"
 
-#: ../actions/avatar.php:113
+#: ../actions/avatar.php:113 actions/profilesettings.php:350
+#: actions/profilesettings.php:379
 msgid "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 "このアドレスは確認待ちです。Jabber/Gtalk でメッセージを確認して下さい。（%s を追加していますか？）"
+msgstr ""
+"このアドレスは確認待ちです。Jabber/Gtalk でメッセージを確認して下さい。（%s "
+"を追加していますか？）"
+
+#: ../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 ""
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+msgid "Awaiting confirmation on this phone number."
+msgstr ""
 
-#: ../lib/util.php:1136
-msgid "Before »"
+#: ../lib/util.php:1318 lib/util.php:1452 lib/facebookaction.php:259
+#: lib/util.php:1792
+#, fuzzy
+msgid "Before »"
 msgstr "前 >>"
 
-#: ../actions/profilesettings.php:52
+#: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: actions/profilesettings.php:82 actions/register.php:184
+#: actions/profilesettings.php:84 actions/register.php:211
 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:222 actions/register.php:98
 msgid "Bio is too long (max 140 chars)."
 msgstr "バイオグラフィが長すぎます。（最長140字）"
 
-#: ../actions/updateprofile.php:118
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+msgid "Can't delete this notice."
+msgstr ""
+
+#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "アバター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/profilesettings.php:433
 msgid "Can't save new password."
 msgstr "新しいパスワードを保存できません。"
 
-#: ../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
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: ../lib/openid.php:121
+#: ../lib/openid.php:121 lib/openid.php:121
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "OpenID consumer object を生成できません。"
 
-#: ../actions/imsettings.php:154
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
 msgid "Cannot normalize that Jabber ID"
 msgstr "その Jabbar ID を正規化できません"
 
-#: ../actions/password.php:45
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:204
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/profilesettings.php:189
 msgid "Change"
 msgstr "変更"
 
-#: ../actions/password.php:32
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: actions/deleteprofile.php:245
+msgid "Change email handling"
+msgstr ""
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
 msgid "Change password"
 msgstr "パスワードの変更"
 
-#: ../actions/password.php:43 ../actions/recoverpassword.php:166
-#: ../actions/register.php:179
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr ""
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#: actions/deleteprofile.php:242
+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/profilesettings.php:187 actions/register.php:196
 msgid "Confirm"
 msgstr "確認"
 
-#: ../actions/confirmaddress.php:84
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
 msgid "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:259
 msgid "Confirmation cancelled."
 msgstr "確認作業がキャンセルされました。"
 
-#: ../actions/confirmaddress.php:38
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+msgid "Confirmation code"
+msgstr ""
+
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
 msgid "Confirmation code not found."
 msgstr "確認コードが見つかりません。"
 
-#: ../actions/finishopenidlogin.php:91
+#: ../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:97
 msgid "Connect"
 msgstr "接続"
 
-#: ../actions/finishopenidlogin.php:86
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
 msgid "Connect existing account"
 msgstr "既存のアカウントと接続"
 
-#: ../lib/util.php:304
+#: ../lib/util.php:332 lib/util.php:348 lib/util.php:360
 msgid "Contact"
 msgstr "コンタクト"
 
-#: ../lib/openid.php:178
+#: ../lib/openid.php:178 lib/openid.php:178
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "OpenIDを作成できません : %s"
 
-#: ../lib/openid.php:160
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:46 actions/twitapifriendships.php:62
+#, 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:39
+msgid "Could not follow user: User not found."
+msgstr ""
+
+#: ../lib/openid.php:160 lib/openid.php:160
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "サーバへリダイレクトできません : %s"
 
-#: ../actions/updateprofile.php:161
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
 msgid "Could not save avatar info"
 msgstr "アバターを保存できません"
 
-#: ../actions/updateprofile.php:154
+#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
 msgid "Could not save new profile info"
 msgstr "新しいプロファイルを保存できません"
 
-#: ../actions/profilesettings.php:146
-msgid "Couldn't confirm email."
-msgstr "メールを確認できません"
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:70
+msgid "Could not subscribe other to you."
+msgstr ""
+
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:55
+msgid "Could not subscribe."
+msgstr ""
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr ""
 
 #: ../actions/finishremotesubscribe.php:99
+#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:112
 msgid "Couldn't convert request tokens to access tokens."
 msgstr "リクエストトークンをアクセストークンに変換できません"
 
-#: ../actions/subscribe.php:59
-msgid "Couldn't create subscription."
-msgstr "サブスクリプションを作成できません"
-
-#: ../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/emailsettings.php:255
 msgid "Couldn't delete email confirmation."
 msgstr "メール承認を削除できません"
 
-#: ../actions/unsubscribe.php:56
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:129
 msgid "Couldn't delete subscription."
 msgstr "サブスクリプションを削除できません"
 
-#: ../actions/remotesubscribe.php:125
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+#: actions/twitapistatuses.php:82
+msgid "Couldn't find any statuses."
+msgstr ""
+
+#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
+#: actions/remotesubscribe.php:148
 msgid "Couldn't get a request token."
 msgstr "リクエストトークンを取得できません"
 
-#: ../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:228
 msgid "Couldn't insert confirmation code."
 msgstr "確認コードを追加できません"
 
 #: ../actions/finishremotesubscribe.php:180
+#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:216
 msgid "Couldn't insert new subscription."
 msgstr "サブスクリプションを追加できません"
 
-#: ../actions/profilesettings.php:175
+#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
+#: actions/profilesettings.php:319 actions/twitapiaccount.php:74
 msgid "Couldn't save profile."
 msgstr "プロファイルを保存できません"
 
-#: ../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:296
+msgid "Couldn't update user for autosubscribe."
+msgstr ""
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+#: actions/emailsettings.php:301 actions/emailsettings.php:315
+msgid "Couldn't update user record."
+msgstr ""
+
+#: ../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/emailsettings.php:179 actions/emailsettings.php:280
+#: actions/othersettings.php:173 actions/profilesettings.php:276
 msgid "Couldn't update user."
 msgstr "ユーザを更新できません"
 
-#: ../actions/finishopenidlogin.php:84
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
 msgid "Create"
 msgstr "作成"
 
-#: ../actions/finishopenidlogin.php:70
+#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
 msgid "Create a new user with this nickname."
 msgstr "このニックネームで新しくユーザを作成"
 
-#: ../actions/finishopenidlogin.php:68
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
 msgid "Create new account"
 msgstr "アカウントを作成"
 
-#: ../actions/finishopenidlogin.php:191
+#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+#: actions/finishopenidlogin.php:208
 msgid "Creating new account for OpenID that already has a user."
 msgstr "既にユーザの存在するOpenIDでアカウントを作成しています"
 
-#: ../actions/imsettings.php:45
+#: ../actions/imsettings.php:45 actions/imsettings.php:46
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "確認された最新の　Jabber/GTakk アドレス"
 
-#: ../actions/showstream.php:337
-msgid "Currently"
-msgstr "最新"
-
-#: ../lib/util.php:893
-#, php-format
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+msgid "Current confirmed email address."
+msgstr ""
+
+#: ../actions/showstream.php:356 actions/showstream.php:367
+#: actions/showstream.php:418
+msgid "Currently"
+msgstr "最新"
+
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:87
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: ../lib/util.php:1061 lib/util.php:1110 lib/util.php:1417
+#, php-format
 msgid "DB error inserting reply: %s"
 msgstr "返信を追加する際にデータベースエラー : %s"
 
-#: ../actions/profilesettings.php:54
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+msgid "Delete notice"
+msgstr ""
+
+#: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: actions/profilesettings.php:84 actions/register.php:186
+#: actions/profilesettings.php:86 actions/register.php:213
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "140字以内で自己紹介"
 
-#: ../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/deleteprofile.php:244 actions/register.php:199
+#: actions/register.php:202
 msgid "Email"
 msgstr "メール"
 
-#: ../actions/profilesettings.php:46
-msgid "Email address"
-msgstr "メールアドレス"
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+msgid "Email Address"
+msgstr ""
+
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+msgid "Email Settings"
+msgstr ""
 
-#: ../actions/profilesettings.php:102 ../actions/register.php:63
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:89
 msgid "Email address already exists."
 msgstr "メールアドレスが既に存在します。"
 
-#: ../lib/mail.php:82
+#: ../lib/mail.php:90 lib/mail.php:90
 msgid "Email address confirmation"
 msgstr "メールアドレス確認"
 
-#: ../actions/recoverpassword.php:176
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
+
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr ""
+
+#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
 msgid "Enter a nickname or email address."
 msgstr "ニックネームかメールアドレスを入力してください。"
 
-#: ../actions/userauthorization.php:136
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+msgid "Enter the code you received on your phone."
+msgstr ""
+
+#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
 msgid "Error authorizing token"
 msgstr "認証トークンエラー"
 
-#: ../actions/finishopenidlogin.php:282
+#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
+#: actions/finishopenidlogin.php:274
 msgid "Error connecting user to OpenID."
 msgstr "ユーザとOpenIDとの接続エラー"
 
-#: ../actions/finishaddopenid.php:78
+#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
 msgid "Error connecting user."
 msgstr "ユーザ接続エラー"
 
 #: ../actions/finishremotesubscribe.php:151
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:164
 msgid "Error inserting avatar"
 msgstr "アバター追加エラー"
 
 #: ../actions/finishremotesubscribe.php:143
+#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:156
 msgid "Error inserting new profile"
 msgstr "プロファイル追加エラー"
 
-#: ../actions/postnotice.php:88
-msgid "Error inserting notice"
-msgstr "通知追加エラー"
-
 #: ../actions/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:180
 msgid "Error inserting remote profile"
 msgstr "リモートプロファイル追加エラー"
 
-#: ../actions/recoverpassword.php:201
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
 msgid "Error saving address confirmation."
 msgstr "アドレス確認保存エラー"
 
-#: ../actions/userauthorization.php:139
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
 msgid "Error saving remote profile"
 msgstr "リモートプロファイル保存エラー"
 
-#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
+#: ../lib/openid.php:226 lib/openid.php:226
 msgid "Error saving the profile."
 msgstr "プロファイル保存エラー"
 
-#: ../lib/openid.php:237
+#: ../lib/openid.php:237 lib/openid.php:237
 msgid "Error saving the user."
 msgstr "ユーザ保存エラー"
 
-#: ../actions/password.php:80
+#: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/profilesettings.php:428
 msgid "Error saving user; invalid."
 msgstr "ユーザ保存エラー; 不正なユーザ"
 
-#: ../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:54 actions/login.php:80
+#: actions/register.php:117
 msgid "Error setting user."
 msgstr "ユーザ設定エラー"
 
-#: ../actions/finishaddopenid.php:83
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
 msgid "Error updating profile"
 msgstr "プロファイル更新エラー"
 
 #: ../actions/finishremotesubscribe.php:161
+#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:174
 msgid "Error updating remote profile"
 msgstr "リモートプロファイル更新エラー"
 
-#: ../actions/recoverpassword.php:79
+#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
 msgid "Error with confirmation code."
 msgstr "確認コードにエラーがあります。"
 
-#: ../actions/finishopenidlogin.php:89
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
 msgid "Existing nickname"
 msgstr "既に存在するニックネーム"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:326 lib/util.php:342 lib/util.php:354
 msgid "FAQ"
 msgstr "よくある質問"
 
-#: ../actions/avatar.php:115
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/profilesettings.php:381
 msgid "Failed updating avatar."
 msgstr "アバターの更新に失敗しました。"
 
-#: ../actions/all.php:61 ../actions/allrss.php:74
+#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
+#: actions/allrss.php:64
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "%s のともだちのフィード"
 
-#: ../actions/replies.php:61 ../actions/repliesrss.php:80
+#: ../actions/replies.php:65 ../actions/repliesrss.php:80
+#: actions/replies.php:65 actions/repliesrss.php:66
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "%s の返信のフィード"
 
-#: ../actions/login.php:118
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:54
+#, php-format
+msgid "Feed for tag %s"
+msgstr ""
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+msgid "Find content of notices"
+msgstr ""
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+msgid "Find people on this site"
+msgstr ""
+
+#: ../actions/login.php:122
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
-msgstr "セキュリティー上の理由により、設定を変更する前にユーザ名とパスワードを入力して下さい。"
+msgstr ""
+"セキュリティー上の理由により、設定を変更する前にユーザ名とパスワードを入力し"
+"て下さい。"
 
-#: ../actions/profilesettings.php:44
+#: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: actions/profilesettings.php:77 actions/register.php:178
+#: actions/profilesettings.php:79 actions/register.php:205
 msgid "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/profilesettings.php:219 actions/register.php:95
 msgid "Full name is too long (max 255 chars)."
 msgstr "フルネームが長すぎます。（255字まで）"
 
-#: ../lib/util.php:279
+#: ../lib/util.php:322 lib/util.php:338 lib/util.php:343 lib/util.php:350
 msgid "Help"
 msgstr "ヘルプ"
 
-#: ../lib/util.php:274
+#: ../lib/util.php:298 lib/util.php:314 lib/util.php:325
 msgid "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:81 actions/register.php:208
 msgid "Homepage"
 msgstr "ホームページ"
 
-#: ../actions/profilesettings.php:87
+#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: actions/profilesettings.php:210 actions/register.php:83
+#: actions/profilesettings.php:216 actions/register.php:92
 msgid "Homepage is not a valid URL."
 msgstr "ホームページのURLが不適切です。"
 
-#: ../actions/imsettings.php:61
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+#: actions/emailsettings.php:101
+msgid "I want to post notices by email."
+msgstr ""
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+#: actions/deleteprofile.php:253
+msgid "IM"
+msgstr ""
+
+#: ../actions/imsettings.php:60 actions/imsettings.php:61
 msgid "IM Address"
 msgstr "IMアドレス"
 
-#: ../actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
 msgid "IM Settings"
 msgstr "IM設定"
 
-#: ../actions/finishopenidlogin.php:88
+#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
-msgstr "既にアカウントをお持ちの場合は、ユーザ名とパスワードでログインし、OpenIDと関連付けて下さい。"
+msgstr ""
+"既にアカウントをお持ちの場合は、ユーザ名とパスワードでログインし、OpenIDと関"
+"連付けて下さい。"
 
 #: ../actions/openidsettings.php:45
 msgid ""
@@ -499,518 +906,825 @@ msgid ""
 "click \"Add\"."
 msgstr "OpenIDを追加する場合、下のボックスにある\"Add\"をつリックして下さい。"
 
-#: ../actions/recoverpassword.php:122
+#: ../actions/recoverpassword.php:137
 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 "パスワードを忘れた場合、登録されたアドレスで新しいものを受け取ることができます。"
+msgstr ""
+
+#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
+#: actions/emailsettings.php:68 actions/smssettings.php:76
+msgid "Incoming email"
+msgstr ""
+
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+#: actions/emailsettings.php:304
+msgid "Incoming email address removed."
+msgstr ""
 
-#: ../actions/password.php:69
+#: ../actions/password.php:69 actions/profilesettings.php:388
+#: actions/profilesettings.php:417
 msgid "Incorrect old password"
 msgstr "古いパスワードが間違っています。"
 
-#: ../actions/login.php:63
+#: ../actions/login.php:67 actions/login.php:67 actions/login.php:74
 msgid "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."
 msgstr "登録されたメールアドレスにパスワードの回復方法をおおくりしました。"
 
-#: ../actions/updateprofile.php:113
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "不正なアバターURL '%s'"
 
-#: ../actions/updateprofile.php:97
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "不正なホームページ '%s'"
 
-#: ../actions/updateprofile.php:81
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "不正なライセンスURL '%s'"
 
-#: ../actions/postnotice.php:61
+#: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:63
 msgid "Invalid notice content"
 msgstr "不正な通知内容"
 
-#: ../actions/postnotice.php:67
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:69
 msgid "Invalid notice uri"
 msgstr "不正な通知uri"
 
-#: ../actions/postnotice.php:72
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:74
 msgid "Invalid notice url"
 msgstr "不正な通知url"
 
-#: ../actions/updateprofile.php:86
+#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "不正なプロファイルURL '%s'。"
 
-#: ../actions/remotesubscribe.php:96
+#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
 msgid "Invalid profile URL (bad format)"
 msgstr "不正なプロファイルURL。（形式不備）"
 
 #: ../actions/finishremotesubscribe.php:77
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:78
 msgid "Invalid profile URL returned by server."
 msgstr "不正なプロファイルURLがサーバから返されました。"
 
-#: ../actions/avatarbynickname.php:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
 msgid "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:256 actions/register.php:112
+#: actions/register.php:130
 msgid "Invalid username or password."
 msgstr "不正なユーザ名またはパスワード。"
 
-#: ../lib/util.php:237
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr ""
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
+
+#: ../lib/util.php:306 lib/util.php:322 lib/util.php:332
+msgid "Invite"
+msgstr ""
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr ""
+
+#: ../lib/util.php:261 lib/util.php:277 lib/util.php:288
 #, 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 ""
-"マイクロブロギングソフト [Laconica](http://laconi.ca/) , "
-"バージョン %s で動いています。 ライセンス [GNU Affero "
-"General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)。"
+"マイクロブロギングソフト [Laconica](http://laconi.ca/) , バージョン %s で動い"
+"ています。 ライセンス [GNU Affero General Public License](http://www.fsf.org/"
+"licensing/licenses/agpl-3.0.html)。"
 
-#: ../actions/imsettings.php:164
+#: ../actions/imsettings.php:173 actions/imsettings.php:181
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID ｊは既に別のユーザが使用しています。"
 
-#: ../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 ""
-"\"UserName@example.org\" といった Jabber または GTalk "
-"のアドレス。まず、%s をIMクライアントやGTalkに追加して下さい。"
+"\"UserName@example.org\" といった Jabber または GTalk のアドレス。まず、%s を"
+"IMクライアントやGTalkに追加して下さい。"
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
+msgid "Language"
+msgstr ""
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+#: actions/profilesettings.php:234
+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:87 actions/register.php:214
 msgid "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/profilesettings.php:225 actions/register.php:101
 msgid "Location is too long (max 255 chars)."
 msgstr "場所が長すぎます。（255字まで）"
 
-#: ../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/login.php:104 actions/login.php:113 actions/openidlogin.php:88
+#: lib/util.php:336
 msgid "Login"
 msgstr "ログイン"
 
-#: ../actions/openidlogin.php:44
+#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:60
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "[OpenID](%%doc.openid%%) でログイン。"
 
-#: ../actions/login.php:122 ../actions/login.php:126
+#: ../actions/login.php:126
 #, 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 ""
 
-#: ../lib/util.php:284
+#: ../lib/util.php:308 lib/util.php:324 lib/util.php:334
 msgid "Logout"
 msgstr "ログアウト"
 
-#: ../actions/login.php:106
+#: ../actions/register.php:166 actions/register.php:180
+#: actions/register.php:207
+msgid "Longer name, preferably your \"real\" name"
+msgstr ""
+
+#: ../actions/login.php:110 actions/login.php:110 actions/login.php:118
 msgid "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 ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr ""
+
+#: ../actions/showstream.php:300 actions/showstream.php:315
+#: actions/showstream.php:363
 msgid "Member since"
 msgstr "からのメンバー"
 
-#: ../actions/userrss.php:70
+#: ../actions/userrss.php:70 actions/userrss.php:67
 #, php-format
 msgid "Microblog by %s"
 msgstr "マイクロブログ by %s"
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
+#: ../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 ""
+
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php:85 actions/register.php:202
+#: actions/register.php:229
 msgid "My text and files are available under "
 msgstr "の下でテキスト及びファイルを利用可能"
 
-#: ../actions/finishopenidlogin.php:71
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+msgid "New"
+msgstr ""
+
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:138
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+#: actions/emailsettings.php:318
+msgid "New incoming email address added."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
 msgid "New nickname"
 msgstr "新しいニックネーム"
 
-#: ../actions/newnotice.php:100
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:141
 msgid "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/profilesettings.php:185
 msgid "New password"
 msgstr "新しいパスワード"
 
-#: ../actions/recoverpassword.php:275
+#: ../actions/recoverpassword.php:314
 msgid "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:108 actions/profilesettings.php:76
+#: actions/register.php:192
 msgid "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/finishopenidlogin.php:192 actions/profilesettings.php:231
+#: actions/register.php:85
 msgid "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:182 actions/profilesettings.php:209
+#: actions/register.php:83
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "ニックネームには、小文字アルファベットと数字のみ使用できます。スペースは使用できません。"
+msgstr ""
+"ニックネームには、小文字アルファベットと数字のみ使用できます。スペースは使用"
+"できません。"
 
-#: ../actions/finishopenidlogin.php:170
+#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:187
 msgid "Nickname not allowed."
 msgstr "そのニックネームは使用できません。"
 
-#: ../actions/remotesubscribe.php:72
+#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
 msgid "Nickname of the user you want to follow"
 msgstr "フォローしたいユーザのニックネーム"
 
-#: ../actions/recoverpassword.php:147
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
 msgid "Nickname or email"
 msgstr "ニックネームまたはメールアドレス"
 
-#: ../actions/imsettings.php:147
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:104
+msgid "No"
+msgstr ""
+
+#: ../actions/imsettings.php:156 actions/imsettings.php:164
 msgid "No Jabber ID."
 msgstr "Jabbar ID はありません。"
 
-#: ../actions/userauthorization.php:128
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
 msgid "No authorization request!"
 msgstr "認証のリクエストがありません。"
 
-#: ../actions/confirmaddress.php:33
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+msgid "No carrier selected."
+msgstr ""
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+msgid "No code entered"
+msgstr ""
+
+#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
 msgid "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:52
+#: actions/newnotice.php:53
 msgid "No content!"
 msgstr "コンテンツがありません！"
 
-#: ../actions/userbyid.php:27
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+#: actions/emailsettings.php:197
+msgid "No email address."
+msgstr ""
+
+#: ../actions/userbyid.php:32 actions/userbyid.php:32
 msgid "No id."
 msgstr "id がありません。"
 
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+#: actions/emailsettings.php:292
+msgid "No incoming email address."
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:65
+#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:66
 msgid "No nickname provided by remote server."
 msgstr "リモートユーザのニックネームがありません。"
 
-#: ../actions/avatarbynickname.php:27
+#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 msgid "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:243
 msgid "No pending confirmation to cancel."
 msgstr "認証待ちのものはありません。"
 
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+msgid "No phone number."
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:72
+#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:73
 msgid "No profile URL returned by server."
 msgstr "サーバから提供されるプロファイルURLはありません。"
 
-#: ../actions/recoverpassword.php:189
+#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
 msgid "No registered email address for that user."
 msgstr "そのユーザにはメールアドレスの登録がありません。"
 
-#: ../actions/userauthorization.php:48
+#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
 msgid "No request found!"
 msgstr "リクエストがありません！"
 
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
+#: actions/noticesearch.php:69 actions/peoplesearch.php:69
+#: actions/noticesearch.php:68 actions/peoplesearch.php:59
 msgid "No results"
 msgstr "結果なし"
 
-#: ../actions/avatarbynickname.php:32
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
 msgid "No size."
 msgstr "サイズがありません。"
 
-#: ../actions/openidsettings.php:135
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:109
+#: actions/twitapistatuses.php:438
+msgid "No status found with that ID."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:411
+msgid "No status with that ID found."
+msgstr ""
+
+#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
 msgid "No such OpenID."
 msgstr "そのようなOpenIDはありません。"
 
-#: ../actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29
 msgid "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:38
+#: actions/shownotice.php:114
 msgid "No such notice."
 msgstr "そのような通知はありません。"
 
-#: ../actions/recoverpassword.php:56
+#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
 msgid "No such recovery code."
 msgstr "そのような回復コードはありません。"
 
-#: ../actions/postnotice.php:56
+#: ../actions/postnotice.php:56 actions/postnotice.php:57
 msgid "No such subscription"
 msgstr "そのようなサブスクリプションはありません。"
 
 #: ../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/showstream.php:157
+#: classes/Command.php:208 classes/Command.php:242 lib/gallery.php:85
+#: lib/subs.php:105
 msgid "No such user."
 msgstr "そのようなユーザはいません。"
 
-#: ../lib/gallery.php:76
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr ""
+
+#: ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
 msgstr "表示できるユーザはいません。"
 
-#: ../actions/recoverpassword.php:60
+#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
 msgid "Not a recovery code."
 msgstr "回復コードではありません。"
 
-#: ../actions/imsettings.php:158
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+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:423 lib/twitterapi.php:450
+#: lib/twitterapi.php:534
+msgid "Not a supported data format."
+msgstr ""
+
+#: ../actions/imsettings.php:167 actions/imsettings.php:175
 msgid "Not a valid Jabber ID"
 msgstr "有効な Jabber ID ではありません。"
 
-#: ../lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131
 msgid "Not a valid OpenID."
 msgstr "有効な OpenID ではありません。"
 
-#: ../actions/profilesettings.php:75 ../actions/register.php:53
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+#: actions/emailsettings.php:208
+msgid "Not a valid email address"
+msgstr ""
+
+#: ../actions/register.php:63 actions/register.php:70 actions/register.php:79
 msgid "Not a valid email address."
 msgstr "有効なメールアドレスではありません。"
 
-#: ../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/profilesettings.php:212 actions/register.php:87
 msgid "Not a valid nickname."
 msgstr "有効なニックネームではありません。"
 
-#: ../actions/remotesubscribe.php:118
+#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
 msgid "Not a valid profile URL (incorrect services)."
 msgstr "有効なプロファイルURLではありません。（間違ったサービス）"
 
-#: ../actions/remotesubscribe.php:111
+#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr "有効なプロファイルURLではありません。（XRDSの定義が無い）"
 
-#: ../actions/remotesubscribe.php:104
+#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
 msgid "Not a valid profile URL (no YADIS document)."
 msgstr "有効なプロファイルURLではありません。（XRDSドキュメントが無い）"
 
-#: ../actions/avatar.php:95
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: actions/profilesettings.php:361
 msgid "Not an image or corrupt file."
 msgstr "画像ではないかファイルが破損しています。"
 
 #: ../actions/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:52
 msgid "Not authorized."
 msgstr "認証されていません。"
 
 #: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38
 msgid "Not expecting this response!"
 msgstr "想定外のレスポンスです！"
 
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
-#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+#: actions/twitapistatuses.php:304
+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:31 actions/newnotice.php:30
+#: actions/nudge.php:30 actions/subedit.php:31 actions/unblock.php:31
 msgid "Not logged in."
 msgstr "ログインしていません。"
 
-#: ../actions/unsubscribe.php:43
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:117
 msgid "Not subscribed!."
 msgstr "購読していません！"
 
-#: ../actions/showstream.php:82
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+msgid "Notice Search"
+msgstr ""
+
+#: ../actions/showstream.php:82 actions/showstream.php:82
+#: actions/showstream.php:111 actions/showstream.php:118
+#: actions/showstream.php:123
 #, php-format
 msgid "Notice feed for %s"
 msgstr "%sの通知フィード"
 
-#: ../actions/shownotice.php:39
+#: ../actions/shownotice.php:39 actions/shownotice.php:39
+#: actions/shownotice.php:45
 msgid "Notice has no profile"
 msgstr "通知にはプロファイルはありません。"
 
-#: ../actions/showstream.php:297
+#: ../actions/showstream.php:316 actions/showstream.php:331
+#: actions/showstream.php:379
 msgid "Notices"
 msgstr "通知"
 
-#: ../actions/password.php:39
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
+#, php-format
+msgid "Notices tagged with %s"
+msgstr ""
+
+#: ../actions/password.php:39 actions/profilesettings.php:178
+#: actions/profilesettings.php:183
 msgid "Old password"
 msgstr "古いパスワード"
 
-#: ../lib/util.php:288
+#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
+#: lib/util.php:330 actions/deleteprofile.php:247 lib/util.php:340
 msgid "OpenID"
 msgstr "OpenID"
 
-#: ../actions/finishopenidlogin.php:61
+#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
 msgid "OpenID Account Setup"
 msgstr "OpenID アカウントセットアップ"
 
-#: ../lib/openid.php:180
+#: ../lib/openid.php:180 lib/openid.php:180
 msgid "OpenID Auto-Submit"
 msgstr "OpenID 自動提示"
 
 #: ../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/finishopenidlogin.php:150 actions/openidlogin.php:76
 msgid "OpenID Login"
 msgstr "OpenID ログイン"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
+#: actions/openidlogin.php:74 actions/openidsettings.php:50
+#: actions/openidlogin.php:82
 msgid "OpenID URL"
 msgstr "OpenID URL"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
+#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 msgid "OpenID authentication cancelled."
 msgstr "OpenID での認証がキャンセルされました。"
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
+#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "OpenID での認証に失敗しました : %s"
 
-#: ../lib/openid.php:133
+#: ../lib/openid.php:133 lib/openid.php:133
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "OpenID 障害 : %s"
 
-#: ../actions/openidsettings.php:144
+#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
 msgid "OpenID removed."
 msgstr "OpenID は消去されました。"
 
-#: ../actions/openidsettings.php:37
+#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
 msgid "OpenID settings"
 msgstr "OpenID 設定"
 
-#: ../actions/avatar.php:84
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: actions/profilesettings.php:350
 msgid "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/login.php:109 actions/register.php:194
 msgid "Password"
 msgstr "パスワード"
 
-#: ../actions/recoverpassword.php:249
+#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
 msgid "Password and confirmation do not match."
 msgstr "パスワードと確認が一致しません。"
 
-#: ../actions/recoverpassword.php:245
+#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
 msgid "Password must be 6 chars or more."
 msgstr "パスワードは6字以上でなければいけません。"
 
-#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
+#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 msgid "Password recovery requested"
 msgstr "パスワード回復のリクエストされました"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:274
+#: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: actions/profilesettings.php:408 actions/recoverpassword.php:326
+#: actions/profilesettings.php:437
 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/profilesettings.php:409 actions/register.php:107
 msgid "Passwords don't match."
 msgstr "パスワードが一致しません。"
 
-#: ../actions/peoplesearch.php:33
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+msgid "People"
+msgstr ""
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+msgid "People Search"
+msgstr ""
+
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
 msgid "People search"
 msgstr "ピープルサーチ"
 
-#: ../lib/stream.php:44
+#: ../lib/stream.php:50 lib/personal.php:50
 msgid "Personal"
 msgstr "パーソナル"
 
-#: ../actions/userauthorization.php:77
+#: ../actions/invite.php:133 actions/invite.php:141
+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 "ユーザの通知を購読するには詳細を確認して下さい。購読しない場合は、\"Cancel\" キャンセルをクリックして下さい。"
+msgstr ""
+"ユーザの通知を購読するには詳細を確認して下さい。購読しない場合は、\"Cancel\" "
+"キャンセルをクリックして下さい。"
 
-#: ../actions/imsettings.php:74
+#: ../actions/imsettings.php:73 actions/imsettings.php:74
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Jabber/GTalkのステータスが変更された時に通知を送る。"
 
-#: ../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
 msgid "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:185 actions/othersettings.php:179
 msgid "Preferences saved."
 msgstr "設定が保存されました。"
 
-#: ../lib/util.php:300
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
+msgid "Preferred language"
+msgstr ""
+
+#: ../lib/util.php:328 lib/util.php:344 lib/util.php:356
 msgid "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:139 classes/Notice.php:149
 msgid "Problem saving notice."
 msgstr "通知を保存する際に問題が発生しました。"
 
-#: ../lib/stream.php:54
+#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
+#: lib/settingsaction.php:84 actions/deleteprofile.php:241
 msgid "Profile"
 msgstr "プロファイル"
 
-#: ../actions/remotesubscribe.php:73
+#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
 msgid "Profile URL"
 msgstr "プロファイルURL"
 
-#: ../actions/profilesettings.php:34
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
 msgid "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
 msgid "Profile unknown"
 msgstr "プロファイルが不明"
 
-#: ../lib/util.php:276
-msgid "Public"
-msgstr "パブリック"
-
-#: ../actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:77
 msgid "Public Stream Feed"
 msgstr "パブリックフィード"
 
-#: ../actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 lib/stream.php:34
 msgid "Public timeline"
 msgstr "パブリックタイムライン"
 
-#: ../actions/recoverpassword.php:151
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:104
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
 msgid "Recover"
 msgstr "回復"
 
-#: ../actions/recoverpassword.php:141
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
 msgid "Recover password"
 msgstr "パスワードを回復"
 
-#: ../actions/recoverpassword.php:67
+#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
 msgid "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:181 actions/register.php:234 lib/util.php:338
 msgid "Register"
 msgstr "登録"
 
-#: ../actions/userauthorization.php:119
+#: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:173
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:241
+msgid "Registration successful"
+msgstr ""
+
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
 msgid "Reject"
 msgstr "拒否"
 
-#: ../actions/login.php:99 ../actions/register.php:183
+#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
+#: actions/register.php:190 actions/login.php:110 actions/openidlogin.php:85
+#: actions/register.php:217
 msgid "Remember me"
 msgstr "ログイン状態を保持"
 
-#: ../actions/updateprofile.php:69
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
 msgid "Remote profile with no matching profile"
 msgstr "リモートプロファイルと一致するものがありません"
 
-#: ../actions/remotesubscribe.php:65
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
 msgid "Remote subscribe"
 msgstr "リモートサブスクライブ"
 
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php:48 actions/emailsettings.php:76
+#: actions/imsettings.php:49 actions/openidsettings.php:108
+#: actions/smssettings.php:50 actions/smssettings.php:84
+#: actions/twittersettings.php:59 actions/twittersettings.php:61
 msgid "Remove"
 msgstr "削除"
 
-#: ../actions/openidsettings.php:68
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
 msgid "Remove OpenID"
 msgstr "OpenID を削除"
 
@@ -1018,42 +1732,77 @@ msgstr "OpenID を削除"
 msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
-msgstr "最後の OpenID を削除すると、ログインできなくなります！削除するまえに、別の OpenID を追加して下さい。"
+msgstr ""
+"最後の OpenID を削除すると、ログインできなくなります！削除するまえに、別の "
+"OpenID を追加して下さい。"
 
-#: ../lib/stream.php:49
+#: ../lib/stream.php:55 lib/personal.php:55
 msgid "Replies"
 msgstr "返信"
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:50
+#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
+#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #, php-format
 msgid "Replies to %s"
 msgstr "%s への返信"
 
-#: ../actions/recoverpassword.php:168
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
 msgid "Reset"
 msgstr "リセット"
 
-#: ../actions/recoverpassword.php:158
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
 msgid "Reset password"
 msgstr "パスワードをリセット"
 
-#: ../actions/recoverpassword.php:167 ../actions/register.php:180
-msgid "Same as password above"
-msgstr "上と同じパスワード"
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/deleteprofile.php:250 actions/subscriptions.php:73
+msgid "SMS"
+msgstr ""
 
-#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
-msgid "Save"
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+msgid "SMS Phone number"
+msgstr ""
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:230
+msgid "SMS confirmation"
+msgstr ""
+
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
+msgid "Same as password above"
+msgstr "上と同じパスワード"
+
+#: ../actions/register.php:156 actions/register.php:170
+#: actions/register.php:197
+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/twittersettings.php:83 actions/emailsettings.php:107
+#: actions/othersettings.php:56 actions/profilesettings.php:106
+#: actions/subscriptions.php:74 actions/tagother.php:100
+#: actions/twittersettings.php:82
+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/util.php:327
 msgid "Search"
 msgstr "検索"
 
-#: ../actions/noticesearch.php:80
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:84
 msgid "Search Stream Feed"
 msgstr "ストリームフィードを検索"
 
-#: ../actions/noticesearch.php:30
+#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
+#: actions/noticesearch.php:29
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -1065,148 +1814,259 @@ msgstr "%%site.name%% の通知を内容から検索。検索語はスペース
 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 "%%site.name%% の人を名前、場所、興味から検索。検索語はスペース区切る。3字以上"
+msgstr ""
+"%%site.name%% の人を名前、場所、興味から検索。検索語はスペース区切る。3字以上"
+
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+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 lib/util.php:1646 lib/util.php:2158
 msgid "Send"
 msgstr "送る"
 
-#: ../actions/imsettings.php:71
+#: ../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."
+msgstr ""
+
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+msgid "Send me notices of new subscriptions through email."
+msgstr ""
+
+#: ../actions/imsettings.php:70 actions/imsettings.php:71
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Jabber/GTalk で私に通知を送って下さい。"
 
-#: ../lib/util.php:282
+#: ../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 ""
+
+#: ../lib/util.php:304 lib/util.php:320 lib/util.php:330
 msgid "Settings"
 msgstr "設定"
 
-#: ../actions/profilesettings.php:183
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:336
 msgid "Settings saved."
 msgstr "設定が保存されました。"
 
-#: ../actions/finishaddopenid.php:66
+#: ../actions/tag.php:60 actions/tag.php:60 actions/tag.php:59
+msgid "Showing most popular tags from the last week"
+msgstr ""
+
+#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
 msgid "Someone else already has this OpenID."
 msgstr "既に他の人がこの OpenID を使用しています。"
 
 #: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
+#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
 msgid "Something weird happened."
 msgstr "不測の事態が発生しました。"
 
-#: ../lib/util.php:302
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr ""
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: ../lib/util.php:330 lib/util.php:346 lib/util.php:358
 msgid "Source"
 msgstr "ソース"
 
-#: ../actions/showstream.php:277
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:359
 msgid "Statistics"
 msgstr "統計データ"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
+#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
+#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
+#: actions/finishopenidlogin.php:199 actions/finishopenidlogin.php:267
 msgid "Stored OpenID not found."
 msgstr "保存された OpenID は見つかりません。"
 
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:172
-#: ../actions/showstream.php:181
+#: ../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:254 lib/util.php:2078
 msgid "Subscribe"
 msgstr "購読"
 
-#: ../actions/showstream.php:294 ../actions/subscribers.php:27
+#: ../actions/showstream.php:313 ../actions/subscribers.php:27
+#: actions/showstream.php:328 actions/subscribers.php:27
+#: actions/showstream.php:376 lib/gallery.php:136 lib/gallery.php:137
 msgid "Subscribers"
 msgstr "購読者"
 
-#: ../actions/userauthorization.php:309
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
 msgid "Subscription authorized"
 msgstr "購読が許可"
 
-#: ../actions/userauthorization.php:319
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
 msgid "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:288 actions/showstream.php:370 lib/gallery.php:131
+#: lib/gallery.php:132
 msgid "Subscriptions"
 msgstr "サブスクリプション"
 
-#: ../actions/avatar.php:87
+#: ../actions/avatar.php:87 actions/profilesettings.php:324
+#: actions/profilesettings.php:353
 msgid "System error uploading file."
 msgstr "ファイルのアップロードでシステムエラー"
 
-#: ../actions/noticesearch.php:34
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317 actions/profilesettings.php:90 actions/showstream.php:382
+#: actions/tag.php:40 actions/tagother.php:96 actions/tagother.php:162
+#: lib/profilelist.php:126 lib/profilelist.php:128
+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:33
 msgid "Text search"
 msgstr "文字検索"
 
-#: ../actions/openidsettings.php:140
+#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
 msgid "That OpenID does not belong to you."
 msgstr "その OpenID はあなたのものではありません。"
 
-#: ../actions/confirmaddress.php:52
+#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
 msgid "That address has already been confirmed."
 msgstr "そのアドレスは既に承認されています。"
 
-#: ../actions/confirmaddress.php:43
+#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
 msgid "That confirmation code is not for you!"
 msgstr "その確認コードはあなたのものではありません！"
 
-#: ../actions/avatar.php:80
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:214
+msgid "That email address already belongs to another user."
+msgstr ""
+
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: actions/profilesettings.php:346
 msgid "That file is too big."
 msgstr "ファイルサイズが大きすぎます。"
 
-#: ../actions/imsettings.php:161
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
 msgid "That is already your Jabber ID."
 msgstr "その Jabber ID は既にあなたのものです。"
 
-#: ../actions/imsettings.php:224
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:211
+msgid "That is already your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+msgid "That is already your phone number."
+msgstr ""
+
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
 msgid "That is not your Jabber ID."
 msgstr "その Jabber ID はあなたのものではありません。"
 
-#: ../actions/imsettings.php:201
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+#: actions/emailsettings.php:270
+msgid "That is not your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+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:247
 msgid "That is the wrong IM address."
 msgstr "その IM アドレスは不正です。"
 
-#: ../actions/newnotice.php:52
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+msgid "That is the wrong confirmation number."
+msgstr ""
+
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+msgid "That phone number already belongs to another user."
+msgstr ""
+
+#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: actions/newnotice.php:49 actions/twitapistatuses.php:330
+#: actions/newnotice.php:61 actions/twitapistatuses.php:271
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "長すぎます。通知は最大 140 字までです。"
 
-#: ../actions/confirmaddress.php:86
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+#: actions/twitapiaccount.php:55
+msgid "That's too long. Max notice size is 255 chars."
+msgstr ""
+
+#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "アドレス \"%s\" はあなたのアカウントとして承認されています。"
 
-#: ../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:285
 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 ""
 
-#: ../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 ""
 
-#: ../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 "%s　の通知を聞いている人"
 
-#: ../actions/subscribers.php:33
+#: ../actions/subscribers.php:33 actions/subscribers.php:33
 msgid "These are the people who listen to your notices."
 msgstr "あなたの通知を聞いている人"
 
-#: ../actions/subscriptions.php:35
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "%s が通知を聞いている人"
 
-#: ../actions/subscriptions.php:33
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
 msgid "These are the people whose notices you listen to."
 msgstr "あなたが通知を聞いている人"
 
-#: ../actions/recoverpassword.php:87
+#: ../actions/invite.php:89 actions/invite.php:96
+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 "確認コードが古すぎます。もう一度やり直してください。"
 
@@ -1214,78 +2074,151 @@ msgstr "確認コードが古すぎます。もう一度やり直してくださ
 msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
-msgstr "このフォームは自動的にサブミットされます。されない場合は、サブミットボタンをクリックして下さい。OpenIDプロバイダへ転送されます。"
+msgstr ""
+"このフォームは自動的にサブミットされます。されない場合は、サブミットボタンを"
+"クリックして下さい。OpenIDプロバイダへ転送されます。"
 
-#: ../actions/finishopenidlogin.php:56
+#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
 #, 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 ""
-"これが %s "
-"への初回のログインです。OpenIDとの関連付けが必要です。アカウントを新規作成するか、既存のアカウントとの関連付けのどちらかを下さい。"
+"これが %s への初回のログインです。OpenIDとの関連付けが必要です。アカウントを"
+"新規作成するか、既存のアカウントとの関連付けのどちらかを下さい。"
+
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:94
+#: actions/twitapifriendships.php:82 actions/twitapistatuses.php:428
+msgid "This method requires a POST or DELETE."
+msgstr ""
 
-#: ../lib/util.php:147
+#: ../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:46
+#: actions/twitapidirect_messages.php:117 actions/twitapifriendships.php:30
+#: actions/twitapistatuses.php:239
+msgid "This method requires a POST."
+msgstr ""
+
+#: ../lib/util.php:164 lib/util.php:246 lib/util.php:257
 msgid "This page is not available in a media type you accept"
 msgstr "このページはあなたが承認したメディアタイプでは利用できません。"
 
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
+msgid "Timezone"
+msgstr ""
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr ""
+
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"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 ""
+"サブスクライブするには、[ログイン](%%action.login%%) するか, [登録](%%action."
+"register%%) を行って下さい。既に [compatible microblogging site](%%doc."
+"openmublog%%) にアカウントを持っおもちの場合は、下にプロファイルURLを入力して"
+"下さい."
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: actions/twitapifriendships.php:128
+msgid "Two user ids or screen_names must be supplied."
 msgstr ""
-"サブスクライブするには、[ログイン](%%action.login%%) "
-"するか, [登録](%%action.register%%) を行って下さい。既に "
-"[compatible microblogging site](%%doc.openmublog%%) にアカウントを持っおもちの場合は、下にプロファイルURLを入力して下さい."
 
-#: ../actions/profilesettings.php:51
+#: ../actions/profilesettings.php:48 ../actions/register.php:169
+#: actions/profilesettings.php:81 actions/register.php:183
+#: actions/profilesettings.php:83 actions/register.php:210
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "ホームページ、ブログ、プロファイル、その他サイトの URL"
 
-#: ../actions/remotesubscribe.php:74
+#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "プロファイルサービスまたはマイクロブロギングサービスのURL"
 
-#: ../actions/imsettings.php:105 ../actions/recoverpassword.php:39
+#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
+#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
+#: actions/emailsettings.php:144 actions/imsettings.php:118
+#: actions/recoverpassword.php:39 actions/smssettings.php:143
+#: actions/twittersettings.php:108 actions/emailsettings.php:147
+#: actions/othersettings.php:146 actions/twittersettings.php:199
 msgid "Unexpected form submission."
 msgstr "予期せぬフォーム送信です。"
 
-#: ../actions/recoverpassword.php:237
+#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
 msgid "Unexpected password reset."
 msgstr "予期せぬパスワードのリセットです。"
 
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:58
+#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:59
 msgid "Unknown version of OMB protocol."
 msgstr "予期せぬ OMB プロトコルのバージョンです。"
 
-#: ../lib/util.php:245
+#: ../lib/util.php:269 lib/util.php:285 lib/util.php:296
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
-msgstr "特に断りが無い場合は、このサイトのコンテンツの著作権は著作者に帰属し、下記条件の下で使用可能です。"
+msgstr ""
+"特に断りが無い場合は、このサイトのコンテンツの著作権は著作者に帰属し、下記条"
+"件の下で使用可能です。"
 
-#: ../actions/confirmaddress.php:48
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr "不明なアドレスタイプ %s"
 
-#: ../actions/showstream.php:193
+#: ../actions/showstream.php:209 actions/showstream.php:219
+#: actions/showstream.php:267 lib/util.php:2094
 msgid "Unsubscribe"
 msgstr "サブスクライブ中止"
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
+#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
+#: actions/postnotice.php:45 actions/updateprofile.php:46
 msgid "Unsupported OMB version"
 msgstr "サポート外の OMB バージョン"
 
-#: ../actions/avatar.php:105
+#: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: actions/profilesettings.php:371
 msgid "Unsupported image file format."
 msgstr "サポート外の画像形式です。"
 
-#: ../actions/avatar.php:68
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: actions/deleteprofile.php:251
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: actions/deleteprofile.php:254
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/twitapistatuses.php:126
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:198
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
+
+#: ../actions/avatar.php:68 actions/profilesettings.php:161
+#: actions/profilesettings.php:166
 msgid "Upload"
 msgstr "アップロード"
 
@@ -1296,104 +2229,200 @@ msgid ""
 "site license, also. Use a picture that belongs to you and that you want to "
 "share."
 msgstr ""
-"\"アバター\" (ユーザの画像) をアップロード。 "
-"アップロードした後では画像の編集はできません。サイズが大きすぎないか（小さすぎないか）確認して下さい。サイトのライセンスが適用されます。自身で所有していて、共有したい画像を使用して下さい。"
+"\"アバター\" (ユーザの画像) をアップロード。 アップロードした後では画像の編集"
+"はできません。サイズが大きすぎないか（小さすぎないか）確認して下さい。サイト"
+"のライセンスが適用されます。自身で所有していて、共有したい画像を使用して下さ"
+"い。"
+
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr ""
+
+#: ../actions/invite.php:114 actions/invite.php:121
+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 actions/register.php:200
+#: actions/register.php:203
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "更新、アナウンス、パスワードリカバリーでのみ使用されます。"
 
 #: ../actions/finishremotesubscribe.php:86
+#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:92
 msgid "User being listened to doesn't exist."
 msgstr "リストされているユーザは存在しません。"
 
 #: ../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/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/showstream.php:57
+#: actions/twitapiaccount.php:63 actions/twitapifavorites.php:40
+#: actions/twitapistatuses.php:163 actions/twitapistatuses.php:492
+#: lib/twitterapi.php:590
 msgid "User has no profile."
 msgstr "プロファイルがありません。"
 
-#: ../actions/remotesubscribe.php:71
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
 msgid "User nickname"
 msgstr "ユーザのニックネーム"
 
-#: ../lib/util.php:969
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../lib/util.php:1159 lib/util.php:1293 lib/util.php:1630
 #, php-format
 msgid "What's up, %s?"
 msgstr "最近どう %s?"
 
-#: ../actions/profilesettings.php:57
+#: ../actions/profilesettings.php:54 ../actions/register.php:175
+#: actions/profilesettings.php:87 actions/register.php:189
+#: actions/profilesettings.php:89 actions/register.php:216
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "いる場所, 例えば \"City, State (or Region), Country\""
 
-#: ../actions/updateprofile.php:127
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "不正な画像形式。'%s'"
 
-#: ../actions/updateprofile.php:122
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "不正な画像サイズ。'%s'"
 
-#: ../actions/finishaddopenid.php:64
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+#: actions/block.php:105
+msgid "Yes"
+msgstr ""
+
+#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
 msgid "You already have this OpenID!"
 msgstr "既にこの OpenID を使用しています。"
 
-#: ../actions/recoverpassword.php:31
+#: ../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
 msgid "You are already logged in!"
 msgstr "既にログイン済みです。"
 
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:102
+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/register.php:164
+#: ../actions/register.php:135 actions/register.php:145
 msgid "You can create a new account to start posting notices."
 msgstr "アカウントを作成して通知の投稿が可能です。"
 
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
 #: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr "\"削除\"をクリックして OpenID を削除できます。"
 
-#: ../actions/imsettings.php:28
+#: ../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 ""
-"Jabber/GTalk [instant "
-"messages](%%doc.im%%)　経由で通知の送信、受信が可能です。下のアドレスを設定して下さい。"
+"Jabber/GTalk [instant messages](%%doc.im%%)　経由で通知の送信、受信が可能で"
+"す。下のアドレスを設定して下さい。"
 
 #: ../actions/profilesettings.php:27
 msgid ""
-"You can update your personal profile info here so people know more about "
-"you."
-msgstr "あなたのことについて知ってもらうために、ここでプロファイル情報を更新できます。"
+"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
+#: actions/finishremotesubscribe.php:83 actions/finishremotesubscribe.php:99
 msgid "You can use the local subscription!"
 msgstr "ローカルサブスクリプションを使用可能です！"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:51
+#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
+#: actions/finishopenidlogin.php:38 actions/register.php:68
+#: actions/register.php:77
 msgid "You can't register if you don't agree to the license."
 msgstr "ライセンスに同意頂けない場合は登録できません。"
 
-#: ../actions/updateprofile.php:62
+#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
 msgid "You did not send us that profile"
 msgstr "そのプロファイルは送信されていません。"
 
-#: ../actions/recoverpassword.php:134
+#: ../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 ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: actions/twitapistatuses.php:455
+msgid "You may not delete another user's status."
+msgstr ""
+
+#: ../actions/invite.php:31 actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+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!"
+msgstr ""
+
+#: ../actions/recoverpassword.php:149
 msgid "You've been identified. Enter a  new password below. "
 msgstr "確認されました。新しいパスワードを入力して下さい。"
 
-#: ../actions/openidlogin.php:67
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:84
 msgid "Your OpenID URL"
 msgstr "あなたの OpenID URL"
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:164
 msgid "Your nickname on this server, or your registered email address."
 msgstr "このサーバでのニックネーム、または登録したメールアドレス。"
 
@@ -1403,787 +2432,88 @@ 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%%) "
-"を使って同じアカウントで様々なウェブサイトへログインすることができます。ここで関連付ける OpenID を管理して下さい。"
+"[OpenID](%%doc.openid%%) を使って同じアカウントで様々なウェブサイトへログイン"
+"することができます。ここで関連付ける OpenID を管理して下さい。"
 
-#: ../lib/util.php:814
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:1287
 msgid "a few seconds ago"
 msgstr "数秒前"
 
-#: ../lib/util.php:826
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:1299
 #, php-format
 msgid "about %d days ago"
 msgstr "約 %d 日前"
 
-#: ../lib/util.php:822
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:1295
 #, php-format
 msgid "about %d hours ago"
 msgstr "約 %d 時間前"
 
-#: ../lib/util.php:818
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:1291
 #, php-format
 msgid "about %d minutes ago"
 msgstr "約 %d 分前"
 
-#: ../lib/util.php:830
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:1303
 #, php-format
 msgid "about %d months ago"
 msgstr "約 %d ヵ月前"
 
-#: ../lib/util.php:824
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:1297
 msgid "about a day ago"
 msgstr "約 1 日前"
 
-#: ../lib/util.php:816
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:1289
 msgid "about a minute ago"
 msgstr "約 1 分前"
 
-#: ../lib/util.php:828
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:1301
 msgid "about a month ago"
 msgstr "約 1 ヵ月前"
 
-#: ../lib/util.php:832
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:1305
 msgid "about a year ago"
 msgstr "約 1 年前"
 
-#: ../lib/util.php:820
-msgid "about an hour ago"
-msgstr "約 1 時間前"
-
-#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
-#: ../lib/stream.php:101
-msgid "in reply to..."
-msgstr "...に対しての返信"
-
-#: ../actions/noticesearch.php:133 ../actions/showstream.php:390
-#: ../lib/stream.php:108
-msgid "reply"
-msgstr "返信"
-
-#: ../actions/password.php:44
-msgid "same as password above"
-msgstr "上のパスワードと同じ"
-
-#: ../lib/util.php:1127
-msgid "« After"
-msgstr "<< 前"
-
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr ""
-
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
-
-#: ../actions/invite.php:168 actions/invite.php:176
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
-
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
-
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
-#, php-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#, php-format
-msgid "%s public timeline"
-msgstr ""
-
-#: ../lib/mail.php:206 lib/mail.php:212
-#, php-format
-msgid "%s status"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#, php-format
-msgid "%s timeline"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
-msgstr ""
-
-#: ../actions/register.php:213
-msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
-msgstr ""
-
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-
-#: ../actions/register.php:154 actions/register.php:168
-msgid "6 or more characters. Required."
-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 ""
-
-#: ../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/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!"
-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 ""
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-msgid "Add or remove OpenIDs"
-msgstr ""
-
-#: ../actions/invite.php:131 actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
-msgstr ""
-
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-msgid "Are you sure you want to delete this notice?"
-msgstr ""
-
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr ""
-
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
-msgid "Can't delete this notice."
-msgstr ""
-
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-msgid "Cannot normalize that email address"
-msgstr ""
-
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr ""
-
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
-msgstr ""
-
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-msgid "Change your profile settings"
-msgstr ""
-
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-msgid "Confirmation code"
-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/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
-msgstr ""
-
-#: ../lib/subs.php:54 lib/subs.php:61
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: ../lib/subs.php:46 lib/subs.php:46
-msgid "Could not subscribe."
-msgstr ""
-
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-msgid "Could not update user with confirmed email address."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-msgid "Couldn't find any statuses."
-msgstr ""
-
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-msgid "Couldn't update user for autosubscribe."
-msgstr ""
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-msgid "Couldn't update user record."
-msgstr ""
-
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-msgid "Current confirmed email address."
-msgstr ""
-
-#: ../classes/Notice.php:72 classes/Notice.php:86
-#, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr ""
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-msgid "Delete notice"
-msgstr ""
-
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-msgid "Email Address"
-msgstr ""
-
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-msgid "Email Settings"
-msgstr ""
-
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-msgid "Email address, like \"UserName@example.org\""
-msgstr ""
-
-#: ../actions/invite.php:129 actions/invite.php:137
-msgid "Email addresses"
-msgstr ""
-
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
-msgstr ""
-
-#: ../actions/tag.php:55 actions/tag.php:55
-#, php-format
-msgid "Feed for tag %s"
-msgstr ""
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr ""
-
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr ""
-
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-msgid "I want to post notices by email."
-msgstr ""
-
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
-msgstr ""
-
-#: ../actions/recoverpassword.php:137
-msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
-"email address you have stored  in your account."
-msgstr ""
-
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-msgid "Incoming email"
-msgstr ""
-
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-msgid "Incoming email address removed."
-msgstr ""
-
-#: ../actions/invite.php:55 actions/invite.php:62
-#, php-format
-msgid "Invalid email address: %s"
-msgstr ""
-
-#: ../actions/invite.php:79 actions/invite.php:86
-msgid "Invitation(s) sent"
-msgstr ""
-
-#: ../actions/invite.php:97 actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
-msgstr ""
-
-#: ../lib/util.php:306 lib/util.php:322
-msgid "Invite"
-msgstr ""
-
-#: ../actions/invite.php:123 actions/invite.php:130
-msgid "Invite new users"
-msgstr ""
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Language"
-msgstr ""
-
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-msgid "Language is too long (max 50 chars)."
-msgstr ""
-
-#: ../actions/register.php:166 actions/register.php:180
-msgid "Longer name, preferably your \"real\" name"
-msgstr ""
-
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-#: actions/emailsettings.php:81 actions/smssettings.php:89
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
-
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-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 ""
-
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-msgid "New"
-msgstr ""
-
-#: ../lib/mail.php:144 lib/mail.php:144
-#, php-format
-msgid "New email address for posting to %s"
-msgstr ""
-
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-msgid "New incoming email address added."
-msgstr ""
-
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-msgid "No"
-msgstr ""
-
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-msgid "No carrier selected."
-msgstr ""
-
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-msgid "No code entered"
-msgstr ""
-
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-msgid "No email address."
-msgstr ""
-
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-msgid "No incoming email address."
-msgstr ""
-
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-msgid "No phone number."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-msgid "No status found with that ID."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-msgid "No status with that ID found."
-msgstr ""
-
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-msgid "No user with that email address or username."
-msgstr ""
-
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-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
-msgid "Not a supported data format."
-msgstr ""
-
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-msgid "Not a valid email address"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-msgid "Not found"
-msgstr ""
-
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-msgid "Notice Search"
-msgstr ""
-
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81
-#, php-format
-msgid "Notices tagged with %s"
-msgstr ""
-
-#: ../actions/invite.php:135 actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-msgid "People"
-msgstr ""
-
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-msgid "People Search"
-msgstr ""
-
-#: ../actions/invite.php:133 actions/invite.php:141
-msgid "Personal message"
-msgstr ""
-
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Preferred language"
-msgstr ""
-
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
-
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-msgid "Publish a MicroID for my email address."
-msgstr ""
-
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr ""
-
-#: ../actions/register.php:28 actions/register.php:28
-msgid "Registration not allowed."
-msgstr ""
-
-#: ../actions/register.php:200 actions/register.php:214
-msgid "Registration successful"
-msgstr ""
-
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
-msgstr ""
-
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-msgid "SMS Phone number"
-msgstr ""
-
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-msgid "SMS Settings"
-msgstr ""
-
-#: ../lib/mail.php:219 lib/mail.php:225
-msgid "SMS confirmation"
-msgstr ""
-
-#: ../actions/register.php:156 actions/register.php:170
-msgid "Same as password above. Required."
-msgstr ""
-
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-msgid "Select a carrier"
-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."
-msgstr ""
-
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-msgid "Send me notices of new subscriptions through email."
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr ""
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
-msgstr ""
-
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317
-msgid "Tags"
-msgstr ""
-
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr ""
-
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr ""
-
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-msgid "That is already your email address."
-msgstr ""
-
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-msgid "That is already your phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-msgid "That is not your email address."
-msgstr ""
-
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-msgid "That is not your phone number."
-msgstr ""
-
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-msgid "That is the wrong confirmation number."
-msgstr ""
-
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-msgid "That phone number already belongs to another user."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-msgid "That's too long. Max notice size is 255 chars."
-msgstr ""
-
-#: ../actions/invite.php:89 actions/invite.php:96
-msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
-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."
-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."
-msgstr ""
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "Timezone"
-msgstr ""
-
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-msgid "Timezone not selected."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-msgid "Two user ids or screen_names must be supplied."
-msgstr ""
-
-#: ../index.php:57 index.php:57
-msgid "Unknown action"
-msgstr ""
-
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-msgid "Updates by SMS"
-msgstr ""
-
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr ""
-
-#: ../actions/invite.php:114 actions/invite.php:121
-msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
-msgstr ""
-
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr ""
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "What timezone are you normally in?"
-msgstr ""
-
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-msgid "Yes"
-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/invite.php:81 actions/invite.php:88
-msgid "You are already subscribed to these users:"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
-msgstr ""
-
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-msgid "You may not delete another user's status."
-msgstr ""
-
-#: ../actions/invite.php:31 actions/invite.php:31
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-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!"
-msgstr ""
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:1293
+msgid "about an hour ago"
+msgstr "約 1 時間前"
 
 #: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
+#: actions/showstream.php:441 lib/stream.php:99 lib/noticelist.php:211
 msgid "delete"
 msgstr ""
 
+#: ../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:135
+#: lib/facebookaction.php:202 lib/noticelist.php:189
+msgid "in reply to..."
+msgstr "...に対しての返信"
+
+#: ../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:142
+#: lib/noticelist.php:199
+msgid "reply"
+msgstr "返信"
+
+#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/profilesettings.php:188
+msgid "same as password above"
+msgstr "上のパスワードと同じ"
+
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+#: actions/twitapistatuses.php:543
 msgid "unsupported file type"
 msgstr ""
 
+#: ../lib/util.php:1309 lib/util.php:1443 lib/facebookaction.php:251
+#: lib/util.php:1783
+#, fuzzy
+msgid "« After"
+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
@@ -2193,6 +2523,12 @@ msgstr ""
 #: 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:38 actions/deleteprofile.php:127 actions/disfavor.php:47
+#: actions/emailsettings.php:130 actions/favor.php:49 actions/login.php:45
+#: actions/newmessage.php:44 actions/newnotice.php:36 actions/nudge.php:47
+#: actions/othersettings.php:139 actions/profilesettings.php:49
+#: actions/subedit.php:38 actions/tagother.php:113
+#: actions/twittersettings.php:188 actions/unblock.php:38
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -2216,12 +2552,14 @@ msgstr ""
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142
+#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:54
+#: actions/twitapifavorites.php:115
 msgid "This notice is already a favorite!"
 msgstr ""
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
+#: classes/Command.php:132 actions/favor.php:61
+#: actions/twitapifavorites.php:122
 msgid "Could not create favorite."
 msgstr ""
 
@@ -2230,11 +2568,12 @@ msgid "Disfavor"
 msgstr ""
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:62
 #, php-format
 msgid "%s favorite notices"
 msgstr ""
 
-#: actions/favoritesrss.php:64
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:66
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr ""
@@ -2260,47 +2599,50 @@ msgid ""
 "\n"
 msgstr ""
 
-#: actions/login.php:104
+#: actions/login.php:104 actions/login.php:111 actions/openidlogin.php:86
 msgid "Automatically login in the future; "
 msgstr ""
 
-#: actions/login.php:122
+#: actions/login.php:122 actions/login.php:130
 msgid "For security reasons, please re-enter your "
 msgstr ""
 
-#: actions/login.php:126
+#: actions/login.php:126 actions/login.php:134
 msgid "Login with your username and password. "
 msgstr ""
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+#: actions/newmessage.php:60 actions/twitapidirect_messages.php:136
 msgid "That's too long. Max message size is 140 chars."
 msgstr ""
 
-#: actions/newmessage.php:65
+#: actions/newmessage.php:65 actions/newmessage.php:68
 msgid "No recipient specified."
 msgstr ""
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
+#: classes/Command.php:206 actions/newmessage.php:71
+#: actions/newmessage.php:116 classes/Command.php:211
 msgid "You can't send a message to this user."
 msgstr ""
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
+#: classes/Command.php:209 actions/newmessage.php:74
+#: actions/twitapidirect_messages.php:153 classes/Command.php:214
 msgid ""
-"Don't send a message to yourself; just say it to yourself quietly "
-"instead."
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: actions/newmessage.php:108
+#: actions/newmessage.php:108 actions/microsummary.php:32
+#: actions/newmessage.php:111
 msgid "No such user"
 msgstr ""
 
-#: actions/newmessage.php:117
+#: actions/newmessage.php:117 actions/newmessage.php:120
 msgid "New message"
 msgstr ""
 
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:95 actions/noticesearch.php:94
 msgid "Notice without matching profile"
 msgstr ""
 
@@ -2347,6 +2689,7 @@ msgstr ""
 
 #: actions/profilesettings.php:115 actions/remotesubscribe.php:320
 #: actions/userauthorization.php:159 actions/userrss.php:76
+#: actions/profilesettings.php:120 actions/remotesubscribe.php:333
 msgid "User without matching profile"
 msgstr ""
 
@@ -2374,18 +2717,18 @@ msgstr ""
 msgid "New password successfully saved. "
 msgstr ""
 
-#: actions/register.php:95
+#: actions/register.php:95 actions/register.php:104
 msgid "Password must be 6 or more characters."
 msgstr ""
 
-#: actions/register.php:216
+#: actions/register.php:216 actions/register.php:243
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to..."
 msgstr ""
 
-#: actions/register.php:227
+#: actions/register.php:227 actions/register.php:254
 msgid "(You should receive a message by email momentarily, with "
 msgstr ""
 
@@ -2400,6 +2743,7 @@ msgid "Feed for favorites of %s"
 msgstr ""
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:88 actions/twitapifavorites.php:57
 msgid "Could not retrieve favorite notices."
 msgstr ""
 
@@ -2421,7 +2765,7 @@ msgstr ""
 msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: actions/showstream.php:154
+#: actions/showstream.php:154 lib/util.php:2105
 msgid "Send a message"
 msgstr ""
 
@@ -2430,73 +2774,78 @@ msgstr ""
 msgid "Mobile carrier for your phone. "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:64
 #, php-format
 msgid "Direct messages to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:65
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:69
 msgid "Direct Messages You've Sent"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:70
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:132
 msgid "No message text!"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:145
 msgid "Recipient user not found."
 msgstr ""
 
 #: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:148
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
-#: actions/twitapifavorites.php:92
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:64
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
-#: actions/twitapifavorites.php:95
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:67
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
+#: actions/twitapifavorites.php:158 lib/mail.php:303
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr ""
 
 #: actions/twitapifavorites.php:188 lib/mail.php:276
+#: actions/twitapifavorites.php:159 lib/mail.php:304
 #, php-format
 msgid ""
 "%1$s just added your notice from %2$s as one of their favorites.\n"
 "\n"
 msgstr ""
 
-#: actions/twittersettings.php:27
+#: actions/twittersettings.php:27 actions/twittersettings.php:29
 msgid ""
 "Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 
-#: actions/twittersettings.php:41
+#: actions/twittersettings.php:41 actions/twittersettings.php:43
 msgid "Twitter settings"
 msgstr ""
 
-#: actions/twittersettings.php:48
+#: actions/twittersettings.php:48 actions/twittersettings.php:50
 msgid "Twitter Account"
 msgstr ""
 
-#: actions/twittersettings.php:56
+#: actions/twittersettings.php:56 actions/twittersettings.php:58
 msgid "Current verified Twitter account."
 msgstr ""
 
@@ -2524,46 +2873,50 @@ msgstr ""
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:216
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr ""
 
-#: actions/twittersettings.php:128
+#: actions/twittersettings.php:128 actions/twittersettings.php:221
 msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: actions/twittersettings.php:137 actions/twittersettings.php:228
 #, php-format
 msgid "Unable to retrieve account information for \"%s\" from Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:234 actions/twittersettings.php:253
 msgid "Unable to save your Twitter settings!"
 msgstr ""
 
-#: actions/twittersettings.php:174
+#: actions/twittersettings.php:174 actions/twittersettings.php:261
 msgid "Twitter settings saved."
 msgstr ""
 
-#: actions/twittersettings.php:192
+#: actions/twittersettings.php:192 actions/twittersettings.php:272
 msgid "That is not your Twitter account."
 msgstr ""
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:280
 msgid "Couldn't remove Twitter user."
 msgstr ""
 
-#: actions/twittersettings.php:212
+#: actions/twittersettings.php:212 actions/twittersettings.php:284
 msgid "Twitter account removed."
 msgstr ""
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
+#: actions/twittersettings.php:299 actions/twittersettings.php:310
+#: actions/twittersettings.php:322
 msgid "Couldn't save Twitter preferences."
 msgstr ""
 
-#: actions/twittersettings.php:245
+#: actions/twittersettings.php:245 actions/twittersettings.php:330
 msgid "Twitter preferences saved."
 msgstr ""
 
@@ -2579,15 +2932,15 @@ msgstr ""
 msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#: classes/Channel.php:113
+#: classes/Channel.php:113 classes/Channel.php:129
 msgid "Command results"
 msgstr ""
 
-#: classes/Channel.php:148
+#: classes/Channel.php:148 classes/Channel.php:175
 msgid "Command complete"
 msgstr ""
 
-#: classes/Channel.php:158
+#: classes/Channel.php:158 classes/Channel.php:185
 msgid "Command failed"
 msgstr ""
 
@@ -2600,7 +2953,7 @@ msgstr ""
 msgid "Subscriptions: %1$s\n"
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:247
 msgid "User has no last notice"
 msgstr ""
 
@@ -2633,59 +2986,60 @@ msgstr ""
 msgid "About: %s"
 msgstr ""
 
-#: classes/Command.php:200
+#: classes/Command.php:200 classes/Command.php:202
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: classes/Command.php:214
+#: classes/Command.php:214 classes/Command.php:219
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: classes/Command.php:216
+#: classes/Command.php:216 classes/Command.php:221
 msgid "Error sending direct message."
 msgstr ""
 
-#: classes/Command.php:263
+#: classes/Command.php:263 classes/Command.php:268
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: classes/Command.php:270
+#: classes/Command.php:270 classes/Command.php:275
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: classes/Command.php:288
+#: classes/Command.php:288 classes/Command.php:293
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: classes/Command.php:295
+#: classes/Command.php:295 classes/Command.php:300
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330
+#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:315
+#: classes/Command.php:335
 msgid "Command not yet implemented."
 msgstr ""
 
-#: classes/Command.php:313
+#: classes/Command.php:313 classes/Command.php:318
 msgid "Notification off."
 msgstr ""
 
-#: classes/Command.php:315
+#: classes/Command.php:315 classes/Command.php:320
 msgid "Can't turn off notification."
 msgstr ""
 
-#: classes/Command.php:333
+#: classes/Command.php:333 classes/Command.php:338
 msgid "Notification on."
 msgstr ""
 
-#: classes/Command.php:335
+#: classes/Command.php:335 classes/Command.php:340
 msgid "Can't turn on notification."
 msgstr ""
 
-#: classes/Command.php:344
+#: classes/Command.php:344 classes/Command.php:349
 msgid "Commands:\n"
 msgstr ""
 
@@ -2697,23 +3051,23 @@ msgstr ""
 msgid "Could not update message with new URI."
 msgstr ""
 
-#: lib/gallery.php:46
+#: lib/gallery.php:46 lib/gallery.php:55
 msgid "User without matching profile in system."
 msgstr ""
 
-#: lib/mail.php:147
+#: lib/mail.php:147 lib/mail.php:141
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:249
+#: lib/mail.php:249 lib/mail.php:275
 #, php-format
 msgid "New private message from %s"
 msgstr ""
 
-#: lib/mail.php:253
+#: lib/mail.php:253 lib/mail.php:279
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -2757,18 +3111,458 @@ msgstr ""
 msgid "Your sent messages"
 msgstr ""
 
-#: lib/settingsaction.php:99
+#: lib/settingsaction.php:99 actions/deleteprofile.php:256
 msgid "Twitter"
 msgstr ""
 
-#: lib/settingsaction.php:100
+#: lib/settingsaction.php:100 actions/deleteprofile.php:257
 msgid "Twitter integration options"
 msgstr ""
 
-#: lib/util.php:1718
+#: lib/util.php:1718 lib/util.php:2145
 msgid "To"
 msgstr ""
 
 #: scripts/maildaemon.php:45
 msgid "Could not parse message."
 msgstr ""
+
+#: actions/block.php:45 actions/subedit.php:45 actions/unblock.php:45
+msgid "No profile specified."
+msgstr ""
+
+#: actions/block.php:52 actions/subedit.php:52 actions/tagother.php:45
+#: actions/unblock.php:52
+msgid "No profile with that ID."
+msgstr ""
+
+#: actions/block.php:78
+#, fuzzy
+msgid "Block user"
+msgstr "そのようなユーザはいません。"
+
+#: actions/block.php:81
+msgid "Are you sure you want to block this user? "
+msgstr ""
+
+#: actions/block.php:117
+#, fuzzy
+msgid "You have already blocked this user."
+msgstr "既にログイン済みです。"
+
+#: actions/block.php:124
+msgid "Failed to save block information."
+msgstr ""
+
+#: actions/deleteprofile.php:25
+msgid "Code not yet ready."
+msgstr ""
+
+#: actions/deleteprofile.php:36
+msgid "Export and delete your user information."
+msgstr ""
+
+#: actions/deleteprofile.php:88 actions/deleteprofile.php:119
+#, fuzzy
+msgid "Delete my account"
+msgstr "アカウントを作成"
+
+#: actions/deleteprofile.php:89
+#, fuzzy
+msgid "Delete my account confirmation"
+msgstr "メール承認を削除できません"
+
+#: actions/deleteprofile.php:117
+msgid "Check if you are sure you want to delete your account."
+msgstr ""
+
+#: actions/deleteprofile.php:259 lib/settingsaction.php:102
+msgid "Other"
+msgstr ""
+
+#: actions/deleteprofile.php:260 lib/settingsaction.php:103
+msgid "Other options"
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Add to favorites"
+msgstr ""
+
+#: actions/emailsettings.php:98
+msgid "Allow friends to nudge me and send me an email."
+msgstr ""
+
+#: actions/facebookremove.php:54
+#, fuzzy
+msgid "Couldn't remove Facebook user."
+msgstr "ユーザを更新できません"
+
+#: actions/favor.php:71
+msgid "Disfavor favorite"
+msgstr ""
+
+#: actions/favorited.php:31 lib/stream.php:45
+#, fuzzy
+msgid "Popular notices"
+msgstr "そのような通知はありません。"
+
+#: actions/favorited.php:54
+msgid "Showing recently popular notices"
+msgstr ""
+
+#: actions/featured.php:32 actions/featured.php:54 lib/stream.php:41
+msgid "Featured users"
+msgstr ""
+
+#: actions/finishremotesubscribe.php:186
+msgid "That user has blocked you from subscribing."
+msgstr ""
+
+#: actions/microsummary.php:39
+msgid "No current status"
+msgstr ""
+
+#: actions/newnotice.php:93
+#, fuzzy
+msgid "Notice posted"
+msgstr "通知"
+
+#: actions/newnotice.php:116 classes/Channel.php:140
+msgid "Ajax Error"
+msgstr ""
+
+#: actions/nudge.php:52
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
+
+#: actions/nudge.php:61
+msgid "Nudge sent"
+msgstr ""
+
+#: actions/othersettings.php:27
+msgid "Manage various other options."
+msgstr ""
+
+#: actions/othersettings.php:33
+#, fuzzy
+msgid "Other Settings"
+msgstr "設定"
+
+#: actions/othersettings.php:35
+msgid "URL Auto-shortening"
+msgstr ""
+
+#: actions/othersettings.php:54
+#, fuzzy
+msgid "Service"
+msgstr "検索"
+
+#: actions/othersettings.php:54
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/othersettings.php:155
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "場所が長すぎます。（255字まで）"
+
+#: actions/peopletag.php:33
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "有効なメールアドレスではありません。"
+
+#: actions/peopletag.php:45
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr ""
+
+#: actions/peopletag.php:87
+#, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+msgstr ""
+
+#: actions/profilesettings.php:92
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+
+#: actions/profilesettings.php:246 actions/tagother.php:131
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "不正なホームページ '%s'"
+
+#: actions/profilesettings.php:328
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "プロファイルを保存できません"
+
+#: actions/public.php:68
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
+msgstr ""
+
+#: actions/public.php:90
+msgid "Could not retrieve public stream."
+msgstr ""
+
+#: actions/register.php:67 actions/register.php:177
+msgid "Sorry, only invited people can register."
+msgstr ""
+
+#: actions/register.php:156
+msgid "With this form you can create a new account. "
+msgstr ""
+
+#: actions/remotesubscribe.php:136 actions/remotesubscribe.php:141
+msgid "That's a local profile! Login to subscribe."
+msgstr ""
+
+#: actions/subedit.php:68
+#, fuzzy
+msgid "You are not subscribed to that profile."
+msgstr "そのプロファイルは送信されていません。"
+
+#: actions/subedit.php:81
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "サブスクリプションを作成できません"
+
+#: actions/subscribe.php:53
+#, fuzzy
+msgid "Not a local user."
+msgstr "そのようなユーザはいません。"
+
+#: actions/subscribe.php:67
+#, fuzzy
+msgid "Subscribed"
+msgstr "購読"
+
+#: actions/subscriptions.php:72
+#, fuzzy
+msgid "Jabber"
+msgstr "Jabbar ID はありません。"
+
+#: actions/tagother.php:31
+#, fuzzy
+msgid "Not logged in"
+msgstr "ログインしていません。"
+
+#: actions/tagother.php:40
+#, fuzzy
+msgid "No id argument."
+msgstr "そのようなドキュメントはありません。"
+
+#: actions/tagother.php:56
+msgid "Tag a person"
+msgstr ""
+
+#: actions/tagother.php:98
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
+msgstr ""
+
+#: actions/tagother.php:120
+#, fuzzy
+msgid "No such profile."
+msgstr "そのような通知はありません。"
+
+#: actions/tagother.php:146
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+
+#: actions/tagother.php:153
+#, fuzzy
+msgid "Could not save tags."
+msgstr "アバターを保存できません"
+
+#: actions/tagother.php:188
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
+
+#: actions/tagrss.php:33
+#, fuzzy
+msgid "No such tag."
+msgstr "そのような通知はありません。"
+
+#: actions/tagrss.php:62
+#, fuzzy, php-format
+msgid "Microblog tagged with %s"
+msgstr "マイクロブログ by %s"
+
+#: actions/twitapiblocks.php:45
+msgid "Block user failed."
+msgstr ""
+
+#: actions/twitapiblocks.php:66
+msgid "Unblock user failed."
+msgstr ""
+
+#: actions/twitapiusers.php:45
+#, fuzzy
+msgid "Not found."
+msgstr "リクエストがありません！"
+
+#: actions/twittersettings.php:63
+msgid "Twitter user name"
+msgstr ""
+
+#: actions/twittersettings.php:67
+#, fuzzy
+msgid "Twitter password"
+msgstr "新しいパスワード"
+
+#: actions/twittersettings.php:129
+msgid "Twitter Friends"
+msgstr ""
+
+#: actions/unblock.php:73
+#, fuzzy
+msgid "Error removing the block."
+msgstr "ユーザ保存エラー"
+
+#: actions/unsubscribe.php:48
+#, fuzzy
+msgid "No profile id in request."
+msgstr "サーバから提供されるプロファイルURLはありません。"
+
+#: actions/unsubscribe.php:55
+#, fuzzy
+msgid "No profile with that id."
+msgstr "リモートプロファイルと一致するものがありません"
+
+#: actions/unsubscribe.php:69
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "サブスクライブ中止"
+
+#: classes/Notice.php:100
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "通知を保存する際に問題が発生しました。"
+
+#: classes/Notice.php:105
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+
+#: classes/Notice.php:112
+msgid "You are banned from posting notices on this site."
+msgstr ""
+
+#: lib/gallery.php:98
+msgid "Filter tags"
+msgstr ""
+
+#: lib/gallery.php:104
+msgid "All"
+msgstr ""
+
+#: lib/gallery.php:108
+msgid "Tag"
+msgstr ""
+
+#: lib/gallery.php:109
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/gallery.php:110
+msgid "Go"
+msgstr ""
+
+#: lib/gallery.php:264
+#, fuzzy
+msgid "Subscriptions navigation"
+msgstr "サブスクリプション"
+
+#: lib/gallery.php:270 lib/gallery.php:292
+msgid "List"
+msgstr ""
+
+#: lib/gallery.php:280 lib/gallery.php:294
+msgid "Icons"
+msgstr ""
+
+#: lib/mail.php:92
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:242
+#, php-format
+msgid "You've been nudged by %s"
+msgstr ""
+
+#: lib/mail.php:246
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+msgstr ""
+
+#: lib/profilelist.php:146
+msgid "(none)"
+msgstr ""
+
+#: lib/stream.php:33
+msgid "Public"
+msgstr "パブリック"
+
+#: lib/stream.php:36 lib/stream.php:37
+msgid "Recent tags"
+msgstr ""
+
+#: lib/stream.php:40
+msgid "Featured"
+msgstr ""
+
+#: lib/stream.php:44
+#, fuzzy
+msgid "Popular"
+msgstr "ピープルサーチ"
+
+#: lib/subs.php:51
+#, fuzzy
+msgid "User has blocked you."
+msgstr "プロファイルがありません。"
+
+#: lib/util.php:2059
+msgid "Send a nudge"
+msgstr ""
+
+#: lib/util.php:2063
+msgid "Nudge sent!"
+msgstr ""
+
+#: lib/util.php:2194
+msgid "Block"
+msgstr ""
+
+#: lib/util.php:2198
+msgid "Unblock"
+msgstr ""
+
+#~ msgid "Couldn't confirm email."
+#~ msgstr "メールを確認できません"
+
+#~ msgid "Email address"
+#~ msgstr "メールアドレス"
+
+#~ msgid "Error inserting notice"
+#~ msgstr "通知追加エラー"
+
+#~ msgid ""
+#~ "If you've forgotten or lost your password, you can get a new one sent  "
+#~ "the email address you have stored  in your account."
+#~ msgstr ""
+#~ "パスワードを忘れた場合、登録されたアドレスで新しいものを受け取ることができ"
+#~ "ます。"
diff --git a/ko/LC_MESSAGES/laconica.po b/ko/LC_MESSAGES/laconica.po
index 971ac3df78..65865b5635 100644
--- a/ko/LC_MESSAGES/laconica.po
+++ b/ko/LC_MESSAGES/laconica.po
@@ -6,47 +6,86 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-14 21:07+1200\n"
+"POT-Creation-Date: 2009-01-12 12:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\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"
-"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"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:61
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
-#: ../actions/register.php:191 actions/finishopenidlogin.php:88
-#: actions/register.php:205
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: actions/finishopenidlogin.php:88 actions/register.php:205
+#: actions/register.php:232
+msgid ""
+" except this private data: password, email address, IM address, phone number."
+msgstr ""
+
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+#: lib/facebookaction.php:195 lib/noticelist.php:160
+msgid " from "
+msgstr ""
+
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: actions/twitapistatuses.php:341
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr ""
+
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
+
+#: ../actions/invite.php:170
+#, php-format
 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 ""
 
-#: ../actions/subscribe.php:84 ../lib/mail.php:124 lib/mail.php:124
-#: lib/mail.php:126
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:115
+#: lib/mail.php:117
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr ""
 
-#: ../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"
@@ -57,133 +96,257 @@ msgid ""
 "%4$s.\n"
 msgstr ""
 
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#: actions/twitapistatuses.php:344
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
+
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
+#: actions/shownotice.php:73
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr ""
 
-#: ../actions/publicrss.php:60 ../actions/publicrss.php:62
-#: actions/publicrss.php:48
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../actions/publicrss.php:62 actions/publicrss.php:48
 #, php-format
 msgid "%s Public Stream"
 msgstr ""
 
-#: ../actions/all.php:47 ../actions/allrss.php:70 ../lib/stream.php:45
-#: ../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: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/twitapistatuses.php:123
 #, php-format
 msgid "%s and friends"
 msgstr ""
 
-#: ../lib/util.php:233 ../lib/util.php:257 lib/util.php:273
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:31
+#, php-format
+msgid "%s public timeline"
+msgstr ""
+
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:217
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:195
+#, php-format
+msgid "%s timeline"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:34
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+
+#: ../lib/util.php:257 lib/util.php:273 lib/util.php:284
 #, 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 ""
 
-#: ../lib/util.php:235 ../lib/util.php:259 lib/util.php:275
+#: ../lib/util.php:259 lib/util.php:275 lib/util.php:286
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr ""
 
-#: ../lib/util.php:250 ../lib/util.php:274 lib/util.php:290
+#: ../lib/util.php:274 lib/util.php:290 lib/util.php:301
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: ../actions/register.php:176 actions/finishopenidlogin.php:79
-#: actions/profilesettings.php:76
+#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
+#: actions/profilesettings.php:78
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 
-#: ../actions/password.php:42 ../actions/register.php:178
+#: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:193
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/profilesettings.php:186
 msgid "6 or more characters"
 msgstr "6글자 이상"
 
-#: ../actions/recoverpassword.php:165 ../actions/recoverpassword.php:180
-#: actions/recoverpassword.php:186
+#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
 msgid "6 or more characters, and don't forget it!"
 msgstr ""
 
-#: ../actions/imsettings.php:188 ../actions/imsettings.php:197
-#: actions/imsettings.php:205
+#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:195
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, 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
+#: actions/emailsettings.php:234
+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 ""
+
+#: ../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/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:30
+#: actions/twitapidirect_messages.php:107 actions/twitapifavorites.php:83
+#: actions/twitapifavorites.php:99 actions/twitapifriendships.php:117
+#: actions/twitapihelp.php:42 actions/twitapistatuses.php:77
+#: actions/twitapistatuses.php:144 actions/twitapistatuses.php:224
+#: actions/twitapistatuses.php:234 actions/twitapistatuses.php:386
+#: actions/twitapistatuses.php:395 actions/twitapistatuses.php:421
+#: actions/twitapiusers.php:30
+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:39
+#: actions/twitapiaccount.php:89 actions/twitapiaccount.php:94
+#: actions/twitapidirect_messages.php:178 actions/twitapifavorites.php:139
+#: actions/twitapihelp.php:49 actions/twitapistatuses.php:549
+msgid "API method under construction."
 msgstr ""
 
-#: ../lib/util.php:296 ../lib/util.php:324 lib/util.php:340
+#: ../lib/util.php:324 lib/util.php:340 lib/util.php:352
 msgid "About"
 msgstr ""
 
-#: ../actions/userauthorization.php:118 ../actions/userauthorization.php:119
-#: actions/userauthorization.php:126
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
 msgid "Accept"
 msgstr ""
 
-#: ../actions/imsettings.php:64 ../actions/openidsettings.php:57
 #: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
-#: ../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/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/twittersettings.php:84
 msgid "Add"
 msgstr ""
 
-#: ../actions/openidsettings.php:43
+#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
 msgid "Add OpenID"
 msgstr "OpenID 추가"
 
-#: ../actions/imsettings.php:39
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: actions/deleteprofile.php:248
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
 msgid "Address"
 msgstr "주소"
 
-#: ../actions/showstream.php:254 ../actions/showstream.php:273
-#: actions/showstream.php:288
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
+
+#: ../actions/showstream.php:273 actions/showstream.php:288
+#: actions/showstream.php:336
 msgid "All subscriptions"
 msgstr ""
 
-#: ../actions/publicrss.php:62 ../actions/publicrss.php:64
-#: actions/publicrss.php:50
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
 #, php-format
 msgid "All updates for %s"
 msgstr ""
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:63
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:29 ../actions/login.php:27
-#: ../actions/openidlogin.php:29 ../actions/register.php:28
-#: ../actions/login.php:31 ../actions/register.php:30
+#: ../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
 msgid "Already logged in."
 msgstr ""
 
-#: ../actions/subscribe.php:48 ../lib/subs.php:42 lib/subs.php:42
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:47
 msgid "Already subscribed!."
 msgstr ""
 
-#: ../actions/userauthorization.php:76 ../actions/userauthorization.php:77
-#: actions/userauthorization.php:83
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+msgid "Are you sure you want to delete this notice?"
+msgstr ""
+
+#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
 msgid "Authorize subscription"
 msgstr ""
 
-#: ../actions/login.php:100 ../actions/register.php:184
 #: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
+#: actions/register.php:192 actions/register.php:219
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 
-#: ../actions/avatar.php:32
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:103
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
+
+#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: actions/profilesettings.php:34
 msgid "Avatar"
 msgstr "아바타"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
+#: actions/profilesettings.php:379
 msgid "Avatar updated."
 msgstr ""
 
@@ -194,39 +357,52 @@ msgid ""
 "message with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 
-#: ../lib/util.php:1136 ../lib/util.php:1318 lib/util.php:1452
-msgid "Before »"
+#: ../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 ""
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+msgid "Awaiting confirmation on this phone number."
+msgstr ""
+
+#: ../lib/util.php:1318 lib/util.php:1452 lib/facebookaction.php:259
+#: lib/util.php:1792
+msgid "Before »"
 msgstr ""
 
-#: ../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:84 actions/register.php:211
 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:222 actions/register.php:98
 msgid "Bio is too long (max 140 chars)."
 msgstr ""
 
-#: ../actions/updateprofile.php:118 ../actions/updateprofile.php:119
-#: actions/updateprofile.php:120
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+msgid "Can't delete this notice."
+msgstr ""
+
+#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr ""
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:261
-#: ../actions/recoverpassword.php:300 actions/profilesettings.php:404
-#: actions/recoverpassword.php:313
+#: ../actions/password.php:85 ../actions/recoverpassword.php:300
+#: actions/profilesettings.php:404 actions/recoverpassword.php:313
+#: actions/profilesettings.php:433
 msgid "Can't save new password."
 msgstr ""
 
-#: ../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:57 ../actions/imsettings.php:58
+#: ../actions/smssettings.php:62 actions/emailsettings.php:58
+#: actions/imsettings.php:59 actions/smssettings.php:62
 msgid "Cancel"
 msgstr ""
 
@@ -234,43 +410,84 @@ msgstr ""
 msgid "Cannot instantiate OpenID consumer object."
 msgstr ""
 
-#: ../actions/imsettings.php:154 ../actions/imsettings.php:163
-#: actions/imsettings.php:171
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
 msgid "Cannot normalize that Jabber ID"
 msgstr ""
 
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:204
+msgid "Cannot normalize that email address"
+msgstr ""
+
 #: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/profilesettings.php:189
 msgid "Change"
 msgstr ""
 
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: actions/deleteprofile.php:245
+msgid "Change email handling"
+msgstr ""
+
 #: ../actions/password.php:32 actions/profilesettings.php:36
 msgid "Change password"
 msgstr ""
 
-#: ../actions/password.php:43 ../actions/recoverpassword.php:166
-#: ../actions/register.php:179 ../actions/recoverpassword.php:181
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr ""
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#: actions/deleteprofile.php:242
+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/profilesettings.php:187 actions/register.php:196
 msgid "Confirm"
 msgstr ""
 
-#: ../actions/confirmaddress.php:84 ../actions/confirmaddress.php:90
-#: actions/confirmaddress.php:90
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
 msgid "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:238 ../actions/imsettings.php:222
+#: ../actions/smssettings.php:245 actions/emailsettings.php:256
+#: actions/imsettings.php:230 actions/smssettings.php:253
+#: actions/emailsettings.php:259
 msgid "Confirmation cancelled."
 msgstr ""
 
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+msgid "Confirmation code"
+msgstr ""
+
 #: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
 msgid "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:97
 msgid "Connect"
 msgstr ""
@@ -279,7 +496,7 @@ msgstr ""
 msgid "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/util.php:360
 msgid "Contact"
 msgstr ""
 
@@ -288,71 +505,99 @@ msgstr ""
 msgid "Could not create OpenID form: %s"
 msgstr ""
 
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:46 actions/twitapifriendships.php:62
+#, 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:39
+msgid "Could not follow user: User not found."
+msgstr ""
+
 #: ../lib/openid.php:160 lib/openid.php:160
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr ""
 
-#: ../actions/updateprofile.php:161 ../actions/updateprofile.php:162
-#: actions/updateprofile.php:163
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
 msgid "Could not save avatar info"
 msgstr ""
 
-#: ../actions/updateprofile.php:154 ../actions/updateprofile.php:155
-#: actions/updateprofile.php:156
+#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
 msgid "Could not save new profile info"
 msgstr ""
 
-#: ../actions/profilesettings.php:146
-msgid "Couldn't confirm email."
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:70
+msgid "Could not subscribe other to you."
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101
-msgid "Couldn't convert request tokens to access tokens."
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:55
+msgid "Could not subscribe."
+msgstr ""
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
 msgstr ""
 
-#: ../actions/subscribe.php:59
-msgid "Couldn't create subscription."
+#: ../actions/finishremotesubscribe.php:99
+#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:112
+msgid "Couldn't convert request tokens to access tokens."
 msgstr ""
 
-#: ../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/emailsettings.php:255
 msgid "Couldn't delete email confirmation."
 msgstr ""
 
-#: ../actions/unsubscribe.php:56 ../lib/subs.php:103 lib/subs.php:116
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:129
 msgid "Couldn't delete subscription."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:125 ../actions/remotesubscribe.php:127
-#: actions/remotesubscribe.php:136
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+#: actions/twitapistatuses.php:82
+msgid "Couldn't find any statuses."
+msgstr ""
+
+#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
+#: actions/remotesubscribe.php:148
 msgid "Couldn't get a request token."
 msgstr ""
 
-#: ../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:205 ../actions/imsettings.php:187
+#: ../actions/smssettings.php:206 actions/emailsettings.php:223
+#: actions/imsettings.php:195 actions/smssettings.php:214
+#: actions/emailsettings.php:228
 msgid "Couldn't insert confirmation code."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182
+#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:216
 msgid "Couldn't insert new subscription."
 msgstr ""
 
-#: ../actions/profilesettings.php:175 ../actions/profilesettings.php:184
-#: ../actions/twitapiaccount.php:96 actions/profilesettings.php:299
-#: actions/twitapiaccount.php:94
+#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
+#: actions/profilesettings.php:319 actions/twitapiaccount.php:74
 msgid "Couldn't save profile."
 msgstr ""
 
-#: ../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:296
+msgid "Couldn't update user for autosubscribe."
+msgstr ""
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+#: actions/emailsettings.php:301 actions/emailsettings.php:315
+msgid "Couldn't update user record."
+msgstr ""
+
 #: ../actions/confirmaddress.php:72 ../actions/emailsettings.php:156
 #: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
 #: ../actions/imsettings.php:243 ../actions/profilesettings.php:141
@@ -361,6 +606,8 @@ msgstr ""
 #: 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/emailsettings.php:179 actions/emailsettings.php:280
+#: actions/othersettings.php:173 actions/profilesettings.php:276
 msgid "Couldn't update user."
 msgstr ""
 
@@ -377,6 +624,7 @@ msgid "Create new account"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+#: actions/finishopenidlogin.php:208
 msgid "Creating new account for OpenID that already has a user."
 msgstr ""
 
@@ -384,51 +632,85 @@ msgstr ""
 msgid "Current confirmed Jabber/GTalk address."
 msgstr ""
 
-#: ../actions/showstream.php:337 ../actions/showstream.php:356
-#: actions/showstream.php:367
-msgid "Currently"
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
-#: ../lib/util.php:893 ../lib/util.php:1061 lib/util.php:1110
-#, php-format
-msgid "DB error inserting reply: %s"
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+msgid "Current confirmed email address."
 msgstr ""
 
-#: ../actions/profilesettings.php:54 ../actions/profilesettings.php:51
-#: ../actions/register.php:172 actions/profilesettings.php:84
-#: actions/register.php:186
-msgid "Describe yourself and your interests in 140 chars"
+#: ../actions/showstream.php:356 actions/showstream.php:367
+#: actions/showstream.php:418
+msgid "Currently"
 msgstr ""
 
-#: ../actions/register.php:181
-msgid "Email"
-msgstr "이메일"
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:87
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: ../lib/util.php:1061 lib/util.php:1110 lib/util.php:1417
+#, php-format
+msgid "DB error inserting reply: %s"
+msgstr ""
+
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+msgid "Delete notice"
+msgstr ""
+
+#: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: actions/profilesettings.php:84 actions/register.php:186
+#: actions/profilesettings.php:86 actions/register.php:213
+msgid "Describe yourself and your interests in 140 chars"
+msgstr ""
+
+#: ../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/deleteprofile.php:244 actions/register.php:199
+#: actions/register.php:202
+msgid "Email"
+msgstr "이메일"
+
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+msgid "Email Address"
+msgstr ""
 
-#: ../actions/profilesettings.php:46
-msgid "Email address"
-msgstr "이메일 주소"
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+msgid "Email Settings"
+msgstr ""
 
-#: ../actions/profilesettings.php:102 ../actions/register.php:63
-#: ../actions/register.php:73 actions/register.php:80
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:89
 msgid "Email address already exists."
 msgstr ""
 
-#: ../lib/mail.php:82 ../lib/mail.php:90 lib/mail.php:90
+#: ../lib/mail.php:90 lib/mail.php:90
 msgid "Email address confirmation"
 msgstr ""
 
-#: ../actions/recoverpassword.php:176 ../actions/recoverpassword.php:191
-#: actions/recoverpassword.php:197
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
+
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr ""
+
+#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
 msgid "Enter a nickname or email address."
 msgstr ""
 
-#: ../actions/userauthorization.php:136 ../actions/userauthorization.php:137
-#: actions/userauthorization.php:144
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+msgid "Enter the code you received on your phone."
+msgstr ""
+
+#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
 msgid "Error authorizing token"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:282 ../actions/finishopenidlogin.php:253
-#: actions/finishopenidlogin.php:259
+#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
+#: actions/finishopenidlogin.php:274
 msgid "Error connecting user to OpenID."
 msgstr ""
 
@@ -437,36 +719,29 @@ msgid "Error connecting user."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:164
 msgid "Error inserting avatar"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145
+#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:156
 msgid "Error inserting new profile"
 msgstr ""
 
-#: ../actions/postnotice.php:88
-msgid "Error inserting notice"
-msgstr ""
-
 #: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:180
 msgid "Error inserting remote profile"
 msgstr ""
 
-#: ../actions/recoverpassword.php:201 ../actions/recoverpassword.php:240
-#: actions/recoverpassword.php:246
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
 msgid "Error saving address confirmation."
 msgstr ""
 
-#: ../actions/userauthorization.php:139 ../actions/userauthorization.php:140
-#: actions/userauthorization.php:147
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
 msgid "Error saving remote profile"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
-#: lib/openid.php:226
+#: ../lib/openid.php:226 lib/openid.php:226
 msgid "Error saving the profile."
 msgstr ""
 
@@ -475,15 +750,15 @@ msgid "Error saving the user."
 msgstr ""
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/profilesettings.php:428
 msgid "Error saving user; invalid."
 msgstr ""
 
-#: ../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/register.php:108 actions/login.php:54 actions/login.php:80
+#: actions/register.php:117
 msgid "Error setting user."
 msgstr ""
 
@@ -492,12 +767,11 @@ msgid "Error updating profile"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163
+#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:174
 msgid "Error updating remote profile"
 msgstr ""
 
-#: ../actions/recoverpassword.php:79 ../actions/recoverpassword.php:80
-#: actions/recoverpassword.php:80
+#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
 msgid "Error with confirmation code."
 msgstr ""
 
@@ -505,27 +779,41 @@ msgstr ""
 msgid "Existing nickname"
 msgstr ""
 
-#: ../lib/util.php:298 ../lib/util.php:326 lib/util.php:342
+#: ../lib/util.php:326 lib/util.php:342 lib/util.php:354
 msgid "FAQ"
 msgstr ""
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/profilesettings.php:381
 msgid "Failed updating avatar."
 msgstr ""
 
-#: ../actions/all.php:61 ../actions/allrss.php:74 ../actions/allrss.php:64
-#: actions/all.php:61 actions/allrss.php:64
+#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
+#: actions/allrss.php:64
 #, php-format
 msgid "Feed for friends of %s"
 msgstr ""
 
-#: ../actions/replies.php:61 ../actions/repliesrss.php:80
-#: ../actions/replies.php:65 actions/replies.php:65 actions/repliesrss.php:66
+#: ../actions/replies.php:65 ../actions/repliesrss.php:80
+#: actions/replies.php:65 actions/repliesrss.php:66
 #, php-format
 msgid "Feed for replies to %s"
 msgstr ""
 
-#: ../actions/login.php:118 ../actions/login.php:122
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:54
+#, php-format
+msgid "Feed for tag %s"
+msgstr ""
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+msgid "Find content of notices"
+msgstr ""
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+msgid "Find people on this site"
+msgstr ""
+
+#: ../actions/login.php:122
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -533,37 +821,52 @@ msgstr ""
 
 #: ../actions/profilesettings.php:44 ../actions/register.php:164
 #: actions/profilesettings.php:77 actions/register.php:178
+#: actions/profilesettings.php:79 actions/register.php:205
 msgid "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/profilesettings.php:219 actions/register.php:95
 msgid "Full name is too long (max 255 chars)."
 msgstr ""
 
-#: ../lib/util.php:279
+#: ../lib/util.php:322 lib/util.php:338 lib/util.php:343 lib/util.php:350
 msgid "Help"
 msgstr "도움말"
 
-#: ../lib/util.php:274
+#: ../lib/util.php:298 lib/util.php:314 lib/util.php:325
 msgid "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:81 actions/register.php:208
 msgid "Homepage"
 msgstr "홈페이지"
 
-#: ../actions/profilesettings.php:87
+#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: actions/profilesettings.php:210 actions/register.php:83
+#: actions/profilesettings.php:216 actions/register.php:92
 msgid "Homepage is not a valid URL."
 msgstr "홈페이지 주소형식이 올바르지 않습니다."
 
-#: ../actions/imsettings.php:61
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+#: actions/emailsettings.php:101
+msgid "I want to post notices by email."
+msgstr ""
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+#: actions/deleteprofile.php:253
+msgid "IM"
+msgstr ""
+
+#: ../actions/imsettings.php:60 actions/imsettings.php:61
 msgid "IM Address"
 msgstr "메신저 주소"
 
-#: ../actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
 msgid "IM Settings"
 msgstr "메신저 설정"
 
@@ -579,58 +882,73 @@ msgid ""
 "click \"Add\"."
 msgstr ""
 
-#: ../actions/recoverpassword.php:122
+#: ../actions/recoverpassword.php:137
 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 ""
 
+#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
+#: actions/emailsettings.php:68 actions/smssettings.php:76
+msgid "Incoming email"
+msgstr ""
+
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+#: actions/emailsettings.php:304
+msgid "Incoming email address removed."
+msgstr ""
+
 #: ../actions/password.php:69 actions/profilesettings.php:388
+#: actions/profilesettings.php:417
 msgid "Incorrect old password"
 msgstr ""
 
-#: ../actions/login.php:63 ../actions/login.php:67 actions/login.php:67
+#: ../actions/login.php:67 actions/login.php:67 actions/login.php:74
 msgid "Incorrect username or password."
 msgstr ""
 
-#: ../actions/recoverpassword.php:226 ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:265
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
 
-#: ../actions/updateprofile.php:113 ../actions/updateprofile.php:114
-#: actions/updateprofile.php:115
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr ""
 
-#: ../actions/updateprofile.php:97 ../actions/updateprofile.php:98
-#: actions/updateprofile.php:99
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr ""
 
-#: ../actions/updateprofile.php:81 ../actions/updateprofile.php:82
-#: actions/updateprofile.php:83
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr ""
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:63
 msgid "Invalid notice content"
 msgstr ""
 
 #: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:69
 msgid "Invalid notice uri"
 msgstr ""
 
 #: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:74
 msgid "Invalid notice url"
 msgstr ""
 
-#: ../actions/updateprofile.php:86 ../actions/updateprofile.php:87
-#: actions/updateprofile.php:88
+#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr ""
@@ -640,7 +958,7 @@ msgid "Invalid profile URL (bad format)"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:78
 msgid "Invalid profile URL returned by server."
 msgstr ""
 
@@ -648,74 +966,119 @@ msgstr ""
 msgid "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:235 ../actions/register.php:93
+#: ../actions/register.php:111 actions/finishopenidlogin.php:241
+#: actions/register.php:103 actions/register.php:121
+#: actions/finishopenidlogin.php:256 actions/register.php:112
+#: actions/register.php:130
 msgid "Invalid username or password."
 msgstr ""
 
-#: ../lib/util.php:237 ../lib/util.php:261 lib/util.php:277
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr ""
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
+
+#: ../lib/util.php:306 lib/util.php:322 lib/util.php:332
+msgid "Invite"
+msgstr ""
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr ""
+
+#: ../lib/util.php:261 lib/util.php:277 lib/util.php:288
 #, 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 ""
 
-#: ../actions/imsettings.php:164 ../actions/imsettings.php:173
-#: actions/imsettings.php:181
+#: ../actions/imsettings.php:173 actions/imsettings.php:181
 msgid "Jabber ID already belongs to another user."
 msgstr ""
 
-#: ../actions/imsettings.php:63 ../actions/imsettings.php:62
-#: 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 ""
 
-#: ../actions/profilesettings.php:55
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
+msgid "Language"
+msgstr ""
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr ""
+
+#: ../actions/profilesettings.php:52 ../actions/register.php:173
+#: actions/profilesettings.php:85 actions/register.php:187
+#: actions/profilesettings.php:87 actions/register.php:214
 msgid "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/profilesettings.php:225 actions/register.php:101
 msgid "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/login.php:104 actions/login.php:113 actions/openidlogin.php:88
+#: lib/util.php:336
 msgid "Login"
 msgstr "로그인"
 
-#: ../actions/openidlogin.php:44
+#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:60
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "[OpenID](%%doc.openid%%)로 로그인하세요."
 
-#: ../actions/login.php:122 ../actions/login.php:126
+#: ../actions/login.php:126
 #, 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 ""
 
-#: ../lib/util.php:284
+#: ../lib/util.php:308 lib/util.php:324 lib/util.php:334
 msgid "Logout"
 msgstr "로그아웃"
 
-#: ../actions/login.php:106
+#: ../actions/register.php:166 actions/register.php:180
+#: actions/register.php:207
+msgid "Longer name, preferably your \"real\" name"
+msgstr ""
+
+#: ../actions/login.php:110 actions/login.php:110 actions/login.php:118
 msgid "Lost or forgotten password?"
 msgstr "비밀번호를 잊어버리셨어요?"
 
-#: ../actions/showstream.php:281 ../actions/showstream.php:300
-#: actions/showstream.php:315
+#: ../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 ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr ""
+
+#: ../actions/showstream.php:300 actions/showstream.php:315
+#: actions/showstream.php:363
 msgid "Member since"
 msgstr ""
 
@@ -724,53 +1087,80 @@ msgstr ""
 msgid "Microblog by %s"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
-#: ../actions/register.php:188 actions/finishopenidlogin.php:85
-#: actions/register.php:202
+#: ../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 ""
+
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php:85 actions/register.php:202
+#: actions/register.php:229
 msgid "My text and files are available under "
 msgstr ""
 
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+msgid "New"
+msgstr ""
+
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:138
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+#: actions/emailsettings.php:318
+msgid "New incoming email address added."
+msgstr ""
+
 #: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
 msgid "New nickname"
 msgstr ""
 
-#: ../actions/newnotice.php:100 ../actions/newnotice.php:87
-#: actions/newnotice.php:96
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:141
 msgid "New notice"
 msgstr ""
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:164
-#: ../actions/recoverpassword.php:179 actions/profilesettings.php:180
-#: actions/recoverpassword.php:185
+#: ../actions/password.php:41 ../actions/recoverpassword.php:179
+#: actions/profilesettings.php:180 actions/recoverpassword.php:185
+#: actions/profilesettings.php:185
 msgid "New password"
 msgstr ""
 
-#: ../actions/recoverpassword.php:275 ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:314
 msgid "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:108 actions/profilesettings.php:76
+#: actions/register.php:192
 msgid "Nickname"
 msgstr "닉네임"
 
-#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:99
-#: ../actions/register.php:59 ../actions/profilesettings.php:110
+#: ../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/finishopenidlogin.php:192 actions/profilesettings.php:231
+#: actions/register.php:85
 msgid "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/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: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:182 actions/profilesettings.php:209
+#: actions/register.php:83
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:187
 msgid "Nickname not allowed."
 msgstr ""
 
@@ -778,37 +1168,57 @@ msgstr ""
 msgid "Nickname of the user you want to follow"
 msgstr ""
 
-#: ../actions/recoverpassword.php:147 ../actions/recoverpassword.php:162
-#: actions/recoverpassword.php:167
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
 msgid "Nickname or email"
 msgstr ""
 
-#: ../actions/imsettings.php:147 ../actions/imsettings.php:156
-#: actions/imsettings.php:164
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:104
+msgid "No"
+msgstr ""
+
+#: ../actions/imsettings.php:156 actions/imsettings.php:164
 msgid "No Jabber ID."
 msgstr ""
 
-#: ../actions/userauthorization.php:128 ../actions/userauthorization.php:129
-#: actions/userauthorization.php:136
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
 msgid "No authorization request!"
 msgstr ""
 
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+msgid "No carrier selected."
+msgstr ""
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+msgid "No code entered"
+msgstr ""
+
 #: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
 msgid "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/newnotice.php:44 actions/newmessage.php:53
+#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:52
+#: actions/newnotice.php:53
 msgid "No content!"
 msgstr ""
 
-#: ../actions/userbyid.php:27 ../actions/userbyid.php:32
-#: actions/userbyid.php:32
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+#: actions/emailsettings.php:197
+msgid "No email address."
+msgstr ""
+
+#: ../actions/userbyid.php:32 actions/userbyid.php:32
 msgid "No id."
 msgstr ""
 
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+#: actions/emailsettings.php:292
+msgid "No incoming email address."
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67
+#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:66
 msgid "No nickname provided by remote server."
 msgstr ""
 
@@ -816,30 +1226,33 @@ msgstr ""
 msgid "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:222 ../actions/imsettings.php:206
+#: ../actions/smssettings.php:229 actions/emailsettings.php:240
+#: actions/imsettings.php:214 actions/smssettings.php:237
+#: actions/emailsettings.php:243
 msgid "No pending confirmation to cancel."
 msgstr ""
 
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+msgid "No phone number."
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74
+#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:73
 msgid "No profile URL returned by server."
 msgstr ""
 
-#: ../actions/recoverpassword.php:189 ../actions/recoverpassword.php:226
-#: actions/recoverpassword.php:232
+#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
 msgid "No registered email address for that user."
 msgstr ""
 
-#: ../actions/userauthorization.php:48 ../actions/userauthorization.php:49
-#: actions/userauthorization.php:55
+#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
 msgid "No request found!"
 msgstr ""
 
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
 #: actions/noticesearch.php:69 actions/peoplesearch.php:69
+#: actions/noticesearch.php:68 actions/peoplesearch.php:59
 msgid "No results"
 msgstr ""
 
@@ -847,6 +1260,17 @@ msgstr ""
 msgid "No size."
 msgstr ""
 
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:109
+#: actions/twitapistatuses.php:438
+msgid "No status found with that ID."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:411
+msgid "No status with that ID found."
+msgstr ""
+
 #: ../actions/openidsettings.php:135 actions/openidsettings.php:144
 msgid "No such OpenID."
 msgstr ""
@@ -855,9 +1279,10 @@ msgstr ""
 msgid "No such document."
 msgstr ""
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:65
-#: ../actions/shownotice.php:83 ../lib/deleteaction.php:30
-#: 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:32
+#: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:38
+#: actions/shownotice.php:114
 msgid "No such notice."
 msgstr ""
 
@@ -870,28 +1295,31 @@ msgid "No such subscription"
 msgstr ""
 
 #: ../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/foaf.php:40 ../actions/replies.php:57
+#: ../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/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/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/showstream.php:157
+#: classes/Command.php:208 classes/Command.php:242 lib/gallery.php:85
+#: lib/subs.php:105
 msgid "No such user."
 msgstr ""
 
-#: ../lib/gallery.php:76 ../lib/gallery.php:80 lib/gallery.php:85
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr ""
+
+#: ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
 msgstr ""
 
@@ -899,8 +1327,18 @@ msgstr ""
 msgid "Not a recovery code."
 msgstr ""
 
-#: ../actions/imsettings.php:158 ../actions/imsettings.php:167
-#: actions/imsettings.php:175
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+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:423 lib/twitterapi.php:450
+#: lib/twitterapi.php:534
+msgid "Not a supported data format."
+msgstr ""
+
+#: ../actions/imsettings.php:167 actions/imsettings.php:175
 msgid "Not a valid Jabber ID"
 msgstr ""
 
@@ -908,24 +1346,26 @@ msgstr ""
 msgid "Not a valid OpenID."
 msgstr ""
 
-#: ../actions/profilesettings.php:75 ../actions/register.php:53
-#: ../actions/register.php:63 actions/register.php:70
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+#: actions/emailsettings.php:208
+msgid "Not a valid email address"
+msgstr ""
+
+#: ../actions/register.php:63 actions/register.php:70 actions/register.php:79
 msgid "Not a valid email address."
 msgstr ""
 
-#: ../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/profilesettings.php:212 actions/register.php:87
 msgid "Not a valid nickname."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:118 ../actions/remotesubscribe.php:120
-#: actions/remotesubscribe.php:129
+#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
 msgid "Not a valid profile URL (incorrect services)."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:111 ../actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:122
+#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr ""
 
@@ -934,11 +1374,12 @@ msgid "Not a valid profile URL (no YADIS document)."
 msgstr ""
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: actions/profilesettings.php:361
 msgid "Not an image or corrupt file."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:52
 msgid "Not authorized."
 msgstr ""
 
@@ -947,41 +1388,61 @@ msgstr ""
 msgid "Not expecting this response!"
 msgstr ""
 
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
-#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
-#: ../actions/logout.php:33 ../actions/subscribe.php:28
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+#: actions/twitapistatuses.php:304
+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
-#: 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
+#: ../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:31 actions/newnotice.php:30
+#: actions/nudge.php:30 actions/subedit.php:31 actions/unblock.php:31
 msgid "Not logged in."
 msgstr ""
 
-#: ../actions/unsubscribe.php:43 ../lib/subs.php:91 lib/subs.php:104
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:117
 msgid "Not subscribed!."
 msgstr ""
 
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+msgid "Notice Search"
+msgstr ""
+
 #: ../actions/showstream.php:82 actions/showstream.php:82
+#: actions/showstream.php:111 actions/showstream.php:118
+#: actions/showstream.php:123
 #, php-format
 msgid "Notice feed for %s"
 msgstr ""
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
+#: actions/shownotice.php:45
 msgid "Notice has no profile"
 msgstr ""
 
-#: ../actions/showstream.php:297 ../actions/showstream.php:316
-#: actions/showstream.php:331
+#: ../actions/showstream.php:316 actions/showstream.php:331
+#: actions/showstream.php:379
 msgid "Notices"
 msgstr ""
 
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
+#, php-format
+msgid "Notices tagged with %s"
+msgstr ""
+
 #: ../actions/password.php:39 actions/profilesettings.php:178
+#: actions/profilesettings.php:183
 msgid "Old password"
 msgstr ""
 
-#: ../lib/util.php:288
+#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
+#: lib/util.php:330 actions/deleteprofile.php:247 lib/util.php:340
 msgid "OpenID"
 msgstr "OpenID"
 
@@ -994,12 +1455,15 @@ msgid "OpenID Auto-Submit"
 msgstr ""
 
 #: ../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/finishopenidlogin.php:150 actions/openidlogin.php:76
 msgid "OpenID Login"
 msgstr "OpenID 로그인"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 #: actions/openidlogin.php:74 actions/openidsettings.php:50
+#: actions/openidlogin.php:82
 msgid "OpenID URL"
 msgstr ""
 
@@ -1027,86 +1491,112 @@ msgstr ""
 msgid "OpenID settings"
 msgstr ""
 
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: actions/profilesettings.php:350
 msgid "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/login.php:109 actions/register.php:194
 msgid "Password"
 msgstr "비밀번호"
 
-#: ../actions/recoverpassword.php:249
+#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
 msgid "Password and confirmation do not match."
 msgstr "비밀번호가 일치하지 않습니다."
 
-#: ../actions/recoverpassword.php:245 ../actions/recoverpassword.php:284
-#: actions/recoverpassword.php:297
+#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
 msgid "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
 msgid "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/profilesettings.php:437
 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/profilesettings.php:409 actions/register.php:107
 msgid "Passwords don't match."
 msgstr "비밀번호가 일치하지 않습니다."
 
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+msgid "People"
+msgstr ""
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+msgid "People Search"
+msgstr ""
+
 #: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
 msgid "People search"
 msgstr ""
 
-#: ../lib/stream.php:44 ../lib/stream.php:50 lib/personal.php:50
+#: ../lib/stream.php:50 lib/personal.php:50
 msgid "Personal"
 msgstr ""
 
-#: ../actions/userauthorization.php:77 ../actions/userauthorization.php:78
+#: ../actions/invite.php:133 actions/invite.php:141
+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 ""
 
-#: ../actions/imsettings.php:74 ../actions/imsettings.php:73
-#: actions/imsettings.php:74
+#: ../actions/imsettings.php:73 actions/imsettings.php:74
 msgid "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: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
 msgid "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:162 ../actions/imsettings.php:144
+#: ../actions/smssettings.php:163 actions/emailsettings.php:180
+#: actions/imsettings.php:152 actions/smssettings.php:171
+#: actions/emailsettings.php:185 actions/othersettings.php:179
 msgid "Preferences saved."
 msgstr ""
 
-#: ../lib/util.php:300
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
+msgid "Preferred language"
+msgstr ""
+
+#: ../lib/util.php:328 lib/util.php:344 lib/util.php:356
 msgid "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:119 classes/Notice.php:139 classes/Notice.php:149
 msgid "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/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
+#: lib/settingsaction.php:84 actions/deleteprofile.php:241
 msgid "Profile"
 msgstr ""
 
@@ -1118,31 +1608,38 @@ msgstr ""
 msgid "Profile settings"
 msgstr ""
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
-#: ../actions/updateprofile.php:52 actions/postnotice.php:52
-#: actions/updateprofile.php:53
+#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
+#: actions/postnotice.php:52 actions/updateprofile.php:53
 msgid "Profile unknown"
 msgstr ""
 
-#: ../lib/util.php:276
-msgid "Public"
-msgstr ""
-
-#: ../actions/public.php:54 actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:77
 msgid "Public Stream Feed"
 msgstr ""
 
-#: ../actions/public.php:33 actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 lib/stream.php:34
 msgid "Public timeline"
 msgstr ""
 
-#: ../actions/recoverpassword.php:151 ../actions/recoverpassword.php:166
-#: actions/recoverpassword.php:171
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:104
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
 msgid "Recover"
 msgstr ""
 
-#: ../actions/recoverpassword.php:141 ../actions/recoverpassword.php:156
-#: actions/recoverpassword.php:161
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
 msgid "Recover password"
 msgstr ""
 
@@ -1150,21 +1647,33 @@ msgstr ""
 msgid "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:181 actions/register.php:234 lib/util.php:338
 msgid "Register"
 msgstr "회원가입"
 
-#: ../actions/userauthorization.php:119 ../actions/userauthorization.php:120
-#: actions/userauthorization.php:127
+#: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:173
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:241
+msgid "Registration successful"
+msgstr ""
+
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
 msgid "Reject"
 msgstr ""
 
-#: ../actions/login.php:99 ../actions/register.php:183
+#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
+#: actions/register.php:190 actions/login.php:110 actions/openidlogin.php:85
+#: actions/register.php:217
 msgid "Remember me"
 msgstr "자동 로그인"
 
-#: ../actions/updateprofile.php:69 ../actions/updateprofile.php:70
-#: actions/updateprofile.php:71
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
 msgid "Remote profile with no matching profile"
 msgstr ""
 
@@ -1172,11 +1681,17 @@ msgstr ""
 msgid "Remote subscribe"
 msgstr ""
 
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php:48 actions/emailsettings.php:76
+#: actions/imsettings.php:49 actions/openidsettings.php:108
+#: actions/smssettings.php:50 actions/smssettings.php:84
+#: actions/twittersettings.php:59 actions/twittersettings.php:61
 msgid "Remove"
 msgstr "삭제"
 
-#: ../actions/openidsettings.php:68
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
 msgid "Remove OpenID"
 msgstr "OpenID 삭제"
 
@@ -1186,50 +1701,73 @@ msgid ""
 "remove it, add another OpenID first."
 msgstr ""
 
-#: ../lib/stream.php:49 ../lib/stream.php:55 lib/personal.php:55
+#: ../lib/stream.php:55 lib/personal.php:55
 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
 #, 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
 msgid "Reset"
 msgstr ""
 
-#: ../actions/recoverpassword.php:158 ../actions/recoverpassword.php:173
-#: actions/recoverpassword.php:178
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
 msgid "Reset password"
 msgstr ""
 
-#: ../actions/recoverpassword.php:167 ../actions/register.php:180
-#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-msgid "Same as password above"
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/deleteprofile.php:250 actions/subscriptions.php:73
+msgid "SMS"
 msgstr ""
 
-#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
-#: ../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
-msgid "Save"
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+msgid "SMS Phone number"
 msgstr ""
 
-#: ../lib/searchaction.php:73 ../lib/util.php:277
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:230
+msgid "SMS confirmation"
+msgstr ""
+
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
+msgid "Same as password above"
+msgstr ""
+
+#: ../actions/register.php:156 actions/register.php:170
+#: actions/register.php:197
+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/twittersettings.php:83 actions/emailsettings.php:107
+#: actions/othersettings.php:56 actions/profilesettings.php:106
+#: actions/subscriptions.php:74 actions/tagother.php:100
+#: actions/twittersettings.php:82
+msgid "Save"
+msgstr ""
+
+#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
+#: lib/util.php:316 lib/util.php:327
 msgid "Search"
 msgstr "검색"
 
 #: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:84
 msgid "Search Stream Feed"
 msgstr ""
 
 #: ../actions/noticesearch.php:30 actions/noticesearch.php:30
+#: actions/noticesearch.php:29
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -1243,25 +1781,51 @@ msgid ""
 "Separate the terms by spaces; they must be 3 characters or more."
 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/smssettings.php:296 actions/smssettings.php:304
+msgid "Select a carrier"
+msgstr ""
+
+#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
+#: lib/util.php:1306 lib/util.php:1731 lib/util.php:1646 lib/util.php:2158
 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
+msgid "Send email to this address to post new notices."
+msgstr ""
+
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+msgid "Send me notices of new subscriptions through email."
+msgstr ""
+
+#: ../actions/imsettings.php:70 actions/imsettings.php:71
 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 ""
+
+#: ../lib/util.php:304 lib/util.php:320 lib/util.php:330
 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:336
 msgid "Settings saved."
 msgstr ""
 
+#: ../actions/tag.php:60 actions/tag.php:60 actions/tag.php:59
+msgid "Showing most popular tags from the last week"
+msgstr ""
+
 #: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
 msgid "Someone else already has this OpenID."
 msgstr ""
@@ -1271,55 +1835,76 @@ msgstr ""
 msgid "Something weird happened."
 msgstr ""
 
-#: ../lib/util.php:302
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr ""
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: ../lib/util.php:330 lib/util.php:346 lib/util.php:358
 msgid "Source"
 msgstr "소스 코드"
 
-#: ../actions/showstream.php:277
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:359
 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:199 actions/finishopenidlogin.php:267
 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:254 lib/util.php:2078
 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:376 lib/gallery.php:136 lib/gallery.php:137
 msgid "Subscribers"
 msgstr ""
 
-#: ../actions/userauthorization.php:309 ../actions/userauthorization.php:310
-#: actions/userauthorization.php:322
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
 msgid "Subscription authorized"
 msgstr ""
 
-#: ../actions/userauthorization.php:319 ../actions/userauthorization.php:320
-#: actions/userauthorization.php:332
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
 msgid "Subscription rejected"
 msgstr ""
 
-#: ../actions/showstream.php:212 ../actions/showstream.php:288
-#: ../actions/subscriptions.php:27 ../actions/showstream.php:230
-#: ../actions/showstream.php:307 actions/showstream.php:240
+#: ../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:288 actions/showstream.php:370 lib/gallery.php:131
+#: lib/gallery.php:132
 msgid "Subscriptions"
 msgstr ""
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
+#: actions/profilesettings.php:353
 msgid "System error uploading file."
 msgstr ""
 
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317 actions/profilesettings.php:90 actions/showstream.php:382
+#: actions/tag.php:40 actions/tagother.php:96 actions/tagother.php:162
+#: lib/profilelist.php:126 lib/profilelist.php:128
+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:33
 msgid "Text search"
 msgstr ""
 
@@ -1335,53 +1920,87 @@ msgstr ""
 msgid "That confirmation code is not for you!"
 msgstr ""
 
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:214
+msgid "That email address already belongs to another user."
+msgstr ""
+
 #: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: actions/profilesettings.php:346
 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
 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:211
+msgid "That is already your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+msgid "That is already your phone number."
+msgstr ""
+
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
 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:270
+msgid "That is not your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+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:247
 msgid "That is the wrong IM address."
 msgstr ""
 
-#: ../actions/newnotice.php:52 ../actions/newnotice.php:49
-#: ../actions/twitapistatuses.php:408 actions/newnotice.php:49
-#: actions/twitapistatuses.php:330
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+msgid "That is the wrong confirmation number."
+msgstr ""
+
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+msgid "That phone number already belongs to another user."
+msgstr ""
+
+#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: actions/newnotice.php:49 actions/twitapistatuses.php:330
+#: actions/newnotice.php:61 actions/twitapistatuses.php:271
 msgid "That's too long. Max notice size is 140 chars."
 msgstr ""
 
-#: ../actions/confirmaddress.php:86 ../actions/confirmaddress.php:92
-#: actions/confirmaddress.php:92
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+#: actions/twitapiaccount.php:55
+msgid "That's too long. Max notice size is 255 chars."
+msgstr ""
+
+#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr ""
 
-#: ../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:285
 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 ""
 
-#: ../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 "
@@ -1406,7 +2025,12 @@ 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
+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 ""
 
@@ -1424,22 +2048,52 @@ msgid ""
 "your existing account, if you have one."
 msgstr ""
 
-#: ../lib/util.php:147 ../lib/util.php:164 lib/util.php:246
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:94
+#: actions/twitapifriendships.php:82 actions/twitapistatuses.php:428
+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:46
+#: actions/twitapidirect_messages.php:117 actions/twitapifriendships.php:30
+#: actions/twitapistatuses.php:239
+msgid "This method requires a POST."
+msgstr ""
+
+#: ../lib/util.php:164 lib/util.php:246 lib/util.php:257
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
+msgid "Timezone"
+msgstr ""
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr ""
+
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"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 ""
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: actions/twitapifriendships.php:128
+msgid "Two user ids or screen_names must be supplied."
 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:83 actions/register.php:210
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 
@@ -1447,25 +2101,29 @@ 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/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/emailsettings.php:147
+#: actions/othersettings.php:146 actions/twittersettings.php:199
 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
 msgid "Unexpected password reset."
 msgstr ""
 
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60
+#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:59
 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 lib/util.php:296
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
@@ -1476,22 +2134,45 @@ msgstr ""
 msgid "Unrecognized address type %s"
 msgstr ""
 
-#: ../actions/showstream.php:193 ../actions/showstream.php:209
-#: actions/showstream.php:219
+#: ../actions/showstream.php:209 actions/showstream.php:219
+#: actions/showstream.php:267 lib/util.php:2094
 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
 msgid "Unsupported OMB version"
 msgstr ""
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: actions/profilesettings.php:371
 msgid "Unsupported image file format."
 msgstr ""
 
-#: ../actions/avatar.php:68
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: actions/deleteprofile.php:251
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: actions/deleteprofile.php:254
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/twitapistatuses.php:126
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:198
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
+
+#: ../actions/avatar.php:68 actions/profilesettings.php:161
+#: actions/profilesettings.php:166
 msgid "Upload"
 msgstr "이미지 올리기"
 
@@ -1503,28 +2184,39 @@ msgid ""
 "share."
 msgstr ""
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:182
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr ""
+
+#: ../actions/invite.php:114 actions/invite.php:121
+msgid ""
+"Use this form to invite your friends and colleagues to use this service."
+msgstr ""
+
 #: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176
+#: actions/register.php:173 actions/register.php:176 actions/register.php:200
+#: actions/register.php:203
 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:92
 msgid "User being listened to doesn't exist."
 msgstr ""
 
 #: ../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/showstream.php:57
+#: actions/twitapiaccount.php:63 actions/twitapifavorites.php:40
+#: actions/twitapistatuses.php:163 actions/twitapistatuses.php:492
+#: lib/twitterapi.php:590
 msgid "User has no profile."
 msgstr ""
 
@@ -1532,46 +2224,78 @@ 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:101
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../lib/util.php:1159 lib/util.php:1293 lib/util.php:1630
 #, php-format
 msgid "What's up, %s?"
 msgstr ""
 
-#: ../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:89 actions/register.php:216
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 
-#: ../actions/updateprofile.php:127 ../actions/updateprofile.php:128
-#: actions/updateprofile.php:129
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr ""
 
-#: ../actions/updateprofile.php:122 ../actions/updateprofile.php:123
-#: actions/updateprofile.php:124
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr ""
 
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+#: actions/block.php:105
+msgid "Yes"
+msgstr ""
+
 #: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
 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
 msgid "You are already logged in!"
 msgstr ""
 
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:102
+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/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 ""
 
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
 #: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
@@ -1581,41 +2305,70 @@ msgstr ""
 #: ../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 ""
-"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
+#: actions/finishremotesubscribe.php:83 actions/finishremotesubscribe.php:99
 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/register.php:77
 msgid "You can't register if you don't agree to the license."
 msgstr ""
 
-#: ../actions/updateprofile.php:62 ../actions/updateprofile.php:63
-#: actions/updateprofile.php:64
+#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
 msgid "You did not send us that profile"
 msgstr ""
 
-#: ../actions/recoverpassword.php:134 ../actions/recoverpassword.php:149
+#: ../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 ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: actions/twitapistatuses.php:455
+msgid "You may not delete another user's status."
+msgstr ""
+
+#: ../actions/invite.php:31 actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+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!"
+msgstr ""
+
+#: ../actions/recoverpassword.php:149
 msgid "You've been identified. Enter a  new password below. "
 msgstr ""
 
 #: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:84
 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."
 msgstr ""
 
@@ -1626,788 +2379,84 @@ msgid ""
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
 
-#: ../lib/util.php:814 ../lib/util.php:943 lib/util.php:992
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:1287
 msgid "a few seconds ago"
 msgstr ""
 
-#: ../lib/util.php:826
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:1299
 #, php-format
 msgid "about %d days ago"
 msgstr "%d일전"
 
-#: ../lib/util.php:822
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:1295
 #, php-format
 msgid "about %d hours ago"
 msgstr "%d시간전"
 
-#: ../lib/util.php:818
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:1291
 #, php-format
 msgid "about %d minutes ago"
 msgstr "%d분전"
 
-#: ../lib/util.php:830 ../lib/util.php:959 lib/util.php:1008
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:1303
 #, php-format
 msgid "about %d months ago"
 msgstr ""
-
-#: ../lib/util.php:824 ../lib/util.php:953 lib/util.php:1002
-msgid "about a day ago"
-msgstr ""
-
-#: ../lib/util.php:816 ../lib/util.php:945 lib/util.php:994
-msgid "about a minute ago"
-msgstr ""
-
-#: ../lib/util.php:828 ../lib/util.php:957 lib/util.php:1006
-msgid "about a month ago"
-msgstr ""
-
-#: ../lib/util.php:832 ../lib/util.php:961 lib/util.php:1010
-msgid "about a year ago"
-msgstr ""
-
-#: ../lib/util.php:820 ../lib/util.php:949 lib/util.php:998
-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..."
-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
-msgid "reply"
-msgstr ""
-
-#: ../actions/password.php:44 actions/profilesettings.php:183
-msgid "same as password above"
-msgstr ""
-
-#: ../lib/util.php:1127 ../lib/util.php:1309 lib/util.php:1443
-msgid "« After"
-msgstr ""
-
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr ""
-
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
-
-#: ../actions/invite.php:168 actions/invite.php:176
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
-
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
-
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
-#, php-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#, php-format
-msgid "%s public timeline"
-msgstr ""
-
-#: ../lib/mail.php:206 lib/mail.php:212
-#, php-format
-msgid "%s status"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#, php-format
-msgid "%s timeline"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
-msgstr ""
-
-#: ../actions/register.php:213
-msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
-msgstr ""
-
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-
-#: ../actions/register.php:154 actions/register.php:168
-msgid "6 or more characters. Required."
-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 ""
-
-#: ../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/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!"
-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 ""
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-msgid "Add or remove OpenIDs"
-msgstr ""
-
-#: ../actions/invite.php:131 actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
-msgstr ""
-
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-msgid "Are you sure you want to delete this notice?"
-msgstr ""
-
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr ""
-
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
-msgid "Can't delete this notice."
-msgstr ""
-
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-msgid "Cannot normalize that email address"
-msgstr ""
-
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr ""
-
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
-msgstr ""
-
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-msgid "Change your profile settings"
-msgstr ""
-
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-msgid "Confirmation code"
-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/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
-msgstr ""
-
-#: ../lib/subs.php:54 lib/subs.php:61
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: ../lib/subs.php:46 lib/subs.php:46
-msgid "Could not subscribe."
-msgstr ""
-
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-msgid "Could not update user with confirmed email address."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-msgid "Couldn't find any statuses."
-msgstr ""
-
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-msgid "Couldn't update user for autosubscribe."
-msgstr ""
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-msgid "Couldn't update user record."
-msgstr ""
-
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-msgid "Current confirmed email address."
-msgstr ""
-
-#: ../classes/Notice.php:72 classes/Notice.php:86
-#, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr ""
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-msgid "Delete notice"
-msgstr ""
-
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-msgid "Email Address"
-msgstr ""
-
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-msgid "Email Settings"
-msgstr ""
-
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-msgid "Email address, like \"UserName@example.org\""
-msgstr ""
-
-#: ../actions/invite.php:129 actions/invite.php:137
-msgid "Email addresses"
-msgstr ""
-
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
-msgstr ""
-
-#: ../actions/tag.php:55 actions/tag.php:55
-#, php-format
-msgid "Feed for tag %s"
-msgstr ""
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr ""
-
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr ""
-
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-msgid "I want to post notices by email."
-msgstr ""
-
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
-msgstr ""
-
-#: ../actions/recoverpassword.php:137
-msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
-"email address you have stored  in your account."
-msgstr ""
-
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-msgid "Incoming email"
-msgstr ""
-
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-msgid "Incoming email address removed."
-msgstr ""
-
-#: ../actions/invite.php:55 actions/invite.php:62
-#, php-format
-msgid "Invalid email address: %s"
-msgstr ""
-
-#: ../actions/invite.php:79 actions/invite.php:86
-msgid "Invitation(s) sent"
-msgstr ""
-
-#: ../actions/invite.php:97 actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
-msgstr ""
-
-#: ../lib/util.php:306 lib/util.php:322
-msgid "Invite"
-msgstr ""
-
-#: ../actions/invite.php:123 actions/invite.php:130
-msgid "Invite new users"
-msgstr ""
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Language"
-msgstr ""
-
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-msgid "Language is too long (max 50 chars)."
-msgstr ""
-
-#: ../actions/register.php:166 actions/register.php:180
-msgid "Longer name, preferably your \"real\" name"
-msgstr ""
-
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-#: actions/emailsettings.php:81 actions/smssettings.php:89
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
-
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-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 ""
-
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-msgid "New"
-msgstr ""
-
-#: ../lib/mail.php:144 lib/mail.php:144
-#, php-format
-msgid "New email address for posting to %s"
-msgstr ""
-
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-msgid "New incoming email address added."
-msgstr ""
-
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-msgid "No"
-msgstr ""
-
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-msgid "No carrier selected."
-msgstr ""
-
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-msgid "No code entered"
-msgstr ""
-
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-msgid "No email address."
-msgstr ""
-
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-msgid "No incoming email address."
-msgstr ""
-
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-msgid "No phone number."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-msgid "No status found with that ID."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-msgid "No status with that ID found."
-msgstr ""
-
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-msgid "No user with that email address or username."
-msgstr ""
-
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-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
-msgid "Not a supported data format."
-msgstr ""
-
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-msgid "Not a valid email address"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-msgid "Not found"
-msgstr ""
-
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-msgid "Notice Search"
-msgstr ""
-
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81
-#, php-format
-msgid "Notices tagged with %s"
-msgstr ""
-
-#: ../actions/invite.php:135 actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-msgid "People"
-msgstr ""
-
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-msgid "People Search"
-msgstr ""
-
-#: ../actions/invite.php:133 actions/invite.php:141
-msgid "Personal message"
-msgstr ""
-
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Preferred language"
-msgstr ""
-
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
-
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-msgid "Publish a MicroID for my email address."
-msgstr ""
-
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr ""
-
-#: ../actions/register.php:28 actions/register.php:28
-msgid "Registration not allowed."
-msgstr ""
-
-#: ../actions/register.php:200 actions/register.php:214
-msgid "Registration successful"
-msgstr ""
-
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
-msgstr ""
-
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-msgid "SMS Phone number"
-msgstr ""
-
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-msgid "SMS Settings"
-msgstr ""
-
-#: ../lib/mail.php:219 lib/mail.php:225
-msgid "SMS confirmation"
-msgstr ""
-
-#: ../actions/register.php:156 actions/register.php:170
-msgid "Same as password above. Required."
-msgstr ""
-
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-msgid "Select a carrier"
-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."
-msgstr ""
-
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-msgid "Send me notices of new subscriptions through email."
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr ""
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
-msgstr ""
-
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317
-msgid "Tags"
-msgstr ""
-
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr ""
-
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr ""
-
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-msgid "That is already your email address."
-msgstr ""
-
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-msgid "That is already your phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-msgid "That is not your email address."
-msgstr ""
-
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-msgid "That is not your phone number."
-msgstr ""
-
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-msgid "That is the wrong confirmation number."
-msgstr ""
-
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-msgid "That phone number already belongs to another user."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-msgid "That's too long. Max notice size is 255 chars."
-msgstr ""
-
-#: ../actions/invite.php:89 actions/invite.php:96
-msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
-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."
-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."
-msgstr ""
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "Timezone"
-msgstr ""
-
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-msgid "Timezone not selected."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-msgid "Two user ids or screen_names must be supplied."
-msgstr ""
-
-#: ../index.php:57 index.php:57
-msgid "Unknown action"
-msgstr ""
-
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-msgid "Updates by SMS"
-msgstr ""
-
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr ""
-
-#: ../actions/invite.php:114 actions/invite.php:121
-msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
-msgstr ""
-
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr ""
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "What timezone are you normally in?"
-msgstr ""
-
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-msgid "Yes"
-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."
+
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:1297
+msgid "about a day ago"
 msgstr ""
 
-#: ../actions/invite.php:81 actions/invite.php:88
-msgid "You are already subscribed to these users:"
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:1289
+msgid "about a minute ago"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:1301
+msgid "about a month ago"
 msgstr ""
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:1305
+msgid "about a year ago"
 msgstr ""
 
-#: ../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"
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:1293
+msgid "about an hour ago"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-msgid "You may not delete another user's status."
+#: ../actions/showstream.php:423 ../lib/stream.php:132
+#: actions/showstream.php:441 lib/stream.php:99 lib/noticelist.php:211
+msgid "delete"
 msgstr ""
 
-#: ../actions/invite.php:31 actions/invite.php:31
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
+#: ../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:135
+#: lib/facebookaction.php:202 lib/noticelist.php:189
+msgid "in reply to..."
 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/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:142
+#: lib/noticelist.php:199
+msgid "reply"
 msgstr ""
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
+#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/profilesettings.php:188
+msgid "same as password above"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+#: actions/twitapistatuses.php:543
 msgid "unsupported file type"
 msgstr ""
 
+#: ../lib/util.php:1309 lib/util.php:1443 lib/facebookaction.php:251
+#: lib/util.php:1783
+msgid "« After"
+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
@@ -2417,6 +2466,12 @@ msgstr ""
 #: 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:38 actions/deleteprofile.php:127 actions/disfavor.php:47
+#: actions/emailsettings.php:130 actions/favor.php:49 actions/login.php:45
+#: actions/newmessage.php:44 actions/newnotice.php:36 actions/nudge.php:47
+#: actions/othersettings.php:139 actions/profilesettings.php:49
+#: actions/subedit.php:38 actions/tagother.php:113
+#: actions/twittersettings.php:188 actions/unblock.php:38
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -2440,12 +2495,14 @@ msgstr ""
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142
+#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:54
+#: actions/twitapifavorites.php:115
 msgid "This notice is already a favorite!"
 msgstr ""
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
+#: classes/Command.php:132 actions/favor.php:61
+#: actions/twitapifavorites.php:122
 msgid "Could not create favorite."
 msgstr ""
 
@@ -2454,11 +2511,12 @@ msgid "Disfavor"
 msgstr ""
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:62
 #, php-format
 msgid "%s favorite notices"
 msgstr ""
 
-#: actions/favoritesrss.php:64
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:66
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr ""
@@ -2484,47 +2542,50 @@ msgid ""
 "\n"
 msgstr ""
 
-#: actions/login.php:104
+#: actions/login.php:104 actions/login.php:111 actions/openidlogin.php:86
 msgid "Automatically login in the future; "
 msgstr ""
 
-#: actions/login.php:122
+#: actions/login.php:122 actions/login.php:130
 msgid "For security reasons, please re-enter your "
 msgstr ""
 
-#: actions/login.php:126
+#: actions/login.php:126 actions/login.php:134
 msgid "Login with your username and password. "
 msgstr ""
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+#: actions/newmessage.php:60 actions/twitapidirect_messages.php:136
 msgid "That's too long. Max message size is 140 chars."
 msgstr ""
 
-#: actions/newmessage.php:65
+#: actions/newmessage.php:65 actions/newmessage.php:68
 msgid "No recipient specified."
 msgstr ""
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
+#: classes/Command.php:206 actions/newmessage.php:71
+#: actions/newmessage.php:116 classes/Command.php:211
 msgid "You can't send a message to this user."
 msgstr ""
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
+#: classes/Command.php:209 actions/newmessage.php:74
+#: actions/twitapidirect_messages.php:153 classes/Command.php:214
 msgid ""
-"Don't send a message to yourself; just say it to yourself quietly "
-"instead."
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: actions/newmessage.php:108
+#: actions/newmessage.php:108 actions/microsummary.php:32
+#: actions/newmessage.php:111
 msgid "No such user"
 msgstr ""
 
-#: actions/newmessage.php:117
+#: actions/newmessage.php:117 actions/newmessage.php:120
 msgid "New message"
 msgstr ""
 
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:95 actions/noticesearch.php:94
 msgid "Notice without matching profile"
 msgstr ""
 
@@ -2571,6 +2632,7 @@ msgstr ""
 
 #: actions/profilesettings.php:115 actions/remotesubscribe.php:320
 #: actions/userauthorization.php:159 actions/userrss.php:76
+#: actions/profilesettings.php:120 actions/remotesubscribe.php:333
 msgid "User without matching profile"
 msgstr ""
 
@@ -2598,18 +2660,18 @@ msgstr ""
 msgid "New password successfully saved. "
 msgstr ""
 
-#: actions/register.php:95
+#: actions/register.php:95 actions/register.php:104
 msgid "Password must be 6 or more characters."
 msgstr ""
 
-#: actions/register.php:216
+#: actions/register.php:216 actions/register.php:243
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to..."
 msgstr ""
 
-#: actions/register.php:227
+#: actions/register.php:227 actions/register.php:254
 msgid "(You should receive a message by email momentarily, with "
 msgstr ""
 
@@ -2624,6 +2686,7 @@ msgid "Feed for favorites of %s"
 msgstr ""
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:88 actions/twitapifavorites.php:57
 msgid "Could not retrieve favorite notices."
 msgstr ""
 
@@ -2645,7 +2708,7 @@ msgstr ""
 msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: actions/showstream.php:154
+#: actions/showstream.php:154 lib/util.php:2105
 msgid "Send a message"
 msgstr ""
 
@@ -2654,73 +2717,78 @@ msgstr ""
 msgid "Mobile carrier for your phone. "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:64
 #, php-format
 msgid "Direct messages to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:65
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:69
 msgid "Direct Messages You've Sent"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:70
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:132
 msgid "No message text!"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:145
 msgid "Recipient user not found."
 msgstr ""
 
 #: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:148
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
-#: actions/twitapifavorites.php:92
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:64
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
-#: actions/twitapifavorites.php:95
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:67
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
+#: actions/twitapifavorites.php:158 lib/mail.php:303
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr ""
 
 #: actions/twitapifavorites.php:188 lib/mail.php:276
+#: actions/twitapifavorites.php:159 lib/mail.php:304
 #, php-format
 msgid ""
 "%1$s just added your notice from %2$s as one of their favorites.\n"
 "\n"
 msgstr ""
 
-#: actions/twittersettings.php:27
+#: actions/twittersettings.php:27 actions/twittersettings.php:29
 msgid ""
 "Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 
-#: actions/twittersettings.php:41
+#: actions/twittersettings.php:41 actions/twittersettings.php:43
 msgid "Twitter settings"
 msgstr ""
 
-#: actions/twittersettings.php:48
+#: actions/twittersettings.php:48 actions/twittersettings.php:50
 msgid "Twitter Account"
 msgstr ""
 
-#: actions/twittersettings.php:56
+#: actions/twittersettings.php:56 actions/twittersettings.php:58
 msgid "Current verified Twitter account."
 msgstr ""
 
@@ -2748,46 +2816,50 @@ msgstr ""
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:216
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr ""
 
-#: actions/twittersettings.php:128
+#: actions/twittersettings.php:128 actions/twittersettings.php:221
 msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: actions/twittersettings.php:137 actions/twittersettings.php:228
 #, php-format
 msgid "Unable to retrieve account information for \"%s\" from Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:234 actions/twittersettings.php:253
 msgid "Unable to save your Twitter settings!"
 msgstr ""
 
-#: actions/twittersettings.php:174
+#: actions/twittersettings.php:174 actions/twittersettings.php:261
 msgid "Twitter settings saved."
 msgstr ""
 
-#: actions/twittersettings.php:192
+#: actions/twittersettings.php:192 actions/twittersettings.php:272
 msgid "That is not your Twitter account."
 msgstr ""
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:280
 msgid "Couldn't remove Twitter user."
 msgstr ""
 
-#: actions/twittersettings.php:212
+#: actions/twittersettings.php:212 actions/twittersettings.php:284
 msgid "Twitter account removed."
 msgstr ""
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
+#: actions/twittersettings.php:299 actions/twittersettings.php:310
+#: actions/twittersettings.php:322
 msgid "Couldn't save Twitter preferences."
 msgstr ""
 
-#: actions/twittersettings.php:245
+#: actions/twittersettings.php:245 actions/twittersettings.php:330
 msgid "Twitter preferences saved."
 msgstr ""
 
@@ -2803,15 +2875,15 @@ msgstr ""
 msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#: classes/Channel.php:113
+#: classes/Channel.php:113 classes/Channel.php:129
 msgid "Command results"
 msgstr ""
 
-#: classes/Channel.php:148
+#: classes/Channel.php:148 classes/Channel.php:175
 msgid "Command complete"
 msgstr ""
 
-#: classes/Channel.php:158
+#: classes/Channel.php:158 classes/Channel.php:185
 msgid "Command failed"
 msgstr ""
 
@@ -2824,7 +2896,7 @@ msgstr ""
 msgid "Subscriptions: %1$s\n"
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:247
 msgid "User has no last notice"
 msgstr ""
 
@@ -2857,59 +2929,60 @@ msgstr ""
 msgid "About: %s"
 msgstr ""
 
-#: classes/Command.php:200
+#: classes/Command.php:200 classes/Command.php:202
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: classes/Command.php:214
+#: classes/Command.php:214 classes/Command.php:219
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: classes/Command.php:216
+#: classes/Command.php:216 classes/Command.php:221
 msgid "Error sending direct message."
 msgstr ""
 
-#: classes/Command.php:263
+#: classes/Command.php:263 classes/Command.php:268
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: classes/Command.php:270
+#: classes/Command.php:270 classes/Command.php:275
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: classes/Command.php:288
+#: classes/Command.php:288 classes/Command.php:293
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: classes/Command.php:295
+#: classes/Command.php:295 classes/Command.php:300
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330
+#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:315
+#: classes/Command.php:335
 msgid "Command not yet implemented."
 msgstr ""
 
-#: classes/Command.php:313
+#: classes/Command.php:313 classes/Command.php:318
 msgid "Notification off."
 msgstr ""
 
-#: classes/Command.php:315
+#: classes/Command.php:315 classes/Command.php:320
 msgid "Can't turn off notification."
 msgstr ""
 
-#: classes/Command.php:333
+#: classes/Command.php:333 classes/Command.php:338
 msgid "Notification on."
 msgstr ""
 
-#: classes/Command.php:335
+#: classes/Command.php:335 classes/Command.php:340
 msgid "Can't turn on notification."
 msgstr ""
 
-#: classes/Command.php:344
+#: classes/Command.php:344 classes/Command.php:349
 msgid "Commands:\n"
 msgstr ""
 
@@ -2921,23 +2994,23 @@ msgstr ""
 msgid "Could not update message with new URI."
 msgstr ""
 
-#: lib/gallery.php:46
+#: lib/gallery.php:46 lib/gallery.php:55
 msgid "User without matching profile in system."
 msgstr ""
 
-#: lib/mail.php:147
+#: lib/mail.php:147 lib/mail.php:141
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:249
+#: lib/mail.php:249 lib/mail.php:275
 #, php-format
 msgid "New private message from %s"
 msgstr ""
 
-#: lib/mail.php:253
+#: lib/mail.php:253 lib/mail.php:279
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -2981,18 +3054,416 @@ msgstr ""
 msgid "Your sent messages"
 msgstr ""
 
-#: lib/settingsaction.php:99
+#: lib/settingsaction.php:99 actions/deleteprofile.php:256
 msgid "Twitter"
 msgstr ""
 
-#: lib/settingsaction.php:100
+#: lib/settingsaction.php:100 actions/deleteprofile.php:257
 msgid "Twitter integration options"
 msgstr ""
 
-#: lib/util.php:1718
+#: lib/util.php:1718 lib/util.php:2145
 msgid "To"
 msgstr ""
 
 #: scripts/maildaemon.php:45
 msgid "Could not parse message."
 msgstr ""
+
+#: actions/block.php:45 actions/subedit.php:45 actions/unblock.php:45
+msgid "No profile specified."
+msgstr ""
+
+#: actions/block.php:52 actions/subedit.php:52 actions/tagother.php:45
+#: actions/unblock.php:52
+msgid "No profile with that ID."
+msgstr ""
+
+#: actions/block.php:78
+msgid "Block user"
+msgstr ""
+
+#: actions/block.php:81
+msgid "Are you sure you want to block this user? "
+msgstr ""
+
+#: actions/block.php:117
+msgid "You have already blocked this user."
+msgstr ""
+
+#: actions/block.php:124
+msgid "Failed to save block information."
+msgstr ""
+
+#: actions/deleteprofile.php:25
+msgid "Code not yet ready."
+msgstr ""
+
+#: actions/deleteprofile.php:36
+msgid "Export and delete your user information."
+msgstr ""
+
+#: actions/deleteprofile.php:88 actions/deleteprofile.php:119
+msgid "Delete my account"
+msgstr ""
+
+#: actions/deleteprofile.php:89
+msgid "Delete my account confirmation"
+msgstr ""
+
+#: actions/deleteprofile.php:117
+msgid "Check if you are sure you want to delete your account."
+msgstr ""
+
+#: actions/deleteprofile.php:259 lib/settingsaction.php:102
+msgid "Other"
+msgstr ""
+
+#: actions/deleteprofile.php:260 lib/settingsaction.php:103
+msgid "Other options"
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Add to favorites"
+msgstr ""
+
+#: actions/emailsettings.php:98
+msgid "Allow friends to nudge me and send me an email."
+msgstr ""
+
+#: actions/facebookremove.php:54
+msgid "Couldn't remove Facebook user."
+msgstr ""
+
+#: actions/favor.php:71
+msgid "Disfavor favorite"
+msgstr ""
+
+#: actions/favorited.php:31 lib/stream.php:45
+msgid "Popular notices"
+msgstr ""
+
+#: actions/favorited.php:54
+msgid "Showing recently popular notices"
+msgstr ""
+
+#: actions/featured.php:32 actions/featured.php:54 lib/stream.php:41
+msgid "Featured users"
+msgstr ""
+
+#: actions/finishremotesubscribe.php:186
+msgid "That user has blocked you from subscribing."
+msgstr ""
+
+#: actions/microsummary.php:39
+msgid "No current status"
+msgstr ""
+
+#: actions/newnotice.php:93
+msgid "Notice posted"
+msgstr ""
+
+#: actions/newnotice.php:116 classes/Channel.php:140
+msgid "Ajax Error"
+msgstr ""
+
+#: actions/nudge.php:52
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
+
+#: actions/nudge.php:61
+msgid "Nudge sent"
+msgstr ""
+
+#: actions/othersettings.php:27
+msgid "Manage various other options."
+msgstr ""
+
+#: actions/othersettings.php:33
+#, fuzzy
+msgid "Other Settings"
+msgstr "메신저 설정"
+
+#: actions/othersettings.php:35
+msgid "URL Auto-shortening"
+msgstr ""
+
+#: actions/othersettings.php:54
+#, fuzzy
+msgid "Service"
+msgstr "검색"
+
+#: actions/othersettings.php:54
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/othersettings.php:155
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr ""
+
+#: actions/peopletag.php:33
+#, php-format
+msgid "Not a valid people tag: %s"
+msgstr ""
+
+#: actions/peopletag.php:45
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr ""
+
+#: actions/peopletag.php:87
+#, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+msgstr ""
+
+#: actions/profilesettings.php:92
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+
+#: actions/profilesettings.php:246 actions/tagother.php:131
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr ""
+
+#: actions/profilesettings.php:328
+msgid "Couldn't save tags."
+msgstr ""
+
+#: actions/public.php:68
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
+msgstr ""
+
+#: actions/public.php:90
+msgid "Could not retrieve public stream."
+msgstr ""
+
+#: actions/register.php:67 actions/register.php:177
+msgid "Sorry, only invited people can register."
+msgstr ""
+
+#: actions/register.php:156
+msgid "With this form you can create a new account. "
+msgstr ""
+
+#: actions/remotesubscribe.php:136 actions/remotesubscribe.php:141
+msgid "That's a local profile! Login to subscribe."
+msgstr ""
+
+#: actions/subedit.php:68
+msgid "You are not subscribed to that profile."
+msgstr ""
+
+#: actions/subedit.php:81
+msgid "Could not save subscription."
+msgstr ""
+
+#: actions/subscribe.php:53
+msgid "Not a local user."
+msgstr ""
+
+#: actions/subscribe.php:67
+msgid "Subscribed"
+msgstr ""
+
+#: actions/subscriptions.php:72
+msgid "Jabber"
+msgstr ""
+
+#: actions/tagother.php:31
+msgid "Not logged in"
+msgstr ""
+
+#: actions/tagother.php:40
+msgid "No id argument."
+msgstr ""
+
+#: actions/tagother.php:56
+msgid "Tag a person"
+msgstr ""
+
+#: actions/tagother.php:98
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
+msgstr ""
+
+#: actions/tagother.php:120
+msgid "No such profile."
+msgstr ""
+
+#: actions/tagother.php:146
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+
+#: actions/tagother.php:153
+msgid "Could not save tags."
+msgstr ""
+
+#: actions/tagother.php:188
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
+
+#: actions/tagrss.php:33
+msgid "No such tag."
+msgstr ""
+
+#: actions/tagrss.php:62
+#, php-format
+msgid "Microblog tagged with %s"
+msgstr ""
+
+#: actions/twitapiblocks.php:45
+msgid "Block user failed."
+msgstr ""
+
+#: actions/twitapiblocks.php:66
+msgid "Unblock user failed."
+msgstr ""
+
+#: actions/twitapiusers.php:45
+msgid "Not found."
+msgstr ""
+
+#: actions/twittersettings.php:63
+msgid "Twitter user name"
+msgstr ""
+
+#: actions/twittersettings.php:67
+msgid "Twitter password"
+msgstr ""
+
+#: actions/twittersettings.php:129
+msgid "Twitter Friends"
+msgstr ""
+
+#: actions/unblock.php:73
+msgid "Error removing the block."
+msgstr ""
+
+#: actions/unsubscribe.php:48
+msgid "No profile id in request."
+msgstr ""
+
+#: actions/unsubscribe.php:55
+msgid "No profile with that id."
+msgstr ""
+
+#: actions/unsubscribe.php:69
+msgid "Unsubscribed"
+msgstr ""
+
+#: classes/Notice.php:100
+msgid "Problem saving notice. Unknown user."
+msgstr ""
+
+#: classes/Notice.php:105
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+
+#: classes/Notice.php:112
+msgid "You are banned from posting notices on this site."
+msgstr ""
+
+#: lib/gallery.php:98
+msgid "Filter tags"
+msgstr ""
+
+#: lib/gallery.php:104
+msgid "All"
+msgstr ""
+
+#: lib/gallery.php:108
+msgid "Tag"
+msgstr ""
+
+#: lib/gallery.php:109
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/gallery.php:110
+msgid "Go"
+msgstr ""
+
+#: lib/gallery.php:264
+msgid "Subscriptions navigation"
+msgstr ""
+
+#: lib/gallery.php:270 lib/gallery.php:292
+msgid "List"
+msgstr ""
+
+#: lib/gallery.php:280 lib/gallery.php:294
+msgid "Icons"
+msgstr ""
+
+#: lib/mail.php:92
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:242
+#, php-format
+msgid "You've been nudged by %s"
+msgstr ""
+
+#: lib/mail.php:246
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+msgstr ""
+
+#: lib/profilelist.php:146
+msgid "(none)"
+msgstr ""
+
+#: lib/stream.php:33
+msgid "Public"
+msgstr ""
+
+#: lib/stream.php:36 lib/stream.php:37
+msgid "Recent tags"
+msgstr ""
+
+#: lib/stream.php:40
+msgid "Featured"
+msgstr ""
+
+#: lib/stream.php:44
+msgid "Popular"
+msgstr ""
+
+#: lib/subs.php:51
+msgid "User has blocked you."
+msgstr ""
+
+#: lib/util.php:2059
+msgid "Send a nudge"
+msgstr ""
+
+#: lib/util.php:2063
+msgid "Nudge sent!"
+msgstr ""
+
+#: lib/util.php:2194
+msgid "Block"
+msgstr ""
+
+#: lib/util.php:2198
+msgid "Unblock"
+msgstr ""
+
+#~ msgid "Email address"
+#~ msgstr "이메일 주소"
diff --git a/mk_MK/LC_MESSAGES/laconica.po b/mk_MK/LC_MESSAGES/laconica.po
index 67538ce606..c973ac5bf9 100644
--- a/mk_MK/LC_MESSAGES/laconica.po
+++ b/mk_MK/LC_MESSAGES/laconica.po
@@ -13,46 +13,88 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-14 21:07+1200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: NOVICA NAKOV <novica@slobodensoftver.org.mk>\n"
-"Language-Team: Macedonian <info@slobodensoftver.org.mk>\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"
-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"POT-Creation-Date: 2009-01-12 12:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/noticesearchrss.php:64
+#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:61
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr "Пребарувај го потокот за „%s“"
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: actions/finishopenidlogin.php:88 actions/register.php:205
+#: actions/register.php:232
+msgid ""
+" except this private data: password, email address, IM address, phone number."
+msgstr ""
+"освен следниве лични податоци: лозинка, адреса за е-пошта, адреса за ИМ, "
+"телефонски број."
+
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+#: lib/facebookaction.php:195 lib/noticelist.php:160
+msgid " from "
+msgstr ""
+
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: actions/twitapistatuses.php:341
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr ""
+
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
+
+#: ../actions/invite.php:170
+#, php-format
 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 ""
-"освен следниве лични податоци: лозинка, "
-"адреса за е-пошта, адреса за ИМ, телефонски број."
 
-#: ../actions/subscribe.php:84
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:115
+#: lib/mail.php:117
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s сега ги следи вашите забелешки за %2$s."
 
-#: ../actions/subscribe.php:86
+#: ../lib/mail.php:126
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -62,982 +104,1635 @@ msgid ""
 "Faithfully yours,\n"
 "%4$s.\n"
 msgstr ""
-"%1$s сега ги следи вашите забелешки на "
-"%2$s.\n"
+"%1$s сега ги следи вашите забелешки на %2$s.\n"
 "\n"
-"\t%3$s\n\nИскрено ваш,\n%4$s.\n"
+"\t%3$s\n"
+"\n"
+"Искрено ваш,\n"
+"%4$s.\n"
+
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#: actions/twitapistatuses.php:344
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
 
-#: ../actions/shownotice.php:45
+#: ../actions/shownotice.php:45 actions/shownotice.php:45
+#: actions/shownotice.php:73
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1$s статус на %2$s"
 
-#: ../actions/publicrss.php:60
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../actions/publicrss.php:62 actions/publicrss.php:48
 #, php-format
 msgid "%s Public Stream"
 msgstr "Јавниот поток на %s"
 
-#: ../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/twitapistatuses.php:123
 #, php-format
 msgid "%s and friends"
 msgstr "%s и пријателите"
 
-#: ../lib/util.php:233
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:31
+#, php-format
+msgid "%s public timeline"
+msgstr ""
+
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:217
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:195
+#, php-format
+msgid "%s timeline"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:34
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+
+#: ../lib/util.php:257 lib/util.php:273 lib/util.php:284
 #, 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%%** е сервис за микроблогирање што "
-"ви го овозможува [%%site.broughtby%%](%%site.broughtbyurl%%). "
+"**%%site.name%%** е сервис за микроблогирање што ви го овозможува [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
 
-#: ../lib/util.php:235
+#: ../lib/util.php:259 lib/util.php:275 lib/util.php:286
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** е сервис за микроблогирање."
 
-#: ../lib/util.php:250
+#: ../lib/util.php:274 lib/util.php:290 lib/util.php:301
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ". Придонесувачите треба да бидат наведени со цело име или прекар."
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: ../actions/register.php:176
+#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
+#: actions/profilesettings.php:78
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 мали букви или бројки. Без интерпукциски знаци и празни места."
 
-#: ../actions/password.php:42 ../actions/register.php:178
+#: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:193
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/profilesettings.php:186
 msgid "6 or more characters"
 msgstr "6 или повеќе знаци"
 
-#: ../actions/recoverpassword.php:165
+#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 или повеќе знаци и не ја заборавајте!"
 
-#: ../actions/imsettings.php:188
+#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:195
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, 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 ""
+"Испративме код за потврда на IM адресата што ја додадовте. Мора да го "
+"одобрите %S за да ви испраќа пораки."
+
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:234
+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 ""
+
+#: ../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/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:30
+#: actions/twitapidirect_messages.php:107 actions/twitapifavorites.php:83
+#: actions/twitapifavorites.php:99 actions/twitapifriendships.php:117
+#: actions/twitapihelp.php:42 actions/twitapistatuses.php:77
+#: actions/twitapistatuses.php:144 actions/twitapistatuses.php:224
+#: actions/twitapistatuses.php:234 actions/twitapistatuses.php:386
+#: actions/twitapistatuses.php:395 actions/twitapistatuses.php:421
+#: actions/twitapiusers.php:30
+msgid "API method not found!"
 msgstr ""
-"Испративме код за потврда на IM адресата "
-"што ја додадовте. Мора да го одобрите %S за да ви испраќа пораки."
 
-#: ../lib/util.php:296
+#: ../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:39
+#: actions/twitapiaccount.php:89 actions/twitapiaccount.php:94
+#: actions/twitapidirect_messages.php:178 actions/twitapifavorites.php:139
+#: actions/twitapihelp.php:49 actions/twitapistatuses.php:549
+msgid "API method under construction."
+msgstr ""
+
+#: ../lib/util.php:324 lib/util.php:340 lib/util.php:352
 msgid "About"
 msgstr "За"
 
-#: ../actions/userauthorization.php:118
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
 msgid "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/twittersettings.php:84
 msgid "Add"
 msgstr "Додај"
 
-#: ../actions/openidsettings.php:43
+#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
 msgid "Add OpenID"
 msgstr "Додај OpenID"
 
-#: ../actions/imsettings.php:39
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: actions/deleteprofile.php:248
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
 msgid "Address"
 msgstr "Адреса"
 
-#: ../actions/showstream.php:254
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
+
+#: ../actions/showstream.php:273 actions/showstream.php:288
+#: actions/showstream.php:336
 msgid "All subscriptions"
 msgstr "Сите претплати"
 
-#: ../actions/publicrss.php:62
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
 #, php-format
 msgid "All updates for %s"
 msgstr "Сите новини од %s"
 
-#: ../actions/noticesearchrss.php:66
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:63
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "Сите новини кои се еднакви со бараниот термин „%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
 msgid "Already logged in."
 msgstr "Веќе сте најавени."
 
-#: ../actions/subscribe.php:48
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:47
 msgid "Already subscribed!."
 msgstr "Веќе сте претплатени!"
 
-#: ../actions/userauthorization.php:76
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+msgid "Are you sure you want to delete this notice?"
+msgstr ""
+
+#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
 msgid "Authorize subscription"
 msgstr "Одобрете ја претплатата"
 
-#: ../actions/login.php:100 ../actions/register.php:184
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192 actions/register.php:219
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
-"Следниот пат најавете се автоматски; не "
-"за компјутери кои ги делите со други!"
+"Следниот пат најавете се автоматски; не за компјутери кои ги делите со други!"
+
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:103
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
 
-#: ../actions/avatar.php:32
+#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: actions/profilesettings.php:34
 msgid "Avatar"
 msgstr "Аватар"
 
-#: ../actions/avatar.php:113
+#: ../actions/avatar.php:113 actions/profilesettings.php:350
+#: actions/profilesettings.php:379
 msgid "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 ""
-"Чекам потвдар за оваа адреса. Проверете "
-"ја вашата Jabber/GTalk сметка за порака со "
-"понатамошни инструкции. (Дали го додадовте %s на вашата листа со пријатели?)"
+"Чекам потвдар за оваа адреса. Проверете ја вашата Jabber/GTalk сметка за "
+"порака со понатамошни инструкции. (Дали го додадовте %s на вашата листа со "
+"пријатели?)"
+
+#: ../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 ""
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+msgid "Awaiting confirmation on this phone number."
+msgstr ""
 
-#: ../lib/util.php:1136
-msgid "Before »"
+#: ../lib/util.php:1318 lib/util.php:1452 lib/facebookaction.php:259
+#: lib/util.php:1792
+#, fuzzy
+msgid "Before »"
 msgstr "Предходни »"
 
-#: ../actions/profilesettings.php:52
+#: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: actions/profilesettings.php:82 actions/register.php:184
+#: actions/profilesettings.php:84 actions/register.php:211
 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:222 actions/register.php:98
 msgid "Bio is too long (max 140 chars)."
 msgstr "Биографијата е предолга (максимумот е 140 знаци)."
 
-#: ../actions/updateprofile.php:118
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+msgid "Can't delete this notice."
+msgstr ""
+
+#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "Не може да се прочита 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/profilesettings.php:433
 msgid "Can't save new password."
 msgstr "Новата лозинка не може да се сними"
 
-#: ../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
 msgid "Cancel"
 msgstr "Откажи"
 
-#: ../lib/openid.php:121
+#: ../lib/openid.php:121 lib/openid.php:121
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Не е возможно да се инстанцира OpenID објект за потрошувачка."
 
-#: ../actions/imsettings.php:154
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
 msgid "Cannot normalize that Jabber ID"
 msgstr "Ова JabberID не може да се нормализира."
 
-#: ../actions/password.php:45
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:204
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/profilesettings.php:189
 msgid "Change"
 msgstr "Промени"
 
-#: ../actions/password.php:32
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: actions/deleteprofile.php:245
+msgid "Change email handling"
+msgstr ""
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
 msgid "Change password"
 msgstr "Промени ја лозинката"
 
-#: ../actions/password.php:43 ../actions/recoverpassword.php:166
-#: ../actions/register.php:179
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr ""
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#: actions/deleteprofile.php:242
+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/profilesettings.php:187 actions/register.php:196
 msgid "Confirm"
 msgstr "Потврди"
 
-#: ../actions/confirmaddress.php:84
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
 msgid "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:259
 msgid "Confirmation cancelled."
 msgstr "Потврдата е откажана"
 
-#: ../actions/confirmaddress.php:38
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+msgid "Confirmation code"
+msgstr ""
+
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
 msgid "Confirmation code not found."
 msgstr "Кодот за потврда не е пронајден."
 
-#: ../actions/finishopenidlogin.php:91
+#: ../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:97
 msgid "Connect"
 msgstr "Поврзи се"
 
-#: ../actions/finishopenidlogin.php:86
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
 msgid "Connect existing account"
 msgstr "Поврзи се со постоечка сметка"
 
-#: ../lib/util.php:304
+#: ../lib/util.php:332 lib/util.php:348 lib/util.php:360
 msgid "Contact"
 msgstr "Контакт"
 
-#: ../lib/openid.php:178
+#: ../lib/openid.php:178 lib/openid.php:178
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "OpenID формуларот не може да се креира:%s"
 
-#: ../lib/openid.php:160
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:46 actions/twitapifriendships.php:62
+#, 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:39
+msgid "Could not follow user: User not found."
+msgstr ""
+
+#: ../lib/openid.php:160 lib/openid.php:160
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "Не може да се пренасочи кон серверот: %s"
 
-#: ../actions/updateprofile.php:161
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
 msgid "Could not save avatar info"
 msgstr "Информациите за аватарот не може да се снимат"
 
-#: ../actions/updateprofile.php:154
+#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
 msgid "Could not save new profile info"
 msgstr "Информациите за новиот профил не може да се снимат"
 
-#: ../actions/profilesettings.php:146
-msgid "Couldn't confirm email."
-msgstr "Адресата за е-пошта неможе да се потврди."
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:70
+msgid "Could not subscribe other to you."
+msgstr ""
+
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:55
+msgid "Could not subscribe."
+msgstr ""
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr ""
 
 #: ../actions/finishremotesubscribe.php:99
+#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:112
 msgid "Couldn't convert request tokens to access tokens."
 msgstr "Белезите за барање не може да се конвертираат во белези за пристап."
 
-#: ../actions/subscribe.php:59
-msgid "Couldn't create subscription."
-msgstr "Не може да се креира претплатата"
-
-#: ../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/emailsettings.php:255
 msgid "Couldn't delete email confirmation."
 msgstr "Не може да се креира потврда за е-пошта."
 
-#: ../actions/unsubscribe.php:56
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:129
 msgid "Couldn't delete subscription."
 msgstr "Претплата не може да се избрише."
 
-#: ../actions/remotesubscribe.php:125
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+#: actions/twitapistatuses.php:82
+msgid "Couldn't find any statuses."
+msgstr ""
+
+#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
+#: actions/remotesubscribe.php:148
 msgid "Couldn't get a request token."
 msgstr "Не може да се земе белег за барање."
 
-#: ../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:228
 msgid "Couldn't insert confirmation code."
 msgstr "Кодот за потврда не може да се внесе."
 
 #: ../actions/finishremotesubscribe.php:180
+#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:216
 msgid "Couldn't insert new subscription."
 msgstr "Не може да се внесе нова претплата."
 
-#: ../actions/profilesettings.php:175
+#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
+#: actions/profilesettings.php:319 actions/twitapiaccount.php:74
 msgid "Couldn't save profile."
 msgstr "Профилот не може да се сними."
 
-#: ../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:296
+msgid "Couldn't update user for autosubscribe."
+msgstr ""
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+#: actions/emailsettings.php:301 actions/emailsettings.php:315
+msgid "Couldn't update user record."
+msgstr ""
+
+#: ../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/emailsettings.php:179 actions/emailsettings.php:280
+#: actions/othersettings.php:173 actions/profilesettings.php:276
 msgid "Couldn't update user."
 msgstr "Корисникот не може да се освежи/"
 
-#: ../actions/finishopenidlogin.php:84
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
 msgid "Create"
 msgstr "Креирај"
 
-#: ../actions/finishopenidlogin.php:70
+#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
 msgid "Create a new user with this nickname."
 msgstr "Креирај нов корисник со овој прекар."
 
-#: ../actions/finishopenidlogin.php:68
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
 msgid "Create new account"
 msgstr "Креирај нова сметка"
 
-#: ../actions/finishopenidlogin.php:191
+#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+#: actions/finishopenidlogin.php:208
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Креирање на нова сметка за OpenID што веќе има корисник."
 
-#: ../actions/imsettings.php:45
+#: ../actions/imsettings.php:45 actions/imsettings.php:46
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Моментално потврдена Jabber/GTalk адреса."
 
-#: ../actions/showstream.php:337
-msgid "Currently"
-msgstr "Моментално"
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
 
-#: ../lib/util.php:893
-#, php-format
-msgid "DB error inserting reply: %s"
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+msgid "Current confirmed email address."
+msgstr ""
+
+#: ../actions/showstream.php:356 actions/showstream.php:367
+#: actions/showstream.php:418
+msgid "Currently"
+msgstr "Моментално"
+
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:87
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: ../lib/util.php:1061 lib/util.php:1110 lib/util.php:1417
+#, php-format
+msgid "DB error inserting reply: %s"
 msgstr "Одговор од внесот во базата: %s"
 
-#: ../actions/profilesettings.php:54
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+msgid "Delete notice"
+msgstr ""
+
+#: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: actions/profilesettings.php:84 actions/register.php:186
+#: actions/profilesettings.php:86 actions/register.php:213
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Опишете се себе си и сопствените интереси во 140 знаци."
 
-#: ../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/deleteprofile.php:244 actions/register.php:199
+#: actions/register.php:202
 msgid "Email"
 msgstr "Е-пошта"
 
-#: ../actions/profilesettings.php:46
-msgid "Email address"
-msgstr "Адреса за е-пошта"
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+msgid "Email Address"
+msgstr ""
+
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+msgid "Email Settings"
+msgstr ""
 
-#: ../actions/profilesettings.php:102 ../actions/register.php:63
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:89
 msgid "Email address already exists."
 msgstr "Адресата веќе постои."
 
-#: ../lib/mail.php:82
+#: ../lib/mail.php:90 lib/mail.php:90
 msgid "Email address confirmation"
 msgstr "Потврдување на адресата"
 
-#: ../actions/recoverpassword.php:176
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
+
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr ""
+
+#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
 msgid "Enter a nickname or email address."
 msgstr "Внесете прекар или е-пошта"
 
-#: ../actions/userauthorization.php:136
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+msgid "Enter the code you received on your phone."
+msgstr ""
+
+#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
 msgid "Error authorizing token"
 msgstr "Грешка во проверувањето на белегот"
 
-#: ../actions/finishopenidlogin.php:282
+#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
+#: actions/finishopenidlogin.php:274
 msgid "Error connecting user to OpenID."
 msgstr "Грешка во поврзувањето на корисникот со OpenID"
 
-#: ../actions/finishaddopenid.php:78
+#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
 msgid "Error connecting user."
 msgstr "Грешка во поврзувањето на корисникот."
 
 #: ../actions/finishremotesubscribe.php:151
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:164
 msgid "Error inserting avatar"
 msgstr "Грешка во внесувањето на аватарот"
 
 #: ../actions/finishremotesubscribe.php:143
+#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:156
 msgid "Error inserting new profile"
 msgstr "Грешка во внесувањето на новиот профил"
 
-#: ../actions/postnotice.php:88
-msgid "Error inserting notice"
-msgstr "Грешка во внесувањето на известувањето"
-
 #: ../actions/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:180
 msgid "Error inserting remote profile"
 msgstr "Грешка во внесувањето на оддалечениот профил"
 
-#: ../actions/recoverpassword.php:201
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
 msgid "Error saving address confirmation."
 msgstr "Грешка во снимањето на потвдата за адресата."
 
-#: ../actions/userauthorization.php:139
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
 msgid "Error saving remote profile"
 msgstr "Грешка во снимањето на оддалечениот профил"
 
-#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
+#: ../lib/openid.php:226 lib/openid.php:226
 msgid "Error saving the profile."
 msgstr "Грешка во снимањето на профилот."
 
-#: ../lib/openid.php:237
+#: ../lib/openid.php:237 lib/openid.php:237
 msgid "Error saving the user."
 msgstr "Грешка во снимањето на корисникот."
 
-#: ../actions/password.php:80
+#: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/profilesettings.php:428
 msgid "Error saving user; invalid."
 msgstr "Грешка во снимањето на корисникот; неправилен."
 
-#: ../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:54 actions/login.php:80
+#: actions/register.php:117
 msgid "Error setting user."
 msgstr "Грешка во поставувањето на корисникот."
 
-#: ../actions/finishaddopenid.php:83
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
 msgid "Error updating profile"
 msgstr "Грешка во освежувањето на профилот"
 
 #: ../actions/finishremotesubscribe.php:161
+#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:174
 msgid "Error updating remote profile"
 msgstr "Грешка во освежувањето на оддалечениот профил"
 
-#: ../actions/recoverpassword.php:79
+#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
 msgid "Error with confirmation code."
 msgstr "Грешка со кодот за потврдување."
 
-#: ../actions/finishopenidlogin.php:89
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
 msgid "Existing nickname"
 msgstr "Постоечки прекар"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:326 lib/util.php:342 lib/util.php:354
 msgid "FAQ"
 msgstr "ЧПП"
 
-#: ../actions/avatar.php:115
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/profilesettings.php:381
 msgid "Failed updating avatar."
 msgstr "Товарањето на аватарот не успеа."
 
-#: ../actions/all.php:61 ../actions/allrss.php:74
+#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
+#: actions/allrss.php:64
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Канал со пријатели на %S"
 
-#: ../actions/replies.php:61 ../actions/repliesrss.php:80
+#: ../actions/replies.php:65 ../actions/repliesrss.php:80
+#: actions/replies.php:65 actions/repliesrss.php:66
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Канал со одговори на %s"
 
-#: ../actions/login.php:118
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:54
+#, php-format
+msgid "Feed for tag %s"
+msgstr ""
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+msgid "Find content of notices"
+msgstr ""
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+msgid "Find people on this site"
+msgstr ""
+
+#: ../actions/login.php:122
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
-"Поради безбедносни причини треба "
-"повторно да го внесете Вашето корисничко име и лозинка пред да ги смените Вашите поставки."
+"Поради безбедносни причини треба повторно да го внесете Вашето корисничко "
+"име и лозинка пред да ги смените Вашите поставки."
 
-#: ../actions/profilesettings.php:44
+#: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: actions/profilesettings.php:77 actions/register.php:178
+#: actions/profilesettings.php:79 actions/register.php:205
 msgid "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/profilesettings.php:219 actions/register.php:95
 msgid "Full name is too long (max 255 chars)."
 msgstr "Целото име е предолго (максимум 255 знаци)"
 
-#: ../lib/util.php:279
+#: ../lib/util.php:322 lib/util.php:338 lib/util.php:343 lib/util.php:350
 msgid "Help"
 msgstr "Помош"
 
-#: ../lib/util.php:274
+#: ../lib/util.php:298 lib/util.php:314 lib/util.php:325
 msgid "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:81 actions/register.php:208
 msgid "Homepage"
 msgstr "Домашна страница"
 
-#: ../actions/profilesettings.php:87
+#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: actions/profilesettings.php:210 actions/register.php:83
+#: actions/profilesettings.php:216 actions/register.php:92
 msgid "Homepage is not a valid URL."
 msgstr "Домашната страница не е правилно URL."
 
-#: ../actions/imsettings.php:61
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+#: actions/emailsettings.php:101
+msgid "I want to post notices by email."
+msgstr ""
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+#: actions/deleteprofile.php:253
+msgid "IM"
+msgstr ""
+
+#: ../actions/imsettings.php:60 actions/imsettings.php:61
 msgid "IM Address"
 msgstr "IM адреса"
 
-#: ../actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
 msgid "IM Settings"
 msgstr "Поставки за IM"
 
-#: ../actions/finishopenidlogin.php:88
+#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
 msgstr ""
-"Ако веќе имае сметка, пријавете се со "
-"Вашето корисничко име и лозика, за истата да ја поврзете со Вашиот OpenID."
+"Ако веќе имае сметка, пријавете се со Вашето корисничко име и лозика, за "
+"истата да ја поврзете со Вашиот OpenID."
 
 #: ../actions/openidsettings.php:45
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
 msgstr ""
-"Ако сакате да додадете OpenID на Вашата "
-"сметка, внесете го подолу и кликнете „Додај“."
+"Ако сакате да додадете OpenID на Вашата сметка, внесете го подолу и кликнете "
+"„Додај“."
 
-#: ../actions/recoverpassword.php:122
+#: ../actions/recoverpassword.php:137
 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 ""
-"Ако сте ја заборавиле или загубиле "
-"лозинката, можете да добиете нова на адресата што ја внесовте во Вашата сметка."
 
-#: ../actions/password.php:69
+#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
+#: actions/emailsettings.php:68 actions/smssettings.php:76
+msgid "Incoming email"
+msgstr ""
+
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+#: actions/emailsettings.php:304
+msgid "Incoming email address removed."
+msgstr ""
+
+#: ../actions/password.php:69 actions/profilesettings.php:388
+#: actions/profilesettings.php:417
 msgid "Incorrect old password"
 msgstr "Неточна стара лозинка"
 
-#: ../actions/login.php:63
+#: ../actions/login.php:67 actions/login.php:67 actions/login.php:74
 msgid "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."
 msgstr ""
-"Упатството за пронаоѓање на Вашата "
-"лозинка е испратено до адресата за е-пошта што е регистрирана со Вашата сметка."
+"Упатството за пронаоѓање на Вашата лозинка е испратено до адресата за е-"
+"пошта што е регистрирана со Вашата сметка."
 
-#: ../actions/updateprofile.php:113
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "Неправилно URL за аватар: '%s'"
 
-#: ../actions/updateprofile.php:97
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "Невалидна домашна страница: '%s'"
 
-#: ../actions/updateprofile.php:81
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "Неправилно URL за лиценца: '%s'"
 
-#: ../actions/postnotice.php:61
+#: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:63
 msgid "Invalid notice content"
 msgstr "Неправилна содржина за известување"
 
-#: ../actions/postnotice.php:67
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:69
 msgid "Invalid notice uri"
 msgstr "Неправилно uri на известување"
 
-#: ../actions/postnotice.php:72
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:74
 msgid "Invalid notice url"
 msgstr "Неправилно url на известување"
 
-#: ../actions/updateprofile.php:86
+#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "Неправилно URL на профил: '%s'"
 
-#: ../actions/remotesubscribe.php:96
+#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
 msgid "Invalid profile URL (bad format)"
 msgstr "Неправилно URL на профил (лош формат)"
 
 #: ../actions/finishremotesubscribe.php:77
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:78
 msgid "Invalid profile URL returned by server."
 msgstr "Неправилно URL на профил вратено од серверот"
 
-#: ../actions/avatarbynickname.php:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
 msgid "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:256 actions/register.php:112
+#: actions/register.php:130
 msgid "Invalid username or password."
 msgstr "Погрешно име или лозинка."
 
-#: ../lib/util.php:237
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr ""
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
+
+#: ../lib/util.php:306 lib/util.php:322 lib/util.php:332
+msgid "Invite"
+msgstr ""
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr ""
+
+#: ../lib/util.php:261 lib/util.php:277 lib/util.php:288
 #, 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 ""
-"Работи на [Laconica](http://laconi.ca/) софтверот за "
-"микроблогирање, верзија %s, достапен пд [GNU "
-"Affero General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"Работи на [Laconica](http://laconi.ca/) софтверот за микроблогирање, верзија "
+"%s, достапен пд [GNU Affero General Public License](http://www.fsf.org/"
+"licensing/licenses/agpl-3.0.html)."
 
-#: ../actions/imsettings.php:164
+#: ../actions/imsettings.php:173 actions/imsettings.php:181
 msgid "Jabber ID already belongs to another user."
 msgstr "Ова Jabber ID му припаќа на друг корисник."
 
-#: ../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 ""
-"Jabber или GTalk адреса како „ime@example.org“. Но "
-"прво додајте го %s во Вашата контакт листа во Вашиот IM клиент или GTalk."
+"Jabber или GTalk адреса како „ime@example.org“. Но прво додајте го %s во "
+"Вашата контакт листа во Вашиот IM клиент или GTalk."
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
+msgid "Language"
+msgstr ""
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+#: actions/profilesettings.php:234
+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:87 actions/register.php:214
 msgid "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/profilesettings.php:225 actions/register.php:101
 msgid "Location is too long (max 255 chars)."
 msgstr "Локацијата е предолга (максимумот е 255 знаци)."
 
-#: ../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/login.php:104 actions/login.php:113 actions/openidlogin.php:88
+#: lib/util.php:336
 msgid "Login"
 msgstr "Пријави се"
 
-#: ../actions/openidlogin.php:44
+#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:60
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Пријавете се со [OpenID](%%doc.openid%%) сметка."
 
-#: ../actions/login.php:122
+#: ../actions/login.php:126
 #, 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 ""
-"Пријавете се со корисничко име и лозинка. "
-"Немате? [Регистрирајте](%%action.register%%) нова сметка или пробајте [OpenID](%%action.openidlogin%%). "
+"Пријавете се со корисничко име и лозинка. Немате? [Регистрирајте](%%action."
+"register%%) нова сметка или пробајте [OpenID](%%action.openidlogin%%). "
 
-#: ../lib/util.php:284
+#: ../lib/util.php:308 lib/util.php:324 lib/util.php:334
 msgid "Logout"
 msgstr "Одјави се"
 
-#: ../actions/login.php:106
+#: ../actions/register.php:166 actions/register.php:180
+#: actions/register.php:207
+msgid "Longer name, preferably your \"real\" name"
+msgstr ""
+
+#: ../actions/login.php:110 actions/login.php:110 actions/login.php:118
 msgid "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 ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr ""
+
+#: ../actions/showstream.php:300 actions/showstream.php:315
+#: actions/showstream.php:363
 msgid "Member since"
 msgstr "Член од"
 
-#: ../actions/userrss.php:70
+#: ../actions/userrss.php:70 actions/userrss.php:67
 #, php-format
 msgid "Microblog by %s"
 msgstr "Микроблог на %s"
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
+#: ../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 ""
+
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php:85 actions/register.php:202
+#: actions/register.php:229
 msgid "My text and files are available under "
 msgstr "Мојот текст и датотеки се достапни под"
 
-#: ../actions/finishopenidlogin.php:71
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+msgid "New"
+msgstr ""
+
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:138
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+#: actions/emailsettings.php:318
+msgid "New incoming email address added."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
 msgid "New nickname"
 msgstr "Нов прекар"
 
-#: ../actions/newnotice.php:100
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:141
 msgid "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/profilesettings.php:185
 msgid "New password"
 msgstr "Нова лозинка"
 
-#: ../actions/recoverpassword.php:275
+#: ../actions/recoverpassword.php:314
 msgid "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:108 actions/profilesettings.php:76
+#: actions/register.php:192
 msgid "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/finishopenidlogin.php:192 actions/profilesettings.php:231
+#: actions/register.php:85
 msgid "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:182 actions/profilesettings.php:209
+#: actions/register.php:83
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Прекарот мора да има само мали букви и бројки и да нема празни места."
 
-#: ../actions/finishopenidlogin.php:170
+#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:187
 msgid "Nickname not allowed."
 msgstr "Тој прекар не е дозволен."
 
-#: ../actions/remotesubscribe.php:72
+#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
 msgid "Nickname of the user you want to follow"
 msgstr "Прекар на корисникот што сакате да го следите."
 
-#: ../actions/recoverpassword.php:147
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
 msgid "Nickname or email"
 msgstr "Прекар или е-пошта"
 
-#: ../actions/imsettings.php:147
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:104
+msgid "No"
+msgstr ""
+
+#: ../actions/imsettings.php:156 actions/imsettings.php:164
 msgid "No Jabber ID."
 msgstr "Нема JabberID."
 
-#: ../actions/userauthorization.php:128
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
 msgid "No authorization request!"
 msgstr "Нема барање за проверка!"
 
-#: ../actions/confirmaddress.php:33
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+msgid "No carrier selected."
+msgstr ""
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+msgid "No code entered"
+msgstr ""
+
+#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
 msgid "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:52
+#: actions/newnotice.php:53
 msgid "No content!"
 msgstr "Нема содржина!"
 
-#: ../actions/userbyid.php:27
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+#: actions/emailsettings.php:197
+msgid "No email address."
+msgstr ""
+
+#: ../actions/userbyid.php:32 actions/userbyid.php:32
 msgid "No id."
 msgstr "Нема id."
 
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+#: actions/emailsettings.php:292
+msgid "No incoming email address."
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:65
+#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:66
 msgid "No nickname provided by remote server."
 msgstr "Серверот не достави прекар."
 
-#: ../actions/avatarbynickname.php:27
+#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 msgid "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:243
 msgid "No pending confirmation to cancel."
 msgstr "Нема потврди кои може да се откажат."
 
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+msgid "No phone number."
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:72
+#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:73
 msgid "No profile URL returned by server."
 msgstr "Серверот не достави URL за профилот."
 
-#: ../actions/recoverpassword.php:189
+#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
 msgid "No registered email address for that user."
 msgstr "Нема регистрирана адреса за е-пошта за тој корисник."
 
-#: ../actions/userauthorization.php:48
+#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
 msgid "No request found!"
 msgstr "Не е пронаједено барање."
 
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
+#: actions/noticesearch.php:69 actions/peoplesearch.php:69
+#: actions/noticesearch.php:68 actions/peoplesearch.php:59
 msgid "No results"
 msgstr "Нема резултати"
 
-#: ../actions/avatarbynickname.php:32
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
 msgid "No size."
 msgstr "Нема големина."
 
-#: ../actions/openidsettings.php:135
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:109
+#: actions/twitapistatuses.php:438
+msgid "No status found with that ID."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:411
+msgid "No status with that ID found."
+msgstr ""
+
+#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
 msgid "No such OpenID."
 msgstr "Нема таков OpenID."
 
-#: ../actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29
 msgid "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:38
+#: actions/shownotice.php:114
 msgid "No such notice."
 msgstr "Нема такво известување."
 
-#: ../actions/recoverpassword.php:56
+#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
 msgid "No such recovery code."
 msgstr "Нема таков код за спасување."
 
-#: ../actions/postnotice.php:56
+#: ../actions/postnotice.php:56 actions/postnotice.php:57
 msgid "No such subscription"
 msgstr "Нема таква претплата"
 
 #: ../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/showstream.php:157
+#: classes/Command.php:208 classes/Command.php:242 lib/gallery.php:85
+#: lib/subs.php:105
 msgid "No such user."
 msgstr "Нема таков корисник."
 
-#: ../lib/gallery.php:76
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr ""
+
+#: ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
 msgstr "Нема никој!"
 
-#: ../actions/recoverpassword.php:60
+#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
 msgid "Not a recovery code."
 msgstr "Ова не е код за спасување."
 
-#: ../actions/imsettings.php:158
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+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:423 lib/twitterapi.php:450
+#: lib/twitterapi.php:534
+msgid "Not a supported data format."
+msgstr ""
+
+#: ../actions/imsettings.php:167 actions/imsettings.php:175
 msgid "Not a valid Jabber ID"
 msgstr "Неправилен JabberID"
 
-#: ../lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131
 msgid "Not a valid OpenID."
 msgstr "Неправилен OpenID."
 
-#: ../actions/profilesettings.php:75 ../actions/register.php:53
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+#: actions/emailsettings.php:208
+msgid "Not a valid email address"
+msgstr ""
+
+#: ../actions/register.php:63 actions/register.php:70 actions/register.php:79
 msgid "Not a valid email address."
 msgstr "Неправилна адреса за е-пошта."
 
-#: ../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/profilesettings.php:212 actions/register.php:87
 msgid "Not a valid nickname."
 msgstr "Неправилен прекар."
 
-#: ../actions/remotesubscribe.php:118
+#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
 msgid "Not a valid profile URL (incorrect services)."
 msgstr "Неправилно URL на профил (неточен сервис)."
 
-#: ../actions/remotesubscribe.php:111
+#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr "Неправилно URL на профил (нема дефиниран XRDS)."
 
-#: ../actions/remotesubscribe.php:104
+#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
 msgid "Not a valid profile URL (no YADIS document)."
 msgstr "Неправилно URL на профил (нема YADIS документ)."
 
-#: ../actions/avatar.php:95
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: actions/profilesettings.php:361
 msgid "Not an image or corrupt file."
 msgstr "Не е слика или датотеката е корумпирана."
 
 #: ../actions/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:52
 msgid "Not authorized."
 msgstr "Не е одобрено."
 
 #: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38
 msgid "Not expecting this response!"
 msgstr "Овој одговор не беше очекуван!"
 
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
-#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+#: actions/twitapistatuses.php:304
+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:31 actions/newnotice.php:30
+#: actions/nudge.php:30 actions/subedit.php:31 actions/unblock.php:31
 msgid "Not logged in."
 msgstr "Не сте пријавени."
 
-#: ../actions/unsubscribe.php:43
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:117
 msgid "Not subscribed!."
 msgstr "Не сте претплатени!"
 
-#: ../actions/showstream.php:82
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+msgid "Notice Search"
+msgstr ""
+
+#: ../actions/showstream.php:82 actions/showstream.php:82
+#: actions/showstream.php:111 actions/showstream.php:118
+#: actions/showstream.php:123
 #, php-format
 msgid "Notice feed for %s"
 msgstr "Канал со известувања на %s"
 
-#: ../actions/shownotice.php:39
+#: ../actions/shownotice.php:39 actions/shownotice.php:39
+#: actions/shownotice.php:45
 msgid "Notice has no profile"
 msgstr "Известувањето нема профил"
 
-#: ../actions/showstream.php:297
+#: ../actions/showstream.php:316 actions/showstream.php:331
+#: actions/showstream.php:379
 msgid "Notices"
 msgstr "Известувања"
 
-#: ../actions/password.php:39
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
+#, php-format
+msgid "Notices tagged with %s"
+msgstr ""
+
+#: ../actions/password.php:39 actions/profilesettings.php:178
+#: actions/profilesettings.php:183
 msgid "Old password"
 msgstr "Стара лозинка"
 
-#: ../lib/util.php:288
+#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
+#: lib/util.php:330 actions/deleteprofile.php:247 lib/util.php:340
 msgid "OpenID"
 msgstr "OpenID"
 
-#: ../actions/finishopenidlogin.php:61
+#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
 msgid "OpenID Account Setup"
 msgstr "Поставување на сметка за OpenID"
 
-#: ../lib/openid.php:180
+#: ../lib/openid.php:180 lib/openid.php:180
 msgid "OpenID Auto-Submit"
 msgstr "Автоматско испраќање на OpenID"
 
 #: ../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/finishopenidlogin.php:150 actions/openidlogin.php:76
 msgid "OpenID Login"
 msgstr "Пријавување со OpenID"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
+#: actions/openidlogin.php:74 actions/openidsettings.php:50
+#: actions/openidlogin.php:82
 msgid "OpenID URL"
 msgstr "OpenID URL"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
+#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 msgid "OpenID authentication cancelled."
 msgstr "Проверката на OpenID е откажана."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
+#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "Проверката на OpenID не успеа: %s"
 
-#: ../lib/openid.php:133
+#: ../lib/openid.php:133 lib/openid.php:133
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "Неуспех на OpenID: %s"
 
-#: ../actions/openidsettings.php:144
+#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
 msgid "OpenID removed."
 msgstr "OpenID-то е отстрането"
 
-#: ../actions/openidsettings.php:37
+#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
 msgid "OpenID settings"
 msgstr "Поставки за OpenID"
 
-#: ../actions/avatar.php:84
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: actions/profilesettings.php:350
 msgid "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/login.php:109 actions/register.php:194
 msgid "Password"
 msgstr "Лозинка"
 
-#: ../actions/recoverpassword.php:249
+#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
 msgid "Password and confirmation do not match."
 msgstr "Двете лозинки не се совпаѓаат."
 
-#: ../actions/recoverpassword.php:245
+#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
 msgid "Password must be 6 chars or more."
 msgstr "Лозинката мора да биде од најмалку 6 знаци."
 
-#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
+#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 msgid "Password recovery requested"
 msgstr "Побарано е пронаоѓање на лозинката"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:274
+#: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: actions/profilesettings.php:408 actions/recoverpassword.php:326
+#: actions/profilesettings.php:437
 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/profilesettings.php:409 actions/register.php:107
 msgid "Passwords don't match."
 msgstr "Лозинките не се совпаѓаат."
 
-#: ../actions/peoplesearch.php:33
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+msgid "People"
+msgstr ""
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+msgid "People Search"
+msgstr ""
+
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
 msgid "People search"
 msgstr "Пребарување на луѓе"
 
-#: ../lib/stream.php:44
+#: ../lib/stream.php:50 lib/personal.php:50
 msgid "Personal"
 msgstr "Личен"
 
-#: ../actions/userauthorization.php:77
+#: ../actions/invite.php:133 actions/invite.php:141
+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 ""
-"Проверете ги овие детали ако сакате да се "
-"претплатите на известувањата на овој корисник. Ако не сакате да се претплатите, кликнете на „Откажи“."
+"Проверете ги овие детали ако сакате да се претплатите на известувањата на "
+"овој корисник. Ако не сакате да се претплатите, кликнете на „Откажи“."
 
-#: ../actions/imsettings.php:74
+#: ../actions/imsettings.php:73 actions/imsettings.php:74
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Испрати известување кога мојот статус на Jabber/GTalk ќе се смени."
 
-#: ../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
 msgid "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:185 actions/othersettings.php:179
 msgid "Preferences saved."
 msgstr "Преференциите се снимени."
 
-#: ../lib/util.php:300
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
+msgid "Preferred language"
+msgstr ""
+
+#: ../lib/util.php:328 lib/util.php:344 lib/util.php:356
 msgid "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:139 classes/Notice.php:149
 msgid "Problem saving notice."
 msgstr "Проблем во снимањето на известувањето."
 
-#: ../lib/stream.php:54
+#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
+#: lib/settingsaction.php:84 actions/deleteprofile.php:241
 msgid "Profile"
 msgstr "Профил"
 
-#: ../actions/remotesubscribe.php:73
+#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
 msgid "Profile URL"
 msgstr "URL на профилот"
 
-#: ../actions/profilesettings.php:34
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
 msgid "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
 msgid "Profile unknown"
 msgstr "Непознат профил"
 
-#: ../lib/util.php:276
-msgid "Public"
-msgstr "Јавен"
-
-#: ../actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:77
 msgid "Public Stream Feed"
 msgstr "Јавен канал"
 
-#: ../actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 lib/stream.php:34
 msgid "Public timeline"
 msgstr "Јавна историја"
 
-#: ../actions/recoverpassword.php:151
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:104
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
 msgid "Recover"
 msgstr "Пронајди"
 
-#: ../actions/recoverpassword.php:141
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
 msgid "Recover password"
 msgstr "Пронаоѓање на лозинка"
 
-#: ../actions/recoverpassword.php:67
+#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
 msgid "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:181 actions/register.php:234 lib/util.php:338
 msgid "Register"
 msgstr "Регистрирај се"
 
-#: ../actions/userauthorization.php:119
+#: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:173
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:241
+msgid "Registration successful"
+msgstr ""
+
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
 msgid "Reject"
 msgstr "Одбиј"
 
-#: ../actions/login.php:99 ../actions/register.php:183
+#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
+#: actions/register.php:190 actions/login.php:110 actions/openidlogin.php:85
+#: actions/register.php:217
 msgid "Remember me"
 msgstr "Запамети ме"
 
-#: ../actions/updateprofile.php:69
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
 msgid "Remote profile with no matching profile"
 msgstr "Оддалечениот профил нема одговарачки профил"
 
-#: ../actions/remotesubscribe.php:65
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
 msgid "Remote subscribe"
 msgstr "Оддалечена претплата"
 
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php:48 actions/emailsettings.php:76
+#: actions/imsettings.php:49 actions/openidsettings.php:108
+#: actions/smssettings.php:50 actions/smssettings.php:84
+#: actions/twittersettings.php:59 actions/twittersettings.php:61
 msgid "Remove"
 msgstr "Отстрани"
 
-#: ../actions/openidsettings.php:68
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
 msgid "Remove OpenID"
 msgstr "Отстрани го OpenID-то"
 
@@ -1046,50 +1741,83 @@ msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
 msgstr ""
-"Ако го остраните Вашето единствено OpenID, "
-"тогаш нема да можете да се пријавите. Ако треба да го отстраните, прво додајте друг OpenID."
+"Ако го остраните Вашето единствено OpenID, тогаш нема да можете да се "
+"пријавите. Ако треба да го отстраните, прво додајте друг OpenID."
 
-#: ../lib/stream.php:49
+#: ../lib/stream.php:55 lib/personal.php:55
 msgid "Replies"
 msgstr "Одговори"
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:50
+#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
+#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #, php-format
 msgid "Replies to %s"
 msgstr "Одговори испратени до %s"
 
-#: ../actions/recoverpassword.php:168
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
 msgid "Reset"
 msgstr "Ресетирај"
 
-#: ../actions/recoverpassword.php:158
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
 msgid "Reset password"
 msgstr "Рестетирај ја лозинката"
 
-#: ../actions/recoverpassword.php:167 ../actions/register.php:180
-msgid "Same as password above"
-msgstr "Исто како лозинката погоре"
-
-#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
-msgid "Save"
-msgstr "Сними"
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/deleteprofile.php:250 actions/subscriptions.php:73
+msgid "SMS"
+msgstr ""
 
-#: ../lib/searchaction.php:73 ../lib/util.php:277
-msgid "Search"
-msgstr "Барај"
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+msgid "SMS Phone number"
+msgstr ""
 
-#: ../actions/noticesearch.php:80
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:230
+msgid "SMS confirmation"
+msgstr ""
+
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
+msgid "Same as password above"
+msgstr "Исто како лозинката погоре"
+
+#: ../actions/register.php:156 actions/register.php:170
+#: actions/register.php:197
+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/twittersettings.php:83 actions/emailsettings.php:107
+#: actions/othersettings.php:56 actions/profilesettings.php:106
+#: actions/subscriptions.php:74 actions/tagother.php:100
+#: actions/twittersettings.php:82
+msgid "Save"
+msgstr "Сними"
+
+#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
+#: lib/util.php:316 lib/util.php:327
+msgid "Search"
+msgstr "Барај"
+
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:84
 msgid "Search Stream Feed"
 msgstr "Барај во каналот"
 
-#: ../actions/noticesearch.php:30
+#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
+#: actions/noticesearch.php:29
 #, 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 ""
-"Барајте известувања на %%site.name%% според "
-"нивната содржина. Термините одделете ги со празни места. Најмала должина е 3 знаци."
+"Барајте известувања на %%site.name%% според нивната содржина. Термините "
+"одделете ги со празни места. Најмала должина е 3 знаци."
 
 #: ../actions/peoplesearch.php:28
 #, php-format
@@ -1097,154 +1825,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 ""
-"Барајте луѓе на %%site.name%% според нивното "
-"име, локација или интереси. Термините одделете ги со празни места. Најмала должина е 3 знаци."
+"Барајте луѓе на %%site.name%% според нивното име, локација или интереси. "
+"Термините одделете ги со празни места. Најмала должина е 3 знаци."
+
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+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 lib/util.php:1646 lib/util.php:2158
 msgid "Send"
 msgstr "Испрати"
 
-#: ../actions/imsettings.php:71
+#: ../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."
+msgstr ""
+
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+msgid "Send me notices of new subscriptions through email."
+msgstr ""
+
+#: ../actions/imsettings.php:70 actions/imsettings.php:71
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Испраќај ми известувања преку Jabber/GTalk."
 
-#: ../lib/util.php:282
+#: ../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 ""
+
+#: ../lib/util.php:304 lib/util.php:320 lib/util.php:330
 msgid "Settings"
 msgstr "Поставки"
 
-#: ../actions/profilesettings.php:183
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:336
 msgid "Settings saved."
 msgstr "Поставките се снимени."
 
-#: ../actions/finishaddopenid.php:66
+#: ../actions/tag.php:60 actions/tag.php:60 actions/tag.php:59
+msgid "Showing most popular tags from the last week"
+msgstr ""
+
+#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
 msgid "Someone else already has this OpenID."
 msgstr "Некој друг веќе го користи ова OpenID."
 
 #: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
+#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
 msgid "Something weird happened."
 msgstr "Нешто чудно се случи."
 
-#: ../lib/util.php:302
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr ""
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: ../lib/util.php:330 lib/util.php:346 lib/util.php:358
 msgid "Source"
 msgstr "Изворен код"
 
-#: ../actions/showstream.php:277
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:359
 msgid "Statistics"
 msgstr "Статистика"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
+#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
+#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
+#: actions/finishopenidlogin.php:199 actions/finishopenidlogin.php:267
 msgid "Stored OpenID not found."
 msgstr "Зачуваниот OpenID не е пронајден."
 
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:172
-#: ../actions/showstream.php:181
+#: ../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:254 lib/util.php:2078
 msgid "Subscribe"
 msgstr "Претплати се"
 
-#: ../actions/showstream.php:294 ../actions/subscribers.php:27
+#: ../actions/showstream.php:313 ../actions/subscribers.php:27
+#: actions/showstream.php:328 actions/subscribers.php:27
+#: actions/showstream.php:376 lib/gallery.php:136 lib/gallery.php:137
 msgid "Subscribers"
 msgstr "Претплатници"
 
-#: ../actions/userauthorization.php:309
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
 msgid "Subscription authorized"
 msgstr "Претплатата е одобрена"
 
-#: ../actions/userauthorization.php:319
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
 msgid "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:288 actions/showstream.php:370 lib/gallery.php:131
+#: lib/gallery.php:132
 msgid "Subscriptions"
 msgstr "Претплати"
 
-#: ../actions/avatar.php:87
+#: ../actions/avatar.php:87 actions/profilesettings.php:324
+#: actions/profilesettings.php:353
 msgid "System error uploading file."
 msgstr "Системска грешка при товарањето на датотеката."
 
-#: ../actions/noticesearch.php:34
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317 actions/profilesettings.php:90 actions/showstream.php:382
+#: actions/tag.php:40 actions/tagother.php:96 actions/tagother.php:162
+#: lib/profilelist.php:126 lib/profilelist.php:128
+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:33
 msgid "Text search"
 msgstr "Текстуално пребарување"
 
-#: ../actions/openidsettings.php:140
+#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
 msgid "That OpenID does not belong to you."
 msgstr "Овој OpenID не Ви припаѓа Вам."
 
-#: ../actions/confirmaddress.php:52
+#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
 msgid "That address has already been confirmed."
 msgstr "Оваа адреса веќе е потврдена."
 
-#: ../actions/confirmaddress.php:43
+#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
 msgid "That confirmation code is not for you!"
 msgstr "Овој код за потврда не е за Вас!"
 
-#: ../actions/avatar.php:80
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:214
+msgid "That email address already belongs to another user."
+msgstr ""
+
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: actions/profilesettings.php:346
 msgid "That file is too big."
 msgstr "Датотеката е преголема."
 
-#: ../actions/imsettings.php:161
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
 msgid "That is already your Jabber ID."
 msgstr "Ова веќе е Вашиот Jabber ID."
 
-#: ../actions/imsettings.php:224
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:211
+msgid "That is already your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+msgid "That is already your phone number."
+msgstr ""
+
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
 msgid "That is not your Jabber ID."
 msgstr "Ова не е Вашиот Jabber ID."
 
-#: ../actions/imsettings.php:201
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+#: actions/emailsettings.php:270
+msgid "That is not your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+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:247
 msgid "That is the wrong IM address."
 msgstr "Ова е погрешната IM адреса."
 
-#: ../actions/newnotice.php:52
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+msgid "That is the wrong confirmation number."
+msgstr ""
+
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+msgid "That phone number already belongs to another user."
+msgstr ""
+
+#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: actions/newnotice.php:49 actions/twitapistatuses.php:330
+#: actions/newnotice.php:61 actions/twitapistatuses.php:271
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "Ова е предолго. Максималната должина е 140 знаци."
 
-#: ../actions/confirmaddress.php:86
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+#: actions/twitapiaccount.php:55
+msgid "That's too long. Max notice size is 255 chars."
+msgstr ""
+
+#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Адресата  \"%s\" е потврдена за Вашата сметка."
 
-#: ../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:285
 msgid "The address was removed."
 msgstr "Адресата е отстранета."
 
-#: ../actions/userauthorization.php:311
+#: ../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 ""
-"Претплатата е одобрена, но нема вратено "
-"URL. Проверете ги инструкциите за местото "
-"за да видите како да ја одобрите претплатата. Вашиот белег за претплата е:"
+"Претплатата е одобрена, но нема вратено URL. Проверете ги инструкциите за "
+"местото за да видите како да ја одобрите претплатата. Вашиот белег за "
+"претплата е:"
 
-#: ../actions/userauthorization.php:321
+#: ../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 ""
-"Претплатата е одбиена, но нема вратено URL. "
-"Проверете ги инструкциите за местото за да видите како целосно да ја одбиете претплатата."
+"Претплатата е одбиена, но нема вратено URL. Проверете ги инструкциите за "
+"местото за да видите како целосно да ја одбиете претплатата."
 
-#: ../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 "Ова се луѓето што ги следат известувањата на %s."
 
-#: ../actions/subscribers.php:33
+#: ../actions/subscribers.php:33 actions/subscribers.php:33
 msgid "These are the people who listen to your notices."
 msgstr "Ова се луѓето што ги следат Вашите известувања."
 
-#: ../actions/subscriptions.php:35
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Ова се луѓето чии известувања ги следи %s."
 
-#: ../actions/subscriptions.php:33
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
 msgid "These are the people whose notices you listen to."
 msgstr "Ова се луѓето чии известувања ги следите."
 
-#: ../actions/recoverpassword.php:87
+#: ../actions/invite.php:89 actions/invite.php:96
+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 "Овој код за потврда е премногу стар. Почнете од почеток."
 
@@ -1253,83 +2091,151 @@ msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
 msgstr ""
-"Овој формулар треба автоматски да се "
-"испрати. Ако тоа не се случи, кликнете на копчето „Испрати“ за да одите до Вашиот OpenID снабдувач."
+"Овој формулар треба автоматски да се испрати. Ако тоа не се случи, кликнете "
+"на копчето „Испрати“ за да одите до Вашиот OpenID снабдувач."
 
-#: ../actions/finishopenidlogin.php:56
+#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
 #, 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 ""
-"Ова е прв пат како се пријавивте на %s и "
-"затоа морам да го поврземе Вашиот OpenID со "
-"локална сметка. Можете да креирате нова сметка или да се поврзете со тековната сметка - ако ја имате."
+"Ова е прв пат како се пријавивте на %s и затоа морам да го поврземе Вашиот "
+"OpenID со локална сметка. Можете да креирате нова сметка или да се поврзете "
+"со тековната сметка - ако ја имате."
+
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:94
+#: actions/twitapifriendships.php:82 actions/twitapistatuses.php:428
+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:46
+#: actions/twitapidirect_messages.php:117 actions/twitapifriendships.php:30
+#: actions/twitapistatuses.php:239
+msgid "This method requires a POST."
+msgstr ""
 
-#: ../lib/util.php:147
+#: ../lib/util.php:164 lib/util.php:246 lib/util.php:257
 msgid "This page is not available in a media type you accept"
 msgstr "Оваа страница не е достапна во форматот кој Вие го прифаќате."
 
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
+msgid "Timezone"
+msgstr ""
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr ""
+
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"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 ""
+"За да се претплатите, може да се [пријавите](%%action.login%%) или  да се "
+"[регистрирате](%%action.register%%). Ако имате сметка на [компатибилно место "
+"за микро блогирање](%%doc.openmublog%%), внесете го URL-то на Вашиот профил "
+"подолу."
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: actions/twitapifriendships.php:128
+msgid "Two user ids or screen_names must be supplied."
 msgstr ""
-"За да се претплатите, може да се "
-"[пријавите](%%action.login%%) или  да се "
-"[регистрирате](%%action.register%%). Ако имате "
-"сметка на [компатибилно место за микро блогирање](%%doc.openmublog%%), внесете го URL-то на Вашиот профил подолу."
 
-#: ../actions/profilesettings.php:51
+#: ../actions/profilesettings.php:48 ../actions/register.php:169
+#: actions/profilesettings.php:81 actions/register.php:183
+#: actions/profilesettings.php:83 actions/register.php:210
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL на Вашата домашна страница, блог или профил на друго место."
 
-#: ../actions/remotesubscribe.php:74
+#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL на Вашиот профил на друго компатибилно место за микроблогирање."
 
-#: ../actions/imsettings.php:105 ../actions/recoverpassword.php:39
+#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
+#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
+#: actions/emailsettings.php:144 actions/imsettings.php:118
+#: actions/recoverpassword.php:39 actions/smssettings.php:143
+#: actions/twittersettings.php:108 actions/emailsettings.php:147
+#: actions/othersettings.php:146 actions/twittersettings.php:199
 msgid "Unexpected form submission."
 msgstr "Неочекувано испраќање на формулар."
 
-#: ../actions/recoverpassword.php:237
+#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
 msgid "Unexpected password reset."
 msgstr "Неочекувано ресетирање на лозинка."
 
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:58
+#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:59
 msgid "Unknown version of OMB protocol."
 msgstr "Непозната верзија на протоколот OMB."
 
-#: ../lib/util.php:245
+#: ../lib/util.php:269 lib/util.php:285 lib/util.php:296
 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:48
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr "Непознат тип на адреса %s"
 
-#: ../actions/showstream.php:193
+#: ../actions/showstream.php:209 actions/showstream.php:219
+#: actions/showstream.php:267 lib/util.php:2094
 msgid "Unsubscribe"
 msgstr "Откажи ја претплатата"
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
+#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
+#: actions/postnotice.php:45 actions/updateprofile.php:46
 msgid "Unsupported OMB version"
 msgstr "Неподдржнана верзија на ОМВ"
 
-#: ../actions/avatar.php:105
+#: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: actions/profilesettings.php:371
 msgid "Unsupported image file format."
 msgstr "Неподдржан фомрат на слики."
 
-#: ../actions/avatar.php:68
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: actions/deleteprofile.php:251
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: actions/deleteprofile.php:254
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/twitapistatuses.php:126
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:198
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
+
+#: ../actions/avatar.php:68 actions/profilesettings.php:161
+#: actions/profilesettings.php:166
 msgid "Upload"
 msgstr "Товари"
 
@@ -1340,114 +2246,205 @@ msgid ""
 "site license, also. Use a picture that belongs to you and that you want to "
 "share."
 msgstr ""
-"Тука можете да поставите нов „аватар“ "
-"(косиничка слика). Не можете да ја "
-"менувате сликата откако ќе ја товарите, "
-"па затоа погрижете се да личи на квадрат. Сликата мора да биде под истата лиценца како ова место. Користете слика која е Ваша и која сакате да ја споделите."
+"Тука можете да поставите нов „аватар“ (косиничка слика). Не можете да ја "
+"менувате сликата откако ќе ја товарите, па затоа погрижете се да личи на "
+"квадрат. Сликата мора да биде под истата лиценца како ова место. Користете "
+"слика која е Ваша и која сакате да ја споделите."
+
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr ""
+
+#: ../actions/invite.php:114 actions/invite.php:121
+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 actions/register.php:200
+#: actions/register.php:203
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Се користи само за надградби, објави и пронаоѓање на лозинка."
 
 #: ../actions/finishremotesubscribe.php:86
+#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:92
 msgid "User being listened to doesn't exist."
 msgstr "Корисникот кој го следите не постои."
 
 #: ../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/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/showstream.php:57
+#: actions/twitapiaccount.php:63 actions/twitapifavorites.php:40
+#: actions/twitapistatuses.php:163 actions/twitapistatuses.php:492
+#: lib/twitterapi.php:590
 msgid "User has no profile."
 msgstr "Корисникот нема профил."
 
-#: ../actions/remotesubscribe.php:71
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
 msgid "User nickname"
 msgstr "Прекар на корисникот"
 
-#: ../lib/util.php:969
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../lib/util.php:1159 lib/util.php:1293 lib/util.php:1630
 #, php-format
 msgid "What's up, %s?"
 msgstr "Што има %s?"
 
-#: ../actions/profilesettings.php:57
+#: ../actions/profilesettings.php:54 ../actions/register.php:175
+#: actions/profilesettings.php:87 actions/register.php:189
+#: actions/profilesettings.php:89 actions/register.php:216
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Каде се наоѓате, на пр. „Град, Држава“."
 
-#: ../actions/updateprofile.php:127
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Погрешен тип на слика за '%s'"
 
-#: ../actions/updateprofile.php:122
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Погрешна големина на слика на '%s'"
 
-#: ../actions/finishaddopenid.php:64
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+#: actions/block.php:105
+msgid "Yes"
+msgstr ""
+
+#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
 msgid "You already have this OpenID!"
 msgstr "Веќе го имате овој OpenID!"
 
-#: ../actions/recoverpassword.php:31
+#: ../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
 msgid "You are already logged in!"
 msgstr "Веќе сте пријавени!"
 
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:102
+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/register.php:164
+#: ../actions/register.php:135 actions/register.php:145
 msgid "You can create a new account to start posting notices."
 msgstr "Можете да креирате нова сметка за да испраќате известувања."
 
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
 #: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr ""
-"Можте да отстраните OpenID од Вашата сметка "
-"со кликање на копчето „Отстрани“."
+"Можте да отстраните OpenID од Вашата сметка со кликање на копчето „Отстрани“."
 
-#: ../actions/imsettings.php:28
+#: ../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 ""
-"Можете да примате и праќате известувања "
-"преку Jabber/GTalk [брзи пораки](%%doc.im%%). Подолу "
+"Можете да примате и праќате известувања преку Jabber/GTalk [брзи пораки](%%"
+"doc.im%%). Подолу "
 
 #: ../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
+#: actions/finishremotesubscribe.php:83 actions/finishremotesubscribe.php:99
 msgid "You can use the local subscription!"
 msgstr "Може да ја користите локалната претплата."
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:51
+#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
+#: actions/finishopenidlogin.php:38 actions/register.php:68
+#: actions/register.php:77
 msgid "You can't register if you don't agree to the license."
 msgstr "Не може да се регистрирате ако не ја прифаќате лиценцата."
 
-#: ../actions/updateprofile.php:62
+#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
 msgid "You did not send us that profile"
 msgstr "Не ни го испративте тој профил."
 
-#: ../actions/recoverpassword.php:134
+#: ../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 ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: actions/twitapistatuses.php:455
+msgid "You may not delete another user's status."
+msgstr ""
+
+#: ../actions/invite.php:31 actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+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!"
+msgstr ""
+
+#: ../actions/recoverpassword.php:149
 msgid "You've been identified. Enter a  new password below. "
 msgstr "Идентификувани сте. Подолу можете да внесете нова лозинка."
 
-#: ../actions/openidlogin.php:67
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:84
 msgid "Your OpenID URL"
 msgstr "Вашето URL за OpenID"
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:164
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
-"Вашиот прекар на овој сервер или адресата "
-"за е-пошта со која се регистриравте."
+"Вашиот прекар на овој сервер или адресата за е-пошта со која се "
+"регистриравте."
 
 #: ../actions/openidsettings.php:28
 #, php-format
@@ -1455,788 +2452,89 @@ 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%%) Ви овозможува да се "
-"пријавувате на многу места со истата "
-"корисничка сметка. Овде можете да ги уредите Вашите поврзани OpenID-ја."
+"[OpenID](%%doc.openid%%) Ви овозможува да се пријавувате на многу места со "
+"истата корисничка сметка. Овде можете да ги уредите Вашите поврзани OpenID-"
+"ја."
 
-#: ../lib/util.php:814
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:1287
 msgid "a few seconds ago"
 msgstr "пред неколку секунди"
 
-#: ../lib/util.php:826
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:1299
 #, php-format
 msgid "about %d days ago"
 msgstr "пред %d денови"
 
-#: ../lib/util.php:822
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:1295
 #, php-format
 msgid "about %d hours ago"
 msgstr "пред %d часа"
 
-#: ../lib/util.php:818
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:1291
 #, php-format
 msgid "about %d minutes ago"
 msgstr "пред %d минути"
 
-#: ../lib/util.php:830
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:1303
 #, php-format
 msgid "about %d months ago"
 msgstr "пред %d месеци"
 
-#: ../lib/util.php:824
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:1297
 msgid "about a day ago"
 msgstr "пред еден ден"
 
-#: ../lib/util.php:816
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:1289
 msgid "about a minute ago"
 msgstr "пред една минута"
 
-#: ../lib/util.php:828
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:1301
 msgid "about a month ago"
 msgstr "пред еден месец"
 
-#: ../lib/util.php:832
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:1305
 msgid "about a year ago"
 msgstr "пред една година"
 
-#: ../lib/util.php:820
-msgid "about an hour ago"
-msgstr "пред еден час"
-
-#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
-#: ../lib/stream.php:101
-msgid "in reply to..."
-msgstr "во одговор на..."
-
-#: ../actions/noticesearch.php:133 ../actions/showstream.php:390
-#: ../lib/stream.php:108
-msgid "reply"
-msgstr "одговор"
-
-#: ../actions/password.php:44
-msgid "same as password above"
-msgstr "исто како лозинката погоре"
-
-#: ../lib/util.php:1127
-msgid "« After"
-msgstr "« Следни"
-
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr ""
-
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
-
-#: ../actions/invite.php:168 actions/invite.php:176
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
-
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
-
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
-#, php-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#, php-format
-msgid "%s public timeline"
-msgstr ""
-
-#: ../lib/mail.php:206 lib/mail.php:212
-#, php-format
-msgid "%s status"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#, php-format
-msgid "%s timeline"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
-msgstr ""
-
-#: ../actions/register.php:213
-msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
-msgstr ""
-
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-
-#: ../actions/register.php:154 actions/register.php:168
-msgid "6 or more characters. Required."
-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 ""
-
-#: ../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/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!"
-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 ""
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-msgid "Add or remove OpenIDs"
-msgstr ""
-
-#: ../actions/invite.php:131 actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
-msgstr ""
-
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-msgid "Are you sure you want to delete this notice?"
-msgstr ""
-
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr ""
-
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
-msgid "Can't delete this notice."
-msgstr ""
-
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-msgid "Cannot normalize that email address"
-msgstr ""
-
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr ""
-
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
-msgstr ""
-
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-msgid "Change your profile settings"
-msgstr ""
-
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-msgid "Confirmation code"
-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/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
-msgstr ""
-
-#: ../lib/subs.php:54 lib/subs.php:61
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: ../lib/subs.php:46 lib/subs.php:46
-msgid "Could not subscribe."
-msgstr ""
-
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-msgid "Could not update user with confirmed email address."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-msgid "Couldn't find any statuses."
-msgstr ""
-
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-msgid "Couldn't update user for autosubscribe."
-msgstr ""
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-msgid "Couldn't update user record."
-msgstr ""
-
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-msgid "Current confirmed email address."
-msgstr ""
-
-#: ../classes/Notice.php:72 classes/Notice.php:86
-#, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr ""
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-msgid "Delete notice"
-msgstr ""
-
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-msgid "Email Address"
-msgstr ""
-
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-msgid "Email Settings"
-msgstr ""
-
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-msgid "Email address, like \"UserName@example.org\""
-msgstr ""
-
-#: ../actions/invite.php:129 actions/invite.php:137
-msgid "Email addresses"
-msgstr ""
-
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
-msgstr ""
-
-#: ../actions/tag.php:55 actions/tag.php:55
-#, php-format
-msgid "Feed for tag %s"
-msgstr ""
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr ""
-
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr ""
-
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-msgid "I want to post notices by email."
-msgstr ""
-
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
-msgstr ""
-
-#: ../actions/recoverpassword.php:137
-msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
-"email address you have stored  in your account."
-msgstr ""
-
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-msgid "Incoming email"
-msgstr ""
-
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-msgid "Incoming email address removed."
-msgstr ""
-
-#: ../actions/invite.php:55 actions/invite.php:62
-#, php-format
-msgid "Invalid email address: %s"
-msgstr ""
-
-#: ../actions/invite.php:79 actions/invite.php:86
-msgid "Invitation(s) sent"
-msgstr ""
-
-#: ../actions/invite.php:97 actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
-msgstr ""
-
-#: ../lib/util.php:306 lib/util.php:322
-msgid "Invite"
-msgstr ""
-
-#: ../actions/invite.php:123 actions/invite.php:130
-msgid "Invite new users"
-msgstr ""
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Language"
-msgstr ""
-
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-msgid "Language is too long (max 50 chars)."
-msgstr ""
-
-#: ../actions/register.php:166 actions/register.php:180
-msgid "Longer name, preferably your \"real\" name"
-msgstr ""
-
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-#: actions/emailsettings.php:81 actions/smssettings.php:89
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
-
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-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 ""
-
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-msgid "New"
-msgstr ""
-
-#: ../lib/mail.php:144 lib/mail.php:144
-#, php-format
-msgid "New email address for posting to %s"
-msgstr ""
-
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-msgid "New incoming email address added."
-msgstr ""
-
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-msgid "No"
-msgstr ""
-
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-msgid "No carrier selected."
-msgstr ""
-
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-msgid "No code entered"
-msgstr ""
-
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-msgid "No email address."
-msgstr ""
-
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-msgid "No incoming email address."
-msgstr ""
-
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-msgid "No phone number."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-msgid "No status found with that ID."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-msgid "No status with that ID found."
-msgstr ""
-
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-msgid "No user with that email address or username."
-msgstr ""
-
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-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
-msgid "Not a supported data format."
-msgstr ""
-
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-msgid "Not a valid email address"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-msgid "Not found"
-msgstr ""
-
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-msgid "Notice Search"
-msgstr ""
-
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81
-#, php-format
-msgid "Notices tagged with %s"
-msgstr ""
-
-#: ../actions/invite.php:135 actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-msgid "People"
-msgstr ""
-
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-msgid "People Search"
-msgstr ""
-
-#: ../actions/invite.php:133 actions/invite.php:141
-msgid "Personal message"
-msgstr ""
-
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Preferred language"
-msgstr ""
-
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
-
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-msgid "Publish a MicroID for my email address."
-msgstr ""
-
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr ""
-
-#: ../actions/register.php:28 actions/register.php:28
-msgid "Registration not allowed."
-msgstr ""
-
-#: ../actions/register.php:200 actions/register.php:214
-msgid "Registration successful"
-msgstr ""
-
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
-msgstr ""
-
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-msgid "SMS Phone number"
-msgstr ""
-
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-msgid "SMS Settings"
-msgstr ""
-
-#: ../lib/mail.php:219 lib/mail.php:225
-msgid "SMS confirmation"
-msgstr ""
-
-#: ../actions/register.php:156 actions/register.php:170
-msgid "Same as password above. Required."
-msgstr ""
-
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-msgid "Select a carrier"
-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."
-msgstr ""
-
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-msgid "Send me notices of new subscriptions through email."
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr ""
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
-msgstr ""
-
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317
-msgid "Tags"
-msgstr ""
-
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr ""
-
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr ""
-
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-msgid "That is already your email address."
-msgstr ""
-
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-msgid "That is already your phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-msgid "That is not your email address."
-msgstr ""
-
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-msgid "That is not your phone number."
-msgstr ""
-
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-msgid "That is the wrong confirmation number."
-msgstr ""
-
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-msgid "That phone number already belongs to another user."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-msgid "That's too long. Max notice size is 255 chars."
-msgstr ""
-
-#: ../actions/invite.php:89 actions/invite.php:96
-msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
-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."
-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."
-msgstr ""
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "Timezone"
-msgstr ""
-
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-msgid "Timezone not selected."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-msgid "Two user ids or screen_names must be supplied."
-msgstr ""
-
-#: ../index.php:57 index.php:57
-msgid "Unknown action"
-msgstr ""
-
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-msgid "Updates by SMS"
-msgstr ""
-
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr ""
-
-#: ../actions/invite.php:114 actions/invite.php:121
-msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
-msgstr ""
-
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr ""
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "What timezone are you normally in?"
-msgstr ""
-
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-msgid "Yes"
-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/invite.php:81 actions/invite.php:88
-msgid "You are already subscribed to these users:"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
-msgstr ""
-
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-msgid "You may not delete another user's status."
-msgstr ""
-
-#: ../actions/invite.php:31 actions/invite.php:31
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-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!"
-msgstr ""
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:1293
+msgid "about an hour ago"
+msgstr "пред еден час"
 
 #: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
+#: actions/showstream.php:441 lib/stream.php:99 lib/noticelist.php:211
 msgid "delete"
 msgstr ""
 
+#: ../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:135
+#: lib/facebookaction.php:202 lib/noticelist.php:189
+msgid "in reply to..."
+msgstr "во одговор на..."
+
+#: ../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:142
+#: lib/noticelist.php:199
+msgid "reply"
+msgstr "одговор"
+
+#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/profilesettings.php:188
+msgid "same as password above"
+msgstr "исто како лозинката погоре"
+
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+#: actions/twitapistatuses.php:543
 msgid "unsupported file type"
 msgstr ""
 
+#: ../lib/util.php:1309 lib/util.php:1443 lib/facebookaction.php:251
+#: lib/util.php:1783
+#, fuzzy
+msgid "« After"
+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
@@ -2246,6 +2544,12 @@ msgstr ""
 #: 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:38 actions/deleteprofile.php:127 actions/disfavor.php:47
+#: actions/emailsettings.php:130 actions/favor.php:49 actions/login.php:45
+#: actions/newmessage.php:44 actions/newnotice.php:36 actions/nudge.php:47
+#: actions/othersettings.php:139 actions/profilesettings.php:49
+#: actions/subedit.php:38 actions/tagother.php:113
+#: actions/twittersettings.php:188 actions/unblock.php:38
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -2269,12 +2573,14 @@ msgstr ""
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142
+#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:54
+#: actions/twitapifavorites.php:115
 msgid "This notice is already a favorite!"
 msgstr ""
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
+#: classes/Command.php:132 actions/favor.php:61
+#: actions/twitapifavorites.php:122
 msgid "Could not create favorite."
 msgstr ""
 
@@ -2283,11 +2589,12 @@ msgid "Disfavor"
 msgstr ""
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:62
 #, php-format
 msgid "%s favorite notices"
 msgstr ""
 
-#: actions/favoritesrss.php:64
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:66
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr ""
@@ -2313,47 +2620,50 @@ msgid ""
 "\n"
 msgstr ""
 
-#: actions/login.php:104
+#: actions/login.php:104 actions/login.php:111 actions/openidlogin.php:86
 msgid "Automatically login in the future; "
 msgstr ""
 
-#: actions/login.php:122
+#: actions/login.php:122 actions/login.php:130
 msgid "For security reasons, please re-enter your "
 msgstr ""
 
-#: actions/login.php:126
+#: actions/login.php:126 actions/login.php:134
 msgid "Login with your username and password. "
 msgstr ""
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+#: actions/newmessage.php:60 actions/twitapidirect_messages.php:136
 msgid "That's too long. Max message size is 140 chars."
 msgstr ""
 
-#: actions/newmessage.php:65
+#: actions/newmessage.php:65 actions/newmessage.php:68
 msgid "No recipient specified."
 msgstr ""
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
+#: classes/Command.php:206 actions/newmessage.php:71
+#: actions/newmessage.php:116 classes/Command.php:211
 msgid "You can't send a message to this user."
 msgstr ""
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
+#: classes/Command.php:209 actions/newmessage.php:74
+#: actions/twitapidirect_messages.php:153 classes/Command.php:214
 msgid ""
-"Don't send a message to yourself; just say it to yourself quietly "
-"instead."
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: actions/newmessage.php:108
+#: actions/newmessage.php:108 actions/microsummary.php:32
+#: actions/newmessage.php:111
 msgid "No such user"
 msgstr ""
 
-#: actions/newmessage.php:117
+#: actions/newmessage.php:117 actions/newmessage.php:120
 msgid "New message"
 msgstr ""
 
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:95 actions/noticesearch.php:94
 msgid "Notice without matching profile"
 msgstr ""
 
@@ -2400,6 +2710,7 @@ msgstr ""
 
 #: actions/profilesettings.php:115 actions/remotesubscribe.php:320
 #: actions/userauthorization.php:159 actions/userrss.php:76
+#: actions/profilesettings.php:120 actions/remotesubscribe.php:333
 msgid "User without matching profile"
 msgstr ""
 
@@ -2427,18 +2738,18 @@ msgstr ""
 msgid "New password successfully saved. "
 msgstr ""
 
-#: actions/register.php:95
+#: actions/register.php:95 actions/register.php:104
 msgid "Password must be 6 or more characters."
 msgstr ""
 
-#: actions/register.php:216
+#: actions/register.php:216 actions/register.php:243
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to..."
 msgstr ""
 
-#: actions/register.php:227
+#: actions/register.php:227 actions/register.php:254
 msgid "(You should receive a message by email momentarily, with "
 msgstr ""
 
@@ -2453,6 +2764,7 @@ msgid "Feed for favorites of %s"
 msgstr ""
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:88 actions/twitapifavorites.php:57
 msgid "Could not retrieve favorite notices."
 msgstr ""
 
@@ -2474,7 +2786,7 @@ msgstr ""
 msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: actions/showstream.php:154
+#: actions/showstream.php:154 lib/util.php:2105
 msgid "Send a message"
 msgstr ""
 
@@ -2483,73 +2795,78 @@ msgstr ""
 msgid "Mobile carrier for your phone. "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:64
 #, php-format
 msgid "Direct messages to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:65
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:69
 msgid "Direct Messages You've Sent"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:70
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:132
 msgid "No message text!"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:145
 msgid "Recipient user not found."
 msgstr ""
 
 #: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:148
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
-#: actions/twitapifavorites.php:92
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:64
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
-#: actions/twitapifavorites.php:95
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:67
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
+#: actions/twitapifavorites.php:158 lib/mail.php:303
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr ""
 
 #: actions/twitapifavorites.php:188 lib/mail.php:276
+#: actions/twitapifavorites.php:159 lib/mail.php:304
 #, php-format
 msgid ""
 "%1$s just added your notice from %2$s as one of their favorites.\n"
 "\n"
 msgstr ""
 
-#: actions/twittersettings.php:27
+#: actions/twittersettings.php:27 actions/twittersettings.php:29
 msgid ""
 "Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 
-#: actions/twittersettings.php:41
+#: actions/twittersettings.php:41 actions/twittersettings.php:43
 msgid "Twitter settings"
 msgstr ""
 
-#: actions/twittersettings.php:48
+#: actions/twittersettings.php:48 actions/twittersettings.php:50
 msgid "Twitter Account"
 msgstr ""
 
-#: actions/twittersettings.php:56
+#: actions/twittersettings.php:56 actions/twittersettings.php:58
 msgid "Current verified Twitter account."
 msgstr ""
 
@@ -2577,46 +2894,50 @@ msgstr ""
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:216
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr ""
 
-#: actions/twittersettings.php:128
+#: actions/twittersettings.php:128 actions/twittersettings.php:221
 msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: actions/twittersettings.php:137 actions/twittersettings.php:228
 #, php-format
 msgid "Unable to retrieve account information for \"%s\" from Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:234 actions/twittersettings.php:253
 msgid "Unable to save your Twitter settings!"
 msgstr ""
 
-#: actions/twittersettings.php:174
+#: actions/twittersettings.php:174 actions/twittersettings.php:261
 msgid "Twitter settings saved."
 msgstr ""
 
-#: actions/twittersettings.php:192
+#: actions/twittersettings.php:192 actions/twittersettings.php:272
 msgid "That is not your Twitter account."
 msgstr ""
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:280
 msgid "Couldn't remove Twitter user."
 msgstr ""
 
-#: actions/twittersettings.php:212
+#: actions/twittersettings.php:212 actions/twittersettings.php:284
 msgid "Twitter account removed."
 msgstr ""
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
+#: actions/twittersettings.php:299 actions/twittersettings.php:310
+#: actions/twittersettings.php:322
 msgid "Couldn't save Twitter preferences."
 msgstr ""
 
-#: actions/twittersettings.php:245
+#: actions/twittersettings.php:245 actions/twittersettings.php:330
 msgid "Twitter preferences saved."
 msgstr ""
 
@@ -2632,15 +2953,15 @@ msgstr ""
 msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#: classes/Channel.php:113
+#: classes/Channel.php:113 classes/Channel.php:129
 msgid "Command results"
 msgstr ""
 
-#: classes/Channel.php:148
+#: classes/Channel.php:148 classes/Channel.php:175
 msgid "Command complete"
 msgstr ""
 
-#: classes/Channel.php:158
+#: classes/Channel.php:158 classes/Channel.php:185
 msgid "Command failed"
 msgstr ""
 
@@ -2653,7 +2974,7 @@ msgstr ""
 msgid "Subscriptions: %1$s\n"
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:247
 msgid "User has no last notice"
 msgstr ""
 
@@ -2686,59 +3007,60 @@ msgstr ""
 msgid "About: %s"
 msgstr ""
 
-#: classes/Command.php:200
+#: classes/Command.php:200 classes/Command.php:202
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: classes/Command.php:214
+#: classes/Command.php:214 classes/Command.php:219
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: classes/Command.php:216
+#: classes/Command.php:216 classes/Command.php:221
 msgid "Error sending direct message."
 msgstr ""
 
-#: classes/Command.php:263
+#: classes/Command.php:263 classes/Command.php:268
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: classes/Command.php:270
+#: classes/Command.php:270 classes/Command.php:275
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: classes/Command.php:288
+#: classes/Command.php:288 classes/Command.php:293
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: classes/Command.php:295
+#: classes/Command.php:295 classes/Command.php:300
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330
+#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:315
+#: classes/Command.php:335
 msgid "Command not yet implemented."
 msgstr ""
 
-#: classes/Command.php:313
+#: classes/Command.php:313 classes/Command.php:318
 msgid "Notification off."
 msgstr ""
 
-#: classes/Command.php:315
+#: classes/Command.php:315 classes/Command.php:320
 msgid "Can't turn off notification."
 msgstr ""
 
-#: classes/Command.php:333
+#: classes/Command.php:333 classes/Command.php:338
 msgid "Notification on."
 msgstr ""
 
-#: classes/Command.php:335
+#: classes/Command.php:335 classes/Command.php:340
 msgid "Can't turn on notification."
 msgstr ""
 
-#: classes/Command.php:344
+#: classes/Command.php:344 classes/Command.php:349
 msgid "Commands:\n"
 msgstr ""
 
@@ -2750,23 +3072,23 @@ msgstr ""
 msgid "Could not update message with new URI."
 msgstr ""
 
-#: lib/gallery.php:46
+#: lib/gallery.php:46 lib/gallery.php:55
 msgid "User without matching profile in system."
 msgstr ""
 
-#: lib/mail.php:147
+#: lib/mail.php:147 lib/mail.php:141
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:249
+#: lib/mail.php:249 lib/mail.php:275
 #, php-format
 msgid "New private message from %s"
 msgstr ""
 
-#: lib/mail.php:253
+#: lib/mail.php:253 lib/mail.php:279
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -2810,18 +3132,458 @@ msgstr ""
 msgid "Your sent messages"
 msgstr ""
 
-#: lib/settingsaction.php:99
+#: lib/settingsaction.php:99 actions/deleteprofile.php:256
 msgid "Twitter"
 msgstr ""
 
-#: lib/settingsaction.php:100
+#: lib/settingsaction.php:100 actions/deleteprofile.php:257
 msgid "Twitter integration options"
 msgstr ""
 
-#: lib/util.php:1718
+#: lib/util.php:1718 lib/util.php:2145
 msgid "To"
 msgstr ""
 
 #: scripts/maildaemon.php:45
 msgid "Could not parse message."
 msgstr ""
+
+#: actions/block.php:45 actions/subedit.php:45 actions/unblock.php:45
+msgid "No profile specified."
+msgstr ""
+
+#: actions/block.php:52 actions/subedit.php:52 actions/tagother.php:45
+#: actions/unblock.php:52
+msgid "No profile with that ID."
+msgstr ""
+
+#: actions/block.php:78
+#, fuzzy
+msgid "Block user"
+msgstr "Нема таков корисник."
+
+#: actions/block.php:81
+msgid "Are you sure you want to block this user? "
+msgstr ""
+
+#: actions/block.php:117
+#, fuzzy
+msgid "You have already blocked this user."
+msgstr "Веќе сте пријавени!"
+
+#: actions/block.php:124
+msgid "Failed to save block information."
+msgstr ""
+
+#: actions/deleteprofile.php:25
+msgid "Code not yet ready."
+msgstr ""
+
+#: actions/deleteprofile.php:36
+msgid "Export and delete your user information."
+msgstr ""
+
+#: actions/deleteprofile.php:88 actions/deleteprofile.php:119
+#, fuzzy
+msgid "Delete my account"
+msgstr "Креирај нова сметка"
+
+#: actions/deleteprofile.php:89
+#, fuzzy
+msgid "Delete my account confirmation"
+msgstr "Не може да се креира потврда за е-пошта."
+
+#: actions/deleteprofile.php:117
+msgid "Check if you are sure you want to delete your account."
+msgstr ""
+
+#: actions/deleteprofile.php:259 lib/settingsaction.php:102
+msgid "Other"
+msgstr ""
+
+#: actions/deleteprofile.php:260 lib/settingsaction.php:103
+msgid "Other options"
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Add to favorites"
+msgstr ""
+
+#: actions/emailsettings.php:98
+msgid "Allow friends to nudge me and send me an email."
+msgstr ""
+
+#: actions/facebookremove.php:54
+#, fuzzy
+msgid "Couldn't remove Facebook user."
+msgstr "Корисникот не може да се освежи/"
+
+#: actions/favor.php:71
+msgid "Disfavor favorite"
+msgstr ""
+
+#: actions/favorited.php:31 lib/stream.php:45
+#, fuzzy
+msgid "Popular notices"
+msgstr "Нема такво известување."
+
+#: actions/favorited.php:54
+msgid "Showing recently popular notices"
+msgstr ""
+
+#: actions/featured.php:32 actions/featured.php:54 lib/stream.php:41
+msgid "Featured users"
+msgstr ""
+
+#: actions/finishremotesubscribe.php:186
+msgid "That user has blocked you from subscribing."
+msgstr ""
+
+#: actions/microsummary.php:39
+msgid "No current status"
+msgstr ""
+
+#: actions/newnotice.php:93
+#, fuzzy
+msgid "Notice posted"
+msgstr "Известувања"
+
+#: actions/newnotice.php:116 classes/Channel.php:140
+msgid "Ajax Error"
+msgstr ""
+
+#: actions/nudge.php:52
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
+
+#: actions/nudge.php:61
+msgid "Nudge sent"
+msgstr ""
+
+#: actions/othersettings.php:27
+msgid "Manage various other options."
+msgstr ""
+
+#: actions/othersettings.php:33
+#, fuzzy
+msgid "Other Settings"
+msgstr "Поставки"
+
+#: actions/othersettings.php:35
+msgid "URL Auto-shortening"
+msgstr ""
+
+#: actions/othersettings.php:54
+#, fuzzy
+msgid "Service"
+msgstr "Барај"
+
+#: actions/othersettings.php:54
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/othersettings.php:155
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Локацијата е предолга (максимумот е 255 знаци)."
+
+#: actions/peopletag.php:33
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "Неправилна адреса за е-пошта."
+
+#: actions/peopletag.php:45
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr ""
+
+#: actions/peopletag.php:87
+#, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+msgstr ""
+
+#: actions/profilesettings.php:92
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+
+#: actions/profilesettings.php:246 actions/tagother.php:131
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Невалидна домашна страница: '%s'"
+
+#: actions/profilesettings.php:328
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "Профилот не може да се сними."
+
+#: actions/public.php:68
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
+msgstr ""
+
+#: actions/public.php:90
+msgid "Could not retrieve public stream."
+msgstr ""
+
+#: actions/register.php:67 actions/register.php:177
+msgid "Sorry, only invited people can register."
+msgstr ""
+
+#: actions/register.php:156
+msgid "With this form you can create a new account. "
+msgstr ""
+
+#: actions/remotesubscribe.php:136 actions/remotesubscribe.php:141
+msgid "That's a local profile! Login to subscribe."
+msgstr ""
+
+#: actions/subedit.php:68
+#, fuzzy
+msgid "You are not subscribed to that profile."
+msgstr "Не ни го испративте тој профил."
+
+#: actions/subedit.php:81
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "Не може да се креира претплатата"
+
+#: actions/subscribe.php:53
+#, fuzzy
+msgid "Not a local user."
+msgstr "Нема таков корисник."
+
+#: actions/subscribe.php:67
+#, fuzzy
+msgid "Subscribed"
+msgstr "Претплати се"
+
+#: actions/subscriptions.php:72
+#, fuzzy
+msgid "Jabber"
+msgstr "Нема JabberID."
+
+#: actions/tagother.php:31
+#, fuzzy
+msgid "Not logged in"
+msgstr "Не сте пријавени."
+
+#: actions/tagother.php:40
+#, fuzzy
+msgid "No id argument."
+msgstr "Нема таков документ."
+
+#: actions/tagother.php:56
+msgid "Tag a person"
+msgstr ""
+
+#: actions/tagother.php:98
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
+msgstr ""
+
+#: actions/tagother.php:120
+#, fuzzy
+msgid "No such profile."
+msgstr "Нема такво известување."
+
+#: actions/tagother.php:146
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+
+#: actions/tagother.php:153
+#, fuzzy
+msgid "Could not save tags."
+msgstr "Информациите за аватарот не може да се снимат"
+
+#: actions/tagother.php:188
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
+
+#: actions/tagrss.php:33
+#, fuzzy
+msgid "No such tag."
+msgstr "Нема такво известување."
+
+#: actions/tagrss.php:62
+#, fuzzy, php-format
+msgid "Microblog tagged with %s"
+msgstr "Микроблог на %s"
+
+#: actions/twitapiblocks.php:45
+msgid "Block user failed."
+msgstr ""
+
+#: actions/twitapiblocks.php:66
+msgid "Unblock user failed."
+msgstr ""
+
+#: actions/twitapiusers.php:45
+#, fuzzy
+msgid "Not found."
+msgstr "Не е пронаједено барање."
+
+#: actions/twittersettings.php:63
+msgid "Twitter user name"
+msgstr ""
+
+#: actions/twittersettings.php:67
+#, fuzzy
+msgid "Twitter password"
+msgstr "Нова лозинка"
+
+#: actions/twittersettings.php:129
+msgid "Twitter Friends"
+msgstr ""
+
+#: actions/unblock.php:73
+#, fuzzy
+msgid "Error removing the block."
+msgstr "Грешка во снимањето на корисникот."
+
+#: actions/unsubscribe.php:48
+#, fuzzy
+msgid "No profile id in request."
+msgstr "Серверот не достави URL за профилот."
+
+#: actions/unsubscribe.php:55
+#, fuzzy
+msgid "No profile with that id."
+msgstr "Оддалечениот профил нема одговарачки профил"
+
+#: actions/unsubscribe.php:69
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Откажи ја претплатата"
+
+#: classes/Notice.php:100
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "Проблем во снимањето на известувањето."
+
+#: classes/Notice.php:105
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+
+#: classes/Notice.php:112
+msgid "You are banned from posting notices on this site."
+msgstr ""
+
+#: lib/gallery.php:98
+msgid "Filter tags"
+msgstr ""
+
+#: lib/gallery.php:104
+msgid "All"
+msgstr ""
+
+#: lib/gallery.php:108
+msgid "Tag"
+msgstr ""
+
+#: lib/gallery.php:109
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/gallery.php:110
+msgid "Go"
+msgstr ""
+
+#: lib/gallery.php:264
+#, fuzzy
+msgid "Subscriptions navigation"
+msgstr "Претплати"
+
+#: lib/gallery.php:270 lib/gallery.php:292
+msgid "List"
+msgstr ""
+
+#: lib/gallery.php:280 lib/gallery.php:294
+msgid "Icons"
+msgstr ""
+
+#: lib/mail.php:92
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:242
+#, php-format
+msgid "You've been nudged by %s"
+msgstr ""
+
+#: lib/mail.php:246
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+msgstr ""
+
+#: lib/profilelist.php:146
+msgid "(none)"
+msgstr ""
+
+#: lib/stream.php:33
+msgid "Public"
+msgstr "Јавен"
+
+#: lib/stream.php:36 lib/stream.php:37
+msgid "Recent tags"
+msgstr ""
+
+#: lib/stream.php:40
+msgid "Featured"
+msgstr ""
+
+#: lib/stream.php:44
+#, fuzzy
+msgid "Popular"
+msgstr "Пребарување на луѓе"
+
+#: lib/subs.php:51
+#, fuzzy
+msgid "User has blocked you."
+msgstr "Корисникот нема профил."
+
+#: lib/util.php:2059
+msgid "Send a nudge"
+msgstr ""
+
+#: lib/util.php:2063
+msgid "Nudge sent!"
+msgstr ""
+
+#: lib/util.php:2194
+msgid "Block"
+msgstr ""
+
+#: lib/util.php:2198
+msgid "Unblock"
+msgstr ""
+
+#~ msgid "Couldn't confirm email."
+#~ msgstr "Адресата за е-пошта неможе да се потврди."
+
+#~ msgid "Email address"
+#~ msgstr "Адреса за е-пошта"
+
+#~ msgid "Error inserting notice"
+#~ msgstr "Грешка во внесувањето на известувањето"
+
+#~ msgid ""
+#~ "If you've forgotten or lost your password, you can get a new one sent  "
+#~ "the email address you have stored  in your account."
+#~ msgstr ""
+#~ "Ако сте ја заборавиле или загубиле лозинката, можете да добиете нова на "
+#~ "адресата што ја внесовте во Вашата сметка."
diff --git a/nl_NL/LC_MESSAGES/laconica.po b/nl_NL/LC_MESSAGES/laconica.po
index 68870c2327..ee317b328e 100644
--- a/nl_NL/LC_MESSAGES/laconica.po
+++ b/nl_NL/LC_MESSAGES/laconica.po
@@ -6,46 +6,88 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-14 21:07+1200\n"
+"POT-Creation-Date: 2009-01-12 12:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\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"
-"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"
 
-#: ../actions/noticesearchrss.php:64
+#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:61
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr "Doorzoek de stroom naar \"%s\""
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: actions/finishopenidlogin.php:88 actions/register.php:205
+#: actions/register.php:232
 msgid ""
-" except this private data: password, email address, IM address, phone "
-"number."
+" except this private data: password, email address, IM address, phone number."
 msgstr ""
 " behalve de volgende privégegevens: wachtwoord, e-mailadres, IM-adres, "
 "telefoonnummer."
 
-#: ../actions/subscribe.php:84
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+#: lib/facebookaction.php:195 lib/noticelist.php:160
+msgid " from "
+msgstr ""
+
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: actions/twitapistatuses.php:341
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr ""
+
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
+
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:115
+#: lib/mail.php:117
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s volgt nu je berichten op %2$s."
 
-#: ../actions/subscribe.php:86
+#: ../lib/mail.php:126
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -62,129 +104,271 @@ msgstr ""
 "Met vriendelijke groet,\n"
 "%4$s.\n"
 
-#: ../actions/shownotice.php:45
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#: actions/twitapistatuses.php:344
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
+
+#: ../actions/shownotice.php:45 actions/shownotice.php:45
+#: actions/shownotice.php:73
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1$s's status op %2$s"
 
-#: ../actions/publicrss.php:60 ../actions/publicrss.php:62
-#: actions/publicrss.php:48
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
 #, php-format
-#, fuzzy
+msgid "%s (%s)"
+msgstr ""
+
+#: ../actions/publicrss.php:62 actions/publicrss.php:48
+#, fuzzy, php-format
 msgid "%s Public Stream"
 msgstr ""
 "#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "%s openbare stroom\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../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/twitapistatuses.php:123
 #, php-format
 msgid "%s and friends"
 msgstr "%s en vrienden"
 
-#: ../lib/util.php:233
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:31
+#, php-format
+msgid "%s public timeline"
+msgstr ""
+
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:217
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:195
+#, php-format
+msgid "%s timeline"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:34
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+
+#: ../lib/util.php:257 lib/util.php:273 lib/util.php:284
 #, 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 een microbloggingdienst van "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+"**%%site.name%%** is een microbloggingdienst van [%%site.broughtby%%](%%site."
+"broughtbyurl%%). "
 
-#: ../lib/util.php:235
+#: ../lib/util.php:259 lib/util.php:275 lib/util.php:286
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** is een microbloggingdienst. "
 
-#: ../lib/util.php:250
+#: ../lib/util.php:274 lib/util.php:290 lib/util.php:301
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ""
 ". Van de oorspronkelijke auteurs dient de volledige naam of gebruikersnaam "
 "te worden vermeld."
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: ../actions/register.php:176
+#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
+#: actions/profilesettings.php:78
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties"
 
-#: ../actions/password.php:42 ../actions/register.php:178
+#: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:193
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/profilesettings.php:186
 msgid "6 or more characters"
 msgstr "6 of meer tekens"
 
-#: ../actions/recoverpassword.php:165
+#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 of meer tekens, en vergeet het niet!"
 
-#: ../actions/imsettings.php:188
+#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:195
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, 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 ""
 "Een bevestigingscode is verstuurd naar het opgegeven IM-adres. Je moet ermee "
 "accoord gaan dat %s boodschappen aan jou stuurt."
 
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:234
+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 ""
+
+#: ../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/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:30
+#: actions/twitapidirect_messages.php:107 actions/twitapifavorites.php:83
+#: actions/twitapifavorites.php:99 actions/twitapifriendships.php:117
+#: actions/twitapihelp.php:42 actions/twitapistatuses.php:77
+#: actions/twitapistatuses.php:144 actions/twitapistatuses.php:224
+#: actions/twitapistatuses.php:234 actions/twitapistatuses.php:386
+#: actions/twitapistatuses.php:395 actions/twitapistatuses.php:421
+#: actions/twitapiusers.php:30
+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:39
+#: actions/twitapiaccount.php:89 actions/twitapiaccount.php:94
+#: actions/twitapidirect_messages.php:178 actions/twitapifavorites.php:139
+#: actions/twitapihelp.php:49 actions/twitapistatuses.php:549
+msgid "API method under construction."
+msgstr ""
+
 #  This would be appropriate for the footer menu link (actual context isn't clear!)
-#: ../lib/util.php:296
+#: ../lib/util.php:324 lib/util.php:340 lib/util.php:352
 msgid "About"
 msgstr "Over ons"
 
-#: ../actions/userauthorization.php:118
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
 msgid "Accept"
 msgstr "Accepteer"
 
-#: ../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/twittersettings.php:84
 msgid "Add"
 msgstr "Voeg toe"
 
-#: ../actions/openidsettings.php:43
+#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
 msgid "Add OpenID"
 msgstr "Voeg OpenID toe"
 
-#: ../actions/imsettings.php:39
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: actions/deleteprofile.php:248
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
 msgid "Address"
 msgstr "Adres"
 
-#: ../actions/showstream.php:254
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
+
+#: ../actions/showstream.php:273 actions/showstream.php:288
+#: actions/showstream.php:336
 msgid "All subscriptions"
 msgstr "Alle abonnementen"
 
-#: ../actions/publicrss.php:62
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
 #, php-format
 msgid "All updates for %s"
 msgstr "Alle updates voor %s"
 
-#: ../actions/noticesearchrss.php:66
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:63
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "Alle updates die overeenkomen met de zoekterm \"%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
 msgid "Already logged in."
 msgstr "Al ingelogd."
 
-#: ../actions/subscribe.php:48
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:47
 msgid "Already subscribed!."
 msgstr "Al geabonneerd!"
 
-#: ../actions/userauthorization.php:76
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+msgid "Are you sure you want to delete this notice?"
+msgstr ""
+
+#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
 msgid "Authorize subscription"
 msgstr "Sta abonnement toe"
 
-#: ../actions/login.php:100 ../actions/register.php:184
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192 actions/register.php:219
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Voortaan automatisch inloggen; niet voor gemeenschappelijke computers!"
 
-#: ../actions/avatar.php:32
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:103
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
+
+#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: actions/profilesettings.php:34
 msgid "Avatar"
 msgstr "Avatar"
 
-#: ../actions/avatar.php:113
+#: ../actions/avatar.php:113 actions/profilesettings.php:350
+#: actions/profilesettings.php:379
 msgid "Avatar updated."
 msgstr "Avatar geactualiseerd."
 
-#: ../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 "
@@ -194,73 +378,147 @@ msgstr ""
 "een boodschap met nadere instructies. (Heb je %s aan je contactenlijst "
 "toegevoegd?)"
 
-#: ../lib/util.php:1136
-msgid "Before »"
+#: ../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 ""
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+msgid "Awaiting confirmation on this phone number."
+msgstr ""
+
+#: ../lib/util.php:1318 lib/util.php:1452 lib/facebookaction.php:259
+#: lib/util.php:1792
+#, fuzzy
+msgid "Before »"
 msgstr "Eerder »"
 
-#: ../actions/profilesettings.php:52
+#: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: actions/profilesettings.php:82 actions/register.php:184
+#: actions/profilesettings.php:84 actions/register.php:211
 msgid "Bio"
 msgstr "Biografie"
 
-#: ../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:222 actions/register.php:98
 msgid "Bio is too long (max 140 chars)."
 msgstr "Biografie is te lang (maximaal 140 tekens)"
 
-#: ../actions/updateprofile.php:118
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+msgid "Can't delete this notice."
+msgstr ""
+
+#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "Kan avatar-URL '%s' niet lezen"
 
-#: ../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/profilesettings.php:433
 msgid "Can't save new password."
 msgstr "Kan nieuw wachtwoord niet opslaan."
 
-#: ../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
 msgid "Cancel"
 msgstr "Annuleer"
 
-#: ../lib/openid.php:121
+#: ../lib/openid.php:121 lib/openid.php:121
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Kan OpenID-consumerobject niet instantiëren."
 
-#: ../actions/imsettings.php:154
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
 msgid "Cannot normalize that Jabber ID"
 msgstr "Kan die Jabber-ID niet normaliseren"
 
-#: ../actions/password.php:45
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:204
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/profilesettings.php:189
 msgid "Change"
 msgstr "Wijzig"
 
-#: ../actions/password.php:32
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: actions/deleteprofile.php:245
+msgid "Change email handling"
+msgstr ""
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
 msgid "Change password"
 msgstr "Wijzig wachtwoord"
 
-#: ../actions/password.php:43 ../actions/recoverpassword.php:166
-#: ../actions/register.php:179
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr ""
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#: actions/deleteprofile.php:242
+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/profilesettings.php:187 actions/register.php:196
 msgid "Confirm"
 msgstr "Bevestig"
 
-#: ../actions/confirmaddress.php:84
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
 msgid "Confirm Address"
 msgstr "Bevestig adres"
 
-#: ../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:259
 msgid "Confirmation cancelled."
 msgstr "Bevestiging geannuleerd."
 
-#: ../actions/confirmaddress.php:38
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+msgid "Confirmation code"
+msgstr ""
+
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
 msgid "Confirmation code not found."
 msgstr "Bevestigingscode niet gevonden."
 
-#: ../actions/finishopenidlogin.php:91
+#: ../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:97
 msgid "Connect"
 msgstr "Koppel"
 
-#: ../actions/finishopenidlogin.php:86
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
 msgid "Connect existing account"
 msgstr "Koppel bestaand account"
 
-#: ../lib/util.php:304
+#: ../lib/util.php:332 lib/util.php:348 lib/util.php:360
 msgid "Contact"
 msgstr "Contact"
 
@@ -269,171 +527,262 @@ msgstr "Contact"
 msgid "Could not create OpenID form: %s"
 msgstr ""
 
-#: ../lib/openid.php:160
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:46 actions/twitapifriendships.php:62
+#, 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:39
+msgid "Could not follow user: User not found."
+msgstr ""
+
+#: ../lib/openid.php:160 lib/openid.php:160
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "Kon niet omleiden naar server: %s"
 
-#: ../actions/updateprofile.php:161
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
 msgid "Could not save avatar info"
 msgstr "Kon avatarinformatie niet opslaan"
 
-#: ../actions/updateprofile.php:154
+#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
 msgid "Could not save new profile info"
 msgstr "Kon de nieuwe profielinformatie niet opslaan"
 
-#: ../actions/profilesettings.php:146
-msgid "Couldn't confirm email."
-msgstr "Kon e-mail niet bevestigen."
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:70
+msgid "Could not subscribe other to you."
+msgstr ""
+
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:55
+msgid "Could not subscribe."
+msgstr ""
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr ""
 
 #: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101
+#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:112
 msgid "Couldn't convert request tokens to access tokens."
 msgstr ""
 
-#: ../actions/subscribe.php:59
-msgid "Couldn't create subscription."
-msgstr "Kon abonnement niet aanmaken."
-
-#: ../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/emailsettings.php:255
 msgid "Couldn't delete email confirmation."
 msgstr "Kon e-mailbevestiging niet verwijderen."
 
-#: ../actions/unsubscribe.php:56
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:129
 msgid "Couldn't delete subscription."
 msgstr "Kon abonnement niet verwijderen."
 
-#: ../actions/remotesubscribe.php:125 ../actions/remotesubscribe.php:127
-#: actions/remotesubscribe.php:136
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+#: actions/twitapistatuses.php:82
+msgid "Couldn't find any statuses."
+msgstr ""
+
+#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
+#: actions/remotesubscribe.php:148
 msgid "Couldn't get a request token."
 msgstr ""
 
-#: ../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:228
 msgid "Couldn't insert confirmation code."
 msgstr "Kon bevestigingscode niet toevoegen"
 
 #: ../actions/finishremotesubscribe.php:180
+#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:216
 msgid "Couldn't insert new subscription."
 msgstr "Kon nieuw abonnement niet toevoegen."
 
-#: ../actions/profilesettings.php:175
+#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
+#: actions/profilesettings.php:319 actions/twitapiaccount.php:74
 msgid "Couldn't save profile."
 msgstr "Kon profiel niet opslaan."
 
-#: ../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:296
+msgid "Couldn't update user for autosubscribe."
+msgstr ""
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+#: actions/emailsettings.php:301 actions/emailsettings.php:315
+msgid "Couldn't update user record."
+msgstr ""
+
+#: ../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/emailsettings.php:179 actions/emailsettings.php:280
+#: actions/othersettings.php:173 actions/profilesettings.php:276
 msgid "Couldn't update user."
 msgstr "Kon gebruiker niet actualiseren."
 
-#: ../actions/finishopenidlogin.php:84
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
 msgid "Create"
 msgstr "Aanmaken"
 
-#: ../actions/finishopenidlogin.php:70
+#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
 msgid "Create a new user with this nickname."
 msgstr "Maak een nieuwe gebruiker aan met deze gebruikersnaam."
 
-#: ../actions/finishopenidlogin.php:68
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
 msgid "Create new account"
 msgstr "Maak een nieuw account aan"
 
-#: ../actions/finishopenidlogin.php:191
+#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+#: actions/finishopenidlogin.php:208
 msgid "Creating new account for OpenID that already has a user."
 msgstr ""
 "Bezig nieuw account aan te maken voor OpenID waarvoor al een "
 "gebruikersaccount bestaat."
 
-#: ../actions/imsettings.php:45
+#: ../actions/imsettings.php:45 actions/imsettings.php:46
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Huidig bevestigd Jabber/GTalk adres."
 
-#: ../actions/showstream.php:337
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+msgid "Current confirmed email address."
+msgstr ""
+
+#: ../actions/showstream.php:356 actions/showstream.php:367
+#: actions/showstream.php:418
 msgid "Currently"
 msgstr "Op dit moment"
 
-#: ../lib/util.php:893
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:87
 #, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Database-fout bij toevoegen antwoord: %s"
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: ../lib/util.php:1061 lib/util.php:1110 lib/util.php:1417
+#, php-format
+msgid "DB error inserting reply: %s"
+msgstr "Database-fout bij toevoegen antwoord: %s"
+
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+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:86 actions/register.php:213
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Beschrijf jezelf en je interesses in 140 tekens"
 
-#: ../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/deleteprofile.php:244 actions/register.php:199
+#: actions/register.php:202
 msgid "Email"
 msgstr "E-mail"
 
-#: ../actions/profilesettings.php:46
-msgid "Email address"
-msgstr "E-mailadres"
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+msgid "Email Address"
+msgstr ""
+
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+msgid "Email Settings"
+msgstr ""
 
-#: ../actions/profilesettings.php:102 ../actions/register.php:63
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:89
 msgid "Email address already exists."
 msgstr "E-mailadres bestaat al."
 
-#: ../lib/mail.php:82
+#: ../lib/mail.php:90 lib/mail.php:90
 msgid "Email address confirmation"
 msgstr "Bevestiging e-mailadres"
 
-#: ../actions/recoverpassword.php:176
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
+
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr ""
+
+#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
 msgid "Enter a nickname or email address."
 msgstr "Voer een gebruikersnaam of e-mailadres in"
 
-#: ../actions/userauthorization.php:136
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+msgid "Enter the code you received on your phone."
+msgstr ""
+
+#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
 msgid "Error authorizing token"
 msgstr "Fout bij autoriseren token"
 
-#: ../actions/finishopenidlogin.php:282
+#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
+#: actions/finishopenidlogin.php:274
 msgid "Error connecting user to OpenID."
 msgstr "Fout bij koppelen gebruiker aan OpenID."
 
-#: ../actions/finishaddopenid.php:78
+#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
 msgid "Error connecting user."
 msgstr "Fout bij koppelen gebruiker."
 
 #: ../actions/finishremotesubscribe.php:151
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:164
 msgid "Error inserting avatar"
 msgstr "Fout bij toevoegen avatar"
 
 #: ../actions/finishremotesubscribe.php:143
+#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:156
 msgid "Error inserting new profile"
 msgstr "Fout bij toevoegen nieuw profiel"
 
-#: ../actions/postnotice.php:88
-msgid "Error inserting notice"
-msgstr "Fout bij toevoegen bericht"
-
 #: ../actions/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:180
 msgid "Error inserting remote profile"
 msgstr "Fout bij toevoegen profiel op afstand"
 
-#: ../actions/recoverpassword.php:201
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
 msgid "Error saving address confirmation."
 msgstr "Fout bij opslaan adresbevestiging."
 
-#: ../actions/userauthorization.php:139
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
 msgid "Error saving remote profile"
 msgstr "Fout bij opslaan profiel op afstand"
 
-#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
+#: ../lib/openid.php:226 lib/openid.php:226
 msgid "Error saving the profile."
 msgstr "Fout bij opslaan van het profiel."
 
-#: ../lib/openid.php:237
+#: ../lib/openid.php:237 lib/openid.php:237
 msgid "Error saving the user."
 msgstr "Fout bij opslaan van de gebruiker."
 
-#: ../actions/password.php:80
+#: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/profilesettings.php:428
 msgid "Error saving user; invalid."
 msgstr "Fout bij opslaan gebruiker; ongeldig."
 
-#: ../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/register.php:108 actions/login.php:54 actions/login.php:80
+#: actions/register.php:117
 #, fuzzy
 msgid "Error setting user."
 msgstr ""
@@ -441,41 +790,58 @@ msgstr ""
 "Fout bij vastleggen gebruiker.\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/finishaddopenid.php:83
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
 msgid "Error updating profile"
 msgstr "Fout bij actualiseren profiel"
 
 #: ../actions/finishremotesubscribe.php:161
+#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:174
 msgid "Error updating remote profile"
 msgstr "Fout bij actualiseren profiel op afstand"
 
-#: ../actions/recoverpassword.php:79
+#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
 msgid "Error with confirmation code."
 msgstr "Fout bij bevestigingscode."
 
-#: ../actions/finishopenidlogin.php:89
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
 msgid "Existing nickname"
 msgstr "Gebruikersnaam bestaat al"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:326 lib/util.php:342 lib/util.php:354
 msgid "FAQ"
 msgstr "Veelgestelde vragen"
 
-#: ../actions/avatar.php:115
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/profilesettings.php:381
 msgid "Failed updating avatar."
 msgstr "Actualiseren avatar niet gelukt."
 
-#: ../actions/all.php:61 ../actions/allrss.php:74
+#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
+#: actions/allrss.php:64
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Feed voor vrienden van %s"
 
-#: ../actions/replies.php:61 ../actions/repliesrss.php:80
+#: ../actions/replies.php:65 ../actions/repliesrss.php:80
+#: actions/replies.php:65 actions/repliesrss.php:66
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Feed voor antwoorden aan %s"
 
-#: ../actions/login.php:118
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:54
+#, php-format
+msgid "Feed for tag %s"
+msgstr ""
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+msgid "Find content of notices"
+msgstr ""
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+msgid "Find people on this site"
+msgstr ""
+
+#: ../actions/login.php:122
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -483,39 +849,58 @@ msgstr ""
 "Om veiligheidsredenen vragen we je je gebruikersnaam en wachtwoord nogmaals "
 "in te voeren alvorens je instellingen te veranderen."
 
-#: ../actions/profilesettings.php:44
+#: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: actions/profilesettings.php:77 actions/register.php:178
+#: actions/profilesettings.php:79 actions/register.php:205
 msgid "Full name"
 msgstr "Volledige naam"
 
-#: ../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/profilesettings.php:219 actions/register.php:95
 msgid "Full name is too long (max 255 chars)."
 msgstr "Volledige naam is te lang (maximaal 255 tekens)"
 
-#: ../lib/util.php:279
+#: ../lib/util.php:322 lib/util.php:338 lib/util.php:343 lib/util.php:350
 msgid "Help"
 msgstr "Help"
 
-#: ../lib/util.php:274
+#: ../lib/util.php:298 lib/util.php:314 lib/util.php:325
 msgid "Home"
 msgstr "Home"
 
-#: ../actions/profilesettings.php:49
+#: ../actions/profilesettings.php:46 ../actions/register.php:167
+#: actions/profilesettings.php:79 actions/register.php:181
+#: actions/profilesettings.php:81 actions/register.php:208
 msgid "Homepage"
 msgstr "Homepage"
 
-#: ../actions/profilesettings.php:87
+#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: actions/profilesettings.php:210 actions/register.php:83
+#: actions/profilesettings.php:216 actions/register.php:92
 msgid "Homepage is not a valid URL."
 msgstr "Homepage is geen geldige URL"
 
-#: ../actions/imsettings.php:61
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+#: actions/emailsettings.php:101
+msgid "I want to post notices by email."
+msgstr ""
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+#: actions/deleteprofile.php:253
+msgid "IM"
+msgstr ""
+
+#: ../actions/imsettings.php:60 actions/imsettings.php:61
 msgid "IM Address"
 msgstr "IM-adres"
 
-#: ../actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
 msgid "IM Settings"
 msgstr "IM-instellingen"
 
-#: ../actions/finishopenidlogin.php:88
+#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -531,95 +916,132 @@ msgstr ""
 "Als je een OpenID aan je account wilt toevoegen, vul het dan in het veld "
 "hieronder in en klik op \"Voeg toe\"."
 
-#: ../actions/recoverpassword.php:122
+#: ../actions/recoverpassword.php:137
 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 ""
-"Als je je wachtwoord vergeten of kwijt bent, kan een nieuw wachtwoord worden "
-"opgestuurd naar het e-mailadres dat je in je account hebt vastgelegd."
 
-#: ../actions/password.php:69
+#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
+#: actions/emailsettings.php:68 actions/smssettings.php:76
+msgid "Incoming email"
+msgstr ""
+
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+#: actions/emailsettings.php:304
+msgid "Incoming email address removed."
+msgstr ""
+
+#: ../actions/password.php:69 actions/profilesettings.php:388
+#: actions/profilesettings.php:417
 msgid "Incorrect old password"
 msgstr "Incorrect oud wachtwoord"
 
-#: ../actions/login.php:63
+#: ../actions/login.php:67 actions/login.php:67 actions/login.php:74
 msgid "Incorrect username or password."
 msgstr "Incorrecte gebruikersnaam of wachtwoord."
 
-#: ../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."
 msgstr ""
-"Instructies om je wachtwoord te herstellen zijn verstuurd naar het "
-"e-mailadres dat voor je account is geregistreerd."
+"Instructies om je wachtwoord te herstellen zijn verstuurd naar het e-"
+"mailadres dat voor je account is geregistreerd."
 
-#: ../actions/updateprofile.php:113
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "Ongeldige avatar-URL '%s'"
 
-#: ../actions/updateprofile.php:97
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "Ongeldige homepage '%s'"
 
-#: ../actions/updateprofile.php:81
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "Ongeldige licentie-URL '%s'"
 
-#: ../actions/postnotice.php:61
+#: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:63
 msgid "Invalid notice content"
 msgstr "Ongeldige berichtinhoud"
 
-#: ../actions/postnotice.php:67
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:69
 msgid "Invalid notice uri"
 msgstr "Ongeldige bericht-URI"
 
-#: ../actions/postnotice.php:72
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:74
 msgid "Invalid notice url"
 msgstr "Ongeldige bericht-URL"
 
-#: ../actions/updateprofile.php:86
+#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "Ongeldige profiel-URL '%s'."
 
-#: ../actions/remotesubscribe.php:96
+#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
 msgid "Invalid profile URL (bad format)"
 msgstr "Ongeldige profiel-URL (foutieve syntax)"
 
 #: ../actions/finishremotesubscribe.php:77
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:78
 msgid "Invalid profile URL returned by server."
 msgstr "Ongeldige profiel-URL teruggestuurd door de server."
 
-#: ../actions/avatarbynickname.php:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
 msgid "Invalid size."
 msgstr "Ongeldige afmeting."
 
-#: ../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:256 actions/register.php:112
+#: actions/register.php:130
 msgid "Invalid username or password."
 msgstr "Ongeldige gebruikersnaam of wachtwoord."
 
-#: ../lib/util.php:237
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr ""
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
+
+#: ../lib/util.php:306 lib/util.php:322 lib/util.php:332
+msgid "Invite"
+msgstr ""
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr ""
+
+#: ../lib/util.php:261 lib/util.php:277 lib/util.php:288
 #, 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 ""
-"Het draait op de [Laconica](http://laconi.ca/) microbloggingsoftware versie "
-"%s, beschikbaar onder the [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"Het draait op de [Laconica](http://laconi.ca/) microbloggingsoftware versie %"
+"s, beschikbaar onder the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 
-#: ../actions/imsettings.php:164
+#: ../actions/imsettings.php:173 actions/imsettings.php:181
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber-ID al in gebruik bij een andere gebruiker"
 
-#: ../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 "
@@ -628,265 +1050,450 @@ msgstr ""
 "Jabber of GTalk adres, zoals \"JouwNaam@example.org\". Zorg ervoor dat je "
 "eerst % aan je contactenlijst in je IM-programma of in GTalk toevoegt."
 
-#: ../actions/profilesettings.php:55
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
+msgid "Language"
+msgstr ""
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr ""
+
+#: ../actions/profilesettings.php:52 ../actions/register.php:173
+#: actions/profilesettings.php:85 actions/register.php:187
+#: actions/profilesettings.php:87 actions/register.php:214
 msgid "Location"
 msgstr "Locatie"
 
-#: ../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/profilesettings.php:225 actions/register.php:101
 msgid "Location is too long (max 255 chars)."
 msgstr "Locatie is te lang (maximaal 255 tekens)."
 
-#: ../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/login.php:104 actions/login.php:113 actions/openidlogin.php:88
+#: lib/util.php:336
 msgid "Login"
 msgstr "Inloggen"
 
-#: ../actions/openidlogin.php:44
+#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:60
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Log in met een [OpenID](%%doc.openid%%) account."
 
-#: ../actions/login.php:122
+#: ../actions/login.php:126
 #, 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 ""
 "Log in met je gebruikersnaam en wachtwoord. Heb je nog geen gebruikersnaam? "
-"[Registreer](%%action.register%%) dan een nieuw account, of probeer "
-"[OpenID](%%action.openidlogin%%)."
+"[Registreer](%%action.register%%) dan een nieuw account, of probeer [OpenID]"
+"(%%action.openidlogin%%)."
 
-#: ../lib/util.php:284
+#: ../lib/util.php:308 lib/util.php:324 lib/util.php:334
 msgid "Logout"
 msgstr "Uitloggen"
 
-#: ../actions/login.php:106
+#: ../actions/register.php:166 actions/register.php:180
+#: actions/register.php:207
+msgid "Longer name, preferably your \"real\" name"
+msgstr ""
+
+#: ../actions/login.php:110 actions/login.php:110 actions/login.php:118
 msgid "Lost or forgotten password?"
 msgstr "Wachtwoord kwijt of vergeten?"
 
+#: ../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 ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr ""
+
 #  String should contain a variable token for since 'when'
-#: ../actions/showstream.php:281
+#: ../actions/showstream.php:300 actions/showstream.php:315
+#: actions/showstream.php:363
 msgid "Member since"
 msgstr "Lid sinds"
 
-#: ../actions/userrss.php:70
+#: ../actions/userrss.php:70 actions/userrss.php:67
 #, php-format
 msgid "Microblog by %s"
 msgstr "Microblog van %s"
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
+#: ../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 ""
+
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php:85 actions/register.php:202
+#: actions/register.php:229
 msgid "My text and files are available under "
 msgstr "Mijn tekst en bestanden zijn beschikbaar onder"
 
-#: ../actions/finishopenidlogin.php:71
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+msgid "New"
+msgstr ""
+
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:138
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+#: actions/emailsettings.php:318
+msgid "New incoming email address added."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
 msgid "New nickname"
 msgstr "Nieuwe gebruikersnaam"
 
-#: ../actions/newnotice.php:100
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:141
 msgid "New notice"
 msgstr "Nieuw bericht"
 
-#: ../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/profilesettings.php:185
 msgid "New password"
 msgstr "Nieuw wachtwoord"
 
-#: ../actions/recoverpassword.php:275
+#: ../actions/recoverpassword.php:314
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nieuw wachtwoord is opgeslagen. Je bent nu ingelogd."
 
-#: ../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:108 actions/profilesettings.php:76
+#: actions/register.php:192
 msgid "Nickname"
 msgstr "Gebruikersnaam"
 
-#: ../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/finishopenidlogin.php:192 actions/profilesettings.php:231
+#: actions/register.php:85
 msgid "Nickname already in use. Try another one."
 msgstr "Gebruikersnaam al in gebruik. Probeer een andere."
 
-#: ../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:182 actions/profilesettings.php:209
+#: actions/register.php:83
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "Gebruikersnaam moet bestaan uit alleen kleine letters en cijfers en geen "
 "spaties."
 
-#: ../actions/finishopenidlogin.php:170
+#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:187
 msgid "Nickname not allowed."
 msgstr "Gebruikersnaam niet toegestaan."
 
-#: ../actions/remotesubscribe.php:72
+#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
 msgid "Nickname of the user you want to follow"
 msgstr "Gebruikersnaam van de gebruiker die je wilt volgen"
 
-#: ../actions/recoverpassword.php:147
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
 msgid "Nickname or email"
 msgstr "Gebruikersnaam of e-mail"
 
-#: ../actions/imsettings.php:147
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:104
+msgid "No"
+msgstr ""
+
+#: ../actions/imsettings.php:156 actions/imsettings.php:164
 msgid "No Jabber ID."
 msgstr "Geen Jabber-ID."
 
-#: ../actions/userauthorization.php:128
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
 msgid "No authorization request!"
 msgstr "Geen autorisatieverzoek!"
 
-#: ../actions/confirmaddress.php:33
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+msgid "No carrier selected."
+msgstr ""
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+msgid "No code entered"
+msgstr ""
+
+#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
 msgid "No confirmation code."
 msgstr "Geen bevestigingscode."
 
-#: ../actions/newnotice.php:49
+#: ../actions/newnotice.php:44 actions/newmessage.php:53
+#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:52
+#: actions/newnotice.php:53
 msgid "No content!"
 msgstr "Geen inhoud!"
 
-#: ../actions/userbyid.php:27
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+#: actions/emailsettings.php:197
+msgid "No email address."
+msgstr ""
+
+#: ../actions/userbyid.php:32 actions/userbyid.php:32
 msgid "No id."
 msgstr "Geen ID."
 
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+#: actions/emailsettings.php:292
+msgid "No incoming email address."
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:65
+#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:66
 msgid "No nickname provided by remote server."
 msgstr "Geen gebruikersnaam verschaft door de server op afstand."
 
-#: ../actions/avatarbynickname.php:27
+#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 msgid "No nickname."
 msgstr "Geen gebruikersnaam."
 
-#: ../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:243
 msgid "No pending confirmation to cancel."
 msgstr "Geen bevestiging in behandeling om te annuleren."
 
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+msgid "No phone number."
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:72
+#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:73
 msgid "No profile URL returned by server."
 msgstr "Geen profiel-URL teruggestuurd door de server."
 
-#: ../actions/recoverpassword.php:189
+#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
 msgid "No registered email address for that user."
 msgstr "Geen geregistreerd e-mailadres voor die gebruiker."
 
-#: ../actions/userauthorization.php:48
+#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
 msgid "No request found!"
 msgstr "Geen verzoek gevonden!"
 
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
 #: actions/noticesearch.php:69 actions/peoplesearch.php:69
+#: actions/noticesearch.php:68 actions/peoplesearch.php:59
 msgid "No results"
 msgstr ""
 
-#: ../actions/avatarbynickname.php:32
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
 msgid "No size."
 msgstr "Geen afmeting."
 
-#: ../actions/openidsettings.php:135
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:109
+#: actions/twitapistatuses.php:438
+msgid "No status found with that ID."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:411
+msgid "No status with that ID found."
+msgstr ""
+
+#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
 msgid "No such OpenID."
 msgstr "Die OpenID is niet bekend."
 
-#: ../actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29
 msgid "No such document."
 msgstr "Onbekend document."
 
-#: ../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:38
+#: actions/shownotice.php:114
 msgid "No such notice."
 msgstr "Onbekend bericht."
 
-#: ../actions/recoverpassword.php:56
+#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
 msgid "No such recovery code."
 msgstr "Onbekende herstelcode."
 
-#: ../actions/postnotice.php:56
+#: ../actions/postnotice.php:56 actions/postnotice.php:57
 msgid "No such subscription"
 msgstr "Onbekend abonnement"
 
 #: ../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/showstream.php:157
+#: classes/Command.php:208 classes/Command.php:242 lib/gallery.php:85
+#: lib/subs.php:105
 msgid "No such user."
 msgstr "Onbekende gebruiker."
 
-#: ../lib/gallery.php:76
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr ""
+
+#: ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
 msgstr "Niemand te tonen!"
 
-#: ../actions/recoverpassword.php:60
+#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
 msgid "Not a recovery code."
 msgstr "Geen geldige herstelcode."
 
-#: ../actions/imsettings.php:158
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+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:423 lib/twitterapi.php:450
+#: lib/twitterapi.php:534
+msgid "Not a supported data format."
+msgstr ""
+
+#: ../actions/imsettings.php:167 actions/imsettings.php:175
 msgid "Not a valid Jabber ID"
 msgstr "Geen geldige Jabber-ID"
 
-#: ../lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131
 msgid "Not a valid OpenID."
 msgstr "Geen geldige OpenID."
 
-#: ../actions/profilesettings.php:75 ../actions/register.php:53
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+#: actions/emailsettings.php:208
+msgid "Not a valid email address"
+msgstr ""
+
+#: ../actions/register.php:63 actions/register.php:70 actions/register.php:79
 msgid "Not a valid email address."
 msgstr "Geen geldig e-mailadres."
 
-#: ../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/profilesettings.php:212 actions/register.php:87
 msgid "Not a valid nickname."
 msgstr "Geen geldige gebruikersnaam."
 
-#: ../actions/remotesubscribe.php:118
+#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
 msgid "Not a valid profile URL (incorrect services)."
 msgstr "Geen geldige profiel-URL (ongeldige diensten)."
 
-#: ../actions/remotesubscribe.php:111
+#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr "Geen geldige profiel-URL (geen XRDS gedefinieerd)."
 
-#: ../actions/remotesubscribe.php:104
+#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
 msgid "Not a valid profile URL (no YADIS document)."
 msgstr "Geen geldige profiel-URL (geen YADIS document)."
 
-#: ../actions/avatar.php:95
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: actions/profilesettings.php:361
 msgid "Not an image or corrupt file."
 msgstr "Geen afbeelding of beschadigd bestand."
 
 #: ../actions/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:52
 msgid "Not authorized."
 msgstr "Niet geautoriseerd."
 
 #: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38
 msgid "Not expecting this response!"
 msgstr "Onverwacht antwoord!"
 
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
-#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+#: actions/twitapistatuses.php:304
+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:31 actions/newnotice.php:30
+#: actions/nudge.php:30 actions/subedit.php:31 actions/unblock.php:31
 msgid "Not logged in."
 msgstr "Niet ingelogd."
 
-#: ../actions/unsubscribe.php:43
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:117
 msgid "Not subscribed!."
 msgstr "Niet geabonneerd!"
 
-#: ../actions/showstream.php:82
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+msgid "Notice Search"
+msgstr ""
+
+#: ../actions/showstream.php:82 actions/showstream.php:82
+#: actions/showstream.php:111 actions/showstream.php:118
+#: actions/showstream.php:123
 #, php-format
 msgid "Notice feed for %s"
 msgstr "Berichten-feed voor %s"
 
-#: ../actions/shownotice.php:39
+#: ../actions/shownotice.php:39 actions/shownotice.php:39
+#: actions/shownotice.php:45
 msgid "Notice has no profile"
 msgstr "Bericht heeft geen profiel"
 
-#: ../actions/showstream.php:297
+#: ../actions/showstream.php:316 actions/showstream.php:331
+#: actions/showstream.php:379
 msgid "Notices"
 msgstr "Berichten"
 
-#: ../actions/password.php:39
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
+#, php-format
+msgid "Notices tagged with %s"
+msgstr ""
+
+#: ../actions/password.php:39 actions/profilesettings.php:178
+#: actions/profilesettings.php:183
 msgid "Old password"
 msgstr "Oud wachtwoord"
 
-#: ../lib/util.php:288
+#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
+#: lib/util.php:330 actions/deleteprofile.php:247 lib/util.php:340
 msgid "OpenID"
 msgstr "OpenID"
 
-#: ../actions/finishopenidlogin.php:61
+#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
 msgid "OpenID Account Setup"
 msgstr "OpenID-account instellen"
 
@@ -895,74 +1502,108 @@ msgid "OpenID Auto-Submit"
 msgstr ""
 
 #: ../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/finishopenidlogin.php:150 actions/openidlogin.php:76
 msgid "OpenID Login"
 msgstr "Log in met OpenID"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
+#: actions/openidlogin.php:74 actions/openidsettings.php:50
+#: actions/openidlogin.php:82
 msgid "OpenID URL"
 msgstr "OpenID-URL"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
+#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 msgid "OpenID authentication cancelled."
 msgstr "OpenID-authenticatie geannuleerd."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
+#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "OpenID-authenticatie niet gelukt: %s"
 
-#: ../lib/openid.php:133
+#: ../lib/openid.php:133 lib/openid.php:133
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "OpenID-fout: %s"
 
-#: ../actions/openidsettings.php:144
+#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
 msgid "OpenID removed."
 msgstr "OpenID verwijderd."
 
-#: ../actions/openidsettings.php:37
+#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
 msgid "OpenID settings"
 msgstr "OpenID-instellingen."
 
-#: ../actions/avatar.php:84
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: actions/profilesettings.php:350
 msgid "Partial upload."
 msgstr "Onvolledige upload."
 
-#: ../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/login.php:109 actions/register.php:194
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: ../actions/recoverpassword.php:249
+#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
 msgid "Password and confirmation do not match."
 msgstr "Wachtwoord en bevestiging komen niet overeen."
 
-#: ../actions/recoverpassword.php:245
+#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
 msgid "Password must be 6 chars or more."
 msgstr "Wachtwoord moet uit 6 of meer tekens bestaan."
 
-#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
+#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 msgid "Password recovery requested"
 msgstr "Wachtwoordherstel aangevraagd"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:274
+#: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: actions/profilesettings.php:408 actions/recoverpassword.php:326
+#: actions/profilesettings.php:437
 msgid "Password saved."
 msgstr "Wachtwoord opgeslagen."
 
-#: ../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/profilesettings.php:409 actions/register.php:107
 msgid "Passwords don't match."
 msgstr "Wachtwoorden komen niet overeen."
 
-#: ../actions/peoplesearch.php:33
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+msgid "People"
+msgstr ""
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+msgid "People Search"
+msgstr ""
+
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
 msgid "People search"
 msgstr "Personen zoeken"
 
-#: ../lib/stream.php:44
+#: ../lib/stream.php:50 lib/personal.php:50
 msgid "Personal"
 msgstr "Persoonlijk"
 
-#: ../actions/userauthorization.php:77
+#: ../actions/invite.php:133 actions/invite.php:141
+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, "
@@ -973,91 +1614,135 @@ msgstr ""
 "aangegeven je op iemand's berichten te willen abonneren, klik dan op "
 "\"Annuleer\"."
 
-#: ../actions/imsettings.php:74
+#: ../actions/imsettings.php:73 actions/imsettings.php:74
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Plaats een bericht als mijn Jabber/GTalk-status verandert."
 
-#: ../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
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: ../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:185 actions/othersettings.php:179
 msgid "Preferences saved."
 msgstr "Voorkeuren opgeslagen."
 
-#: ../lib/util.php:300
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
+msgid "Preferred language"
+msgstr ""
+
+#: ../lib/util.php:328 lib/util.php:344 lib/util.php:356
 msgid "Privacy"
 msgstr "Privacy"
 
-#: ../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:139 classes/Notice.php:149
 msgid "Problem saving notice."
 msgstr "Probleem bij opslaan bericht."
 
-#: ../lib/stream.php:54
+#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
+#: lib/settingsaction.php:84 actions/deleteprofile.php:241
 msgid "Profile"
 msgstr "Profiel"
 
-#: ../actions/remotesubscribe.php:73
+#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
 msgid "Profile URL"
 msgstr "Profiel-URL"
 
-#: ../actions/profilesettings.php:34
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
 msgid "Profile settings"
 msgstr "Profielinstellingen"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
+#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
+#: actions/postnotice.php:52 actions/updateprofile.php:53
 msgid "Profile unknown"
 msgstr "Profiel onbekend"
 
-#: ../lib/util.php:276
-msgid "Public"
-msgstr "Openbaar"
-
-#: ../actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:77
 msgid "Public Stream Feed"
 msgstr "Openbare stream-feed"
 
-#: ../actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 lib/stream.php:34
 msgid "Public timeline"
 msgstr "Openbare tijdlijn"
 
-#: ../actions/recoverpassword.php:151
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:104
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
 msgid "Recover"
 msgstr "Herstellen"
 
-#: ../actions/recoverpassword.php:141
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
 msgid "Recover password"
 msgstr "Wachtwoord herstellen"
 
-#: ../actions/recoverpassword.php:67
+#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
 msgid "Recovery code for unknown user."
 msgstr "Herstelcode voor onbekende gebruiker."
 
-#: ../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:181 actions/register.php:234 lib/util.php:338
 msgid "Register"
 msgstr "Registreer"
 
-#: ../actions/userauthorization.php:119
+#: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:173
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:241
+msgid "Registration successful"
+msgstr ""
+
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
 msgid "Reject"
 msgstr "Afwijzen"
 
-#: ../actions/login.php:99 ../actions/register.php:183
+#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
+#: actions/register.php:190 actions/login.php:110 actions/openidlogin.php:85
+#: actions/register.php:217
 msgid "Remember me"
 msgstr "Onthoud mij"
 
-#: ../actions/updateprofile.php:69
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
 msgid "Remote profile with no matching profile"
 msgstr "Profiel op afstand zonder overeenkomend profiel"
 
-#: ../actions/remotesubscribe.php:65
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
 msgid "Remote subscribe"
 msgstr "Abonneren op afstand"
 
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php:48 actions/emailsettings.php:76
+#: actions/imsettings.php:49 actions/openidsettings.php:108
+#: actions/smssettings.php:50 actions/smssettings.php:84
+#: actions/twittersettings.php:59 actions/twittersettings.php:61
 msgid "Remove"
 msgstr "Verwijderen"
 
-#: ../actions/openidsettings.php:68
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
 msgid "Remove OpenID"
 msgstr "Verwijder OpenID"
 
@@ -1069,40 +1754,73 @@ msgstr ""
 "Verwijderen van je enige OpenID zou het onmogelijk maken in te loggen! Als "
 "je het moet verwijderen, voeg dan eerst een ander OpenID toe."
 
-#: ../lib/stream.php:49
+#: ../lib/stream.php:55 lib/personal.php:55
 msgid "Replies"
 msgstr "Antwoorden"
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:50
+#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
+#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #, php-format
 msgid "Replies to %s"
 msgstr "Antwoorden aan %s"
 
-#: ../actions/recoverpassword.php:168
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
 msgid "Reset"
 msgstr "Terugstellen"
 
-#: ../actions/recoverpassword.php:158
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
 msgid "Reset password"
 msgstr "Wachtwoord terugstellen"
 
-#: ../actions/recoverpassword.php:167 ../actions/register.php:180
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/deleteprofile.php:250 actions/subscriptions.php:73
+msgid "SMS"
+msgstr ""
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+msgid "SMS Phone number"
+msgstr ""
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:230
+msgid "SMS confirmation"
+msgstr ""
+
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
 msgid "Same as password above"
 msgstr "Gelijk aan wachtwoord hierboven"
 
-#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
+#: ../actions/register.php:156 actions/register.php:170
+#: actions/register.php:197
+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/twittersettings.php:83 actions/emailsettings.php:107
+#: actions/othersettings.php:56 actions/profilesettings.php:106
+#: actions/subscriptions.php:74 actions/tagother.php:100
+#: actions/twittersettings.php:82
 msgid "Save"
 msgstr "Opslaan"
 
-#: ../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/util.php:327
 msgid "Search"
 msgstr "Zoeken"
 
-#: ../actions/noticesearch.php:80
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:84
 msgid "Search Stream Feed"
 msgstr "Doorzoek stroom-feed"
 
-#: ../actions/noticesearch.php:30
+#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
+#: actions/noticesearch.php:29
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -1121,114 +1839,219 @@ msgstr ""
 "interesses. Scheid de zoektermen met spaties; ze moeten uit 3 of meer tekens "
 "bestaan."
 
-#: ../lib/util.php:982
-msgid "Send"
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+msgid "Select a carrier"
+msgstr ""
+
+#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
+#: lib/util.php:1306 lib/util.php:1731 lib/util.php:1646 lib/util.php:2158
+msgid "Send"
 msgstr "Verstuur"
 
-#: ../actions/imsettings.php:71
+#: ../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."
+msgstr ""
+
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+msgid "Send me notices of new subscriptions through email."
+msgstr ""
+
+#: ../actions/imsettings.php:70 actions/imsettings.php:71
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Stuur mij berichten via Jabber/GTalk."
 
-#: ../lib/util.php:282
+#: ../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 ""
+
+#: ../lib/util.php:304 lib/util.php:320 lib/util.php:330
 msgid "Settings"
 msgstr "Instellingen"
 
-#: ../actions/profilesettings.php:183
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:336
 msgid "Settings saved."
 msgstr "Instellingen opgeslagen."
 
-#: ../actions/finishaddopenid.php:66
+#: ../actions/tag.php:60 actions/tag.php:60 actions/tag.php:59
+msgid "Showing most popular tags from the last week"
+msgstr ""
+
+#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
 msgid "Someone else already has this OpenID."
 msgstr "Iemand anders heeft die OpenID al."
 
 #: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
+#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
 msgid "Something weird happened."
 msgstr "Er is iets eigenaardigs gebeurd."
 
-#: ../lib/util.php:302 ../lib/util.php:330 lib/util.php:346
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr ""
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: ../lib/util.php:330 lib/util.php:346 lib/util.php:358
 msgid "Source"
 msgstr ""
 
-#: ../actions/showstream.php:277
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:359
 msgid "Statistics"
 msgstr "Statistieken"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
+#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
+#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
+#: actions/finishopenidlogin.php:199 actions/finishopenidlogin.php:267
 msgid "Stored OpenID not found."
 msgstr "Opgeslagen OpenID niet gevonden."
 
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:172
-#: ../actions/showstream.php:181
+#: ../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:254 lib/util.php:2078
 msgid "Subscribe"
 msgstr "Abonneren"
 
-#: ../actions/showstream.php:294 ../actions/subscribers.php:27
+#: ../actions/showstream.php:313 ../actions/subscribers.php:27
+#: actions/showstream.php:328 actions/subscribers.php:27
+#: actions/showstream.php:376 lib/gallery.php:136 lib/gallery.php:137
 msgid "Subscribers"
 msgstr "Abonnees"
 
-#: ../actions/userauthorization.php:309
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
 msgid "Subscription authorized"
 msgstr "Abonnement geautoriseerd"
 
-#: ../actions/userauthorization.php:319
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
 msgid "Subscription rejected"
 msgstr "Abonnement afgewezen"
 
-#: ../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:288 actions/showstream.php:370 lib/gallery.php:131
+#: lib/gallery.php:132
 msgid "Subscriptions"
 msgstr "Abonnementen"
 
-#: ../actions/avatar.php:87
+#: ../actions/avatar.php:87 actions/profilesettings.php:324
+#: actions/profilesettings.php:353
 msgid "System error uploading file."
 msgstr "Systeemfout bij uploaden bestand."
 
-#: ../actions/noticesearch.php:34
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317 actions/profilesettings.php:90 actions/showstream.php:382
+#: actions/tag.php:40 actions/tagother.php:96 actions/tagother.php:162
+#: lib/profilelist.php:126 lib/profilelist.php:128
+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:33
 msgid "Text search"
 msgstr "Tekst doorzoeken"
 
-#: ../actions/openidsettings.php:140
+#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
 msgid "That OpenID does not belong to you."
 msgstr "Die OpenID is niet van jou."
 
-#: ../actions/confirmaddress.php:52
+#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
 msgid "That address has already been confirmed."
 msgstr "Dat adres is al bevestigd."
 
-#: ../actions/confirmaddress.php:43
+#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
 msgid "That confirmation code is not for you!"
 msgstr "Die bevestigingscode is niet voor jou!"
 
-#: ../actions/avatar.php:80
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:214
+msgid "That email address already belongs to another user."
+msgstr ""
+
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: actions/profilesettings.php:346
 msgid "That file is too big."
 msgstr "Dat bestand is te groot."
 
-#: ../actions/imsettings.php:161
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
 msgid "That is already your Jabber ID."
 msgstr "Dat is al je Jabber-ID."
 
-#: ../actions/imsettings.php:224
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:211
+msgid "That is already your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+msgid "That is already your phone number."
+msgstr ""
+
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
 msgid "That is not your Jabber ID."
 msgstr "Dat is niet je Jabber-ID."
 
-#: ../actions/imsettings.php:201
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+#: actions/emailsettings.php:270
+msgid "That is not your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+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:247
 msgid "That is the wrong IM address."
 msgstr "Dat is het verkeerde IM-adres."
 
-#: ../actions/newnotice.php:52
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+msgid "That is the wrong confirmation number."
+msgstr ""
+
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+msgid "That phone number already belongs to another user."
+msgstr ""
+
+#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: actions/newnotice.php:49 actions/twitapistatuses.php:330
+#: actions/newnotice.php:61 actions/twitapistatuses.php:271
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "Dat is te lang. Maximale berichtlengte is 140 tekens."
 
-#: ../actions/confirmaddress.php:86
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+#: actions/twitapiaccount.php:55
+msgid "That's too long. Max notice size is 255 chars."
+msgstr ""
+
+#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Het adres \"%s\" is voor je account bevestigd."
 
-#: ../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:285
 msgid "The address was removed."
 msgstr "Het adres was verwijderd."
 
-#: ../actions/userauthorization.php:311
+#: ../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 "
@@ -1238,7 +2061,7 @@ msgstr ""
 "Loop de instructies van de site na voor details over hoe het abonnement te "
 "autoriseren. Je abonnement-token is:"
 
-#: ../actions/userauthorization.php:321
+#: ../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 "
@@ -1248,25 +2071,30 @@ msgstr ""
 "de instructies van de site na voor details over hoe het abonnement volledig "
 "af te wijzen."
 
-#: ../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 "Dit zijn de mensen die %s's berichten volgen."
 
-#: ../actions/subscribers.php:33
+#: ../actions/subscribers.php:33 actions/subscribers.php:33
 msgid "These are the people who listen to your notices."
 msgstr "Dit zijn de mensen die jouw berichten volgen."
 
-#: ../actions/subscriptions.php:35
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Dit zijn de mensen van wie %s de berichten volgt."
 
-#: ../actions/subscriptions.php:33
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
 msgid "These are the people whose notices you listen to."
 msgstr "Dit zijn de mensen van wie jij de berichten volgt."
 
-#: ../actions/recoverpassword.php:87
+#: ../actions/invite.php:89 actions/invite.php:96
+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 "Deze bevestigingscode is te oud. Begin alsjeblieft opnieuw."
 
@@ -1278,7 +2106,7 @@ msgstr ""
 "Dit formulier zou zichzelf automatisch moeten versturen. Zoniet, klik dan op "
 "de verstuurknop om naar je OpenID-provider te gaan."
 
-#: ../actions/finishopenidlogin.php:56
+#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -1289,44 +2117,86 @@ msgstr ""
 "koppelen aan een lokaal account. Je kunt ofwel een nieuw account aanmaken, "
 "ofwel koppelen aan je bestaande account, als je er al een hebt."
 
-#: ../lib/util.php:147
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:94
+#: actions/twitapifriendships.php:82 actions/twitapistatuses.php:428
+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:46
+#: actions/twitapidirect_messages.php:117 actions/twitapifriendships.php:30
+#: actions/twitapistatuses.php:239
+msgid "This method requires a POST."
+msgstr ""
+
+#: ../lib/util.php:164 lib/util.php:246 lib/util.php:257
 msgid "This page is not available in a media type you accept"
 msgstr "Deze pagina is niet beschikbaar in een mediatype dat jij accepteert"
 
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
+msgid "Timezone"
+msgstr ""
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr ""
+
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"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 ""
 "Om je te abonneren kun je [inloggen](%%action.login%%), of een nieuw account "
 "[registreren](%%action.register%%). Als je al een account op een "
 "[compatibele microblogging-site](%%doc.openmublog%%) hebt, voer dan "
 "hieronder je profiel-URL in."
 
-#: ../actions/profilesettings.php:51
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: actions/twitapifriendships.php:128
+msgid "Two user ids or screen_names must be supplied."
+msgstr ""
+
+#: ../actions/profilesettings.php:48 ../actions/register.php:169
+#: actions/profilesettings.php:81 actions/register.php:183
+#: actions/profilesettings.php:83 actions/register.php:210
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL van je homepage, blog, of profiel op een andere site"
 
-#: ../actions/remotesubscribe.php:74
+#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL van je profiel op een andere, compatibele microbloggingdienst"
 
-#: ../actions/imsettings.php:105 ../actions/recoverpassword.php:39
+#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
+#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
+#: actions/emailsettings.php:144 actions/imsettings.php:118
+#: actions/recoverpassword.php:39 actions/smssettings.php:143
+#: actions/twittersettings.php:108 actions/emailsettings.php:147
+#: actions/othersettings.php:146 actions/twittersettings.php:199
 msgid "Unexpected form submission."
 msgstr "Formulier onverwacht ingezonden."
 
-#: ../actions/recoverpassword.php:237
+#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
 msgid "Unexpected password reset."
 msgstr "Wachtwoord onverwacht teruggesteld."
 
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:58
+#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:59
 msgid "Unknown version of OMB protocol."
 msgstr "Onbekende versie van het OMB-protocol."
 
-#: ../lib/util.php:245
+#: ../lib/util.php:269 lib/util.php:285 lib/util.php:296
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
@@ -1339,19 +2209,45 @@ msgstr ""
 msgid "Unrecognized address type %s"
 msgstr ""
 
-#: ../actions/showstream.php:193
+#: ../actions/showstream.php:209 actions/showstream.php:219
+#: actions/showstream.php:267 lib/util.php:2094
 msgid "Unsubscribe"
 msgstr "Abonnement opheffen"
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
+#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
+#: actions/postnotice.php:45 actions/updateprofile.php:46
 msgid "Unsupported OMB version"
 msgstr "Niet ondersteunde OMB-versie"
 
-#: ../actions/avatar.php:105
+#: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: actions/profilesettings.php:371
 msgid "Unsupported image file format."
 msgstr "Niet ondersteund beeldbestandsformaat."
 
-#: ../actions/avatar.php:68
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: actions/deleteprofile.php:251
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: actions/deleteprofile.php:254
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/twitapistatuses.php:126
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:198
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
+
+#: ../actions/avatar.php:68 actions/profilesettings.php:161
+#: actions/profilesettings.php:166
 msgid "Upload"
 msgstr "Uploaden"
 
@@ -1367,59 +2263,118 @@ msgstr ""
 "vierkant is. Het moet ook onder site licentie vallen. Gebruik een afbeelding "
 "die je eigendom is en die je wilt delen."
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:182
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr ""
+
+#: ../actions/invite.php:114 actions/invite.php:121
+msgid ""
+"Use this form to invite your friends and colleagues to use this service."
+msgstr ""
+
+#: ../actions/register.php:159 ../actions/register.php:162
+#: actions/register.php:173 actions/register.php:176 actions/register.php:200
+#: actions/register.php:203
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Alleen gebruikt voor updates, aankondigingen en wachtwoordherstel"
 
 #: ../actions/finishremotesubscribe.php:86
+#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:92
 msgid "User being listened to doesn't exist."
 msgstr "Gebruiker waarnaar geluisterd wordt betaat niet."
 
 #: ../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/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/showstream.php:57
+#: actions/twitapiaccount.php:63 actions/twitapifavorites.php:40
+#: actions/twitapistatuses.php:163 actions/twitapistatuses.php:492
+#: lib/twitterapi.php:590
 msgid "User has no profile."
 msgstr "Gebruiker heeft geen profiel."
 
-#: ../actions/remotesubscribe.php:71
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
 msgid "User nickname"
 msgstr "Gebruikersnaam"
 
-#: ../lib/util.php:969
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../lib/util.php:1159 lib/util.php:1293 lib/util.php:1630
 #, php-format
 msgid "What's up, %s?"
 msgstr "Hoe staat het ermee, %s?"
 
-#: ../actions/profilesettings.php:57
+#: ../actions/profilesettings.php:54 ../actions/register.php:175
+#: actions/profilesettings.php:87 actions/register.php:189
+#: actions/profilesettings.php:89 actions/register.php:216
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Waar je bent, bijvoorbeeld \"woonplaats, land\" of \"postcode, land\""
 
-#: ../actions/updateprofile.php:127
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Foutief beeldbestandstype voor '%s'"
 
-#: ../actions/updateprofile.php:122
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Verkeerde afmeting van afbeelding bij '%s'"
 
-#: ../actions/finishaddopenid.php:64
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+#: actions/block.php:105
+msgid "Yes"
+msgstr ""
+
+#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
 msgid "You already have this OpenID!"
 msgstr "Je hebt die OpenID al!"
 
-#: ../actions/recoverpassword.php:31
+#: ../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
 msgid "You are already logged in!"
 msgstr "Je bent al aangemeld!"
 
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:102
+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 "Hier kun je je wachtwoord wijzigen. Kies een goede!"
 
-#: ../actions/register.php:164
+#: ../actions/register.php:135 actions/register.php:145
 msgid "You can create a new account to start posting notices."
 msgstr "Je kunt een nieuw account aanmaken om berichten te gaan plaatsen."
 
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
 #: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
@@ -1429,46 +2384,78 @@ msgstr ""
 "te klikken."
 
 #: ../actions/imsettings.php:28 actions/imsettings.php:28
-#, php-format
-#, fuzzy
+#, fuzzy, 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 ""
 "#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Je kunt berichten verzenden en ontvangen via Jabber/GTalk [instant "
-"messages](%%doc.im%%). Configureer je adres en instellingen hieronder.\n"
+"Je kunt berichten verzenden en ontvangen via Jabber/GTalk [instant messages]"
+"(%%doc.im%%). Configureer je adres en instellingen hieronder.\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
 #: ../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 ""
 "Je kunt hier je persoonlijke profielinformatie bijwerken zodat mensen meer "
 "over je weten."
 
 #: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
+#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
+#: actions/finishremotesubscribe.php:83 actions/finishremotesubscribe.php:99
 msgid "You can use the local subscription!"
 msgstr "Je kunt het lokale abonnement gebruiken!"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:51
+#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
+#: actions/finishopenidlogin.php:38 actions/register.php:68
+#: actions/register.php:77
 msgid "You can't register if you don't agree to the license."
 msgstr "Je kunt niet registreren als je niet met de licentie akkoord gaat."
 
-#: ../actions/updateprofile.php:62
+#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
 msgid "You did not send us that profile"
 msgstr "Je hebt dat profiel niet ingezonden"
 
-#: ../actions/recoverpassword.php:134
+#: ../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 ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: actions/twitapistatuses.php:455
+msgid "You may not delete another user's status."
+msgstr ""
+
+#: ../actions/invite.php:31 actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+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!"
+msgstr ""
+
+#: ../actions/recoverpassword.php:149
 msgid "You've been identified. Enter a  new password below. "
 msgstr "Je bent geïdentificeerd. Vul hieronder een nieuw wachtwoord in."
 
-#: ../actions/openidlogin.php:67
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:84
 msgid "Your OpenID URL"
 msgstr "Je OpenID-URL"
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:164
 msgid "Your nickname on this server, or your registered email address."
 msgstr "Je gebruikersnaam op deze server, of je geregistreerde e-mailadres."
 
@@ -1479,787 +2466,87 @@ msgid ""
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
 "Met [OpenID](%%doc.openid%%) kun je op vele sites inloggen met hetzelfde "
-"gebruikersaccount. Hier kun je de aan je account gekoppelde OpenID's "
-"beheren."
+"gebruikersaccount. Hier kun je de aan je account gekoppelde OpenID's beheren."
 
-#: ../lib/util.php:814
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:1287
 msgid "a few seconds ago"
 msgstr "een paar seconden geleden"
 
-#: ../lib/util.php:826
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:1299
 #, php-format
 msgid "about %d days ago"
 msgstr "ongeveer %d dagen geleden"
 
-#: ../lib/util.php:822
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:1295
 #, php-format
 msgid "about %d hours ago"
 msgstr "ongeveer %d uur geleden"
 
-#: ../lib/util.php:818
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:1291
 #, php-format
 msgid "about %d minutes ago"
 msgstr "ongeveer %d minuten geleden"
 
-#: ../lib/util.php:830
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:1303
 #, php-format
 msgid "about %d months ago"
 msgstr "ongeveer %d maanden geleden"
 
-#: ../lib/util.php:824
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:1297
 msgid "about a day ago"
 msgstr "ongeveer een dag geleden"
 
-#: ../lib/util.php:816
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:1289
 msgid "about a minute ago"
 msgstr "ongeveer een minuut geleden"
 
-#: ../lib/util.php:828
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:1301
 msgid "about a month ago"
 msgstr "ongeveer een maand geleden"
 
-#: ../lib/util.php:832
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:1305
 msgid "about a year ago"
 msgstr "ongeveer een jaar geleden"
 
-#: ../lib/util.php:820
-msgid "about an hour ago"
-msgstr "ongeveer een uur geleden"
-
-#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
-#: ../lib/stream.php:101
-msgid "in reply to..."
-msgstr "in antwoord op..."
-
-#: ../actions/noticesearch.php:133 ../actions/showstream.php:390
-#: ../lib/stream.php:108
-msgid "reply"
-msgstr "antwoord"
-
-#: ../actions/password.php:44
-msgid "same as password above"
-msgstr "gelijk aan wachtwoord hierboven"
-
-#: ../lib/util.php:1127
-msgid "« After"
-msgstr "« Later"
-
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr ""
-
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
-
-#: ../actions/invite.php:168 actions/invite.php:176
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
-
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
-
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
-#, php-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#, php-format
-msgid "%s public timeline"
-msgstr ""
-
-#: ../lib/mail.php:206 lib/mail.php:212
-#, php-format
-msgid "%s status"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#, php-format
-msgid "%s timeline"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
-msgstr ""
-
-#: ../actions/register.php:213
-msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
-msgstr ""
-
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-
-#: ../actions/register.php:154 actions/register.php:168
-msgid "6 or more characters. Required."
-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 ""
-
-#: ../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/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!"
-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 ""
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-msgid "Add or remove OpenIDs"
-msgstr ""
-
-#: ../actions/invite.php:131 actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
-msgstr ""
-
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-msgid "Are you sure you want to delete this notice?"
-msgstr ""
-
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr ""
-
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
-msgid "Can't delete this notice."
-msgstr ""
-
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-msgid "Cannot normalize that email address"
-msgstr ""
-
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr ""
-
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
-msgstr ""
-
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-msgid "Change your profile settings"
-msgstr ""
-
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-msgid "Confirmation code"
-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/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
-msgstr ""
-
-#: ../lib/subs.php:54 lib/subs.php:61
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: ../lib/subs.php:46 lib/subs.php:46
-msgid "Could not subscribe."
-msgstr ""
-
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-msgid "Could not update user with confirmed email address."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-msgid "Couldn't find any statuses."
-msgstr ""
-
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-msgid "Couldn't update user for autosubscribe."
-msgstr ""
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-msgid "Couldn't update user record."
-msgstr ""
-
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-msgid "Current confirmed email address."
-msgstr ""
-
-#: ../classes/Notice.php:72 classes/Notice.php:86
-#, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr ""
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-msgid "Delete notice"
-msgstr ""
-
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-msgid "Email Address"
-msgstr ""
-
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-msgid "Email Settings"
-msgstr ""
-
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-msgid "Email address, like \"UserName@example.org\""
-msgstr ""
-
-#: ../actions/invite.php:129 actions/invite.php:137
-msgid "Email addresses"
-msgstr ""
-
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
-msgstr ""
-
-#: ../actions/tag.php:55 actions/tag.php:55
-#, php-format
-msgid "Feed for tag %s"
-msgstr ""
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr ""
-
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr ""
-
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-msgid "I want to post notices by email."
-msgstr ""
-
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
-msgstr ""
-
-#: ../actions/recoverpassword.php:137
-msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
-"email address you have stored  in your account."
-msgstr ""
-
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-msgid "Incoming email"
-msgstr ""
-
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-msgid "Incoming email address removed."
-msgstr ""
-
-#: ../actions/invite.php:55 actions/invite.php:62
-#, php-format
-msgid "Invalid email address: %s"
-msgstr ""
-
-#: ../actions/invite.php:79 actions/invite.php:86
-msgid "Invitation(s) sent"
-msgstr ""
-
-#: ../actions/invite.php:97 actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
-msgstr ""
-
-#: ../lib/util.php:306 lib/util.php:322
-msgid "Invite"
-msgstr ""
-
-#: ../actions/invite.php:123 actions/invite.php:130
-msgid "Invite new users"
-msgstr ""
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Language"
-msgstr ""
-
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-msgid "Language is too long (max 50 chars)."
-msgstr ""
-
-#: ../actions/register.php:166 actions/register.php:180
-msgid "Longer name, preferably your \"real\" name"
-msgstr ""
-
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-#: actions/emailsettings.php:81 actions/smssettings.php:89
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
-
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-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 ""
-
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-msgid "New"
-msgstr ""
-
-#: ../lib/mail.php:144 lib/mail.php:144
-#, php-format
-msgid "New email address for posting to %s"
-msgstr ""
-
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-msgid "New incoming email address added."
-msgstr ""
-
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-msgid "No"
-msgstr ""
-
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-msgid "No carrier selected."
-msgstr ""
-
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-msgid "No code entered"
-msgstr ""
-
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-msgid "No email address."
-msgstr ""
-
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-msgid "No incoming email address."
-msgstr ""
-
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-msgid "No phone number."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-msgid "No status found with that ID."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-msgid "No status with that ID found."
-msgstr ""
-
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-msgid "No user with that email address or username."
-msgstr ""
-
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-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
-msgid "Not a supported data format."
-msgstr ""
-
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-msgid "Not a valid email address"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-msgid "Not found"
-msgstr ""
-
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-msgid "Notice Search"
-msgstr ""
-
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81
-#, php-format
-msgid "Notices tagged with %s"
-msgstr ""
-
-#: ../actions/invite.php:135 actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-msgid "People"
-msgstr ""
-
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-msgid "People Search"
-msgstr ""
-
-#: ../actions/invite.php:133 actions/invite.php:141
-msgid "Personal message"
-msgstr ""
-
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Preferred language"
-msgstr ""
-
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
-
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-msgid "Publish a MicroID for my email address."
-msgstr ""
-
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr ""
-
-#: ../actions/register.php:28 actions/register.php:28
-msgid "Registration not allowed."
-msgstr ""
-
-#: ../actions/register.php:200 actions/register.php:214
-msgid "Registration successful"
-msgstr ""
-
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
-msgstr ""
-
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-msgid "SMS Phone number"
-msgstr ""
-
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-msgid "SMS Settings"
-msgstr ""
-
-#: ../lib/mail.php:219 lib/mail.php:225
-msgid "SMS confirmation"
-msgstr ""
-
-#: ../actions/register.php:156 actions/register.php:170
-msgid "Same as password above. Required."
-msgstr ""
-
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-msgid "Select a carrier"
-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."
-msgstr ""
-
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-msgid "Send me notices of new subscriptions through email."
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr ""
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
-msgstr ""
-
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317
-msgid "Tags"
-msgstr ""
-
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr ""
-
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr ""
-
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-msgid "That is already your email address."
-msgstr ""
-
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-msgid "That is already your phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-msgid "That is not your email address."
-msgstr ""
-
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-msgid "That is not your phone number."
-msgstr ""
-
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-msgid "That is the wrong confirmation number."
-msgstr ""
-
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-msgid "That phone number already belongs to another user."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-msgid "That's too long. Max notice size is 255 chars."
-msgstr ""
-
-#: ../actions/invite.php:89 actions/invite.php:96
-msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
-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."
-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."
-msgstr ""
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "Timezone"
-msgstr ""
-
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-msgid "Timezone not selected."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-msgid "Two user ids or screen_names must be supplied."
-msgstr ""
-
-#: ../index.php:57 index.php:57
-msgid "Unknown action"
-msgstr ""
-
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-msgid "Updates by SMS"
-msgstr ""
-
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr ""
-
-#: ../actions/invite.php:114 actions/invite.php:121
-msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
-msgstr ""
-
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr ""
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "What timezone are you normally in?"
-msgstr ""
-
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-msgid "Yes"
-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/invite.php:81 actions/invite.php:88
-msgid "You are already subscribed to these users:"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
-msgstr ""
-
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-msgid "You may not delete another user's status."
-msgstr ""
-
-#: ../actions/invite.php:31 actions/invite.php:31
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-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!"
-msgstr ""
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:1293
+msgid "about an hour ago"
+msgstr "ongeveer een uur geleden"
 
 #: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
+#: actions/showstream.php:441 lib/stream.php:99 lib/noticelist.php:211
 msgid "delete"
 msgstr ""
 
+#: ../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:135
+#: lib/facebookaction.php:202 lib/noticelist.php:189
+msgid "in reply to..."
+msgstr "in antwoord op..."
+
+#: ../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:142
+#: lib/noticelist.php:199
+msgid "reply"
+msgstr "antwoord"
+
+#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/profilesettings.php:188
+msgid "same as password above"
+msgstr "gelijk aan wachtwoord hierboven"
+
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+#: actions/twitapistatuses.php:543
 msgid "unsupported file type"
 msgstr ""
 
+#: ../lib/util.php:1309 lib/util.php:1443 lib/facebookaction.php:251
+#: lib/util.php:1783
+#, fuzzy
+msgid "« After"
+msgstr "« Later"
+
 #: actions/deletenotice.php:74 actions/disfavor.php:43
 #: actions/emailsettings.php:127 actions/favor.php:45
 #: actions/finishopenidlogin.php:33 actions/imsettings.php:105
@@ -2269,6 +2556,12 @@ msgstr ""
 #: 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:38 actions/deleteprofile.php:127 actions/disfavor.php:47
+#: actions/emailsettings.php:130 actions/favor.php:49 actions/login.php:45
+#: actions/newmessage.php:44 actions/newnotice.php:36 actions/nudge.php:47
+#: actions/othersettings.php:139 actions/profilesettings.php:49
+#: actions/subedit.php:38 actions/tagother.php:113
+#: actions/twittersettings.php:188 actions/unblock.php:38
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -2292,12 +2585,14 @@ msgstr ""
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142
+#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:54
+#: actions/twitapifavorites.php:115
 msgid "This notice is already a favorite!"
 msgstr ""
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
+#: classes/Command.php:132 actions/favor.php:61
+#: actions/twitapifavorites.php:122
 msgid "Could not create favorite."
 msgstr ""
 
@@ -2306,11 +2601,12 @@ msgid "Disfavor"
 msgstr ""
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:62
 #, php-format
 msgid "%s favorite notices"
 msgstr ""
 
-#: actions/favoritesrss.php:64
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:66
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr ""
@@ -2336,47 +2632,50 @@ msgid ""
 "\n"
 msgstr ""
 
-#: actions/login.php:104
+#: actions/login.php:104 actions/login.php:111 actions/openidlogin.php:86
 msgid "Automatically login in the future; "
 msgstr ""
 
-#: actions/login.php:122
+#: actions/login.php:122 actions/login.php:130
 msgid "For security reasons, please re-enter your "
 msgstr ""
 
-#: actions/login.php:126
+#: actions/login.php:126 actions/login.php:134
 msgid "Login with your username and password. "
 msgstr ""
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+#: actions/newmessage.php:60 actions/twitapidirect_messages.php:136
 msgid "That's too long. Max message size is 140 chars."
 msgstr ""
 
-#: actions/newmessage.php:65
+#: actions/newmessage.php:65 actions/newmessage.php:68
 msgid "No recipient specified."
 msgstr ""
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
+#: classes/Command.php:206 actions/newmessage.php:71
+#: actions/newmessage.php:116 classes/Command.php:211
 msgid "You can't send a message to this user."
 msgstr ""
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
+#: classes/Command.php:209 actions/newmessage.php:74
+#: actions/twitapidirect_messages.php:153 classes/Command.php:214
 msgid ""
-"Don't send a message to yourself; just say it to yourself quietly "
-"instead."
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: actions/newmessage.php:108
+#: actions/newmessage.php:108 actions/microsummary.php:32
+#: actions/newmessage.php:111
 msgid "No such user"
 msgstr ""
 
-#: actions/newmessage.php:117
+#: actions/newmessage.php:117 actions/newmessage.php:120
 msgid "New message"
 msgstr ""
 
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:95 actions/noticesearch.php:94
 msgid "Notice without matching profile"
 msgstr ""
 
@@ -2423,6 +2722,7 @@ msgstr ""
 
 #: actions/profilesettings.php:115 actions/remotesubscribe.php:320
 #: actions/userauthorization.php:159 actions/userrss.php:76
+#: actions/profilesettings.php:120 actions/remotesubscribe.php:333
 msgid "User without matching profile"
 msgstr ""
 
@@ -2450,18 +2750,18 @@ msgstr ""
 msgid "New password successfully saved. "
 msgstr ""
 
-#: actions/register.php:95
+#: actions/register.php:95 actions/register.php:104
 msgid "Password must be 6 or more characters."
 msgstr ""
 
-#: actions/register.php:216
+#: actions/register.php:216 actions/register.php:243
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to..."
 msgstr ""
 
-#: actions/register.php:227
+#: actions/register.php:227 actions/register.php:254
 msgid "(You should receive a message by email momentarily, with "
 msgstr ""
 
@@ -2476,6 +2776,7 @@ msgid "Feed for favorites of %s"
 msgstr ""
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:88 actions/twitapifavorites.php:57
 msgid "Could not retrieve favorite notices."
 msgstr ""
 
@@ -2497,7 +2798,7 @@ msgstr ""
 msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: actions/showstream.php:154
+#: actions/showstream.php:154 lib/util.php:2105
 msgid "Send a message"
 msgstr ""
 
@@ -2506,73 +2807,78 @@ msgstr ""
 msgid "Mobile carrier for your phone. "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:64
 #, php-format
 msgid "Direct messages to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:65
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:69
 msgid "Direct Messages You've Sent"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:70
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:132
 msgid "No message text!"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:145
 msgid "Recipient user not found."
 msgstr ""
 
 #: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:148
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
-#: actions/twitapifavorites.php:92
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:64
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
-#: actions/twitapifavorites.php:95
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:67
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
+#: actions/twitapifavorites.php:158 lib/mail.php:303
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr ""
 
 #: actions/twitapifavorites.php:188 lib/mail.php:276
+#: actions/twitapifavorites.php:159 lib/mail.php:304
 #, php-format
 msgid ""
 "%1$s just added your notice from %2$s as one of their favorites.\n"
 "\n"
 msgstr ""
 
-#: actions/twittersettings.php:27
+#: actions/twittersettings.php:27 actions/twittersettings.php:29
 msgid ""
 "Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 
-#: actions/twittersettings.php:41
+#: actions/twittersettings.php:41 actions/twittersettings.php:43
 msgid "Twitter settings"
 msgstr ""
 
-#: actions/twittersettings.php:48
+#: actions/twittersettings.php:48 actions/twittersettings.php:50
 msgid "Twitter Account"
 msgstr ""
 
-#: actions/twittersettings.php:56
+#: actions/twittersettings.php:56 actions/twittersettings.php:58
 msgid "Current verified Twitter account."
 msgstr ""
 
@@ -2600,46 +2906,50 @@ msgstr ""
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:216
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr ""
 
-#: actions/twittersettings.php:128
+#: actions/twittersettings.php:128 actions/twittersettings.php:221
 msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: actions/twittersettings.php:137 actions/twittersettings.php:228
 #, php-format
 msgid "Unable to retrieve account information for \"%s\" from Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:234 actions/twittersettings.php:253
 msgid "Unable to save your Twitter settings!"
 msgstr ""
 
-#: actions/twittersettings.php:174
+#: actions/twittersettings.php:174 actions/twittersettings.php:261
 msgid "Twitter settings saved."
 msgstr ""
 
-#: actions/twittersettings.php:192
+#: actions/twittersettings.php:192 actions/twittersettings.php:272
 msgid "That is not your Twitter account."
 msgstr ""
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:280
 msgid "Couldn't remove Twitter user."
 msgstr ""
 
-#: actions/twittersettings.php:212
+#: actions/twittersettings.php:212 actions/twittersettings.php:284
 msgid "Twitter account removed."
 msgstr ""
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
+#: actions/twittersettings.php:299 actions/twittersettings.php:310
+#: actions/twittersettings.php:322
 msgid "Couldn't save Twitter preferences."
 msgstr ""
 
-#: actions/twittersettings.php:245
+#: actions/twittersettings.php:245 actions/twittersettings.php:330
 msgid "Twitter preferences saved."
 msgstr ""
 
@@ -2655,15 +2965,15 @@ msgstr ""
 msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#: classes/Channel.php:113
+#: classes/Channel.php:113 classes/Channel.php:129
 msgid "Command results"
 msgstr ""
 
-#: classes/Channel.php:148
+#: classes/Channel.php:148 classes/Channel.php:175
 msgid "Command complete"
 msgstr ""
 
-#: classes/Channel.php:158
+#: classes/Channel.php:158 classes/Channel.php:185
 msgid "Command failed"
 msgstr ""
 
@@ -2676,7 +2986,7 @@ msgstr ""
 msgid "Subscriptions: %1$s\n"
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:247
 msgid "User has no last notice"
 msgstr ""
 
@@ -2709,59 +3019,60 @@ msgstr ""
 msgid "About: %s"
 msgstr ""
 
-#: classes/Command.php:200
+#: classes/Command.php:200 classes/Command.php:202
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: classes/Command.php:214
+#: classes/Command.php:214 classes/Command.php:219
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: classes/Command.php:216
+#: classes/Command.php:216 classes/Command.php:221
 msgid "Error sending direct message."
 msgstr ""
 
-#: classes/Command.php:263
+#: classes/Command.php:263 classes/Command.php:268
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: classes/Command.php:270
+#: classes/Command.php:270 classes/Command.php:275
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: classes/Command.php:288
+#: classes/Command.php:288 classes/Command.php:293
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: classes/Command.php:295
+#: classes/Command.php:295 classes/Command.php:300
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330
+#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:315
+#: classes/Command.php:335
 msgid "Command not yet implemented."
 msgstr ""
 
-#: classes/Command.php:313
+#: classes/Command.php:313 classes/Command.php:318
 msgid "Notification off."
 msgstr ""
 
-#: classes/Command.php:315
+#: classes/Command.php:315 classes/Command.php:320
 msgid "Can't turn off notification."
 msgstr ""
 
-#: classes/Command.php:333
+#: classes/Command.php:333 classes/Command.php:338
 msgid "Notification on."
 msgstr ""
 
-#: classes/Command.php:335
+#: classes/Command.php:335 classes/Command.php:340
 msgid "Can't turn on notification."
 msgstr ""
 
-#: classes/Command.php:344
+#: classes/Command.php:344 classes/Command.php:349
 msgid "Commands:\n"
 msgstr ""
 
@@ -2773,23 +3084,23 @@ msgstr ""
 msgid "Could not update message with new URI."
 msgstr ""
 
-#: lib/gallery.php:46
+#: lib/gallery.php:46 lib/gallery.php:55
 msgid "User without matching profile in system."
 msgstr ""
 
-#: lib/mail.php:147
+#: lib/mail.php:147 lib/mail.php:141
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:249
+#: lib/mail.php:249 lib/mail.php:275
 #, php-format
 msgid "New private message from %s"
 msgstr ""
 
-#: lib/mail.php:253
+#: lib/mail.php:253 lib/mail.php:279
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -2833,18 +3144,459 @@ msgstr ""
 msgid "Your sent messages"
 msgstr ""
 
-#: lib/settingsaction.php:99
+#: lib/settingsaction.php:99 actions/deleteprofile.php:256
 msgid "Twitter"
 msgstr ""
 
-#: lib/settingsaction.php:100
+#: lib/settingsaction.php:100 actions/deleteprofile.php:257
 msgid "Twitter integration options"
 msgstr ""
 
-#: lib/util.php:1718
+#: lib/util.php:1718 lib/util.php:2145
 msgid "To"
 msgstr ""
 
 #: scripts/maildaemon.php:45
 msgid "Could not parse message."
 msgstr ""
+
+#: actions/block.php:45 actions/subedit.php:45 actions/unblock.php:45
+msgid "No profile specified."
+msgstr ""
+
+#: actions/block.php:52 actions/subedit.php:52 actions/tagother.php:45
+#: actions/unblock.php:52
+msgid "No profile with that ID."
+msgstr ""
+
+#: actions/block.php:78
+#, fuzzy
+msgid "Block user"
+msgstr "Onbekende gebruiker."
+
+#: actions/block.php:81
+msgid "Are you sure you want to block this user? "
+msgstr ""
+
+#: actions/block.php:117
+#, fuzzy
+msgid "You have already blocked this user."
+msgstr "Je bent al aangemeld!"
+
+#: actions/block.php:124
+msgid "Failed to save block information."
+msgstr ""
+
+#: actions/deleteprofile.php:25
+msgid "Code not yet ready."
+msgstr ""
+
+#: actions/deleteprofile.php:36
+msgid "Export and delete your user information."
+msgstr ""
+
+#: actions/deleteprofile.php:88 actions/deleteprofile.php:119
+#, fuzzy
+msgid "Delete my account"
+msgstr "Maak een nieuw account aan"
+
+#: actions/deleteprofile.php:89
+#, fuzzy
+msgid "Delete my account confirmation"
+msgstr "Kon e-mailbevestiging niet verwijderen."
+
+#: actions/deleteprofile.php:117
+msgid "Check if you are sure you want to delete your account."
+msgstr ""
+
+#: actions/deleteprofile.php:259 lib/settingsaction.php:102
+msgid "Other"
+msgstr ""
+
+#: actions/deleteprofile.php:260 lib/settingsaction.php:103
+msgid "Other options"
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Add to favorites"
+msgstr ""
+
+#: actions/emailsettings.php:98
+msgid "Allow friends to nudge me and send me an email."
+msgstr ""
+
+#: actions/facebookremove.php:54
+#, fuzzy
+msgid "Couldn't remove Facebook user."
+msgstr "Kon gebruiker niet actualiseren."
+
+#: actions/favor.php:71
+msgid "Disfavor favorite"
+msgstr ""
+
+#: actions/favorited.php:31 lib/stream.php:45
+#, fuzzy
+msgid "Popular notices"
+msgstr "Onbekend bericht."
+
+#: actions/favorited.php:54
+msgid "Showing recently popular notices"
+msgstr ""
+
+#: actions/featured.php:32 actions/featured.php:54 lib/stream.php:41
+msgid "Featured users"
+msgstr ""
+
+#: actions/finishremotesubscribe.php:186
+msgid "That user has blocked you from subscribing."
+msgstr ""
+
+#: actions/microsummary.php:39
+msgid "No current status"
+msgstr ""
+
+#: actions/newnotice.php:93
+#, fuzzy
+msgid "Notice posted"
+msgstr "Berichten"
+
+#: actions/newnotice.php:116 classes/Channel.php:140
+msgid "Ajax Error"
+msgstr ""
+
+#: actions/nudge.php:52
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
+
+#: actions/nudge.php:61
+msgid "Nudge sent"
+msgstr ""
+
+#: actions/othersettings.php:27
+msgid "Manage various other options."
+msgstr ""
+
+#: actions/othersettings.php:33
+#, fuzzy
+msgid "Other Settings"
+msgstr "Instellingen"
+
+#: actions/othersettings.php:35
+msgid "URL Auto-shortening"
+msgstr ""
+
+#: actions/othersettings.php:54
+#, fuzzy
+msgid "Service"
+msgstr "Zoeken"
+
+#: actions/othersettings.php:54
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/othersettings.php:155
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Locatie is te lang (maximaal 255 tekens)."
+
+#: actions/peopletag.php:33
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "Geen geldig e-mailadres."
+
+#: actions/peopletag.php:45
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr ""
+
+#: actions/peopletag.php:87
+#, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+msgstr ""
+
+#: actions/profilesettings.php:92
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+
+#: actions/profilesettings.php:246 actions/tagother.php:131
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Ongeldige homepage '%s'"
+
+#: actions/profilesettings.php:328
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "Kon profiel niet opslaan."
+
+#: actions/public.php:68
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
+msgstr ""
+
+#: actions/public.php:90
+msgid "Could not retrieve public stream."
+msgstr ""
+
+#: actions/register.php:67 actions/register.php:177
+msgid "Sorry, only invited people can register."
+msgstr ""
+
+#: actions/register.php:156
+msgid "With this form you can create a new account. "
+msgstr ""
+
+#: actions/remotesubscribe.php:136 actions/remotesubscribe.php:141
+msgid "That's a local profile! Login to subscribe."
+msgstr ""
+
+#: actions/subedit.php:68
+#, fuzzy
+msgid "You are not subscribed to that profile."
+msgstr "Je hebt dat profiel niet ingezonden"
+
+#: actions/subedit.php:81
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "Kon abonnement niet aanmaken."
+
+#: actions/subscribe.php:53
+#, fuzzy
+msgid "Not a local user."
+msgstr "Onbekende gebruiker."
+
+#: actions/subscribe.php:67
+#, fuzzy
+msgid "Subscribed"
+msgstr "Abonneren"
+
+#: actions/subscriptions.php:72
+#, fuzzy
+msgid "Jabber"
+msgstr "Geen Jabber-ID."
+
+#: actions/tagother.php:31
+#, fuzzy
+msgid "Not logged in"
+msgstr "Niet ingelogd."
+
+#: actions/tagother.php:40
+#, fuzzy
+msgid "No id argument."
+msgstr "Onbekend document."
+
+#: actions/tagother.php:56
+msgid "Tag a person"
+msgstr ""
+
+#: actions/tagother.php:98
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
+msgstr ""
+
+#: actions/tagother.php:120
+#, fuzzy
+msgid "No such profile."
+msgstr "Onbekend bericht."
+
+#: actions/tagother.php:146
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+
+#: actions/tagother.php:153
+#, fuzzy
+msgid "Could not save tags."
+msgstr "Kon avatarinformatie niet opslaan"
+
+#: actions/tagother.php:188
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
+
+#: actions/tagrss.php:33
+#, fuzzy
+msgid "No such tag."
+msgstr "Onbekend bericht."
+
+#: actions/tagrss.php:62
+#, fuzzy, php-format
+msgid "Microblog tagged with %s"
+msgstr "Microblog van %s"
+
+#: actions/twitapiblocks.php:45
+msgid "Block user failed."
+msgstr ""
+
+#: actions/twitapiblocks.php:66
+msgid "Unblock user failed."
+msgstr ""
+
+#: actions/twitapiusers.php:45
+#, fuzzy
+msgid "Not found."
+msgstr "Geen verzoek gevonden!"
+
+#: actions/twittersettings.php:63
+msgid "Twitter user name"
+msgstr ""
+
+#: actions/twittersettings.php:67
+#, fuzzy
+msgid "Twitter password"
+msgstr "Nieuw wachtwoord"
+
+#: actions/twittersettings.php:129
+msgid "Twitter Friends"
+msgstr ""
+
+#: actions/unblock.php:73
+#, fuzzy
+msgid "Error removing the block."
+msgstr "Fout bij opslaan van de gebruiker."
+
+#: actions/unsubscribe.php:48
+#, fuzzy
+msgid "No profile id in request."
+msgstr "Geen profiel-URL teruggestuurd door de server."
+
+#: actions/unsubscribe.php:55
+#, fuzzy
+msgid "No profile with that id."
+msgstr "Profiel op afstand zonder overeenkomend profiel"
+
+#: actions/unsubscribe.php:69
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Abonnement opheffen"
+
+#: classes/Notice.php:100
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "Probleem bij opslaan bericht."
+
+#: classes/Notice.php:105
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+
+#: classes/Notice.php:112
+msgid "You are banned from posting notices on this site."
+msgstr ""
+
+#: lib/gallery.php:98
+msgid "Filter tags"
+msgstr ""
+
+#: lib/gallery.php:104
+msgid "All"
+msgstr ""
+
+#: lib/gallery.php:108
+msgid "Tag"
+msgstr ""
+
+#: lib/gallery.php:109
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/gallery.php:110
+msgid "Go"
+msgstr ""
+
+#: lib/gallery.php:264
+#, fuzzy
+msgid "Subscriptions navigation"
+msgstr "Abonnementen"
+
+#: lib/gallery.php:270 lib/gallery.php:292
+msgid "List"
+msgstr ""
+
+#: lib/gallery.php:280 lib/gallery.php:294
+msgid "Icons"
+msgstr ""
+
+#: lib/mail.php:92
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:242
+#, php-format
+msgid "You've been nudged by %s"
+msgstr ""
+
+#: lib/mail.php:246
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+msgstr ""
+
+#: lib/profilelist.php:146
+msgid "(none)"
+msgstr ""
+
+#: lib/stream.php:33
+msgid "Public"
+msgstr "Openbaar"
+
+#: lib/stream.php:36 lib/stream.php:37
+msgid "Recent tags"
+msgstr ""
+
+#: lib/stream.php:40
+msgid "Featured"
+msgstr ""
+
+#: lib/stream.php:44
+#, fuzzy
+msgid "Popular"
+msgstr "Personen zoeken"
+
+#: lib/subs.php:51
+#, fuzzy
+msgid "User has blocked you."
+msgstr "Gebruiker heeft geen profiel."
+
+#: lib/util.php:2059
+msgid "Send a nudge"
+msgstr ""
+
+#: lib/util.php:2063
+msgid "Nudge sent!"
+msgstr ""
+
+#: lib/util.php:2194
+msgid "Block"
+msgstr ""
+
+#: lib/util.php:2198
+msgid "Unblock"
+msgstr ""
+
+#~ msgid "Couldn't confirm email."
+#~ msgstr "Kon e-mail niet bevestigen."
+
+#~ msgid "Email address"
+#~ msgstr "E-mailadres"
+
+#~ msgid "Error inserting notice"
+#~ msgstr "Fout bij toevoegen bericht"
+
+#~ 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 ""
+#~ "Als je je wachtwoord vergeten of kwijt bent, kan een nieuw wachtwoord "
+#~ "worden opgestuurd naar het e-mailadres dat je in je account hebt "
+#~ "vastgelegd."
diff --git a/no_NB/LC_MESSAGES/laconica.po b/no_NB/LC_MESSAGES/laconica.po
index 8bdc44b68a..f2895044ea 100644
--- a/no_NB/LC_MESSAGES/laconica.po
+++ b/no_NB/LC_MESSAGES/laconica.po
@@ -7,63 +7,88 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"#-#-#-#-#  laconica.po  #-#-#-#-#\n"
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-29 20:02+1200\n"
-"PO-Revision-Date: 2008-08-01 17:38+0100\n"
-"Last-Translator: forteller <forteller@gmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Norwegian Bokmal\n"
-"X-Poedit-Country: NORWAY\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"POT-Creation-Date: 2009-01-12 12:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"#-#-#-#-#  laconica.po  #-#-#-#-#\n"
+"X-Poedit-Language: Norwegian Bokmal\n"
+"X-Poedit-Country: NORWAY\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:61
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr ""
 
-#: ../actions/tag.php:139
-msgid " by "
-msgstr "av"
-
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:255
-#: ../actions/register.php:191 actions/finishopenidlogin.php:88
-#: actions/register.php:205
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: actions/finishopenidlogin.php:88 actions/register.php:205
+#: actions/register.php:232
 msgid ""
-" except this private data: password, email address, IM address, phone "
-"number."
+" except this private data: password, email address, IM address, phone number."
+msgstr ""
+
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+#: lib/facebookaction.php:195 lib/noticelist.php:160
+msgid " from "
 msgstr ""
 
-#: ../actions/twitapistatuses.php:469 ../actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:412
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: actions/twitapistatuses.php:341
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
 msgstr ""
 
-#: ../actions/tag.php:127
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
+
+#: ../actions/invite.php:170
 #, php-format
-msgid "%1$s Notices recently tagged with %2$s"
+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 ""
 
-#: ../lib/mail.php:120 ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:115
+#: lib/mail.php:117
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr ""
 
-#: ../lib/mail.php:122 ../lib/mail.php:126
+#: ../lib/mail.php:126
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -74,104 +99,116 @@ msgid ""
 "%4$s.\n"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:473 ../actions/twitapistatuses.php:482
-#: actions/twitapistatuses.php:415
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#: actions/twitapistatuses.php:344
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
+#: actions/shownotice.php:73
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr ""
 
-#: ../actions/publicrss.php:60 ../actions/publicrss.php:62
-#: actions/publicrss.php:48
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../actions/publicrss.php:62 actions/publicrss.php:48
 #, php-format
 msgid "%s Public Stream"
 msgstr ""
 
 #: ../actions/all.php:47 ../actions/allrss.php:60
-#: ../actions/twitapistatuses.php:235 ../lib/stream.php:51
+#: ../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/twitapistatuses.php:123
 #, php-format
 msgid "%s and friends"
 msgstr "%s og venner"
 
 #: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:31
 #, php-format
 msgid "%s public timeline"
 msgstr ""
 
-#: ../lib/mail.php:202 ../lib/mail.php:206 lib/mail.php:212
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:217
 #, php-format
 msgid "%s status"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:335 ../actions/twitapistatuses.php:338
-#: actions/twitapistatuses.php:265
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:195
 #, php-format
 msgid "%s timeline"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:34
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 
-#: ../actions/register.php:277 ../actions/register.php:213
+#: ../actions/register.php:213
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 msgstr ""
 
-#: ../lib/util.php:244 ../lib/util.php:257 lib/util.php:273
+#: ../lib/util.php:257 lib/util.php:273 lib/util.php:284
 #, 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 ""
 
-#: ../lib/util.php:246 ../lib/util.php:259 lib/util.php:275
+#: ../lib/util.php:259 lib/util.php:275 lib/util.php:286
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr ""
 
-#: ../lib/util.php:261 ../lib/util.php:274 lib/util.php:290
+#: ../lib/util.php:274 lib/util.php:290 lib/util.php:301
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 #: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
+#: actions/profilesettings.php:78
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 
-#: ../actions/register.php:221 ../actions/register.php:152
-#: actions/register.php:166
+#: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:193
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 
-#: ../actions/password.php:42
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/profilesettings.php:186
 msgid "6 or more characters"
 msgstr "6 eller flere tegn"
 
-#: ../actions/recoverpassword.php:165 ../actions/recoverpassword.php:180
-#: actions/recoverpassword.php:186
+#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
 msgid "6 or more characters, and don't forget it!"
 msgstr ""
 
-#: ../actions/register.php:223 ../actions/register.php:154
-#: actions/register.php:168
+#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:195
 msgid "6 or more characters. Required."
 msgstr ""
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, 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
+#: actions/emailsettings.php:234
 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."
@@ -183,48 +220,107 @@ msgid ""
 "(and spam box!) for the code and instructions on how to use it."
 msgstr ""
 
-#: ../lib/util.php:310
+#: ../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:30
+#: actions/twitapidirect_messages.php:107 actions/twitapifavorites.php:83
+#: actions/twitapifavorites.php:99 actions/twitapifriendships.php:117
+#: actions/twitapihelp.php:42 actions/twitapistatuses.php:77
+#: actions/twitapistatuses.php:144 actions/twitapistatuses.php:224
+#: actions/twitapistatuses.php:234 actions/twitapistatuses.php:386
+#: actions/twitapistatuses.php:395 actions/twitapistatuses.php:421
+#: actions/twitapiusers.php:30
+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:39
+#: actions/twitapiaccount.php:89 actions/twitapiaccount.php:94
+#: actions/twitapidirect_messages.php:178 actions/twitapifavorites.php:139
+#: actions/twitapihelp.php:49 actions/twitapistatuses.php:549
+msgid "API method under construction."
+msgstr ""
+
+#: ../lib/util.php:324 lib/util.php:340 lib/util.php:352
 msgid "About"
 msgstr "Om"
 
-#: ../actions/userauthorization.php:119
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
 msgid "Accept"
 msgstr "Aksepter"
 
 #: ../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/twittersettings.php:84
 msgid "Add"
 msgstr "Legg til"
 
-#: ../actions/openidsettings.php:43
+#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
 msgid "Add OpenID"
 msgstr "Legg til OpenID"
 
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: actions/deleteprofile.php:248
+msgid "Add or remove OpenIDs"
+msgstr ""
+
 #: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
 msgid "Address"
 msgstr "Adresse"
 
-#: ../actions/showstream.php:273
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
+
+#: ../actions/showstream.php:273 actions/showstream.php:288
+#: actions/showstream.php:336
 msgid "All subscriptions"
 msgstr "Alle abonnementer"
 
-#: ../actions/publicrss.php:62
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
 #, php-format
 msgid "All updates for %s"
 msgstr "Alle oppdateringer for %s"
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:63
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr ""
 
 #: ../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
 msgid "Already logged in."
 msgstr "Allerede logget inn."
 
-#: ../actions/subscribe.php:49 ../lib/subs.php:42 lib/subs.php:42
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:47
 msgid "Already subscribed!."
 msgstr ""
 
@@ -232,27 +328,29 @@ msgstr ""
 msgid "Are you sure you want to delete this notice?"
 msgstr ""
 
-#: ../actions/userauthorization.php:77
+#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
 msgid "Authorize subscription"
 msgstr "Autoriser abonnementet"
 
-#: ../actions/login.php:104 ../actions/register.php:242
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192 actions/register.php:219
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
-"Logg inn automatisk i framtiden. Ikke for datamaskiner du deler med "
-"andre!"
+"Logg inn automatisk i framtiden. Ikke for datamaskiner du deler med andre!"
 
-#: ../actions/profilesettings.php:65
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:103
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "Abonner "
 
-#: ../actions/avatar.php:32
+#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: actions/profilesettings.php:34
 msgid "Avatar"
 msgstr "Avatar"
 
-#: ../actions/avatar.php:113
+#: ../actions/avatar.php:113 actions/profilesettings.php:350
+#: actions/profilesettings.php:379
 msgid "Avatar updated."
 msgstr "Avataren har blitt oppdatert."
 
@@ -269,20 +367,26 @@ msgid ""
 "a message with further instructions."
 msgstr ""
 
-#: ../actions/smssettings.php:58
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
 msgid "Awaiting confirmation on this phone number."
 msgstr "Venter på bekreftelse på dette telefonnummeret"
 
-#: ../lib/util.php:1290
-msgid "Before »"
+#: ../lib/util.php:1318 lib/util.php:1452 lib/facebookaction.php:259
+#: lib/util.php:1792
+#, fuzzy
+msgid "Before »"
 msgstr "Tidligere »"
 
-#: ../actions/profilesettings.php:49 ../actions/register.php:234
+#: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: actions/profilesettings.php:82 actions/register.php:184
+#: actions/profilesettings.php:84 actions/register.php:211
 msgid "Bio"
 msgstr "Bio"
 
-#: ../actions/profilesettings.php:101 ../actions/register.php:78
-#: ../actions/updateprofile.php:103
+#: ../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:222 actions/register.php:98
 msgid "Bio is too long (max 140 chars)."
 msgstr "Bioen er for lang (max 140 tegn)"
 
@@ -295,12 +399,15 @@ msgstr ""
 msgid "Can't read avatar URL '%s'"
 msgstr ""
 
-#: ../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/profilesettings.php:433
 msgid "Can't save new password."
 msgstr "Klarer ikke å lagre det nye passordet"
 
 #: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62
+#: ../actions/smssettings.php:62 actions/emailsettings.php:58
+#: actions/imsettings.php:59 actions/smssettings.php:62
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -313,32 +420,53 @@ msgid "Cannot normalize that Jabber ID"
 msgstr ""
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:204
 msgid "Cannot normalize that email address"
 msgstr ""
 
-#: ../actions/password.php:45
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/profilesettings.php:189
 msgid "Change"
 msgstr "Endre"
 
-#: ../actions/password.php:32
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: actions/deleteprofile.php:245
+msgid "Change email handling"
+msgstr ""
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
 msgid "Change password"
 msgstr "Endre passord"
 
-#: ../actions/password.php:43 ../actions/recoverpassword.php:166
-#: ../actions/register.php:224 ../actions/smssettings.php:65
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr ""
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#: actions/deleteprofile.php:242
+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/profilesettings.php:187 actions/register.php:196
 msgid "Confirm"
 msgstr "Bekreft"
 
-#: ../actions/confirmaddress.php:86
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
 msgid "Confirm Address"
 msgstr "Bekreft Adresse"
 
 #: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245
+#: ../actions/smssettings.php:245 actions/emailsettings.php:256
+#: actions/imsettings.php:230 actions/smssettings.php:253
+#: actions/emailsettings.php:259
 msgid "Confirmation cancelled."
 msgstr "Bekreftelse avbrutt."
 
-#: ../actions/smssettings.php:63
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
 msgid "Confirmation code"
 msgstr "Bekreftelseskode"
 
@@ -346,7 +474,7 @@ msgstr "Bekreftelseskode"
 msgid "Confirmation code not found."
 msgstr ""
 
-#: ../actions/register.php:266 ../actions/register.php:202
+#: ../actions/register.php:202
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -365,7 +493,7 @@ msgid ""
 "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
 msgid "Connect"
 msgstr "Koble til"
 
@@ -373,7 +501,7 @@ msgstr "Koble til"
 msgid "Connect existing account"
 msgstr ""
 
-#: ../lib/util.php:318
+#: ../lib/util.php:332 lib/util.php:348 lib/util.php:360
 msgid "Contact"
 msgstr "Kontakt"
 
@@ -382,8 +510,15 @@ msgstr "Kontakt"
 msgid "Could not create OpenID form: %s"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:48 ../actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:53
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:46 actions/twitapifriendships.php:62
+#, 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:39
 msgid "Could not follow user: User not found."
 msgstr ""
 
@@ -392,66 +527,79 @@ msgstr ""
 msgid "Could not redirect to server: %s"
 msgstr ""
 
-#: ../actions/updateprofile.php:162
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
 msgid "Could not save avatar info"
 msgstr "Klarte ikke å lagre avatar-informasjonen"
 
-#: ../actions/updateprofile.php:155
+#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
 msgid "Could not save new profile info"
 msgstr "Klarte ikke å lagre den nye profil-informasjonen"
 
-#: ../actions/subscribe.php:62 ../lib/subs.php:54 lib/subs.php:61
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:70
 msgid "Could not subscribe other to you."
 msgstr ""
 
-#: ../actions/subscribe.php:54 ../lib/subs.php:46 lib/subs.php:46
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:55
 msgid "Could not subscribe."
 msgstr ""
 
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101
+#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:112
 msgid "Couldn't convert request tokens to access tokens."
 msgstr ""
 
-#: ../actions/confirmaddress.php:80 ../actions/emailsettings.php:234
+#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
 #: ../actions/imsettings.php:218 ../actions/smssettings.php:241
-#: ../actions/confirmaddress.php:84 actions/confirmaddress.php:84
-#: actions/emailsettings.php:252 actions/imsettings.php:226
-#: actions/smssettings.php:249
+#: actions/confirmaddress.php:84 actions/emailsettings.php:252
+#: actions/imsettings.php:226 actions/smssettings.php:249
+#: actions/emailsettings.php:255
 msgid "Couldn't delete email confirmation."
 msgstr ""
 
-#: ../actions/unsubscribe.php:57 ../lib/subs.php:103 lib/subs.php:116
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:129
 msgid "Couldn't delete subscription."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:125 ../actions/remotesubscribe.php:127
-#: actions/remotesubscribe.php:136
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+#: actions/twitapistatuses.php:82
+msgid "Couldn't find any statuses."
+msgstr ""
+
+#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
+#: actions/remotesubscribe.php:148
 msgid "Couldn't get a request token."
 msgstr ""
 
 #: ../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:228
 msgid "Couldn't insert confirmation code."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182
+#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:216
 msgid "Couldn't insert new subscription."
 msgstr ""
 
-#: ../actions/profilesettings.php:181 ../actions/twitapiaccount.php:92
+#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
+#: actions/profilesettings.php:319 actions/twitapiaccount.php:74
 msgid "Couldn't save profile."
 msgstr "Klarte ikke å lagre profil."
 
-#: ../actions/profilesettings.php:158 ../actions/profilesettings.php:161
-#: actions/profilesettings.php:276
+#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
+#: actions/profilesettings.php:296
 msgid "Couldn't update user for autosubscribe."
 msgstr ""
 
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
 #: actions/emailsettings.php:298 actions/emailsettings.php:312
+#: actions/emailsettings.php:301 actions/emailsettings.php:315
 msgid "Couldn't update user record."
 msgstr ""
 
@@ -459,6 +607,12 @@ msgstr ""
 #: ../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/emailsettings.php:179 actions/emailsettings.php:280
+#: actions/othersettings.php:173 actions/profilesettings.php:276
 msgid "Couldn't update user."
 msgstr "Klarte ikke å oppdatere bruker."
 
@@ -466,40 +620,42 @@ msgstr "Klarte ikke å oppdatere bruker."
 msgid "Create"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:70
+#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
 msgid "Create a new user with this nickname."
 msgstr "Lag en ny bruker med dette nicket."
 
-#: ../actions/finishopenidlogin.php:68
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
 msgid "Create new account"
 msgstr "Opprett en ny konto"
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+#: actions/finishopenidlogin.php:208
 msgid "Creating new account for OpenID that already has a user."
 msgstr ""
 
-#: ../actions/imsettings.php:45
+#: ../actions/imsettings.php:45 actions/imsettings.php:46
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Nåværende bekreftede Jabber/GTak-adresse."
 
-#: ../actions/smssettings.php:46
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Nåværende bekreftede telefonnummer med mulighet for å motta SMS."
 
-#: ../actions/emailsettings.php:44
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
 msgid "Current confirmed email address."
 msgstr "Nåværende bekreftede e-postadresse"
 
 #: ../actions/showstream.php:356 actions/showstream.php:367
+#: actions/showstream.php:418
 msgid "Currently"
 msgstr ""
 
-#: ../classes/Notice.php:72 classes/Notice.php:86
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:87
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr ""
 
-#: ../lib/util.php:1033 ../lib/util.php:1061 lib/util.php:1110
+#: ../lib/util.php:1061 lib/util.php:1110 lib/util.php:1417
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr ""
@@ -508,24 +664,29 @@ msgstr ""
 msgid "Delete notice"
 msgstr ""
 
-#: ../actions/profilesettings.php:51 ../actions/register.php:236
+#: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: actions/profilesettings.php:84 actions/register.php:186
+#: actions/profilesettings.php:86 actions/register.php:213
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Beskriv degselv og dine interesser med 140 tegn"
 
-#: ../actions/register.php:226
+#: ../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/deleteprofile.php:244 actions/register.php:199
+#: actions/register.php:202
 msgid "Email"
 msgstr "E-post"
 
-#: ../actions/emailsettings.php:59
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
 msgid "Email Address"
 msgstr "E-postadresse"
 
-#: ../actions/emailsettings.php:32
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
 msgid "Email Settings"
 msgstr "Innstillinger for e-post"
 
-#: ../actions/register.php:69 ../actions/register.php:73
-#: actions/register.php:80
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:89
 msgid "Email address already exists."
 msgstr ""
 
@@ -537,8 +698,11 @@ msgstr ""
 msgid "Email address, like \"UserName@example.org\""
 msgstr ""
 
-#: ../actions/recoverpassword.php:176 ../actions/recoverpassword.php:191
-#: actions/recoverpassword.php:197
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr ""
+
+#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
 msgid "Enter a nickname or email address."
 msgstr ""
 
@@ -550,8 +714,8 @@ msgstr ""
 msgid "Error authorizing token"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:282 ../actions/finishopenidlogin.php:253
-#: actions/finishopenidlogin.php:259
+#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
+#: actions/finishopenidlogin.php:274
 msgid "Error connecting user to OpenID."
 msgstr ""
 
@@ -560,26 +724,21 @@ msgid "Error connecting user."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:164
 msgid "Error inserting avatar"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145
+#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:156
 msgid "Error inserting new profile"
 msgstr ""
 
-#: ../actions/postnotice.php:89
-msgid "Error inserting notice"
-msgstr ""
-
 #: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:180
 msgid "Error inserting remote profile"
 msgstr ""
 
-#: ../actions/recoverpassword.php:201 ../actions/recoverpassword.php:240
-#: actions/recoverpassword.php:246
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
 msgid "Error saving address confirmation."
 msgstr ""
 
@@ -587,8 +746,7 @@ msgstr ""
 msgid "Error saving remote profile"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
-#: lib/openid.php:226
+#: ../lib/openid.php:226 lib/openid.php:226
 msgid "Error saving the profile."
 msgstr ""
 
@@ -597,14 +755,15 @@ msgid "Error saving the user."
 msgstr ""
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/profilesettings.php:428
 msgid "Error saving user; invalid."
 msgstr ""
 
 #: ../actions/login.php:47 ../actions/login.php:73
-#: ../actions/recoverpassword.php:268 ../actions/register.php:92
 #: ../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/register.php:108 actions/login.php:54 actions/login.php:80
+#: actions/register.php:117
 msgid "Error setting user."
 msgstr ""
 
@@ -613,38 +772,40 @@ msgid "Error updating profile"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163
+#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:174
 msgid "Error updating remote profile"
 msgstr ""
 
-#: ../actions/recoverpassword.php:79 ../actions/recoverpassword.php:80
-#: actions/recoverpassword.php:80
+#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
 msgid "Error with confirmation code."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:89
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
 msgid "Existing nickname"
 msgstr "Eksisterende nick"
 
-#: ../lib/util.php:312
+#: ../lib/util.php:326 lib/util.php:342 lib/util.php:354
 msgid "FAQ"
 msgstr "OSS/FAQ"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/profilesettings.php:381
 msgid "Failed updating avatar."
 msgstr ""
 
-#: ../actions/all.php:61 ../actions/allrss.php:64
+#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
+#: actions/allrss.php:64
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Feed for %s sine venner"
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
+#: actions/replies.php:65 actions/repliesrss.php:66
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Feed for svar til %s"
 
-#: ../actions/tag.php:55
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:54
 #, php-format
 msgid "Feed for tag %s"
 msgstr "Feed for taggen %s"
@@ -663,42 +824,54 @@ msgid ""
 "changing your settings."
 msgstr ""
 
-#: ../actions/profilesettings.php:44 ../actions/register.php:228
+#: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: actions/profilesettings.php:77 actions/register.php:178
+#: actions/profilesettings.php:79 actions/register.php:205
 msgid "Full name"
 msgstr "Fullt navn"
 
-#: ../actions/profilesettings.php:98 ../actions/register.php:75
-#: ../actions/updateprofile.php:93
+#: ../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/profilesettings.php:219 actions/register.php:95
 msgid "Full name is too long (max 255 chars)."
 msgstr "Beklager, navnet er for langt (max 250 tegn)."
 
-#: ../lib/util.php:291
+#: ../lib/util.php:322 lib/util.php:338 lib/util.php:343 lib/util.php:350
 msgid "Help"
 msgstr "Hjelp"
 
-#: ../lib/util.php:285
+#: ../lib/util.php:298 lib/util.php:314 lib/util.php:325
 msgid "Home"
 msgstr "Hjem"
 
-#: ../actions/profilesettings.php:46 ../actions/register.php:231
+#: ../actions/profilesettings.php:46 ../actions/register.php:167
+#: actions/profilesettings.php:79 actions/register.php:181
+#: actions/profilesettings.php:81 actions/register.php:208
 msgid "Homepage"
 msgstr "Hjemmesiden"
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:72
-#: ../actions/register.php:76 actions/profilesettings.php:210
-#: actions/register.php:83
+#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: actions/profilesettings.php:210 actions/register.php:83
+#: actions/profilesettings.php:216 actions/register.php:92
 msgid "Homepage is not a valid URL."
 msgstr ""
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+#: actions/emailsettings.php:101
 msgid "I want to post notices by email."
 msgstr ""
 
-#: ../actions/imsettings.php:60
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+#: actions/deleteprofile.php:253
+msgid "IM"
+msgstr ""
+
+#: ../actions/imsettings.php:60 actions/imsettings.php:61
 msgid "IM Address"
 msgstr "IM-adresse"
 
-#: ../actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
 msgid "IM Settings"
 msgstr "Innstillinger for IM"
 
@@ -714,29 +887,32 @@ msgid ""
 "click \"Add\"."
 msgstr ""
 
-#: ../actions/recoverpassword.php:122
+#: ../actions/recoverpassword.php:137
 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 ""
 
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
+#: actions/emailsettings.php:68 actions/smssettings.php:76
 msgid "Incoming email"
 msgstr "innkommende e-post"
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+#: actions/emailsettings.php:304
 msgid "Incoming email address removed."
 msgstr ""
 
-#: ../actions/password.php:69
+#: ../actions/password.php:69 actions/profilesettings.php:388
+#: actions/profilesettings.php:417
 msgid "Incorrect old password"
 msgstr "Feil gammelt passord"
 
-#: ../actions/login.php:67
+#: ../actions/login.php:67 actions/login.php:67 actions/login.php:74
 msgid "Incorrect username or password."
 msgstr "Feil brukernavn eller passord"
 
-#: ../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."
@@ -744,12 +920,17 @@ msgstr ""
 "Instruksjoner om hvordan du kan gjenopprette ditt passord har blitt sendt "
 "til din registrerte e-postadresse."
 
-#: ../actions/updateprofile.php:114
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "Ugyldig avatar-URL '%s'"
 
-#: ../actions/updateprofile.php:98
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "Ugyldig hjemmeside '%s'"
@@ -760,18 +941,21 @@ msgid "Invalid license URL '%s'"
 msgstr ""
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:63
 msgid "Invalid notice content"
 msgstr ""
 
 #: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:69
 msgid "Invalid notice uri"
 msgstr ""
 
 #: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:74
 msgid "Invalid notice url"
 msgstr ""
 
-#: ../actions/updateprofile.php:87
+#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "Ugyldig profil-URL '%s'"
@@ -781,25 +965,44 @@ msgid "Invalid profile URL (bad format)"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:78
 msgid "Invalid profile URL returned by server."
 msgstr ""
 
-#: ../actions/avatarbynickname.php:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
 msgid "Invalid size."
 msgstr "Ugyldig størrelse"
 
-#: ../actions/finishopenidlogin.php:264 ../actions/register.php:87
-#: ../actions/register.php:103
+#: ../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:256 actions/register.php:112
+#: actions/register.php:130
 msgid "Invalid username or password."
 msgstr "Ugyldig brukernavn eller passord"
 
-#: ../lib/util.php:248 ../lib/util.php:261 lib/util.php:277
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr ""
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
+
+#: ../lib/util.php:306 lib/util.php:322 lib/util.php:332
+msgid "Invite"
+msgstr ""
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr ""
+
+#: ../lib/util.php:261 lib/util.php:277 lib/util.php:288
 #, 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 ""
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
@@ -813,37 +1016,39 @@ msgid ""
 "add %s to your buddy list in your IM client or on GTalk."
 msgstr ""
 
-#: ../actions/profilesettings.php:57
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
 msgid "Language"
 msgstr "Språk"
 
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+#: actions/profilesettings.php:234
 msgid "Language is too long (max 50 chars)."
 msgstr ""
 
-#: ../actions/tag.php:133
-msgid "Last message posted: "
-msgstr ""
-
-#: ../actions/profilesettings.php:52 ../actions/register.php:237
-#: ../actions/register.php:173 actions/profilesettings.php:85
-#: actions/register.php:187
+#: ../actions/profilesettings.php:52 ../actions/register.php:173
+#: actions/profilesettings.php:85 actions/register.php:187
+#: actions/profilesettings.php:87 actions/register.php:214
 msgid "Location"
 msgstr ""
 
-#: ../actions/profilesettings.php:104 ../actions/register.php:81
-#: ../actions/updateprofile.php:108 ../actions/register.php:85
-#: actions/profilesettings.php:219 actions/register.php:92
-#: actions/updateprofile.php:109
+#: ../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/profilesettings.php:225 actions/register.php:101
 msgid "Location is too long (max 255 chars)."
 msgstr ""
 
 #: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:298
+#: ../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/login.php:104 actions/login.php:113 actions/openidlogin.php:88
+#: lib/util.php:336
 msgid "Login"
 msgstr "Logg inn"
 
-#: ../actions/openidlogin.php:44
+#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:60
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Logg inn med en [OpenID](%%doc.openid%%)-konto."
@@ -851,20 +1056,21 @@ msgstr "Logg inn med en [OpenID](%%doc.openid%%)-konto."
 #: ../actions/login.php:126
 #, 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 ""
 
-#: ../lib/util.php:296
+#: ../lib/util.php:308 lib/util.php:324 lib/util.php:334
 msgid "Logout"
 msgstr "Logg ut"
 
-#: ../actions/register.php:230
+#: ../actions/register.php:166 actions/register.php:180
+#: actions/register.php:207
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Lengre navn, helst ditt \"ekte\" navn"
 
-#: ../actions/login.php:110
+#: ../actions/login.php:110 actions/login.php:110 actions/login.php:118
 msgid "Lost or forgotten password?"
 msgstr "Mistet eller glemt passordet?"
 
@@ -878,11 +1084,12 @@ msgstr ""
 msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
-#: ../actions/showstream.php:300
+#: ../actions/showstream.php:300 actions/showstream.php:315
+#: actions/showstream.php:363
 msgid "Member since"
 msgstr "Medlem siden"
 
-#: ../actions/userrss.php:70
+#: ../actions/userrss.php:70 actions/userrss.php:67
 #, php-format
 msgid "Microblog by %s"
 msgstr "Mikroblogg av %s"
@@ -894,61 +1101,73 @@ msgid ""
 "email but isn't listed here, send email to let us know at %s."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:252
-#: ../actions/register.php:188 actions/finishopenidlogin.php:85
-#: actions/register.php:202
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php:85 actions/register.php:202
+#: actions/register.php:229
 msgid "My text and files are available under "
 msgstr ""
 
 #: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
 msgid "New"
 msgstr "Ny"
 
-#: ../lib/mail.php:140 ../lib/mail.php:144 lib/mail.php:144
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:138
 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+#: actions/emailsettings.php:318
 msgid "New incoming email address added."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:71
+#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
 msgid "New nickname"
 msgstr "Nytt nick"
 
-#: ../actions/newnotice.php:102 ../actions/newnotice.php:87
-#: actions/newnotice.php:96
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:141
 msgid "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/profilesettings.php:185
 msgid "New password"
 msgstr "Nytt passord"
 
-#: ../actions/recoverpassword.php:275 ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:314
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
 
 #: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:220
+#: ../actions/register.php:151 actions/login.php:101
+#: actions/profilesettings.php:74 actions/register.php:165
+#: actions/login.php:108 actions/profilesettings.php:76
+#: actions/register.php:192
 msgid "Nickname"
 msgstr "Nick"
 
 #: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:65
+#: ../actions/register.php:69 actions/finishopenidlogin.php:181
+#: actions/profilesettings.php:225 actions/register.php:76
+#: actions/finishopenidlogin.php:192 actions/profilesettings.php:231
+#: actions/register.php:85
 msgid "Nickname already in use. Try another one."
 msgstr "Det nicket er allerede i bruk. Prøv et annet."
 
 #: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
-#: ../actions/register.php:63 ../actions/updateprofile.php:77
-#: ../actions/register.php:67 actions/finishopenidlogin.php:171
-#: actions/profilesettings.php:203 actions/register.php:74
-#: actions/updateprofile.php:78
+#: ../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:182 actions/profilesettings.php:209
+#: actions/register.php:83
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:170
+#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:187
 msgid "Nickname not allowed."
 msgstr "Dette nicket er ikke tillatt"
 
@@ -956,15 +1175,16 @@ msgstr "Dette nicket er ikke tillatt"
 msgid "Nickname of the user you want to follow"
 msgstr ""
 
-#: ../actions/recoverpassword.php:147
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
 msgid "Nickname or email"
 msgstr "Nick eller e-postadresse"
 
 #: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:104
 msgid "No"
 msgstr ""
 
-#: ../actions/imsettings.php:156
+#: ../actions/imsettings.php:156 actions/imsettings.php:164
 msgid "No Jabber ID."
 msgstr "Ingen Jabber ID."
 
@@ -984,25 +1204,28 @@ msgstr ""
 msgid "No confirmation code."
 msgstr ""
 
-#: ../actions/newnotice.php:50 ../actions/newnotice.php:44
-#: actions/newmessage.php:53 actions/newnotice.php:44 classes/Command.php:197
+#: ../actions/newnotice.php:44 actions/newmessage.php:53
+#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:52
+#: actions/newnotice.php:53
 msgid "No content!"
 msgstr ""
 
-#: ../actions/emailsettings.php:174
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+#: actions/emailsettings.php:197
 msgid "No email address."
 msgstr "Ingen e-postadresse."
 
-#: ../actions/userbyid.php:32
+#: ../actions/userbyid.php:32 actions/userbyid.php:32
 msgid "No id."
 msgstr "Ingen id."
 
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+#: actions/emailsettings.php:292
 msgid "No incoming email address."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67
+#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:66
 msgid "No nickname provided by remote server."
 msgstr ""
 
@@ -1013,6 +1236,7 @@ msgstr ""
 #: ../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:243
 msgid "No pending confirmation to cancel."
 msgstr ""
 
@@ -1021,12 +1245,11 @@ msgid "No phone number."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74
+#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:73
 msgid "No profile URL returned by server."
 msgstr ""
 
-#: ../actions/recoverpassword.php:189 ../actions/recoverpassword.php:226
-#: actions/recoverpassword.php:232
+#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
 msgid "No registered email address for that user."
 msgstr ""
 
@@ -1036,6 +1259,7 @@ msgstr ""
 
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
 #: actions/noticesearch.php:69 actions/peoplesearch.php:69
+#: actions/noticesearch.php:68 actions/peoplesearch.php:59
 msgid "No results"
 msgstr ""
 
@@ -1043,6 +1267,17 @@ msgstr ""
 msgid "No size."
 msgstr ""
 
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:109
+#: actions/twitapistatuses.php:438
+msgid "No status found with that ID."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:411
+msgid "No status with that ID found."
+msgstr ""
+
 #: ../actions/openidsettings.php:135 actions/openidsettings.php:144
 msgid "No such OpenID."
 msgstr ""
@@ -1053,7 +1288,8 @@ msgstr ""
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
 #: ../lib/deleteaction.php:30 actions/shownotice.php:32
-#: actions/shownotice.php:83 lib/deleteaction.php:30
+#: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:38
+#: actions/shownotice.php:114
 msgid "No such notice."
 msgstr ""
 
@@ -1067,13 +1303,12 @@ msgstr ""
 
 #: ../actions/all.php:34 ../actions/allrss.php:35
 #: ../actions/avatarbynickname.php:43 ../actions/foaf.php:40
-#: ../actions/recoverpassword.php:185 ../actions/remotesubscribe.php:84
-#: ../actions/remotesubscribe.php:91 ../actions/replies.php:57
-#: ../actions/repliesrss.php:35 ../actions/showstream.php:110
-#: ../actions/subscribe.php:44 ../actions/unsubscribe.php:39
-#: ../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/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
@@ -1081,10 +1316,16 @@ msgstr ""
 #: 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
+#: lib/subs.php:33 lib/subs.php:95 actions/showstream.php:157
+#: classes/Command.php:208 classes/Command.php:242 lib/gallery.php:85
+#: lib/subs.php:105
 msgid "No such user."
 msgstr ""
 
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr ""
+
 #: ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
 msgstr ""
@@ -1093,33 +1334,45 @@ msgstr ""
 msgid "Not a recovery code."
 msgstr ""
 
-#: ../actions/imsettings.php:167
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+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:423 lib/twitterapi.php:450
+#: lib/twitterapi.php:534
+msgid "Not a supported data format."
+msgstr ""
+
+#: ../actions/imsettings.php:167 actions/imsettings.php:175
 msgid "Not a valid Jabber ID"
 msgstr "Ugyldig Jabber ID"
 
-#: ../lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131
 msgid "Not a valid OpenID."
 msgstr "Ugyldig OpenID"
 
-#: ../actions/emailsettings.php:185
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+#: actions/emailsettings.php:208
 msgid "Not a valid email address"
 msgstr "Ugyldig e-postadresse"
 
-#: ../actions/register.php:59
+#: ../actions/register.php:63 actions/register.php:70 actions/register.php:79
 msgid "Not a valid email address."
 msgstr "Ugyldig e-postadresse."
 
-#: ../actions/profilesettings.php:91 ../actions/register.php:67
+#: ../actions/profilesettings.php:91 ../actions/register.php:71
+#: actions/profilesettings.php:206 actions/register.php:78
+#: actions/profilesettings.php:212 actions/register.php:87
 msgid "Not a valid nickname."
 msgstr "Ugyldig nick."
 
-#: ../actions/remotesubscribe.php:118 ../actions/remotesubscribe.php:120
-#: actions/remotesubscribe.php:129
+#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
 msgid "Not a valid profile URL (incorrect services)."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:111 ../actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:122
+#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr ""
 
@@ -1128,10 +1381,12 @@ msgid "Not a valid profile URL (no YADIS document)."
 msgstr ""
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: actions/profilesettings.php:361
 msgid "Not an image or corrupt file."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:52
 msgid "Not authorized."
 msgstr "Ikke autorisert."
 
@@ -1140,14 +1395,24 @@ msgstr "Ikke autorisert."
 msgid "Not expecting this response!"
 msgstr ""
 
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+#: actions/twitapistatuses.php:304
+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
+#: ../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:31 actions/newnotice.php:30
+#: actions/nudge.php:30 actions/subedit.php:31 actions/unblock.php:31
 msgid "Not logged in."
 msgstr "Ikke logget inn."
 
-#: ../actions/unsubscribe.php:44 ../lib/subs.php:91 lib/subs.php:104
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:117
 msgid "Not subscribed!."
 msgstr ""
 
@@ -1156,29 +1421,35 @@ msgid "Notice Search"
 msgstr ""
 
 #: ../actions/showstream.php:82 actions/showstream.php:82
+#: actions/showstream.php:111 actions/showstream.php:118
+#: actions/showstream.php:123
 #, php-format
 msgid "Notice feed for %s"
 msgstr ""
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
+#: actions/shownotice.php:45
 msgid "Notice has no profile"
 msgstr ""
 
 #: ../actions/showstream.php:316 actions/showstream.php:331
+#: actions/showstream.php:379
 msgid "Notices"
 msgstr ""
 
-#: ../actions/tag.php:35 ../actions/tag.php:81 ../actions/tag.php:124
-#: actions/tag.php:35 actions/tag.php:81
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
 #, php-format
 msgid "Notices tagged with %s"
 msgstr ""
 
-#: ../actions/password.php:39
+#: ../actions/password.php:39 actions/profilesettings.php:178
+#: actions/profilesettings.php:183
 msgid "Old password"
 msgstr "Gammelt passord"
 
-#: ../lib/util.php:302
+#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
+#: lib/util.php:330 actions/deleteprofile.php:247 lib/util.php:340
 msgid "OpenID"
 msgstr "OpenID"
 
@@ -1193,13 +1464,17 @@ msgstr ""
 #: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
 #: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
+#: actions/finishopenidlogin.php:150 actions/openidlogin.php:76
 msgid "OpenID Login"
 msgstr ""
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
+#: actions/openidlogin.php:74 actions/openidsettings.php:50
+#: actions/openidlogin.php:82
 msgid "OpenID URL"
 msgstr "OpenID-URL"
-#-#-#-#-
+
+# -#-#-#-
 #  laconica.po#-#-#-#-
 #  eller autentifikasjon?
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
@@ -1222,45 +1497,52 @@ msgstr ""
 msgid "OpenID failure: %s"
 msgstr ""
 
-#: ../actions/openidsettings.php:144
+#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
 msgid "OpenID removed."
 msgstr "OpenID fjernet"
 
-#: ../actions/openidsettings.php:37
+#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
 msgid "OpenID settings"
 msgstr "Innstillinger for OpenID"
 
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: actions/profilesettings.php:350
 msgid "Partial upload."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:90 ../actions/login.php:102
-#: ../actions/register.php:222
+#: ../actions/register.php:153 ../lib/settingsaction.php:93
+#: actions/finishopenidlogin.php:96 actions/login.php:102
+#: actions/register.php:167 actions/login.php:109 actions/register.php:194
 msgid "Password"
 msgstr "Passord"
 
-#: ../actions/recoverpassword.php:249 ../actions/recoverpassword.php:288
-#: actions/recoverpassword.php:301
+#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
 msgid "Password and confirmation do not match."
 msgstr ""
 
-#: ../actions/recoverpassword.php:245
+#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
 msgid "Password must be 6 chars or more."
 msgstr "Passordet må bestå av 6 eller flere tegn."
 
-#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
 #: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
 #: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 msgid "Password recovery requested"
 msgstr ""
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:274
+#: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: actions/profilesettings.php:408 actions/recoverpassword.php:326
+#: actions/profilesettings.php:437
 msgid "Password saved."
 msgstr "Passordet ble lagret"
 
-#: ../actions/password.php:61 ../actions/register.php:84
-#: ../actions/register.php:88 actions/profilesettings.php:380
-#: actions/register.php:98
+#: ../actions/password.php:61 ../actions/register.php:88
+#: actions/profilesettings.php:380 actions/register.php:98
+#: actions/profilesettings.php:409 actions/register.php:107
 msgid "Passwords don't match."
 msgstr ""
 
@@ -1276,10 +1558,14 @@ msgstr ""
 msgid "People search"
 msgstr ""
 
-#: ../lib/stream.php:50
+#: ../lib/stream.php:50 lib/personal.php:50
 msgid "Personal"
 msgstr "Personlig"
 
+#: ../actions/invite.php:133 actions/invite.php:141
+msgid "Personal message"
+msgstr ""
+
 #: ../actions/smssettings.php:69 actions/smssettings.php:69
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
@@ -1305,24 +1591,26 @@ msgstr ""
 #: ../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:185 actions/othersettings.php:179
 msgid "Preferences saved."
 msgstr ""
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
 msgid "Preferred language"
 msgstr ""
 
-#: ../lib/util.php:314 ../lib/util.php:328 lib/util.php:344
+#: ../lib/util.php:328 lib/util.php:344 lib/util.php:356
 msgid "Privacy"
 msgstr ""
 
-#: ../actions/newnotice.php:62 ../actions/newnotice.php:70
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119
+#: classes/Notice.php:119 classes/Notice.php:139 classes/Notice.php:149
 msgid "Problem saving notice."
 msgstr ""
 
-#: ../lib/stream.php:60
+#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
+#: lib/settingsaction.php:84 actions/deleteprofile.php:241
 msgid "Profile"
 msgstr "Profil"
 
@@ -1339,37 +1627,33 @@ msgstr ""
 msgid "Profile unknown"
 msgstr ""
 
-#: ../lib/util.php:287
-#, fuzzy
-msgid "Public"
-msgstr "Offentlig"
-
-#: ../actions/public.php:54 actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:77
 msgid "Public Stream Feed"
 msgstr ""
 
-#: ../actions/public.php:33 actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 lib/stream.php:34
 msgid "Public timeline"
 msgstr ""
 
-#: ../actions/imsettings.php:79
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publiser en MicroID for min Jabber/Gtalk-adresse."
 
-#: ../actions/emailsettings.php:94
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:104
 msgid "Publish a MicroID for my email address."
 msgstr "Publiser en MicroID for min e-postadresse."
 
-#: ../actions/tag.php:75 ../actions/tag.php:76
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
 msgid "Recent Tags"
 msgstr "Nyeste Tagger"
 
-#: ../actions/recoverpassword.php:151
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
 msgid "Recover"
 msgstr "Gjenopprett"
 
-#: ../actions/recoverpassword.php:141 ../actions/recoverpassword.php:156
-#: actions/recoverpassword.php:161
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
 msgid "Recover password"
 msgstr ""
 
@@ -1377,18 +1661,19 @@ msgstr ""
 msgid "Recovery code for unknown user."
 msgstr ""
 
-#: ../actions/register.php:216 ../actions/register.php:257 ../lib/util.php:300
 #: ../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:181 actions/register.php:234 lib/util.php:338
 msgid "Register"
 msgstr ""
 
 #: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:173
 msgid "Registration not allowed."
 msgstr ""
 
-#: ../actions/register.php:264 ../actions/register.php:200
-#: actions/register.php:214
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:241
 msgid "Registration successful"
 msgstr ""
 
@@ -1396,7 +1681,9 @@ msgstr ""
 msgid "Reject"
 msgstr ""
 
-#: ../actions/login.php:103 ../actions/register.php:240
+#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
+#: actions/register.php:190 actions/login.php:110 actions/openidlogin.php:85
+#: actions/register.php:217
 msgid "Remember me"
 msgstr "Husk meg"
 
@@ -1411,10 +1698,14 @@ msgstr ""
 #: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
 #: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php:48 actions/emailsettings.php:76
+#: actions/imsettings.php:49 actions/openidsettings.php:108
+#: actions/smssettings.php:50 actions/smssettings.php:84
+#: actions/twittersettings.php:59 actions/twittersettings.php:61
 msgid "Remove"
 msgstr "Fjern"
 
-#: ../actions/openidsettings.php:68
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
 msgid "Remove OpenID"
 msgstr "Fjern OpenID"
 
@@ -1424,60 +1715,73 @@ msgid ""
 "remove it, add another OpenID first."
 msgstr ""
 
-#: ../lib/stream.php:55
+#: ../lib/stream.php:55 lib/personal.php:55
 msgid "Replies"
 msgstr "Svar"
 
 #: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
+#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #, php-format
 msgid "Replies to %s"
 msgstr "Svar til %s"
 
-#: ../actions/recoverpassword.php:168
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
 msgid "Reset"
 msgstr "Nullstill"
 
-#: ../actions/recoverpassword.php:158 ../actions/recoverpassword.php:173
-#: actions/recoverpassword.php:178
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
 msgid "Reset password"
 msgstr ""
 
-#: ../actions/smssettings.php:67
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/deleteprofile.php:250 actions/subscriptions.php:73
+msgid "SMS"
+msgstr ""
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
 msgid "SMS Phone number"
 msgstr "Telefonnummer for SMS"
 
-#: ../actions/smssettings.php:33
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
 msgid "SMS Settings"
 msgstr "Innstillinger for SMS"
 
-#: ../lib/mail.php:215 ../lib/mail.php:219 lib/mail.php:225
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:230
 msgid "SMS confirmation"
 msgstr ""
 
-#: ../actions/recoverpassword.php:167 ../actions/recoverpassword.php:182
-#: actions/recoverpassword.php:188
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
 msgid "Same as password above"
 msgstr ""
 
-#: ../actions/register.php:225 ../actions/register.php:156
-#: actions/register.php:170
+#: ../actions/register.php:156 actions/register.php:170
+#: actions/register.php:197
 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/twittersettings.php:83 actions/emailsettings.php:107
+#: actions/othersettings.php:56 actions/profilesettings.php:106
+#: actions/subscriptions.php:74 actions/tagother.php:100
+#: actions/twittersettings.php:82
 msgid "Save"
 msgstr "Lagre"
 
-#: ../lib/searchaction.php:84 ../lib/util.php:288
+#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
+#: lib/util.php:316 lib/util.php:327
 msgid "Search"
 msgstr "Søk"
 
 #: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:84
 msgid "Search Stream Feed"
 msgstr ""
 
 #: ../actions/noticesearch.php:30 actions/noticesearch.php:30
+#: actions/noticesearch.php:29
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -1495,7 +1799,8 @@ msgstr ""
 msgid "Select a carrier"
 msgstr ""
 
-#: ../lib/util.php:1144
+#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
+#: lib/util.php:1306 lib/util.php:1731 lib/util.php:1646 lib/util.php:2158
 msgid "Send"
 msgstr "Send"
 
@@ -1522,16 +1827,16 @@ msgstr ""
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
-#: ../lib/util.php:294 ../lib/util.php:304 lib/util.php:320
+#: ../lib/util.php:304 lib/util.php:320 lib/util.php:330
 msgid "Settings"
 msgstr ""
 
-#: ../actions/profilesettings.php:189 ../actions/profilesettings.php:192
-#: actions/profilesettings.php:307
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:336
 msgid "Settings saved."
 msgstr ""
 
-#: ../actions/tag.php:60 actions/tag.php:60
+#: ../actions/tag.php:60 actions/tag.php:60 actions/tag.php:59
 msgid "Showing most popular tags from the last week"
 msgstr ""
 
@@ -1544,28 +1849,39 @@ msgstr ""
 msgid "Something weird happened."
 msgstr ""
 
-#: ../lib/util.php:316
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr ""
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: ../lib/util.php:330 lib/util.php:346 lib/util.php:358
 msgid "Source"
 msgstr "Kilde"
 
-#: ../actions/showstream.php:296
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:359
 msgid "Statistics"
 msgstr "Statistikk"
 
-#: ../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:199 actions/finishopenidlogin.php:267
 msgid "Stored OpenID not found."
 msgstr ""
 
 #: ../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:254 lib/util.php:2078
 msgid "Subscribe"
 msgstr ""
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
 #: actions/showstream.php:328 actions/subscribers.php:27
+#: actions/showstream.php:376 lib/gallery.php:136 lib/gallery.php:137
 msgid "Subscribers"
 msgstr ""
 
@@ -1580,22 +1896,29 @@ msgstr ""
 #: ../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:288 actions/showstream.php:370 lib/gallery.php:131
+#: lib/gallery.php:132
 msgid "Subscriptions"
 msgstr ""
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
+#: actions/profilesettings.php:353
 msgid "System error uploading file."
 msgstr ""
 
-#: ../actions/tag.php:41 ../lib/util.php:289
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317 actions/profilesettings.php:90 actions/showstream.php:382
+#: actions/tag.php:40 actions/tagother.php:96 actions/tagother.php:162
+#: lib/profilelist.php:126 lib/profilelist.php:128
 msgid "Tags"
 msgstr "Tagger"
 
-#: ../lib/searchaction.php:104
+#: ../lib/searchaction.php:104 lib/searchaction.php:104
 msgid "Text"
 msgstr "Tekst"
 
-#: ../actions/noticesearch.php:34
+#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
+#: actions/noticesearch.php:33
 msgid "Text search"
 msgstr "Tekst-søk"
 
@@ -1612,38 +1935,44 @@ msgid "That confirmation code is not for you!"
 msgstr ""
 
 #: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:214
 msgid "That email address already belongs to another user."
 msgstr ""
 
-#: ../actions/avatar.php:80
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: actions/profilesettings.php:346
 msgid "That file is too big."
 msgstr "Den filen er for stor."
 
-#: ../actions/imsettings.php:170
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
 msgid "That is already your Jabber ID."
 msgstr "Det er allerede din Jabber ID."
 
-#: ../actions/emailsettings.php:188
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:211
 msgid "That is already your email address."
 msgstr "Det er allerede din e-postadresse."
 
-#: ../actions/smssettings.php:188
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
 msgid "That is already your phone number."
 msgstr "Det er allerede din ditt telefonnummer."
 
-#: ../actions/imsettings.php:233
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
 msgid "That is not your Jabber ID."
 msgstr "Det er ikke din Jabber ID."
 
-#: ../actions/emailsettings.php:249
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+#: actions/emailsettings.php:270
 msgid "That is not your email address."
 msgstr "Det er ikke din e-postadresse."
 
-#: ../actions/smssettings.php:257
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
 msgid "That is not your phone number."
 msgstr "Det er ikke ditt telefonnummer."
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
+#: actions/emailsettings.php:244 actions/imsettings.php:218
+#: actions/emailsettings.php:247
 msgid "That is the wrong IM address."
 msgstr "Det er feil IM-adresse."
 
@@ -1655,14 +1984,18 @@ msgstr ""
 msgid "That phone number already belongs to another user."
 msgstr ""
 
-#: ../actions/newnotice.php:53 ../actions/newnotice.php:49
-#: ../actions/twitapistatuses.php:408 actions/newnotice.php:49
-#: actions/twitapistatuses.php:330
+#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: actions/newnotice.php:49 actions/twitapistatuses.php:330
+#: actions/newnotice.php:61 actions/twitapistatuses.php:271
 msgid "That's too long. Max notice size is 140 chars."
 msgstr ""
 
-#: ../actions/confirmaddress.php:88 ../actions/confirmaddress.php:92
-#: actions/confirmaddress.php:92
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+#: actions/twitapiaccount.php:55
+msgid "That's too long. Max notice size is 255 chars."
+msgstr ""
+
+#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr ""
@@ -1670,6 +2003,7 @@ msgstr ""
 #: ../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:285
 msgid "The address was removed."
 msgstr ""
 
@@ -1705,7 +2039,12 @@ 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
+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 ""
 
@@ -1723,33 +2062,52 @@ msgid ""
 "your existing account, if you have one."
 msgstr ""
 
-#: ../lib/util.php:151 ../lib/util.php:164 lib/util.php:246
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:94
+#: actions/twitapifriendships.php:82 actions/twitapistatuses.php:428
+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:46
+#: actions/twitapidirect_messages.php:117 actions/twitapifriendships.php:30
+#: actions/twitapistatuses.php:239
+msgid "This method requires a POST."
+msgstr ""
+
+#: ../lib/util.php:164 lib/util.php:246 lib/util.php:257
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
-#: ../actions/profilesettings.php:63
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
 msgid "Timezone"
 msgstr "Tidssone"
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:228
 msgid "Timezone not selected."
 msgstr ""
 
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"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 ""
 
-#: ../actions/twitapifriendships.php:150 ../actions/twitapifriendships.php:163
-#: actions/twitapifriendships.php:167
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: actions/twitapifriendships.php:128
 msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:233
+#: ../actions/profilesettings.php:48 ../actions/register.php:169
+#: actions/profilesettings.php:81 actions/register.php:183
+#: actions/profilesettings.php:83 actions/register.php:210
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL til din hjemmeside, blogg, eller profil på annen nettside."
 
@@ -1761,21 +2119,25 @@ msgstr ""
 #: ../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/twittersettings.php:108 actions/emailsettings.php:147
+#: actions/othersettings.php:146 actions/twittersettings.php:199
 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
 msgid "Unexpected password reset."
 msgstr ""
 
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60
+#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:59
 msgid "Unknown version of OMB protocol."
 msgstr ""
 
-#: ../lib/util.php:256 ../lib/util.php:269 lib/util.php:285
+#: ../lib/util.php:269 lib/util.php:285 lib/util.php:296
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
@@ -1787,6 +2149,7 @@ msgid "Unrecognized address type %s"
 msgstr ""
 
 #: ../actions/showstream.php:209 actions/showstream.php:219
+#: actions/showstream.php:267 lib/util.php:2094
 msgid "Unsubscribe"
 msgstr ""
 
@@ -1796,26 +2159,34 @@ msgid "Unsupported OMB version"
 msgstr ""
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: actions/profilesettings.php:371
 msgid "Unsupported image file format."
 msgstr ""
 
-#: ../lib/twitterapi.php:257 ../lib/twitterapi.php:278
-msgid "Unsupported type"
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: actions/deleteprofile.php:251
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: actions/deleteprofile.php:254
+msgid "Updates by instant messenger (IM)"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:238 ../actions/twitapistatuses.php:241
-#: actions/twitapistatuses.php:158
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/twitapistatuses.php:126
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:338 ../actions/twitapistatuses.php:341
-#: actions/twitapistatuses.php:268
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:198
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
-#: ../actions/avatar.php:68
+#: ../actions/avatar.php:68 actions/profilesettings.php:161
+#: actions/profilesettings.php:166
 msgid "Upload"
 msgstr "Last opp"
 
@@ -1827,29 +2198,39 @@ msgid ""
 "share."
 msgstr ""
 
-#: ../actions/register.php:227 ../actions/register.php:159
-#: ../actions/register.php:162 actions/register.php:173
-#: actions/register.php:176
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr ""
+
+#: ../actions/invite.php:114 actions/invite.php:121
+msgid ""
+"Use this form to invite your friends and colleagues to use this service."
+msgstr ""
+
+#: ../actions/register.php:159 ../actions/register.php:162
+#: actions/register.php:173 actions/register.php:176 actions/register.php:200
+#: actions/register.php:203
 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:92
 msgid "User being listened to doesn't exist."
 msgstr ""
 
 #: ../actions/all.php:41 ../actions/avatarbynickname.php:48
 #: ../actions/foaf.php:47 ../actions/replies.php:41
-#: ../actions/showstream.php:44 ../actions/twitapiaccount.php:78
-#: ../actions/twitapistatuses.php:316 ../actions/twitapistatuses.php:621
-#: ../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/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/showstream.php:57
+#: actions/twitapiaccount.php:63 actions/twitapifavorites.php:40
+#: actions/twitapistatuses.php:163 actions/twitapistatuses.php:492
+#: lib/twitterapi.php:590
 msgid "User has no profile."
 msgstr ""
 
@@ -1857,18 +2238,23 @@ msgstr ""
 msgid "User nickname"
 msgstr ""
 
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
 msgid "What timezone are you normally in?"
 msgstr ""
 
-#: ../lib/util.php:1131 ../lib/util.php:1159 lib/util.php:1293
+#: ../lib/util.php:1159 lib/util.php:1293 lib/util.php:1630
 #, php-format
 msgid "What's up, %s?"
 msgstr ""
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:239
-#: ../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:89 actions/register.php:216
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 
@@ -1883,6 +2269,8 @@ msgid "Wrong size image at '%s'"
 msgstr ""
 
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+#: actions/block.php:105
 msgid "Yes"
 msgstr "Ja"
 
@@ -1896,21 +2284,24 @@ msgid ""
 "be undone."
 msgstr ""
 
-#: ../actions/recoverpassword.php:31
+#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
 msgid "You are already logged in!"
 msgstr "Du er allerede logget inn!"
 
-#: ../actions/twitapifriendships.php:115 ../actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:102
+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/register.php:209 ../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 ""
 
@@ -1928,24 +2319,24 @@ msgstr ""
 #: ../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 ""
-"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
+#: actions/finishremotesubscribe.php:83 actions/finishremotesubscribe.php:99
 msgid "You can use the local subscription!"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:57
-#: ../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/register.php:77
 msgid "You can't register if you don't agree to the license."
 msgstr ""
 
@@ -1953,7 +2344,7 @@ msgstr ""
 msgid "You did not send us that profile"
 msgstr ""
 
-#: ../lib/mail.php:143 ../lib/mail.php:147
+#: ../lib/mail.php:147
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -1966,15 +2357,32 @@ msgid ""
 "%4$s"
 msgstr ""
 
-#: ../actions/recoverpassword.php:134 ../actions/recoverpassword.php:149
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: actions/twitapistatuses.php:455
+msgid "You may not delete another user's status."
+msgstr ""
+
+#: ../actions/invite.php:31 actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+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!"
+msgstr ""
+
+#: ../actions/recoverpassword.php:149
 msgid "You've been identified. Enter a  new password below. "
 msgstr ""
 
 #: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:84
 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."
 msgstr ""
 
@@ -1985,343 +2393,82 @@ msgid ""
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
 
-#: ../lib/util.php:919
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:1287
 msgid "a few seconds ago"
 msgstr "noen få sekunder siden"
 
-#: ../lib/util.php:931
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:1299
 #, php-format
 msgid "about %d days ago"
 msgstr "omtrent %d dager siden"
 
-#: ../lib/util.php:927
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:1295
 #, php-format
 msgid "about %d hours ago"
 msgstr "omtrent %d timer siden"
 
-#: ../lib/util.php:923
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:1291
 #, php-format
 msgid "about %d minutes ago"
 msgstr "omtrent %d minutter siden"
 
-#: ../lib/util.php:935
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:1303
 #, php-format
 msgid "about %d months ago"
 msgstr "omtrent %d måneder siden"
 
-#: ../lib/util.php:929
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:1297
 msgid "about a day ago"
 msgstr "omtrent én dag siden"
 
-#: ../lib/util.php:921
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:1289
 msgid "about a minute ago"
 msgstr "omtrent ett minutt siden"
 
-#: ../lib/util.php:933
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:1301
 msgid "about a month ago"
 msgstr "omtrent én måned siden"
 
-#: ../lib/util.php:937
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:1305
 msgid "about a year ago"
 msgstr "omtrent ett år siden"
 
-#: ../lib/util.php:925
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:1293
 msgid "about an hour ago"
 msgstr "omtrent én time siden"
 
-#: ../actions/showstream.php:424 ../lib/stream.php:130
+#: ../actions/showstream.php:423 ../lib/stream.php:132
+#: actions/showstream.php:441 lib/stream.php:99 lib/noticelist.php:211
 msgid "delete"
 msgstr "slett"
 
-#: ../actions/noticesearch.php:126 ../actions/showstream.php:408
-#: ../lib/stream.php:114 ../actions/noticesearch.php:130 ../lib/stream.php:117
-#: actions/noticesearch.php:136 actions/showstream.php:426 lib/stream.php:84
+#: ../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:135
+#: lib/facebookaction.php:202 lib/noticelist.php:189
 msgid "in reply to..."
 msgstr ""
 
-#: ../lib/twitterapi.php:363
-msgid "not a supported data format"
-msgstr ""
-
-#: ../actions/noticesearch.php:133 ../actions/showstream.php:415
-#: ../lib/stream.php:121
+#: ../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:142
+#: lib/noticelist.php:199
 msgid "reply"
 msgstr "svar"
 
 #: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/profilesettings.php:188
 msgid "same as password above"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:691 ../actions/twitapistatuses.php:755
-#: actions/twitapistatuses.php:678
+#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+#: actions/twitapistatuses.php:543
 msgid "unsupported file type"
 msgstr ""
 
-#: ../lib/util.php:1281 ../lib/util.php:1309 lib/util.php:1443
-msgid "« After"
-msgstr ""
-
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr ""
-
-#: ../actions/invite.php:168 actions/invite.php:176
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
-
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
-#, php-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../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!"
-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 ""
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-msgid "Add or remove OpenIDs"
-msgstr ""
-
-#: ../actions/invite.php:131 actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
-msgstr ""
-
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr ""
-
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
-msgstr ""
-
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-msgid "Change your profile settings"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-msgid "Could not update user with confirmed email address."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-msgid "Couldn't find any statuses."
-msgstr ""
-
-#: ../actions/invite.php:129 actions/invite.php:137
-msgid "Email addresses"
-msgstr ""
-
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
-msgstr ""
-
-#: ../actions/recoverpassword.php:137
-msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
-"email address you have stored  in your account."
-msgstr ""
-
-#: ../actions/invite.php:55 actions/invite.php:62
-#, php-format
-msgid "Invalid email address: %s"
-msgstr ""
-
-#: ../actions/invite.php:79 actions/invite.php:86
-msgid "Invitation(s) sent"
-msgstr ""
-
-#: ../actions/invite.php:97 actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
-msgstr ""
-
-#: ../lib/util.php:306 lib/util.php:322
-msgid "Invite"
-msgstr ""
-
-#: ../actions/invite.php:123 actions/invite.php:130
-msgid "Invite new users"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-msgid "No status found with that ID."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-msgid "No status with that ID found."
-msgstr ""
-
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-msgid "No user with that email address or username."
-msgstr ""
-
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-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
-msgid "Not a supported data format."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-msgid "Not found"
-msgstr ""
-
-#: ../actions/invite.php:135 actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
-#: ../actions/invite.php:133 actions/invite.php:141
-msgid "Personal message"
-msgstr ""
-
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
-msgstr ""
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-msgid "That's too long. Max notice size is 255 chars."
-msgstr ""
-
-#: ../actions/invite.php:89 actions/invite.php:96
-msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
-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."
-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."
-msgstr ""
-
-#: ../index.php:57 index.php:57
-msgid "Unknown action"
-msgstr ""
-
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-msgid "Updates by SMS"
-msgstr ""
-
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr ""
-
-#: ../actions/invite.php:114 actions/invite.php:121
-msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
-msgstr ""
-
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr ""
-
-#: ../actions/invite.php:81 actions/invite.php:88
-msgid "You are already subscribed to these users:"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-msgid "You may not delete another user's status."
-msgstr ""
-
-#: ../actions/invite.php:31 actions/invite.php:31
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-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!"
+#: ../lib/util.php:1309 lib/util.php:1443 lib/facebookaction.php:251
+#: lib/util.php:1783
+msgid "« After"
 msgstr ""
 
 #: actions/deletenotice.php:74 actions/disfavor.php:43
@@ -2333,6 +2480,12 @@ msgstr ""
 #: 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:38 actions/deleteprofile.php:127 actions/disfavor.php:47
+#: actions/emailsettings.php:130 actions/favor.php:49 actions/login.php:45
+#: actions/newmessage.php:44 actions/newnotice.php:36 actions/nudge.php:47
+#: actions/othersettings.php:139 actions/profilesettings.php:49
+#: actions/subedit.php:38 actions/tagother.php:113
+#: actions/twittersettings.php:188 actions/unblock.php:38
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -2356,12 +2509,14 @@ msgstr ""
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142
+#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:54
+#: actions/twitapifavorites.php:115
 msgid "This notice is already a favorite!"
 msgstr ""
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
+#: classes/Command.php:132 actions/favor.php:61
+#: actions/twitapifavorites.php:122
 msgid "Could not create favorite."
 msgstr ""
 
@@ -2370,11 +2525,12 @@ msgid "Disfavor"
 msgstr ""
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:62
 #, php-format
 msgid "%s favorite notices"
 msgstr ""
 
-#: actions/favoritesrss.php:64
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:66
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr ""
@@ -2400,47 +2556,50 @@ msgid ""
 "\n"
 msgstr ""
 
-#: actions/login.php:104
+#: actions/login.php:104 actions/login.php:111 actions/openidlogin.php:86
 msgid "Automatically login in the future; "
 msgstr ""
 
-#: actions/login.php:122
+#: actions/login.php:122 actions/login.php:130
 msgid "For security reasons, please re-enter your "
 msgstr ""
 
-#: actions/login.php:126
+#: actions/login.php:126 actions/login.php:134
 msgid "Login with your username and password. "
 msgstr ""
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+#: actions/newmessage.php:60 actions/twitapidirect_messages.php:136
 msgid "That's too long. Max message size is 140 chars."
 msgstr ""
 
-#: actions/newmessage.php:65
+#: actions/newmessage.php:65 actions/newmessage.php:68
 msgid "No recipient specified."
 msgstr ""
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
+#: classes/Command.php:206 actions/newmessage.php:71
+#: actions/newmessage.php:116 classes/Command.php:211
 msgid "You can't send a message to this user."
 msgstr ""
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
+#: classes/Command.php:209 actions/newmessage.php:74
+#: actions/twitapidirect_messages.php:153 classes/Command.php:214
 msgid ""
-"Don't send a message to yourself; just say it to yourself quietly "
-"instead."
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: actions/newmessage.php:108
+#: actions/newmessage.php:108 actions/microsummary.php:32
+#: actions/newmessage.php:111
 msgid "No such user"
 msgstr ""
 
-#: actions/newmessage.php:117
+#: actions/newmessage.php:117 actions/newmessage.php:120
 msgid "New message"
 msgstr ""
 
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:95 actions/noticesearch.php:94
 msgid "Notice without matching profile"
 msgstr ""
 
@@ -2487,6 +2646,7 @@ msgstr ""
 
 #: actions/profilesettings.php:115 actions/remotesubscribe.php:320
 #: actions/userauthorization.php:159 actions/userrss.php:76
+#: actions/profilesettings.php:120 actions/remotesubscribe.php:333
 msgid "User without matching profile"
 msgstr ""
 
@@ -2514,18 +2674,18 @@ msgstr ""
 msgid "New password successfully saved. "
 msgstr ""
 
-#: actions/register.php:95
+#: actions/register.php:95 actions/register.php:104
 msgid "Password must be 6 or more characters."
 msgstr ""
 
-#: actions/register.php:216
+#: actions/register.php:216 actions/register.php:243
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to..."
 msgstr ""
 
-#: actions/register.php:227
+#: actions/register.php:227 actions/register.php:254
 msgid "(You should receive a message by email momentarily, with "
 msgstr ""
 
@@ -2540,6 +2700,7 @@ msgid "Feed for favorites of %s"
 msgstr ""
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:88 actions/twitapifavorites.php:57
 msgid "Could not retrieve favorite notices."
 msgstr ""
 
@@ -2561,7 +2722,7 @@ msgstr ""
 msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: actions/showstream.php:154
+#: actions/showstream.php:154 lib/util.php:2105
 msgid "Send a message"
 msgstr ""
 
@@ -2570,73 +2731,78 @@ msgstr ""
 msgid "Mobile carrier for your phone. "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:64
 #, php-format
 msgid "Direct messages to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:65
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:69
 msgid "Direct Messages You've Sent"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:70
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:132
 msgid "No message text!"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:145
 msgid "Recipient user not found."
 msgstr ""
 
 #: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:148
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
-#: actions/twitapifavorites.php:92
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:64
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
-#: actions/twitapifavorites.php:95
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:67
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
+#: actions/twitapifavorites.php:158 lib/mail.php:303
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr ""
 
 #: actions/twitapifavorites.php:188 lib/mail.php:276
+#: actions/twitapifavorites.php:159 lib/mail.php:304
 #, php-format
 msgid ""
 "%1$s just added your notice from %2$s as one of their favorites.\n"
 "\n"
 msgstr ""
 
-#: actions/twittersettings.php:27
+#: actions/twittersettings.php:27 actions/twittersettings.php:29
 msgid ""
 "Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 
-#: actions/twittersettings.php:41
+#: actions/twittersettings.php:41 actions/twittersettings.php:43
 msgid "Twitter settings"
 msgstr ""
 
-#: actions/twittersettings.php:48
+#: actions/twittersettings.php:48 actions/twittersettings.php:50
 msgid "Twitter Account"
 msgstr ""
 
-#: actions/twittersettings.php:56
+#: actions/twittersettings.php:56 actions/twittersettings.php:58
 msgid "Current verified Twitter account."
 msgstr ""
 
@@ -2664,46 +2830,50 @@ msgstr ""
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:216
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr ""
 
-#: actions/twittersettings.php:128
+#: actions/twittersettings.php:128 actions/twittersettings.php:221
 msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: actions/twittersettings.php:137 actions/twittersettings.php:228
 #, php-format
 msgid "Unable to retrieve account information for \"%s\" from Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:234 actions/twittersettings.php:253
 msgid "Unable to save your Twitter settings!"
 msgstr ""
 
-#: actions/twittersettings.php:174
+#: actions/twittersettings.php:174 actions/twittersettings.php:261
 msgid "Twitter settings saved."
 msgstr ""
 
-#: actions/twittersettings.php:192
+#: actions/twittersettings.php:192 actions/twittersettings.php:272
 msgid "That is not your Twitter account."
 msgstr ""
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:280
 msgid "Couldn't remove Twitter user."
 msgstr ""
 
-#: actions/twittersettings.php:212
+#: actions/twittersettings.php:212 actions/twittersettings.php:284
 msgid "Twitter account removed."
 msgstr ""
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
+#: actions/twittersettings.php:299 actions/twittersettings.php:310
+#: actions/twittersettings.php:322
 msgid "Couldn't save Twitter preferences."
 msgstr ""
 
-#: actions/twittersettings.php:245
+#: actions/twittersettings.php:245 actions/twittersettings.php:330
 msgid "Twitter preferences saved."
 msgstr ""
 
@@ -2719,15 +2889,15 @@ msgstr ""
 msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#: classes/Channel.php:113
+#: classes/Channel.php:113 classes/Channel.php:129
 msgid "Command results"
 msgstr ""
 
-#: classes/Channel.php:148
+#: classes/Channel.php:148 classes/Channel.php:175
 msgid "Command complete"
 msgstr ""
 
-#: classes/Channel.php:158
+#: classes/Channel.php:158 classes/Channel.php:185
 msgid "Command failed"
 msgstr ""
 
@@ -2740,7 +2910,7 @@ msgstr ""
 msgid "Subscriptions: %1$s\n"
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:247
 msgid "User has no last notice"
 msgstr ""
 
@@ -2773,59 +2943,60 @@ msgstr ""
 msgid "About: %s"
 msgstr ""
 
-#: classes/Command.php:200
+#: classes/Command.php:200 classes/Command.php:202
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: classes/Command.php:214
+#: classes/Command.php:214 classes/Command.php:219
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: classes/Command.php:216
+#: classes/Command.php:216 classes/Command.php:221
 msgid "Error sending direct message."
 msgstr ""
 
-#: classes/Command.php:263
+#: classes/Command.php:263 classes/Command.php:268
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: classes/Command.php:270
+#: classes/Command.php:270 classes/Command.php:275
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: classes/Command.php:288
+#: classes/Command.php:288 classes/Command.php:293
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: classes/Command.php:295
+#: classes/Command.php:295 classes/Command.php:300
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330
+#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:315
+#: classes/Command.php:335
 msgid "Command not yet implemented."
 msgstr ""
 
-#: classes/Command.php:313
+#: classes/Command.php:313 classes/Command.php:318
 msgid "Notification off."
 msgstr ""
 
-#: classes/Command.php:315
+#: classes/Command.php:315 classes/Command.php:320
 msgid "Can't turn off notification."
 msgstr ""
 
-#: classes/Command.php:333
+#: classes/Command.php:333 classes/Command.php:338
 msgid "Notification on."
 msgstr ""
 
-#: classes/Command.php:335
+#: classes/Command.php:335 classes/Command.php:340
 msgid "Can't turn on notification."
 msgstr ""
 
-#: classes/Command.php:344
+#: classes/Command.php:344 classes/Command.php:349
 msgid "Commands:\n"
 msgstr ""
 
@@ -2837,23 +3008,23 @@ msgstr ""
 msgid "Could not update message with new URI."
 msgstr ""
 
-#: lib/gallery.php:46
+#: lib/gallery.php:46 lib/gallery.php:55
 msgid "User without matching profile in system."
 msgstr ""
 
-#: lib/mail.php:147
+#: lib/mail.php:147 lib/mail.php:141
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:249
+#: lib/mail.php:249 lib/mail.php:275
 #, php-format
 msgid "New private message from %s"
 msgstr ""
 
-#: lib/mail.php:253
+#: lib/mail.php:253 lib/mail.php:279
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -2897,18 +3068,433 @@ msgstr ""
 msgid "Your sent messages"
 msgstr ""
 
-#: lib/settingsaction.php:99
+#: lib/settingsaction.php:99 actions/deleteprofile.php:256
 msgid "Twitter"
 msgstr ""
 
-#: lib/settingsaction.php:100
+#: lib/settingsaction.php:100 actions/deleteprofile.php:257
 msgid "Twitter integration options"
 msgstr ""
 
-#: lib/util.php:1718
+#: lib/util.php:1718 lib/util.php:2145
 msgid "To"
 msgstr ""
 
 #: scripts/maildaemon.php:45
 msgid "Could not parse message."
 msgstr ""
+
+#: actions/block.php:45 actions/subedit.php:45 actions/unblock.php:45
+msgid "No profile specified."
+msgstr ""
+
+#: actions/block.php:52 actions/subedit.php:52 actions/tagother.php:45
+#: actions/unblock.php:52
+msgid "No profile with that ID."
+msgstr ""
+
+#: actions/block.php:78
+msgid "Block user"
+msgstr ""
+
+#: actions/block.php:81
+msgid "Are you sure you want to block this user? "
+msgstr ""
+
+#: actions/block.php:117
+#, fuzzy
+msgid "You have already blocked this user."
+msgstr "Du er allerede logget inn!"
+
+#: actions/block.php:124
+msgid "Failed to save block information."
+msgstr ""
+
+#: actions/deleteprofile.php:25
+msgid "Code not yet ready."
+msgstr ""
+
+#: actions/deleteprofile.php:36
+msgid "Export and delete your user information."
+msgstr ""
+
+#: actions/deleteprofile.php:88 actions/deleteprofile.php:119
+#, fuzzy
+msgid "Delete my account"
+msgstr "Opprett en ny konto"
+
+#: actions/deleteprofile.php:89
+msgid "Delete my account confirmation"
+msgstr ""
+
+#: actions/deleteprofile.php:117
+msgid "Check if you are sure you want to delete your account."
+msgstr ""
+
+#: actions/deleteprofile.php:259 lib/settingsaction.php:102
+msgid "Other"
+msgstr ""
+
+#: actions/deleteprofile.php:260 lib/settingsaction.php:103
+msgid "Other options"
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Add to favorites"
+msgstr ""
+
+#: actions/emailsettings.php:98
+msgid "Allow friends to nudge me and send me an email."
+msgstr ""
+
+#: actions/facebookremove.php:54
+#, fuzzy
+msgid "Couldn't remove Facebook user."
+msgstr "Klarte ikke å oppdatere bruker."
+
+#: actions/favor.php:71
+msgid "Disfavor favorite"
+msgstr ""
+
+#: actions/favorited.php:31 lib/stream.php:45
+msgid "Popular notices"
+msgstr ""
+
+#: actions/favorited.php:54
+msgid "Showing recently popular notices"
+msgstr ""
+
+#: actions/featured.php:32 actions/featured.php:54 lib/stream.php:41
+msgid "Featured users"
+msgstr ""
+
+#: actions/finishremotesubscribe.php:186
+msgid "That user has blocked you from subscribing."
+msgstr ""
+
+#: actions/microsummary.php:39
+msgid "No current status"
+msgstr ""
+
+#: actions/newnotice.php:93
+msgid "Notice posted"
+msgstr ""
+
+#: actions/newnotice.php:116 classes/Channel.php:140
+msgid "Ajax Error"
+msgstr ""
+
+#: actions/nudge.php:52
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
+
+#: actions/nudge.php:61
+msgid "Nudge sent"
+msgstr ""
+
+#: actions/othersettings.php:27
+msgid "Manage various other options."
+msgstr ""
+
+#: actions/othersettings.php:33
+#, fuzzy
+msgid "Other Settings"
+msgstr "Innstillinger for IM"
+
+#: actions/othersettings.php:35
+msgid "URL Auto-shortening"
+msgstr ""
+
+#: actions/othersettings.php:54
+#, fuzzy
+msgid "Service"
+msgstr "Søk"
+
+#: actions/othersettings.php:54
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/othersettings.php:155
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Bioen er for lang (max 140 tegn)"
+
+#: actions/peopletag.php:33
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "Ugyldig e-postadresse"
+
+#: actions/peopletag.php:45
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr ""
+
+#: actions/peopletag.php:87
+#, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+msgstr ""
+
+#: actions/profilesettings.php:92
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+
+#: actions/profilesettings.php:246 actions/tagother.php:131
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Ugyldig hjemmeside '%s'"
+
+#: actions/profilesettings.php:328
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "Klarte ikke å lagre profil."
+
+#: actions/public.php:68
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
+msgstr ""
+
+#: actions/public.php:90
+msgid "Could not retrieve public stream."
+msgstr ""
+
+#: actions/register.php:67 actions/register.php:177
+msgid "Sorry, only invited people can register."
+msgstr ""
+
+#: actions/register.php:156
+msgid "With this form you can create a new account. "
+msgstr ""
+
+#: actions/remotesubscribe.php:136 actions/remotesubscribe.php:141
+msgid "That's a local profile! Login to subscribe."
+msgstr ""
+
+#: actions/subedit.php:68
+msgid "You are not subscribed to that profile."
+msgstr ""
+
+#: actions/subedit.php:81
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "Klarte ikke å lagre avatar-informasjonen"
+
+#: actions/subscribe.php:53
+#, fuzzy
+msgid "Not a local user."
+msgstr "Ugyldig OpenID"
+
+#: actions/subscribe.php:67
+msgid "Subscribed"
+msgstr ""
+
+#: actions/subscriptions.php:72
+#, fuzzy
+msgid "Jabber"
+msgstr "Ingen Jabber ID."
+
+#: actions/tagother.php:31
+#, fuzzy
+msgid "Not logged in"
+msgstr "Ikke logget inn."
+
+#: actions/tagother.php:40
+msgid "No id argument."
+msgstr ""
+
+#: actions/tagother.php:56
+msgid "Tag a person"
+msgstr ""
+
+#: actions/tagother.php:98
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
+msgstr ""
+
+#: actions/tagother.php:120
+#, fuzzy
+msgid "No such profile."
+msgstr "Klarte ikke å lagre profil."
+
+#: actions/tagother.php:146
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+
+#: actions/tagother.php:153
+#, fuzzy
+msgid "Could not save tags."
+msgstr "Klarte ikke å lagre avatar-informasjonen"
+
+#: actions/tagother.php:188
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
+
+#: actions/tagrss.php:33
+msgid "No such tag."
+msgstr ""
+
+#: actions/tagrss.php:62
+#, fuzzy, php-format
+msgid "Microblog tagged with %s"
+msgstr "Mikroblogg av %s"
+
+#: actions/twitapiblocks.php:45
+msgid "Block user failed."
+msgstr ""
+
+#: actions/twitapiblocks.php:66
+msgid "Unblock user failed."
+msgstr ""
+
+#: actions/twitapiusers.php:45
+#, fuzzy
+msgid "Not found."
+msgstr "Ingen id."
+
+#: actions/twittersettings.php:63
+msgid "Twitter user name"
+msgstr ""
+
+#: actions/twittersettings.php:67
+#, fuzzy
+msgid "Twitter password"
+msgstr "Nytt passord"
+
+#: actions/twittersettings.php:129
+msgid "Twitter Friends"
+msgstr ""
+
+#: actions/unblock.php:73
+msgid "Error removing the block."
+msgstr ""
+
+#: actions/unsubscribe.php:48
+msgid "No profile id in request."
+msgstr ""
+
+#: actions/unsubscribe.php:55
+msgid "No profile with that id."
+msgstr ""
+
+#: actions/unsubscribe.php:69
+msgid "Unsubscribed"
+msgstr ""
+
+#: classes/Notice.php:100
+msgid "Problem saving notice. Unknown user."
+msgstr ""
+
+#: classes/Notice.php:105
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+
+#: classes/Notice.php:112
+msgid "You are banned from posting notices on this site."
+msgstr ""
+
+#: lib/gallery.php:98
+#, fuzzy
+msgid "Filter tags"
+msgstr "Feed for taggen %s"
+
+#: lib/gallery.php:104
+msgid "All"
+msgstr ""
+
+#: lib/gallery.php:108
+#, fuzzy
+msgid "Tag"
+msgstr "Tagger"
+
+#: lib/gallery.php:109
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/gallery.php:110
+msgid "Go"
+msgstr ""
+
+#: lib/gallery.php:264
+msgid "Subscriptions navigation"
+msgstr ""
+
+#: lib/gallery.php:270 lib/gallery.php:292
+msgid "List"
+msgstr ""
+
+#: lib/gallery.php:280 lib/gallery.php:294
+msgid "Icons"
+msgstr ""
+
+#: lib/mail.php:92
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:242
+#, php-format
+msgid "You've been nudged by %s"
+msgstr ""
+
+#: lib/mail.php:246
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+msgstr ""
+
+#: lib/profilelist.php:146
+msgid "(none)"
+msgstr ""
+
+#: lib/stream.php:33
+#, fuzzy
+msgid "Public"
+msgstr "Offentlig"
+
+#: lib/stream.php:36 lib/stream.php:37
+#, fuzzy
+msgid "Recent tags"
+msgstr "Nyeste Tagger"
+
+#: lib/stream.php:40
+msgid "Featured"
+msgstr ""
+
+#: lib/stream.php:44
+msgid "Popular"
+msgstr ""
+
+#: lib/subs.php:51
+msgid "User has blocked you."
+msgstr ""
+
+#: lib/util.php:2059
+msgid "Send a nudge"
+msgstr ""
+
+#: lib/util.php:2063
+msgid "Nudge sent!"
+msgstr ""
+
+#: lib/util.php:2194
+msgid "Block"
+msgstr ""
+
+#: lib/util.php:2198
+msgid "Unblock"
+msgstr ""
+
+#~ msgid " by "
+#~ msgstr "av"
diff --git a/pl_PL/LC_MESSAGES/laconica.po b/pl_PL/LC_MESSAGES/laconica.po
index 0beb8e85a8..89eb208122 100644
--- a/pl_PL/LC_MESSAGES/laconica.po
+++ b/pl_PL/LC_MESSAGES/laconica.po
@@ -13,28 +13,19 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-14 21:07+1200\n"
+"POT-Creation-Date: 2009-01-12 12:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Paweł Wilk <siefca@gnu.org>\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\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"
-"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"
 
 #  Polish language has 3 plural forms.
 #  Special case is used for one and some numbers ending in 2, 3, or 4.
@@ -42,25 +33,76 @@ msgstr ""
 #  1         WINDOW   -> 1 OKNO
 #  x2 to x4  WINDOWS  -> x2 do x4 OKNA  (x != 1)
 #  5 or more WINDOWS  -> 5 lub więcej OKIEN
-#: ../actions/noticesearchrss.php:64
+#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:61
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr "Szukaj strumienia dla \"%s\""
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: actions/finishopenidlogin.php:88 actions/register.php:205
+#: actions/register.php:232
 msgid ""
-" except this private data: password, email address, IM address, phone "
-"number."
+" except this private data: password, email address, IM address, phone number."
 msgstr ""
 "z wyłączeniem tych prywatnych danych: e-maila, identyfikatora IM, numeru "
 "telefonu."
 
-#: ../actions/subscribe.php:84
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+#: lib/facebookaction.php:195 lib/noticelist.php:160
+msgid " from "
+msgstr ""
+
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: actions/twitapistatuses.php:341
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr ""
+
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
+
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:115
+#: lib/mail.php:117
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s obserwuje teraz Twoje wpisy na %2$s."
 
-#: ../actions/subscribe.php:86
+#: ../lib/mail.php:126
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -75,125 +117,268 @@ msgstr ""
 "Kłaniam się,\n"
 "%4$s.\n"
 
-#: ../actions/shownotice.php:45
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#: actions/twitapistatuses.php:344
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
+
+#: ../actions/shownotice.php:45 actions/shownotice.php:45
+#: actions/shownotice.php:73
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "Status użytkownika %1$s na %2$s"
 
-#: ../actions/publicrss.php:60
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../actions/publicrss.php:62 actions/publicrss.php:48
 #, php-format
 msgid "%s Public Stream"
 msgstr "Publiczny strumień %s"
 
-#: ../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/twitapistatuses.php:123
 #, php-format
 msgid "%s and friends"
 msgstr "%s i przyjaciele"
 
-#: ../lib/util.php:233
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:31
+#, php-format
+msgid "%s public timeline"
+msgstr ""
+
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:217
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:195
+#, php-format
+msgid "%s timeline"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:34
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+
+#: ../lib/util.php:257 lib/util.php:273 lib/util.php:284
 #, 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%%** to serwis z mikroblogami prowadzony przez "
-"[%%site.broughtby%%](%%site.broughtbyurl%%)."
+"**%%site.name%%** to serwis z mikroblogami prowadzony przez [%%site.broughtby"
+"%%](%%site.broughtbyurl%%)."
 
-#: ../lib/util.php:235
+#: ../lib/util.php:259 lib/util.php:275 lib/util.php:286
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** to serwis do mikroblogowania."
 
-#: ../lib/util.php:250
+#: ../lib/util.php:274 lib/util.php:290 lib/util.php:301
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ""
-". Współpracownicy powinni być wymienieni z imienia i nazwiska lub "
-"pseudonimu."
+". Współpracownicy powinni być wymienieni z imienia i nazwiska lub pseudonimu."
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: ../actions/register.php:176
+#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
+#: actions/profilesettings.php:78
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "Max. 64 znaki alfanumeryczne, bez spacji i znaków przestankowych"
 
-#: ../actions/password.php:42 ../actions/register.php:178
+#: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:193
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/profilesettings.php:186
 msgid "6 or more characters"
 msgstr "6 lub więcej znaków"
 
-#: ../actions/recoverpassword.php:165
+#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 lub więcej znaków – nie zapomnij go!"
 
-#: ../actions/imsettings.php:188
+#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:195
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, 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 ""
 "Na Twój adres komunikatora został wysłany kod potwierdzający. Musisz "
 "zaakceptować otrzymywanie wiadomości od %s."
 
-#: ../lib/util.php:296
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:234
+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 ""
+
+#: ../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/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:30
+#: actions/twitapidirect_messages.php:107 actions/twitapifavorites.php:83
+#: actions/twitapifavorites.php:99 actions/twitapifriendships.php:117
+#: actions/twitapihelp.php:42 actions/twitapistatuses.php:77
+#: actions/twitapistatuses.php:144 actions/twitapistatuses.php:224
+#: actions/twitapistatuses.php:234 actions/twitapistatuses.php:386
+#: actions/twitapistatuses.php:395 actions/twitapistatuses.php:421
+#: actions/twitapiusers.php:30
+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:39
+#: actions/twitapiaccount.php:89 actions/twitapiaccount.php:94
+#: actions/twitapidirect_messages.php:178 actions/twitapifavorites.php:139
+#: actions/twitapihelp.php:49 actions/twitapistatuses.php:549
+msgid "API method under construction."
+msgstr ""
+
+#: ../lib/util.php:324 lib/util.php:340 lib/util.php:352
 msgid "About"
 msgstr "O serwisie"
 
-#: ../actions/userauthorization.php:118
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
 msgid "Accept"
 msgstr "Akceptuj"
 
-#: ../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/twittersettings.php:84
 msgid "Add"
 msgstr "Dodaj"
 
-#: ../actions/openidsettings.php:43
+#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
 msgid "Add OpenID"
 msgstr "Dodaj konto OpenID"
 
-#: ../actions/imsettings.php:39
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: actions/deleteprofile.php:248
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
 msgid "Address"
 msgstr "Adres"
 
-#: ../actions/showstream.php:254
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
+
+#: ../actions/showstream.php:273 actions/showstream.php:288
+#: actions/showstream.php:336
 msgid "All subscriptions"
 msgstr "Wszyscy obserwowani"
 
-#: ../actions/publicrss.php:62
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
 #, php-format
 msgid "All updates for %s"
 msgstr "Wszystkie aktualizacje od %s"
 
-#: ../actions/noticesearchrss.php:66
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:63
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "Wszystkie aktualizacje pasujące do wzorca wyszukiwania \"%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
 msgid "Already logged in."
 msgstr "Jesteś już zalogowany."
 
-#: ../actions/subscribe.php:48
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:47
 msgid "Already subscribed!."
 msgstr "Już obserwujesz!"
 
-#: ../actions/userauthorization.php:76
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+msgid "Are you sure you want to delete this notice?"
+msgstr ""
+
+#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
 msgid "Authorize subscription"
 msgstr "Pozwól na obserwację"
 
-#: ../actions/login.php:100 ../actions/register.php:184
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192 actions/register.php:219
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
-"Automatycznie loguj mnie na konto. Nie używać w przypadku "
-"współdzielonych komputerów!"
+"Automatycznie loguj mnie na konto. Nie używać w przypadku współdzielonych "
+"komputerów!"
+
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:103
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
 
-#: ../actions/avatar.php:32
+#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: actions/profilesettings.php:34
 msgid "Avatar"
 msgstr "Awatar"
 
-#: ../actions/avatar.php:113
+#: ../actions/avatar.php:113 actions/profilesettings.php:350
+#: actions/profilesettings.php:379
 msgid "Avatar updated."
 msgstr "Awatar załadowany."
 
-#: ../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 "
@@ -203,322 +388,529 @@ msgstr ""
 "Jabbera/GTalka przyszła wiadomość z dalszymi instrukcjami. (Nie zapomnij "
 "dodać %s do listy znajomych.)"
 
-#: ../lib/util.php:1136
-msgid "Before »"
+#: ../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 ""
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+msgid "Awaiting confirmation on this phone number."
+msgstr ""
+
+#: ../lib/util.php:1318 lib/util.php:1452 lib/facebookaction.php:259
+#: lib/util.php:1792
+#, fuzzy
+msgid "Before »"
 msgstr "Wcześniej »"
 
-#: ../actions/profilesettings.php:52
+#: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: actions/profilesettings.php:82 actions/register.php:184
+#: actions/profilesettings.php:84 actions/register.php:211
 msgid "Bio"
 msgstr "O mnie"
 
-#: ../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:222 actions/register.php:98
 msgid "Bio is too long (max 140 chars)."
 msgstr "Wpis \"O mnie\" jest za długi (maks. 140 znaków)"
 
-#: ../actions/updateprofile.php:118
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+msgid "Can't delete this notice."
+msgstr ""
+
+#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "Nie można odczytać URL-a awatara '%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/profilesettings.php:433
 msgid "Can't save new password."
 msgstr "Nie można zapisać nowego hasła."
 
-#: ../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
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: ../lib/openid.php:121
+#: ../lib/openid.php:121 lib/openid.php:121
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Nie można stworzyć instancji obiektu OpenID."
 
-#: ../actions/imsettings.php:154
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
 msgid "Cannot normalize that Jabber ID"
 msgstr "Nie można znormalizować tego identyfikatora Jabbera"
 
-#: ../actions/password.php:45
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:204
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/profilesettings.php:189
 msgid "Change"
 msgstr "Zmień"
 
-#: ../actions/password.php:32
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: actions/deleteprofile.php:245
+msgid "Change email handling"
+msgstr ""
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
 msgid "Change password"
 msgstr "Zmień hasło"
 
-#: ../actions/password.php:43 ../actions/recoverpassword.php:166
-#: ../actions/register.php:179
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr ""
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#: actions/deleteprofile.php:242
+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/profilesettings.php:187 actions/register.php:196
 msgid "Confirm"
 msgstr "Potwierdź"
 
-#: ../actions/confirmaddress.php:84
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
 msgid "Confirm Address"
 msgstr "Potwierdź adres"
 
-#: ../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:259
 msgid "Confirmation cancelled."
 msgstr "Anulowano potwierdzenie."
 
-#: ../actions/confirmaddress.php:38
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+msgid "Confirmation code"
+msgstr ""
+
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
 msgid "Confirmation code not found."
 msgstr "Nie znaleziono kodu potwierdzającego."
 
-#: ../actions/finishopenidlogin.php:91
+#: ../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:97
 msgid "Connect"
 msgstr "Połącz"
 
-#: ../actions/finishopenidlogin.php:86
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
 msgid "Connect existing account"
 msgstr "Połącz z istniejącym kontem"
 
-#: ../lib/util.php:304
+#: ../lib/util.php:332 lib/util.php:348 lib/util.php:360
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../lib/openid.php:178
+#: ../lib/openid.php:178 lib/openid.php:178
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "Nie można utworzyć formularza OpenID: %s"
 
-#: ../lib/openid.php:160
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:46 actions/twitapifriendships.php:62
+#, 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:39
+msgid "Could not follow user: User not found."
+msgstr ""
+
+#: ../lib/openid.php:160 lib/openid.php:160
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "Nie można przekierować do serwera: %s"
 
-#: ../actions/updateprofile.php:161
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
 msgid "Could not save avatar info"
 msgstr "Nie można zapisać informacji o awatarze"
 
-#: ../actions/updateprofile.php:154
+#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
 msgid "Could not save new profile info"
 msgstr "Nie można zapisać informacji o nowym profilu"
 
-#: ../actions/profilesettings.php:146
-msgid "Couldn't confirm email."
-msgstr "Nie można potwierdzić e-maila."
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:70
+msgid "Could not subscribe other to you."
+msgstr ""
+
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:55
+msgid "Could not subscribe."
+msgstr ""
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr ""
 
 #: ../actions/finishremotesubscribe.php:99
+#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:112
 msgid "Couldn't convert request tokens to access tokens."
 msgstr "Nie można przekształcić tokenów z żądaniami na tokeny dostępu."
 
-#: ../actions/subscribe.php:59
-msgid "Couldn't create subscription."
-msgstr "Nie można obserwować."
-
-#: ../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/emailsettings.php:255
 msgid "Couldn't delete email confirmation."
 msgstr "Nie można skasować potwierdzenia adresu e-mail."
 
-#: ../actions/unsubscribe.php:56
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:129
 msgid "Couldn't delete subscription."
 msgstr "Nie można usunąć obserwacji."
 
-#: ../actions/remotesubscribe.php:125
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+#: actions/twitapistatuses.php:82
+msgid "Couldn't find any statuses."
+msgstr ""
+
+#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
+#: actions/remotesubscribe.php:148
 msgid "Couldn't get a request token."
 msgstr "Nie można uzyskać tokena z żądaniem."
 
-#: ../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:228
 msgid "Couldn't insert confirmation code."
 msgstr "Nie można wprowadzić kodu potwierdzającego."
 
 #: ../actions/finishremotesubscribe.php:180
+#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:216
 msgid "Couldn't insert new subscription."
 msgstr "Nie można wprowadzić nowej obserwacji."
 
-#: ../actions/profilesettings.php:175
+#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
+#: actions/profilesettings.php:319 actions/twitapiaccount.php:74
 msgid "Couldn't save profile."
 msgstr "Nie można zapisać profilu."
 
-#: ../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:296
+msgid "Couldn't update user for autosubscribe."
+msgstr ""
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+#: actions/emailsettings.php:301 actions/emailsettings.php:315
+msgid "Couldn't update user record."
+msgstr ""
+
+#: ../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/emailsettings.php:179 actions/emailsettings.php:280
+#: actions/othersettings.php:173 actions/profilesettings.php:276
 msgid "Couldn't update user."
 msgstr "Nie można zaktualizować użytkownika."
 
-#: ../actions/finishopenidlogin.php:84
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
 msgid "Create"
 msgstr "Utwórz"
 
-#: ../actions/finishopenidlogin.php:70
+#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
 msgid "Create a new user with this nickname."
 msgstr "Załóż użytkownika o tym pseudonimie."
 
-#: ../actions/finishopenidlogin.php:68
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
 msgid "Create new account"
 msgstr "Załóż nowe konto"
 
-#: ../actions/finishopenidlogin.php:191
+#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+#: actions/finishopenidlogin.php:208
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Tworzenie nowego konta użytkownika na podstawie identyfikatora OpenID."
 
-#: ../actions/imsettings.php:45
+#: ../actions/imsettings.php:45 actions/imsettings.php:46
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Potwierdzone adresy Jabbera/GTalka"
 
-#: ../actions/showstream.php:337
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+msgid "Current confirmed email address."
+msgstr ""
+
+#: ../actions/showstream.php:356 actions/showstream.php:367
+#: actions/showstream.php:418
 msgid "Currently"
 msgstr "Obecnie"
 
-#: ../lib/util.php:893
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:87
 #, php-format
-msgid "DB error inserting reply: %s"
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: ../lib/util.php:1061 lib/util.php:1110 lib/util.php:1417
+#, php-format
+msgid "DB error inserting reply: %s"
 msgstr "Błąd przy dodawaniu do bazy danych: %s"
 
-#: ../actions/profilesettings.php:54
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+msgid "Delete notice"
+msgstr ""
+
+#: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: actions/profilesettings.php:84 actions/register.php:186
+#: actions/profilesettings.php:86 actions/register.php:213
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Opisz się w 140 znakach"
 
-#: ../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/deleteprofile.php:244 actions/register.php:199
+#: actions/register.php:202
 msgid "Email"
 msgstr "E-mail"
 
-#: ../actions/profilesettings.php:46
-msgid "Email address"
-msgstr "Adres e-mailowy"
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+msgid "Email Address"
+msgstr ""
+
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+msgid "Email Settings"
+msgstr ""
 
-#: ../actions/profilesettings.php:102 ../actions/register.php:63
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:89
 msgid "Email address already exists."
 msgstr "Taki e-mail już istnieje"
 
-#: ../lib/mail.php:82
+#: ../lib/mail.php:90 lib/mail.php:90
 msgid "Email address confirmation"
 msgstr "Potwierdzenie adresu e-mailowego"
 
-#: ../actions/recoverpassword.php:176
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
+
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr ""
+
+#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
 msgid "Enter a nickname or email address."
 msgstr "Podaj pseudonim lub adres e-mailowy"
 
-#: ../actions/userauthorization.php:136
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+msgid "Enter the code you received on your phone."
+msgstr ""
+
+#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
 msgid "Error authorizing token"
 msgstr "Błąd podczas autoryzacji tokena"
 
-#: ../actions/finishopenidlogin.php:282
+#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
+#: actions/finishopenidlogin.php:274
 msgid "Error connecting user to OpenID."
 msgstr "Błąd w podłączaniu użytkownika do OpenID."
 
-#: ../actions/finishaddopenid.php:78
+#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
 msgid "Error connecting user."
 msgstr "Błąd w podłączaniu użytkownika."
 
 #: ../actions/finishremotesubscribe.php:151
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:164
 msgid "Error inserting avatar"
 msgstr "Błąd we wstawianiu awatara"
 
 #: ../actions/finishremotesubscribe.php:143
+#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:156
 msgid "Error inserting new profile"
 msgstr "Błąd podczas wprowadzania nowego profilu"
 
-#: ../actions/postnotice.php:88
-msgid "Error inserting notice"
-msgstr "Błąd przy wprowadzaniu wpisu"
-
 #: ../actions/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:180
 msgid "Error inserting remote profile"
 msgstr "Błąd podczas wprowadzania zdalnego profilu"
 
-#: ../actions/recoverpassword.php:201
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
 msgid "Error saving address confirmation."
 msgstr "Błąd w zapisie potwierdzenia adresu."
 
-#: ../actions/userauthorization.php:139
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
 msgid "Error saving remote profile"
 msgstr "Błąd w zapisie zdalnego profilu."
 
-#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
+#: ../lib/openid.php:226 lib/openid.php:226
 msgid "Error saving the profile."
 msgstr "Błąd w zapisie profilu."
 
-#: ../lib/openid.php:237
+#: ../lib/openid.php:237 lib/openid.php:237
 msgid "Error saving the user."
 msgstr "Błąd w zapisie użytkownika."
 
-#: ../actions/password.php:80
+#: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/profilesettings.php:428
 msgid "Error saving user; invalid."
 msgstr "Błąd podczas zapisywania użytkownika; niepoprawne dane."
 
-#: ../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:54 actions/login.php:80
+#: actions/register.php:117
 msgid "Error setting user."
 msgstr "Błąd w ustawianiu danych użytkownika."
 
-#: ../actions/finishaddopenid.php:83
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
 msgid "Error updating profile"
 msgstr "Błąd podczas aktualizowania profilu"
 
 #: ../actions/finishremotesubscribe.php:161
+#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:174
 msgid "Error updating remote profile"
 msgstr "Błąd podczas aktualizowania zdalnego profilu"
 
-#: ../actions/recoverpassword.php:79
+#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
 msgid "Error with confirmation code."
 msgstr "Błąd kodu potwierdzającego."
 
-#: ../actions/finishopenidlogin.php:89
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
 msgid "Existing nickname"
 msgstr "Dotychczasowy pseudonim"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:326 lib/util.php:342 lib/util.php:354
 msgid "FAQ"
 msgstr "FAQ"
 
-#: ../actions/avatar.php:115
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/profilesettings.php:381
 msgid "Failed updating avatar."
 msgstr "Uaktualnianie awatara nie powiodło się."
 
-#: ../actions/all.php:61 ../actions/allrss.php:74
+#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
+#: actions/allrss.php:64
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Kanał dla znajomych użytkownika %s"
 
-#: ../actions/replies.php:61 ../actions/repliesrss.php:80
+#: ../actions/replies.php:65 ../actions/repliesrss.php:80
+#: actions/replies.php:65 actions/repliesrss.php:66
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Kanał dla odpowiedzi do użytkownika %s"
 
-#: ../actions/login.php:118
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:54
+#, php-format
+msgid "Feed for tag %s"
+msgstr ""
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+msgid "Find content of notices"
+msgstr ""
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+msgid "Find people on this site"
+msgstr ""
+
+#: ../actions/login.php:122
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
-"Z powodów bezpieczeństwa wprowadź proszę ponownie nazwę użytkownika i "
-"hasło przed zmianą swoich ustawień."
+"Z powodów bezpieczeństwa wprowadź proszę ponownie nazwę użytkownika i hasło "
+"przed zmianą swoich ustawień."
 
-#: ../actions/profilesettings.php:44
+#: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: actions/profilesettings.php:77 actions/register.php:178
+#: actions/profilesettings.php:79 actions/register.php:205
 msgid "Full name"
 msgstr "Pełna nazwa"
 
-#: ../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/profilesettings.php:219 actions/register.php:95
 msgid "Full name is too long (max 255 chars)."
 msgstr "Pełna nazwa jest zbyt długa (max. 255 znaków)."
 
-#: ../lib/util.php:279
+#: ../lib/util.php:322 lib/util.php:338 lib/util.php:343 lib/util.php:350
 msgid "Help"
 msgstr "Pomoc"
 
-#: ../lib/util.php:274
+#: ../lib/util.php:298 lib/util.php:314 lib/util.php:325
 msgid "Home"
 msgstr "Początek"
 
-#: ../actions/profilesettings.php:49
+#: ../actions/profilesettings.php:46 ../actions/register.php:167
+#: actions/profilesettings.php:79 actions/register.php:181
+#: actions/profilesettings.php:81 actions/register.php:208
 msgid "Homepage"
 msgstr "Strona domowa"
 
-#: ../actions/profilesettings.php:87
+#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: actions/profilesettings.php:210 actions/register.php:83
+#: actions/profilesettings.php:216 actions/register.php:92
 msgid "Homepage is not a valid URL."
 msgstr "Adres strony domowej nie jest poprawnym URL-em."
 
-#: ../actions/imsettings.php:61
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+#: actions/emailsettings.php:101
+msgid "I want to post notices by email."
+msgstr ""
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+#: actions/deleteprofile.php:253
+msgid "IM"
+msgstr ""
+
+#: ../actions/imsettings.php:60 actions/imsettings.php:61
 msgid "IM Address"
 msgstr "Adres komunikatora"
 
-#: ../actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
 msgid "IM Settings"
 msgstr "Ustawienia komunikatora"
 
-#: ../actions/finishopenidlogin.php:88
+#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
 msgstr ""
-"Jeśli już masz konto, zaloguj się używając nazwy użytkownika i hasła, "
-"aby połączyć je ze swoim identyfikatorem OpenID."
+"Jeśli już masz konto, zaloguj się używając nazwy użytkownika i hasła, aby "
+"połączyć je ze swoim identyfikatorem OpenID."
 
 #: ../actions/openidsettings.php:45
 msgid ""
@@ -528,531 +920,829 @@ msgstr ""
 "Jeśli chcesz skojarzyć konto OpenID ze swoim lokalnym kontem, wprowadź "
 "identyfikator w poniższe pole i kliknij \"Dodaj\"."
 
-#: ../actions/recoverpassword.php:122
+#: ../actions/recoverpassword.php:137
 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 ""
-"Jeśli Twoje hasło gdzieś się zapodziało lub zostało zapomniane to "
-"możesz wygenerować nowe. Zostanie ono wysłane na adres e-mailowy "
-"skojarzony z Twoim kontem."
 
-#: ../actions/password.php:69
+#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
+#: actions/emailsettings.php:68 actions/smssettings.php:76
+msgid "Incoming email"
+msgstr ""
+
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+#: actions/emailsettings.php:304
+msgid "Incoming email address removed."
+msgstr ""
+
+#: ../actions/password.php:69 actions/profilesettings.php:388
+#: actions/profilesettings.php:417
 msgid "Incorrect old password"
 msgstr "Stare hasło jest niepoprawne"
 
-#: ../actions/login.php:63
+#: ../actions/login.php:67 actions/login.php:67 actions/login.php:74
 msgid "Incorrect username or password."
 msgstr "Błędna nazwa użytkownika lub hasło."
 
-#: ../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."
 msgstr ""
-"Instrukcje dotyczące przywrócenia hasła zostały wysłane na adres "
-"e-mailowy skojarzony z Twoim kontem."
+"Instrukcje dotyczące przywrócenia hasła zostały wysłane na adres e-mailowy "
+"skojarzony z Twoim kontem."
 
-#: ../actions/updateprofile.php:113
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "Błędny URL awatara '%s'"
 
-#: ../actions/updateprofile.php:97
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "Błędna strona domowa '%s'"
 
-#: ../actions/updateprofile.php:81
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "Błędny URL licencji '%s'"
 
-#: ../actions/postnotice.php:61
+#: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:63
 msgid "Invalid notice content"
 msgstr "Błędna zawartość wpisu"
 
-#: ../actions/postnotice.php:67
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:69
 msgid "Invalid notice uri"
 msgstr "Błędny URI wpisu"
 
-#: ../actions/postnotice.php:72
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:74
 msgid "Invalid notice url"
 msgstr "Błędny URL wpisu"
 
-#: ../actions/updateprofile.php:86
+#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "Błędny URL profilu '%s'."
 
-#: ../actions/remotesubscribe.php:96
+#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
 msgid "Invalid profile URL (bad format)"
 msgstr "Błędny URL profilu (zły format)"
 
 #: ../actions/finishremotesubscribe.php:77
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:78
 msgid "Invalid profile URL returned by server."
 msgstr "Błędny URL profilu zwrócony przez serwer."
 
-#: ../actions/avatarbynickname.php:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
 msgid "Invalid size."
 msgstr "Niepoprawny rozmiar."
 
-#: ../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:256 actions/register.php:112
+#: actions/register.php:130
 msgid "Invalid username or password."
 msgstr "Błędna nazwa użytkownika lub hasło."
 
-#: ../lib/util.php:237
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr ""
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
+
+#: ../lib/util.php:306 lib/util.php:322 lib/util.php:332
+msgid "Invite"
+msgstr ""
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr ""
+
+#: ../lib/util.php:261 lib/util.php:277 lib/util.php:288
 #, 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 ""
-"Działa pod kontrolą  oprogramowania [Laconica](http://laconi.ca/) "
-"służącego do prowadzenia mikroblogów, w wersji %s, dostępnego na "
-"licencji [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"Działa pod kontrolą  oprogramowania [Laconica](http://laconi.ca/) służącego "
+"do prowadzenia mikroblogów, w wersji %s, dostępnego na licencji [GNU Affero "
+"General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
-#: ../actions/imsettings.php:164
+#: ../actions/imsettings.php:173 actions/imsettings.php:181
 msgid "Jabber ID already belongs to another user."
 msgstr "Identyfikator Jabbera należy już do innego użytkownika."
 
-#: ../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 ""
-"Adres Jabbera lub GTalka w postaci \"Użytkownik@przykladowadomena.org\". "
-"Nie zapomnij dodać %s do listy znajomych w swoim komunikatorze lub panelu "
-"GTalka."
+"Adres Jabbera lub GTalka w postaci \"Użytkownik@przykladowadomena.org\". Nie "
+"zapomnij dodać %s do listy znajomych w swoim komunikatorze lub panelu GTalka."
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
+msgid "Language"
+msgstr ""
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+#: actions/profilesettings.php:234
+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:87 actions/register.php:214
 msgid "Location"
 msgstr "Lokalizacja"
 
-#: ../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/profilesettings.php:225 actions/register.php:101
 msgid "Location is too long (max 255 chars)."
 msgstr "Lokalizacja jest za długa (max. 255 znaków)."
 
-#: ../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/login.php:104 actions/login.php:113 actions/openidlogin.php:88
+#: lib/util.php:336
 msgid "Login"
 msgstr "Login"
 
-#: ../actions/openidlogin.php:44
+#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:60
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Zaloguj się używając konta  [OpenID](%%doc.openid%%)."
 
-#: ../actions/login.php:122
+#: ../actions/login.php:126
 #, 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 ""
 "Zaloguj się używając nazwy użytkownika i hasła. Nie masz ich jeszcze? "
 "[Zarejestruj się](%%action.register%%) i utwórz konto, albo użyj swojego "
 "[OpenID](%%action.openidlogin%%)."
 
-#: ../lib/util.php:284
+#: ../lib/util.php:308 lib/util.php:324 lib/util.php:334
 msgid "Logout"
 msgstr "Wyloguj"
 
-#: ../actions/login.php:106
+#: ../actions/register.php:166 actions/register.php:180
+#: actions/register.php:207
+msgid "Longer name, preferably your \"real\" name"
+msgstr ""
+
+#: ../actions/login.php:110 actions/login.php:110 actions/login.php:118
 msgid "Lost or forgotten password?"
 msgstr "Zgubione hasło?"
 
-#: ../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 ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr ""
+
+#: ../actions/showstream.php:300 actions/showstream.php:315
+#: actions/showstream.php:363
 msgid "Member since"
 msgstr "W serwisie od"
 
-#: ../actions/userrss.php:70
+#: ../actions/userrss.php:70 actions/userrss.php:67
 #, php-format
 msgid "Microblog by %s"
 msgstr "%s – mikroblog"
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
+#: ../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 ""
+
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php:85 actions/register.php:202
+#: actions/register.php:229
 msgid "My text and files are available under "
 msgstr "Moje teksty i pliki są widoczne pod"
 
-#: ../actions/finishopenidlogin.php:71
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+msgid "New"
+msgstr ""
+
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:138
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+#: actions/emailsettings.php:318
+msgid "New incoming email address added."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
 msgid "New nickname"
 msgstr "Nowy pseudonim"
 
-#: ../actions/newnotice.php:100
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:141
 msgid "New notice"
 msgstr "Nowy wpis"
 
-#: ../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/profilesettings.php:185
 msgid "New password"
 msgstr "Nowe hasło"
 
-#: ../actions/recoverpassword.php:275
+#: ../actions/recoverpassword.php:314
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nowe hasło zapisano pomyślnie. Możesz się zalogować."
 
-#: ../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:108 actions/profilesettings.php:76
+#: actions/register.php:192
 msgid "Nickname"
 msgstr "Pseudonim"
 
-#: ../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/finishopenidlogin.php:192 actions/profilesettings.php:231
+#: actions/register.php:85
 msgid "Nickname already in use. Try another one."
 msgstr "Ten pseudonim jest już w użyciu. Wybierz inny."
 
-#: ../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:182 actions/profilesettings.php:209
+#: actions/register.php:83
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Pseudonim musi zawierać tylko małe litery i cyfry, bez znaków spacji."
 
-#: ../actions/finishopenidlogin.php:170
+#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:187
 msgid "Nickname not allowed."
 msgstr "Pseudonim niedozwolony."
 
-#: ../actions/remotesubscribe.php:72
+#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
 msgid "Nickname of the user you want to follow"
 msgstr "Pseudonim użytkownika którego chcesz obserwować"
 
-#: ../actions/recoverpassword.php:147
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
 msgid "Nickname or email"
 msgstr "Pseudonim lub e-mail"
 
-#: ../actions/imsettings.php:147
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:104
+msgid "No"
+msgstr ""
+
+#: ../actions/imsettings.php:156 actions/imsettings.php:164
 msgid "No Jabber ID."
 msgstr "Brak identyfikatora Jabbera."
 
-#: ../actions/userauthorization.php:128
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
 msgid "No authorization request!"
 msgstr "Brak żądania autoryzacji!"
 
-#: ../actions/confirmaddress.php:33
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+msgid "No carrier selected."
+msgstr ""
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+msgid "No code entered"
+msgstr ""
+
+#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
 msgid "No confirmation code."
 msgstr "Brak kodu potwierdzającego."
 
-#: ../actions/newnotice.php:49
+#: ../actions/newnotice.php:44 actions/newmessage.php:53
+#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:52
+#: actions/newnotice.php:53
 msgid "No content!"
 msgstr "Brak zawartości!"
 
-#: ../actions/userbyid.php:27
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+#: actions/emailsettings.php:197
+msgid "No email address."
+msgstr ""
+
+#: ../actions/userbyid.php:32 actions/userbyid.php:32
 msgid "No id."
 msgstr "Brak identyfikatora."
 
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+#: actions/emailsettings.php:292
+msgid "No incoming email address."
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:65
+#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:66
 msgid "No nickname provided by remote server."
 msgstr "Zdalny serwer nie wysłał pseudonimu."
 
-#: ../actions/avatarbynickname.php:27
+#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 msgid "No nickname."
 msgstr "Brak pseudonimu."
 
-#: ../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:243
 msgid "No pending confirmation to cancel."
 msgstr "Brak oczekujących potwierdzeń do anulowania."
 
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+msgid "No phone number."
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:72
+#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:73
 msgid "No profile URL returned by server."
 msgstr "Serwer nie zwrócił żadnego URL-a."
 
-#: ../actions/recoverpassword.php:189
+#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
 msgid "No registered email address for that user."
 msgstr "Brak zarejestrowanych adresów e-mailowych dla tego użytkownika."
 
-#: ../actions/userauthorization.php:48
+#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
 msgid "No request found!"
 msgstr "Nie znaleziono żądania!"
 
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
+#: actions/noticesearch.php:69 actions/peoplesearch.php:69
+#: actions/noticesearch.php:68 actions/peoplesearch.php:59
 msgid "No results"
 msgstr "Brak wyników"
 
-#: ../actions/avatarbynickname.php:32
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
 msgid "No size."
 msgstr "Zerowy rozmiar."
 
-#: ../actions/openidsettings.php:135
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:109
+#: actions/twitapistatuses.php:438
+msgid "No status found with that ID."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:411
+msgid "No status with that ID found."
+msgstr ""
+
+#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
 msgid "No such OpenID."
 msgstr "Brak takiego identyfikatora OpenID."
 
-#: ../actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29
 msgid "No such document."
 msgstr "Brak takiego dokumentu."
 
-#: ../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:38
+#: actions/shownotice.php:114
 msgid "No such notice."
 msgstr "Brak takiego wpisu."
 
-#: ../actions/recoverpassword.php:56
+#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
 msgid "No such recovery code."
 msgstr "Brak takiego kodu przywracania."
 
-#: ../actions/postnotice.php:56
+#: ../actions/postnotice.php:56 actions/postnotice.php:57
 msgid "No such subscription"
 msgstr "Nie ma takiej obserwacji"
 
 #: ../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/showstream.php:157
+#: classes/Command.php:208 classes/Command.php:242 lib/gallery.php:85
+#: lib/subs.php:105
 msgid "No such user."
 msgstr "Brak takiego użytkownika."
 
-#: ../lib/gallery.php:76
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr ""
+
+#: ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
 msgstr "Nie ma kogo pokazać!"
 
-#: ../actions/recoverpassword.php:60
+#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
 msgid "Not a recovery code."
 msgstr "To nie jest kod przywracania."
 
-#: ../actions/imsettings.php:158
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+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:423 lib/twitterapi.php:450
+#: lib/twitterapi.php:534
+msgid "Not a supported data format."
+msgstr ""
+
+#: ../actions/imsettings.php:167 actions/imsettings.php:175
 msgid "Not a valid Jabber ID"
 msgstr "Niepoprawny identyfikator Jabbera"
 
-#: ../lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131
 msgid "Not a valid OpenID."
 msgstr "Niepoprawny identyfikator OpenID."
 
-#: ../actions/profilesettings.php:75 ../actions/register.php:53
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+#: actions/emailsettings.php:208
+msgid "Not a valid email address"
+msgstr ""
+
+#: ../actions/register.php:63 actions/register.php:70 actions/register.php:79
 msgid "Not a valid email address."
 msgstr "Niewłaściwy adres e-mailowy."
 
-#: ../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/profilesettings.php:212 actions/register.php:87
 msgid "Not a valid nickname."
 msgstr "Niewłaściwy pseudonim."
 
-#: ../actions/remotesubscribe.php:118
+#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
 msgid "Not a valid profile URL (incorrect services)."
 msgstr "Błędny URL profilu (niepoprawne usługi)"
 
-#: ../actions/remotesubscribe.php:111
+#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr "Błędny URL profilu (nie zdefiniowany XRDS)"
 
-#: ../actions/remotesubscribe.php:104
+#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
 msgid "Not a valid profile URL (no YADIS document)."
 msgstr "Błędny URL profilu (brak dokumentu YADIS)"
 
-#: ../actions/avatar.php:95
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: actions/profilesettings.php:361
 msgid "Not an image or corrupt file."
 msgstr "Brak obrazka lub plik uszkodzony."
 
 #: ../actions/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:52
 msgid "Not authorized."
 msgstr "Brak autoryzacji."
 
 #: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38
 msgid "Not expecting this response!"
 msgstr "Nieoczekiwana odpowiedź!"
 
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
-#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+#: actions/twitapistatuses.php:304
+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:31 actions/newnotice.php:30
+#: actions/nudge.php:30 actions/subedit.php:31 actions/unblock.php:31
 msgid "Not logged in."
 msgstr "Niezalogowany."
 
-#: ../actions/unsubscribe.php:43
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:117
 msgid "Not subscribed!."
 msgstr "Nie obserwujesz!."
 
-#: ../actions/showstream.php:82
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+msgid "Notice Search"
+msgstr ""
+
+#: ../actions/showstream.php:82 actions/showstream.php:82
+#: actions/showstream.php:111 actions/showstream.php:118
+#: actions/showstream.php:123
 #, php-format
 msgid "Notice feed for %s"
 msgstr "Kanał wpisów dla %s"
 
-#: ../actions/shownotice.php:39
+#: ../actions/shownotice.php:39 actions/shownotice.php:39
+#: actions/shownotice.php:45
 msgid "Notice has no profile"
 msgstr "Wpis nie ma przypisanego profilu"
 
-#: ../actions/showstream.php:297
+#: ../actions/showstream.php:316 actions/showstream.php:331
+#: actions/showstream.php:379
 msgid "Notices"
 msgstr "Wpisy"
 
-#: ../actions/password.php:39
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
+#, php-format
+msgid "Notices tagged with %s"
+msgstr ""
+
+#: ../actions/password.php:39 actions/profilesettings.php:178
+#: actions/profilesettings.php:183
 msgid "Old password"
 msgstr "Stare hasło"
 
-#: ../lib/util.php:288
+#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
+#: lib/util.php:330 actions/deleteprofile.php:247 lib/util.php:340
 msgid "OpenID"
 msgstr "OpenID"
 
-#: ../actions/finishopenidlogin.php:61
+#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
 msgid "OpenID Account Setup"
 msgstr "Ustawienia konta OpenID"
 
-#: ../lib/openid.php:180
+#: ../lib/openid.php:180 lib/openid.php:180
 msgid "OpenID Auto-Submit"
 msgstr "Automatyczne zatwierdzanie OpenID"
 
 #: ../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/finishopenidlogin.php:150 actions/openidlogin.php:76
 msgid "OpenID Login"
 msgstr "Użytkownik OpenID"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
+#: actions/openidlogin.php:74 actions/openidsettings.php:50
+#: actions/openidlogin.php:82
 msgid "OpenID URL"
 msgstr "URL usługi OpenID"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
+#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 msgid "OpenID authentication cancelled."
 msgstr "Uwiarygadnianie OpenID przerwane."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
+#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "Uwiarygadnianie OpenID nie powiodło się: %s"
 
-#: ../lib/openid.php:133
+#: ../lib/openid.php:133 lib/openid.php:133
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "Awaria OpenID: %s"
 
-#: ../actions/openidsettings.php:144
+#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
 msgid "OpenID removed."
 msgstr "Usunięto identyfikator OpenID."
 
-#: ../actions/openidsettings.php:37
+#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
 msgid "OpenID settings"
 msgstr "Ustawienia OpenID"
 
-#: ../actions/avatar.php:84
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: actions/profilesettings.php:350
 msgid "Partial upload."
 msgstr "Częściowa wysyłka."
 
-#: ../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/login.php:109 actions/register.php:194
 msgid "Password"
 msgstr "Hasło"
 
-#: ../actions/recoverpassword.php:249
+#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
 msgid "Password and confirmation do not match."
 msgstr "Hasło i jego potwierdzenie nie pasują do siebie."
 
-#: ../actions/recoverpassword.php:245
+#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
 msgid "Password must be 6 chars or more."
 msgstr "Hasło musi mieć 6 lub więcej znaków."
 
-#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
+#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 msgid "Password recovery requested"
 msgstr "Zażądano odzyskania hasła"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:274
+#: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: actions/profilesettings.php:408 actions/recoverpassword.php:326
+#: actions/profilesettings.php:437
 msgid "Password saved."
 msgstr "Hasło zostało zapisane."
 
-#: ../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/profilesettings.php:409 actions/register.php:107
 msgid "Passwords don't match."
 msgstr "Podane hasła nie pasują do siebie."
 
-#: ../actions/peoplesearch.php:33
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+msgid "People"
+msgstr ""
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+msgid "People Search"
+msgstr ""
+
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
 msgid "People search"
 msgstr "Szukaj ludzi"
 
-#: ../lib/stream.php:44
+#: ../lib/stream.php:50 lib/personal.php:50
 msgid "Personal"
 msgstr "Osobiste"
 
-#: ../actions/userauthorization.php:77
+#: ../actions/invite.php:133 actions/invite.php:141
+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 ""
 "Sprawdź proszę poniższe informacje, aby upewnić się czy na pewno chcesz "
-"obserwować wpisy tego użytkownika. Jeżeli to pomyłka lub chodziło o "
-"kogoś innego kliknij \"Anuluj\"."
+"obserwować wpisy tego użytkownika. Jeżeli to pomyłka lub chodziło o kogoś "
+"innego kliknij \"Anuluj\"."
 
-#: ../actions/imsettings.php:74
+#: ../actions/imsettings.php:73 actions/imsettings.php:74
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Utwórz wpis kiedy zmieni się status na komunikatorze."
 
-#: ../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
 msgid "Preferences"
 msgstr "Preferencje"
 
-#: ../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:185 actions/othersettings.php:179
 msgid "Preferences saved."
 msgstr "Preferencje zostały zapisane."
 
-#: ../lib/util.php:300
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
+msgid "Preferred language"
+msgstr ""
+
+#: ../lib/util.php:328 lib/util.php:344 lib/util.php:356
 msgid "Privacy"
 msgstr "Prywatność"
 
-#: ../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:139 classes/Notice.php:149
 msgid "Problem saving notice."
 msgstr "Problem z zachowywaniem wpisu."
 
-#: ../lib/stream.php:54
+#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
+#: lib/settingsaction.php:84 actions/deleteprofile.php:241
 msgid "Profile"
 msgstr "Profil"
 
-#: ../actions/remotesubscribe.php:73
+#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
 msgid "Profile URL"
 msgstr "URL profilu"
 
-#: ../actions/profilesettings.php:34
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
 msgid "Profile settings"
 msgstr "Ustawienia profilu"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
+#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
+#: actions/postnotice.php:52 actions/updateprofile.php:53
 msgid "Profile unknown"
 msgstr "Nieznany profil"
 
-#: ../lib/util.php:276
-msgid "Public"
-msgstr "Publiczny"
-
-#: ../actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:77
 msgid "Public Stream Feed"
 msgstr "Publiczny Kanał Strumieni"
 
-#: ../actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 lib/stream.php:34
 msgid "Public timeline"
 msgstr "Publiczna oś czasu"
 
-#: ../actions/recoverpassword.php:151
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:104
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
 msgid "Recover"
 msgstr "Przywróć"
 
-#: ../actions/recoverpassword.php:141
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
 msgid "Recover password"
 msgstr "Odzyskiwanie hasła"
 
-#: ../actions/recoverpassword.php:67
+#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
 msgid "Recovery code for unknown user."
 msgstr "Kod przywracający dla nieznanego użytkownika."
 
-#: ../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:181 actions/register.php:234 lib/util.php:338
 msgid "Register"
 msgstr "Zarejestruj"
 
-#: ../actions/userauthorization.php:119
+#: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:173
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:241
+msgid "Registration successful"
+msgstr ""
+
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
 msgid "Reject"
 msgstr "Odrzuć"
 
-#: ../actions/login.php:99 ../actions/register.php:183
+#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
+#: actions/register.php:190 actions/login.php:110 actions/openidlogin.php:85
+#: actions/register.php:217
 msgid "Remember me"
 msgstr "Pamiętaj mnie"
 
-#: ../actions/updateprofile.php:69
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
 msgid "Remote profile with no matching profile"
 msgstr "Zdalny profil bez odpowiadającego profilu lokalnego"
 
-#: ../actions/remotesubscribe.php:65
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
 msgid "Remote subscribe"
 msgstr "Zdalna subskrypcja"
 
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php:48 actions/emailsettings.php:76
+#: actions/imsettings.php:49 actions/openidsettings.php:108
+#: actions/smssettings.php:50 actions/smssettings.php:84
+#: actions/twittersettings.php:59 actions/twittersettings.php:61
 msgid "Remove"
 msgstr "Usuń"
 
-#: ../actions/openidsettings.php:68
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
 msgid "Remove OpenID"
 msgstr "Usuń konto OpenID"
 
@@ -1061,43 +1751,76 @@ msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
 msgstr ""
-"Usunięcie jedynego konta OpenID uniemożliwi dalsze logowanie! Jeśli "
-"musisz je usunąć dodaj wcześniej jakieś inne."
+"Usunięcie jedynego konta OpenID uniemożliwi dalsze logowanie! Jeśli musisz "
+"je usunąć dodaj wcześniej jakieś inne."
 
-#: ../lib/stream.php:49
+#: ../lib/stream.php:55 lib/personal.php:55
 msgid "Replies"
 msgstr "Odpowiedzi"
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:50
+#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
+#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #, php-format
 msgid "Replies to %s"
 msgstr "Odpowiedzi na %s"
 
-#: ../actions/recoverpassword.php:168
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
 msgid "Reset"
 msgstr "Wyzeruj"
 
-#: ../actions/recoverpassword.php:158
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
 msgid "Reset password"
 msgstr "Ustaw ponownie hasło"
 
-#: ../actions/recoverpassword.php:167 ../actions/register.php:180
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/deleteprofile.php:250 actions/subscriptions.php:73
+msgid "SMS"
+msgstr ""
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+msgid "SMS Phone number"
+msgstr ""
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:230
+msgid "SMS confirmation"
+msgstr ""
+
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
 msgid "Same as password above"
 msgstr "Takie samo jak hasło wprowadzone powyżej"
 
-#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
+#: ../actions/register.php:156 actions/register.php:170
+#: actions/register.php:197
+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/twittersettings.php:83 actions/emailsettings.php:107
+#: actions/othersettings.php:56 actions/profilesettings.php:106
+#: actions/subscriptions.php:74 actions/tagother.php:100
+#: actions/twittersettings.php:82
 msgid "Save"
 msgstr "Zapisz"
 
-#: ../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/util.php:327
 msgid "Search"
 msgstr "Szukaj"
 
-#: ../actions/noticesearch.php:80
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:84
 msgid "Search Stream Feed"
 msgstr "Szukaj Kanału Strumieni"
 
-#: ../actions/noticesearch.php:30
+#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
+#: actions/noticesearch.php:29
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -1116,153 +1839,262 @@ msgstr ""
 "nazwiska, miejscowości lub zainteresowania. Użyj spacji aby oddzielić "
 "elementy wyszukiwania. Słowa muszą mieć minimum 3 znaki."
 
-#: ../lib/util.php:982
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+msgid "Select a carrier"
+msgstr ""
+
+#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
+#: lib/util.php:1306 lib/util.php:1731 lib/util.php:1646 lib/util.php:2158
 msgid "Send"
 msgstr "Wyślij"
 
-#: ../actions/imsettings.php:71
+#: ../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."
+msgstr ""
+
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+msgid "Send me notices of new subscriptions through email."
+msgstr ""
+
+#: ../actions/imsettings.php:70 actions/imsettings.php:71
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Wysyłaj mi wpisy przez Jabbera/GTalka"
 
-#: ../lib/util.php:282
+#: ../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 ""
+
+#: ../lib/util.php:304 lib/util.php:320 lib/util.php:330
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: ../actions/profilesettings.php:183
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:336
 msgid "Settings saved."
 msgstr "Ustawienia zostały zapisane."
 
-#: ../actions/finishaddopenid.php:66
+#: ../actions/tag.php:60 actions/tag.php:60 actions/tag.php:59
+msgid "Showing most popular tags from the last week"
+msgstr ""
+
+#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
 msgid "Someone else already has this OpenID."
 msgstr "Ktoś inny posługuje się już tym identyfikatorem OpenID."
 
 #: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
+#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
 msgid "Something weird happened."
 msgstr "Stało się coś dziwnego."
 
-#: ../lib/util.php:302
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr ""
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: ../lib/util.php:330 lib/util.php:346 lib/util.php:358
 msgid "Source"
 msgstr "Kod źródłowy"
 
-#: ../actions/showstream.php:277
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:359
 msgid "Statistics"
 msgstr "Statystyki"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
+#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
+#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
+#: actions/finishopenidlogin.php:199 actions/finishopenidlogin.php:267
 msgid "Stored OpenID not found."
 msgstr "Nie znaleziono zapisanego konta OpenID."
 
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:172
-#: ../actions/showstream.php:181
+#: ../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:254 lib/util.php:2078
 msgid "Subscribe"
 msgstr "Subskrybuj"
 
-#: ../actions/showstream.php:294 ../actions/subscribers.php:27
+#: ../actions/showstream.php:313 ../actions/subscribers.php:27
+#: actions/showstream.php:328 actions/subscribers.php:27
+#: actions/showstream.php:376 lib/gallery.php:136 lib/gallery.php:137
 msgid "Subscribers"
 msgstr "Subskrybenci"
 
-#: ../actions/userauthorization.php:309
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
 msgid "Subscription authorized"
 msgstr "Subskrypcja uwierzytelniona"
 
-#: ../actions/userauthorization.php:319
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
 msgid "Subscription rejected"
 msgstr "Subskrypcja odrzucona"
 
-#: ../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:288 actions/showstream.php:370 lib/gallery.php:131
+#: lib/gallery.php:132
 msgid "Subscriptions"
 msgstr "Subskrypcje"
 
-#: ../actions/avatar.php:87
+#: ../actions/avatar.php:87 actions/profilesettings.php:324
+#: actions/profilesettings.php:353
 msgid "System error uploading file."
 msgstr "Błąd systemowy podczas wysyłania pliku."
 
-#: ../actions/noticesearch.php:34
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317 actions/profilesettings.php:90 actions/showstream.php:382
+#: actions/tag.php:40 actions/tagother.php:96 actions/tagother.php:162
+#: lib/profilelist.php:126 lib/profilelist.php:128
+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:33
 msgid "Text search"
 msgstr "Szukaj tekstu"
 
-#: ../actions/openidsettings.php:140
+#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
 msgid "That OpenID does not belong to you."
 msgstr "Ten identyfikator OpenID nie należy do Ciebie."
 
-#: ../actions/confirmaddress.php:52
+#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
 msgid "That address has already been confirmed."
 msgstr "Ten adres został już potwierdzony"
 
-#: ../actions/confirmaddress.php:43
+#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
 msgid "That confirmation code is not for you!"
 msgstr "Ten kod potwierdzający nie jest przeznaczony dla Ciebie!"
 
-#: ../actions/avatar.php:80
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:214
+msgid "That email address already belongs to another user."
+msgstr ""
+
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: actions/profilesettings.php:346
 msgid "That file is too big."
 msgstr "Ten plik jest za duży."
 
-#: ../actions/imsettings.php:161
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
 msgid "That is already your Jabber ID."
 msgstr "Ten identyfikator Jabbera jest już do Ciebie przypisany."
 
-#: ../actions/imsettings.php:224
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:211
+msgid "That is already your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+msgid "That is already your phone number."
+msgstr ""
+
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
 msgid "That is not your Jabber ID."
 msgstr "To nie jest Twój identyfikator Jabbera."
 
-#: ../actions/imsettings.php:201
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+#: actions/emailsettings.php:270
+msgid "That is not your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+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:247
 msgid "That is the wrong IM address."
 msgstr "To jest błędny adres komunikatora."
 
-#: ../actions/newnotice.php:52
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+msgid "That is the wrong confirmation number."
+msgstr ""
+
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+msgid "That phone number already belongs to another user."
+msgstr ""
+
+#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: actions/newnotice.php:49 actions/twitapistatuses.php:330
+#: actions/newnotice.php:61 actions/twitapistatuses.php:271
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "Wpis za długi. Maksymalna długość to 140 znaków."
 
-#: ../actions/confirmaddress.php:86
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+#: actions/twitapiaccount.php:55
+msgid "That's too long. Max notice size is 255 chars."
+msgstr ""
+
+#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Skojarzony z Twoim kontem adres \"%s\" został potwierdzony."
 
-#: ../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:285
 msgid "The address was removed."
 msgstr "Adres został usunięty."
 
-#: ../actions/userauthorization.php:311
+#: ../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 ""
-"Twoje żądanie obserwacji zostało odrzucone, ale nie przekazano żadnego "
-"URL-a do zwrotnego komunikatu. Sprawdź w instrukcjach serwisu w jaki "
-"sposób dokładnie odbywa się odrzucanie subskrypcji. Twój token "
-"subskrypcji to:"
+"Twoje żądanie obserwacji zostało odrzucone, ale nie przekazano żadnego URL-a "
+"do zwrotnego komunikatu. Sprawdź w instrukcjach serwisu w jaki sposób "
+"dokładnie odbywa się odrzucanie subskrypcji. Twój token subskrypcji to:"
 
-#: ../actions/userauthorization.php:321
+#: ../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 ""
-"Twoje żądanie obserwacji zostało odrzucone, ale nie przekazano żadnego "
-"URL-a do zwrotnego komunikatu. Sprawdź w instrukcjach serwisu w jaki "
-"sposób dokładnie odbywa się odrzucanie subskrypcji."
+"Twoje żądanie obserwacji zostało odrzucone, ale nie przekazano żadnego URL-a "
+"do zwrotnego komunikatu. Sprawdź w instrukcjach serwisu w jaki sposób "
+"dokładnie odbywa się odrzucanie subskrypcji."
 
-#: ../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 "Ludzie obserwujący wpisy użytkownika %s."
 
-#: ../actions/subscribers.php:33
+#: ../actions/subscribers.php:33 actions/subscribers.php:33
 msgid "These are the people who listen to your notices."
 msgstr "Ludzie obserwujący Twoje wpisy."
 
-#: ../actions/subscriptions.php:35
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Ludzie, których wpisy obserwuje użytkownik %s."
 
-#: ../actions/subscriptions.php:33
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
 msgid "These are the people whose notices you listen to."
 msgstr "Ludzie których wpisy obserwujesz."
 
-#: ../actions/recoverpassword.php:87
+#: ../actions/invite.php:89 actions/invite.php:96
+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 "Kod potwierdzający jest przeterminowany. Zacznij jeszcze raz."
 
@@ -1271,58 +2103,99 @@ msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
 msgstr ""
-"Ten formularz powinien wysłać się automatycznie. Jeśli tak się nie "
-"stanie kliknij Wyślij, aby przejść do Twojego dostawcy OpenID."
+"Ten formularz powinien wysłać się automatycznie. Jeśli tak się nie stanie "
+"kliknij Wyślij, aby przejść do Twojego dostawcy OpenID."
 
-#: ../actions/finishopenidlogin.php:56
+#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
 #, 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 ""
-"Jeżeli logujesz się po raz pierwszy do %s to twoje konto OpenID musi "
-"zostać skojarzone z kontem lokalnym. Możesz więc albo utworzyć nowe "
-"konto, albo połączyć je z posiadanym istniejącym."
+"Jeżeli logujesz się po raz pierwszy do %s to twoje konto OpenID musi zostać "
+"skojarzone z kontem lokalnym. Możesz więc albo utworzyć nowe konto, albo "
+"połączyć je z posiadanym istniejącym."
+
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:94
+#: actions/twitapifriendships.php:82 actions/twitapistatuses.php:428
+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:46
+#: actions/twitapidirect_messages.php:117 actions/twitapifriendships.php:30
+#: actions/twitapistatuses.php:239
+msgid "This method requires a POST."
+msgstr ""
 
-#: ../lib/util.php:147
+#: ../lib/util.php:164 lib/util.php:246 lib/util.php:257
 msgid "This page is not available in a media type you accept"
 msgstr "Ta strona nie jest dostępna dla medium, którego typ akceptujesz"
 
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
+msgid "Timezone"
+msgstr ""
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr ""
+
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"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 ""
+"Aby się zapisać możesz się [zalogować](%%action.login%%) lub [zarejestrować]"
+"(%%action.register%%). Jeśli już posiadasz konto w [kompatybilnym serwisie](%"
+"%doc.openmublog%%) wprowadź poniżej identyfikator URL."
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: actions/twitapifriendships.php:128
+msgid "Two user ids or screen_names must be supplied."
 msgstr ""
-"Aby się zapisać możesz się [zalogować](%%action.login%%) lub "
-"[zarejestrować](%%action.register%%). Jeśli już posiadasz konto w "
-"[kompatybilnym serwisie](%%doc.openmublog%%) wprowadź poniżej "
-"identyfikator URL."
 
-#: ../actions/profilesettings.php:51
+#: ../actions/profilesettings.php:48 ../actions/register.php:169
+#: actions/profilesettings.php:81 actions/register.php:183
+#: actions/profilesettings.php:83 actions/register.php:210
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL Twojej strony domowej, bloga, lub profilu na innej stronie"
 
-#: ../actions/remotesubscribe.php:74
+#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL Twojego profilu na kompatybilnym serwisie do mikroblogów"
 
-#: ../actions/imsettings.php:105 ../actions/recoverpassword.php:39
+#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
+#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
+#: actions/emailsettings.php:144 actions/imsettings.php:118
+#: actions/recoverpassword.php:39 actions/smssettings.php:143
+#: actions/twittersettings.php:108 actions/emailsettings.php:147
+#: actions/othersettings.php:146 actions/twittersettings.php:199
 msgid "Unexpected form submission."
 msgstr "Nieoczekiwane przesłanie formularza."
 
-#: ../actions/recoverpassword.php:237
+#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
 msgid "Unexpected password reset."
 msgstr "Nieoczekiwane wyzerowanie hasła."
 
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:58
+#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:59
 msgid "Unknown version of OMB protocol."
 msgstr "Nieznana wersja protokołu OMB."
 
-#: ../lib/util.php:245
+#: ../lib/util.php:269 lib/util.php:285 lib/util.php:296
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
@@ -1330,24 +2203,50 @@ msgstr ""
 "Prawo do kopiowania zawartości tej strony, chyba że zaznaczono inaczej, "
 "należy do tworzących jej treści i uwarunkowane zasadami"
 
-#: ../actions/confirmaddress.php:48
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr "Nierozpoznany typ adresu %s"
 
-#: ../actions/showstream.php:193
+#: ../actions/showstream.php:209 actions/showstream.php:219
+#: actions/showstream.php:267 lib/util.php:2094
 msgid "Unsubscribe"
 msgstr "Zrezygnuj z subskrypcji"
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
+#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
+#: actions/postnotice.php:45 actions/updateprofile.php:46
 msgid "Unsupported OMB version"
 msgstr "Nieobsługiwana wersja OMB"
 
-#: ../actions/avatar.php:105
+#: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: actions/profilesettings.php:371
 msgid "Unsupported image file format."
 msgstr "Nieobsługiwany format pliku obrazu."
 
-#: ../actions/avatar.php:68
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: actions/deleteprofile.php:251
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: actions/deleteprofile.php:254
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/twitapistatuses.php:126
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:198
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
+
+#: ../actions/avatar.php:68 actions/profilesettings.php:161
+#: actions/profilesettings.php:166
 msgid "Upload"
 msgstr "Wyślij"
 
@@ -1359,116 +2258,205 @@ msgid ""
 "share."
 msgstr ""
 "Tu możesz wysłać nowego \"awatara\" (wizerunek użytkownika). Nie da się "
-"edytować obrazu po jego umieszczeniu w serwisie, więc upewnij się, że "
-"jest w miarę kwadratowy. Wysyłając go zgadzasz się na jego publikację "
-"na warunkach podanych w licencji strony. Użyj grafiki, która należy do "
-"Ciebie i którą możesz dzielić się z innymi."
+"edytować obrazu po jego umieszczeniu w serwisie, więc upewnij się, że jest w "
+"miarę kwadratowy. Wysyłając go zgadzasz się na jego publikację na warunkach "
+"podanych w licencji strony. Użyj grafiki, która należy do Ciebie i którą "
+"możesz dzielić się z innymi."
+
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr ""
+
+#: ../actions/invite.php:114 actions/invite.php:121
+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 actions/register.php:200
+#: actions/register.php:203
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Używane tylko do aktualizacji, ogłoszeń i przywracania hasła"
 
 #: ../actions/finishremotesubscribe.php:86
+#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:92
 msgid "User being listened to doesn't exist."
 msgstr "Obserwowany użytkownik nie istnieje."
 
 #: ../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/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/showstream.php:57
+#: actions/twitapiaccount.php:63 actions/twitapifavorites.php:40
+#: actions/twitapistatuses.php:163 actions/twitapistatuses.php:492
+#: lib/twitterapi.php:590
 msgid "User has no profile."
 msgstr "Użytkownik nie ma profilu."
 
-#: ../actions/remotesubscribe.php:71
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
 msgid "User nickname"
 msgstr "Pseudonim użytkownika"
 
-#: ../lib/util.php:969
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../lib/util.php:1159 lib/util.php:1293 lib/util.php:1630
 #, php-format
 msgid "What's up, %s?"
 msgstr "Co słychać, %s?"
 
-#: ../actions/profilesettings.php:57
+#: ../actions/profilesettings.php:54 ../actions/register.php:175
+#: actions/profilesettings.php:87 actions/register.php:189
+#: actions/profilesettings.php:89 actions/register.php:216
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Gdzie jesteś? (np. \"miasto, region, kraj\")"
 
-#: ../actions/updateprofile.php:127
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Nieprawidłowy typ obrazu dla '%s'"
 
-#: ../actions/updateprofile.php:122
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Nieprawidłowy rozmiar obrazu dla '%s'"
 
-#: ../actions/finishaddopenid.php:64
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+#: actions/block.php:105
+msgid "Yes"
+msgstr ""
+
+#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
 msgid "You already have this OpenID!"
 msgstr "Już masz ten identyfikator OpenID!"
 
-#: ../actions/recoverpassword.php:31
+#: ../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
 msgid "You are already logged in!"
 msgstr "Nie musisz ponownie się logować!"
 
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:102
+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 "Tu możesz zmienić hasło. Wybierz porządne!"
 
-#: ../actions/register.php:164
+#: ../actions/register.php:135 actions/register.php:145
 msgid "You can create a new account to start posting notices."
 msgstr "Możesz utworzyć nowe konto, aby rozpocząć wysyłanie wpisów."
 
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
 #: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr ""
-"Możesz usunąć łączność z serwerem OpenID ze swojego konta klikając "
-"\"Usuń\"."
+"Możesz usunąć łączność z serwerem OpenID ze swojego konta klikając \"Usuń\"."
 
-#: ../actions/imsettings.php:28
+#: ../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 ""
-"Możesz wysyłać i odbierać wpisy przez komunikator Jabber/GTalk "
-"(%%doc.im%%). Poniżej możesz skonfigurować swój adres i ustawienia IM."
+"Możesz wysyłać i odbierać wpisy przez komunikator Jabber/GTalk (%%doc.im%%). "
+"Poniżej możesz skonfigurować swój adres i ustawienia IM."
 
 #: ../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 ""
 "W tym miejscu możesz zaktualizować informacje zawarte w Twoim osobistym "
 "profilu, aby inni mogli lepiej Cię poznać."
 
 #: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
+#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
+#: actions/finishremotesubscribe.php:83 actions/finishremotesubscribe.php:99
 msgid "You can use the local subscription!"
 msgstr "Możesz skorzystać z lokalnej subskrypcji!"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:51
+#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
+#: actions/finishopenidlogin.php:38 actions/register.php:68
+#: actions/register.php:77
 msgid "You can't register if you don't agree to the license."
 msgstr ""
-"Nie możesz się zarejestrować, jeśli nie zgadzasz się z warunkami "
-"licencji."
+"Nie możesz się zarejestrować, jeśli nie zgadzasz się z warunkami licencji."
 
-#: ../actions/updateprofile.php:62
+#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
 msgid "You did not send us that profile"
 msgstr "Ten profil nie był wysłany przez Ciebie"
 
-#: ../actions/recoverpassword.php:134
+#: ../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 ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: actions/twitapistatuses.php:455
+msgid "You may not delete another user's status."
+msgstr ""
+
+#: ../actions/invite.php:31 actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+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!"
+msgstr ""
+
+#: ../actions/recoverpassword.php:149
 msgid "You've been identified. Enter a  new password below. "
 msgstr "Identyfikacja pomyślna. Wprowadź poniżej nowe hasło."
 
-#: ../actions/openidlogin.php:67
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:84
 msgid "Your OpenID URL"
 msgstr "URL Twojej usługi OpenID"
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:164
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
-"Twój pseudonim na tym serwerze lub adres e-mailowy użyty podczas "
-"rejestracji."
+"Twój pseudonim na tym serwerze lub adres e-mailowy użyty podczas rejestracji."
 
 #: ../actions/openidsettings.php:28
 #, php-format
@@ -1480,784 +2468,85 @@ msgstr ""
 "wykorzystaniem jednego konta użytkownika. Tu możesz zarządzać swoimi "
 "identyfikatorami OpenID."
 
-#: ../lib/util.php:814
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:1287
 msgid "a few seconds ago"
 msgstr "kilka sekund temu"
 
-#: ../lib/util.php:826
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:1299
 #, php-format
 msgid "about %d days ago"
 msgstr "około %d dni temu"
 
-#: ../lib/util.php:822
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:1295
 #, php-format
 msgid "about %d hours ago"
 msgstr "około %d godzin temu"
 
-#: ../lib/util.php:818
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:1291
 #, php-format
 msgid "about %d minutes ago"
 msgstr "około %d minut temu"
 
-#: ../lib/util.php:830
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:1303
 #, php-format
 msgid "about %d months ago"
 msgstr "około %d miesięcy temu"
 
-#: ../lib/util.php:824
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:1297
 msgid "about a day ago"
 msgstr "blisko dzień temu"
 
-#: ../lib/util.php:816
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:1289
 msgid "about a minute ago"
 msgstr "blisko minutę temu"
 
-#: ../lib/util.php:828
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:1301
 msgid "about a month ago"
 msgstr "blisko miesiąc temu"
 
-#: ../lib/util.php:832
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:1305
 msgid "about a year ago"
 msgstr "blisko rok temu"
 
-#: ../lib/util.php:820
-msgid "about an hour ago"
-msgstr "blisko godzinę temu"
-
-#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
-#: ../lib/stream.php:101
-msgid "in reply to..."
-msgstr "w odpowiedzi na…"
-
-#: ../actions/noticesearch.php:133 ../actions/showstream.php:390
-#: ../lib/stream.php:108
-msgid "reply"
-msgstr "odpowiedź"
-
-#: ../actions/password.php:44
-msgid "same as password above"
-msgstr "takie samo hasło jak powyżej"
-
-#: ../lib/util.php:1127
-msgid "« After"
-msgstr "« następne"
-
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr ""
-
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
-
-#: ../actions/invite.php:168 actions/invite.php:176
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
-
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
-
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
-#, php-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#, php-format
-msgid "%s public timeline"
-msgstr ""
-
-#: ../lib/mail.php:206 lib/mail.php:212
-#, php-format
-msgid "%s status"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#, php-format
-msgid "%s timeline"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
-msgstr ""
-
-#: ../actions/register.php:213
-msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
-msgstr ""
-
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-
-#: ../actions/register.php:154 actions/register.php:168
-msgid "6 or more characters. Required."
-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 ""
-
-#: ../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/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!"
-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 ""
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-msgid "Add or remove OpenIDs"
-msgstr ""
-
-#: ../actions/invite.php:131 actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
-msgstr ""
-
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-msgid "Are you sure you want to delete this notice?"
-msgstr ""
-
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr ""
-
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
-msgid "Can't delete this notice."
-msgstr ""
-
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-msgid "Cannot normalize that email address"
-msgstr ""
-
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr ""
-
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
-msgstr ""
-
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-msgid "Change your profile settings"
-msgstr ""
-
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-msgid "Confirmation code"
-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/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
-msgstr ""
-
-#: ../lib/subs.php:54 lib/subs.php:61
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: ../lib/subs.php:46 lib/subs.php:46
-msgid "Could not subscribe."
-msgstr ""
-
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-msgid "Could not update user with confirmed email address."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-msgid "Couldn't find any statuses."
-msgstr ""
-
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-msgid "Couldn't update user for autosubscribe."
-msgstr ""
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-msgid "Couldn't update user record."
-msgstr ""
-
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-msgid "Current confirmed email address."
-msgstr ""
-
-#: ../classes/Notice.php:72 classes/Notice.php:86
-#, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr ""
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-msgid "Delete notice"
-msgstr ""
-
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-msgid "Email Address"
-msgstr ""
-
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-msgid "Email Settings"
-msgstr ""
-
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-msgid "Email address, like \"UserName@example.org\""
-msgstr ""
-
-#: ../actions/invite.php:129 actions/invite.php:137
-msgid "Email addresses"
-msgstr ""
-
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
-msgstr ""
-
-#: ../actions/tag.php:55 actions/tag.php:55
-#, php-format
-msgid "Feed for tag %s"
-msgstr ""
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr ""
-
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr ""
-
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-msgid "I want to post notices by email."
-msgstr ""
-
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
-msgstr ""
-
-#: ../actions/recoverpassword.php:137
-msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
-"email address you have stored  in your account."
-msgstr ""
-
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-msgid "Incoming email"
-msgstr ""
-
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-msgid "Incoming email address removed."
-msgstr ""
-
-#: ../actions/invite.php:55 actions/invite.php:62
-#, php-format
-msgid "Invalid email address: %s"
-msgstr ""
-
-#: ../actions/invite.php:79 actions/invite.php:86
-msgid "Invitation(s) sent"
-msgstr ""
-
-#: ../actions/invite.php:97 actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
-msgstr ""
-
-#: ../lib/util.php:306 lib/util.php:322
-msgid "Invite"
-msgstr ""
-
-#: ../actions/invite.php:123 actions/invite.php:130
-msgid "Invite new users"
-msgstr ""
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Language"
-msgstr ""
-
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-msgid "Language is too long (max 50 chars)."
-msgstr ""
-
-#: ../actions/register.php:166 actions/register.php:180
-msgid "Longer name, preferably your \"real\" name"
-msgstr ""
-
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-#: actions/emailsettings.php:81 actions/smssettings.php:89
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
-
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-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 ""
-
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-msgid "New"
-msgstr ""
-
-#: ../lib/mail.php:144 lib/mail.php:144
-#, php-format
-msgid "New email address for posting to %s"
-msgstr ""
-
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-msgid "New incoming email address added."
-msgstr ""
-
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-msgid "No"
-msgstr ""
-
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-msgid "No carrier selected."
-msgstr ""
-
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-msgid "No code entered"
-msgstr ""
-
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-msgid "No email address."
-msgstr ""
-
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-msgid "No incoming email address."
-msgstr ""
-
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-msgid "No phone number."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-msgid "No status found with that ID."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-msgid "No status with that ID found."
-msgstr ""
-
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-msgid "No user with that email address or username."
-msgstr ""
-
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-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
-msgid "Not a supported data format."
-msgstr ""
-
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-msgid "Not a valid email address"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-msgid "Not found"
-msgstr ""
-
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-msgid "Notice Search"
-msgstr ""
-
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81
-#, php-format
-msgid "Notices tagged with %s"
-msgstr ""
-
-#: ../actions/invite.php:135 actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-msgid "People"
-msgstr ""
-
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-msgid "People Search"
-msgstr ""
-
-#: ../actions/invite.php:133 actions/invite.php:141
-msgid "Personal message"
-msgstr ""
-
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Preferred language"
-msgstr ""
-
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
-
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-msgid "Publish a MicroID for my email address."
-msgstr ""
-
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr ""
-
-#: ../actions/register.php:28 actions/register.php:28
-msgid "Registration not allowed."
-msgstr ""
-
-#: ../actions/register.php:200 actions/register.php:214
-msgid "Registration successful"
-msgstr ""
-
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
-msgstr ""
-
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-msgid "SMS Phone number"
-msgstr ""
-
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-msgid "SMS Settings"
-msgstr ""
-
-#: ../lib/mail.php:219 lib/mail.php:225
-msgid "SMS confirmation"
-msgstr ""
-
-#: ../actions/register.php:156 actions/register.php:170
-msgid "Same as password above. Required."
-msgstr ""
-
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-msgid "Select a carrier"
-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."
-msgstr ""
-
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-msgid "Send me notices of new subscriptions through email."
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr ""
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
-msgstr ""
-
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317
-msgid "Tags"
-msgstr ""
-
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr ""
-
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr ""
-
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-msgid "That is already your email address."
-msgstr ""
-
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-msgid "That is already your phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-msgid "That is not your email address."
-msgstr ""
-
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-msgid "That is not your phone number."
-msgstr ""
-
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-msgid "That is the wrong confirmation number."
-msgstr ""
-
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-msgid "That phone number already belongs to another user."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-msgid "That's too long. Max notice size is 255 chars."
-msgstr ""
-
-#: ../actions/invite.php:89 actions/invite.php:96
-msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
-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."
-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."
-msgstr ""
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "Timezone"
-msgstr ""
-
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-msgid "Timezone not selected."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-msgid "Two user ids or screen_names must be supplied."
-msgstr ""
-
-#: ../index.php:57 index.php:57
-msgid "Unknown action"
-msgstr ""
-
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-msgid "Updates by SMS"
-msgstr ""
-
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr ""
-
-#: ../actions/invite.php:114 actions/invite.php:121
-msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
-msgstr ""
-
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr ""
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "What timezone are you normally in?"
-msgstr ""
-
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-msgid "Yes"
-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/invite.php:81 actions/invite.php:88
-msgid "You are already subscribed to these users:"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
-msgstr ""
-
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-msgid "You may not delete another user's status."
-msgstr ""
-
-#: ../actions/invite.php:31 actions/invite.php:31
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-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!"
-msgstr ""
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:1293
+msgid "about an hour ago"
+msgstr "blisko godzinę temu"
 
 #: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
+#: actions/showstream.php:441 lib/stream.php:99 lib/noticelist.php:211
 msgid "delete"
 msgstr ""
 
+#: ../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:135
+#: lib/facebookaction.php:202 lib/noticelist.php:189
+msgid "in reply to..."
+msgstr "w odpowiedzi na…"
+
+#: ../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:142
+#: lib/noticelist.php:199
+msgid "reply"
+msgstr "odpowiedź"
+
+#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/profilesettings.php:188
+msgid "same as password above"
+msgstr "takie samo hasło jak powyżej"
+
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+#: actions/twitapistatuses.php:543
 msgid "unsupported file type"
 msgstr ""
 
+#: ../lib/util.php:1309 lib/util.php:1443 lib/facebookaction.php:251
+#: lib/util.php:1783
+#, fuzzy
+msgid "« After"
+msgstr "« następne"
+
 #: actions/deletenotice.php:74 actions/disfavor.php:43
 #: actions/emailsettings.php:127 actions/favor.php:45
 #: actions/finishopenidlogin.php:33 actions/imsettings.php:105
@@ -2267,6 +2556,12 @@ msgstr ""
 #: 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:38 actions/deleteprofile.php:127 actions/disfavor.php:47
+#: actions/emailsettings.php:130 actions/favor.php:49 actions/login.php:45
+#: actions/newmessage.php:44 actions/newnotice.php:36 actions/nudge.php:47
+#: actions/othersettings.php:139 actions/profilesettings.php:49
+#: actions/subedit.php:38 actions/tagother.php:113
+#: actions/twittersettings.php:188 actions/unblock.php:38
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -2290,12 +2585,14 @@ msgstr ""
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142
+#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:54
+#: actions/twitapifavorites.php:115
 msgid "This notice is already a favorite!"
 msgstr ""
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
+#: classes/Command.php:132 actions/favor.php:61
+#: actions/twitapifavorites.php:122
 msgid "Could not create favorite."
 msgstr ""
 
@@ -2304,11 +2601,12 @@ msgid "Disfavor"
 msgstr ""
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:62
 #, php-format
 msgid "%s favorite notices"
 msgstr ""
 
-#: actions/favoritesrss.php:64
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:66
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr ""
@@ -2334,47 +2632,50 @@ msgid ""
 "\n"
 msgstr ""
 
-#: actions/login.php:104
+#: actions/login.php:104 actions/login.php:111 actions/openidlogin.php:86
 msgid "Automatically login in the future; "
 msgstr ""
 
-#: actions/login.php:122
+#: actions/login.php:122 actions/login.php:130
 msgid "For security reasons, please re-enter your "
 msgstr ""
 
-#: actions/login.php:126
+#: actions/login.php:126 actions/login.php:134
 msgid "Login with your username and password. "
 msgstr ""
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+#: actions/newmessage.php:60 actions/twitapidirect_messages.php:136
 msgid "That's too long. Max message size is 140 chars."
 msgstr ""
 
-#: actions/newmessage.php:65
+#: actions/newmessage.php:65 actions/newmessage.php:68
 msgid "No recipient specified."
 msgstr ""
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
+#: classes/Command.php:206 actions/newmessage.php:71
+#: actions/newmessage.php:116 classes/Command.php:211
 msgid "You can't send a message to this user."
 msgstr ""
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
+#: classes/Command.php:209 actions/newmessage.php:74
+#: actions/twitapidirect_messages.php:153 classes/Command.php:214
 msgid ""
-"Don't send a message to yourself; just say it to yourself quietly "
-"instead."
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: actions/newmessage.php:108
+#: actions/newmessage.php:108 actions/microsummary.php:32
+#: actions/newmessage.php:111
 msgid "No such user"
 msgstr ""
 
-#: actions/newmessage.php:117
+#: actions/newmessage.php:117 actions/newmessage.php:120
 msgid "New message"
 msgstr ""
 
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:95 actions/noticesearch.php:94
 msgid "Notice without matching profile"
 msgstr ""
 
@@ -2421,6 +2722,7 @@ msgstr ""
 
 #: actions/profilesettings.php:115 actions/remotesubscribe.php:320
 #: actions/userauthorization.php:159 actions/userrss.php:76
+#: actions/profilesettings.php:120 actions/remotesubscribe.php:333
 msgid "User without matching profile"
 msgstr ""
 
@@ -2448,18 +2750,18 @@ msgstr ""
 msgid "New password successfully saved. "
 msgstr ""
 
-#: actions/register.php:95
+#: actions/register.php:95 actions/register.php:104
 msgid "Password must be 6 or more characters."
 msgstr ""
 
-#: actions/register.php:216
+#: actions/register.php:216 actions/register.php:243
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to..."
 msgstr ""
 
-#: actions/register.php:227
+#: actions/register.php:227 actions/register.php:254
 msgid "(You should receive a message by email momentarily, with "
 msgstr ""
 
@@ -2474,6 +2776,7 @@ msgid "Feed for favorites of %s"
 msgstr ""
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:88 actions/twitapifavorites.php:57
 msgid "Could not retrieve favorite notices."
 msgstr ""
 
@@ -2495,7 +2798,7 @@ msgstr ""
 msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: actions/showstream.php:154
+#: actions/showstream.php:154 lib/util.php:2105
 msgid "Send a message"
 msgstr ""
 
@@ -2504,73 +2807,78 @@ msgstr ""
 msgid "Mobile carrier for your phone. "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:64
 #, php-format
 msgid "Direct messages to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:65
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:69
 msgid "Direct Messages You've Sent"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:70
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:132
 msgid "No message text!"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:145
 msgid "Recipient user not found."
 msgstr ""
 
 #: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:148
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
-#: actions/twitapifavorites.php:92
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:64
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
-#: actions/twitapifavorites.php:95
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:67
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
+#: actions/twitapifavorites.php:158 lib/mail.php:303
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr ""
 
 #: actions/twitapifavorites.php:188 lib/mail.php:276
+#: actions/twitapifavorites.php:159 lib/mail.php:304
 #, php-format
 msgid ""
 "%1$s just added your notice from %2$s as one of their favorites.\n"
 "\n"
 msgstr ""
 
-#: actions/twittersettings.php:27
+#: actions/twittersettings.php:27 actions/twittersettings.php:29
 msgid ""
 "Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 
-#: actions/twittersettings.php:41
+#: actions/twittersettings.php:41 actions/twittersettings.php:43
 msgid "Twitter settings"
 msgstr ""
 
-#: actions/twittersettings.php:48
+#: actions/twittersettings.php:48 actions/twittersettings.php:50
 msgid "Twitter Account"
 msgstr ""
 
-#: actions/twittersettings.php:56
+#: actions/twittersettings.php:56 actions/twittersettings.php:58
 msgid "Current verified Twitter account."
 msgstr ""
 
@@ -2598,46 +2906,50 @@ msgstr ""
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:216
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr ""
 
-#: actions/twittersettings.php:128
+#: actions/twittersettings.php:128 actions/twittersettings.php:221
 msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: actions/twittersettings.php:137 actions/twittersettings.php:228
 #, php-format
 msgid "Unable to retrieve account information for \"%s\" from Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:234 actions/twittersettings.php:253
 msgid "Unable to save your Twitter settings!"
 msgstr ""
 
-#: actions/twittersettings.php:174
+#: actions/twittersettings.php:174 actions/twittersettings.php:261
 msgid "Twitter settings saved."
 msgstr ""
 
-#: actions/twittersettings.php:192
+#: actions/twittersettings.php:192 actions/twittersettings.php:272
 msgid "That is not your Twitter account."
 msgstr ""
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:280
 msgid "Couldn't remove Twitter user."
 msgstr ""
 
-#: actions/twittersettings.php:212
+#: actions/twittersettings.php:212 actions/twittersettings.php:284
 msgid "Twitter account removed."
 msgstr ""
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
+#: actions/twittersettings.php:299 actions/twittersettings.php:310
+#: actions/twittersettings.php:322
 msgid "Couldn't save Twitter preferences."
 msgstr ""
 
-#: actions/twittersettings.php:245
+#: actions/twittersettings.php:245 actions/twittersettings.php:330
 msgid "Twitter preferences saved."
 msgstr ""
 
@@ -2653,15 +2965,15 @@ msgstr ""
 msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#: classes/Channel.php:113
+#: classes/Channel.php:113 classes/Channel.php:129
 msgid "Command results"
 msgstr ""
 
-#: classes/Channel.php:148
+#: classes/Channel.php:148 classes/Channel.php:175
 msgid "Command complete"
 msgstr ""
 
-#: classes/Channel.php:158
+#: classes/Channel.php:158 classes/Channel.php:185
 msgid "Command failed"
 msgstr ""
 
@@ -2674,7 +2986,7 @@ msgstr ""
 msgid "Subscriptions: %1$s\n"
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:247
 msgid "User has no last notice"
 msgstr ""
 
@@ -2707,59 +3019,60 @@ msgstr ""
 msgid "About: %s"
 msgstr ""
 
-#: classes/Command.php:200
+#: classes/Command.php:200 classes/Command.php:202
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: classes/Command.php:214
+#: classes/Command.php:214 classes/Command.php:219
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: classes/Command.php:216
+#: classes/Command.php:216 classes/Command.php:221
 msgid "Error sending direct message."
 msgstr ""
 
-#: classes/Command.php:263
+#: classes/Command.php:263 classes/Command.php:268
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: classes/Command.php:270
+#: classes/Command.php:270 classes/Command.php:275
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: classes/Command.php:288
+#: classes/Command.php:288 classes/Command.php:293
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: classes/Command.php:295
+#: classes/Command.php:295 classes/Command.php:300
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330
+#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:315
+#: classes/Command.php:335
 msgid "Command not yet implemented."
 msgstr ""
 
-#: classes/Command.php:313
+#: classes/Command.php:313 classes/Command.php:318
 msgid "Notification off."
 msgstr ""
 
-#: classes/Command.php:315
+#: classes/Command.php:315 classes/Command.php:320
 msgid "Can't turn off notification."
 msgstr ""
 
-#: classes/Command.php:333
+#: classes/Command.php:333 classes/Command.php:338
 msgid "Notification on."
 msgstr ""
 
-#: classes/Command.php:335
+#: classes/Command.php:335 classes/Command.php:340
 msgid "Can't turn on notification."
 msgstr ""
 
-#: classes/Command.php:344
+#: classes/Command.php:344 classes/Command.php:349
 msgid "Commands:\n"
 msgstr ""
 
@@ -2771,23 +3084,23 @@ msgstr ""
 msgid "Could not update message with new URI."
 msgstr ""
 
-#: lib/gallery.php:46
+#: lib/gallery.php:46 lib/gallery.php:55
 msgid "User without matching profile in system."
 msgstr ""
 
-#: lib/mail.php:147
+#: lib/mail.php:147 lib/mail.php:141
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:249
+#: lib/mail.php:249 lib/mail.php:275
 #, php-format
 msgid "New private message from %s"
 msgstr ""
 
-#: lib/mail.php:253
+#: lib/mail.php:253 lib/mail.php:279
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -2831,18 +3144,459 @@ msgstr ""
 msgid "Your sent messages"
 msgstr ""
 
-#: lib/settingsaction.php:99
+#: lib/settingsaction.php:99 actions/deleteprofile.php:256
 msgid "Twitter"
 msgstr ""
 
-#: lib/settingsaction.php:100
+#: lib/settingsaction.php:100 actions/deleteprofile.php:257
 msgid "Twitter integration options"
 msgstr ""
 
-#: lib/util.php:1718
+#: lib/util.php:1718 lib/util.php:2145
 msgid "To"
 msgstr ""
 
 #: scripts/maildaemon.php:45
 msgid "Could not parse message."
 msgstr ""
+
+#: actions/block.php:45 actions/subedit.php:45 actions/unblock.php:45
+msgid "No profile specified."
+msgstr ""
+
+#: actions/block.php:52 actions/subedit.php:52 actions/tagother.php:45
+#: actions/unblock.php:52
+msgid "No profile with that ID."
+msgstr ""
+
+#: actions/block.php:78
+#, fuzzy
+msgid "Block user"
+msgstr "Brak takiego użytkownika."
+
+#: actions/block.php:81
+msgid "Are you sure you want to block this user? "
+msgstr ""
+
+#: actions/block.php:117
+#, fuzzy
+msgid "You have already blocked this user."
+msgstr "Nie musisz ponownie się logować!"
+
+#: actions/block.php:124
+msgid "Failed to save block information."
+msgstr ""
+
+#: actions/deleteprofile.php:25
+msgid "Code not yet ready."
+msgstr ""
+
+#: actions/deleteprofile.php:36
+msgid "Export and delete your user information."
+msgstr ""
+
+#: actions/deleteprofile.php:88 actions/deleteprofile.php:119
+#, fuzzy
+msgid "Delete my account"
+msgstr "Załóż nowe konto"
+
+#: actions/deleteprofile.php:89
+#, fuzzy
+msgid "Delete my account confirmation"
+msgstr "Nie można skasować potwierdzenia adresu e-mail."
+
+#: actions/deleteprofile.php:117
+msgid "Check if you are sure you want to delete your account."
+msgstr ""
+
+#: actions/deleteprofile.php:259 lib/settingsaction.php:102
+msgid "Other"
+msgstr ""
+
+#: actions/deleteprofile.php:260 lib/settingsaction.php:103
+msgid "Other options"
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Add to favorites"
+msgstr ""
+
+#: actions/emailsettings.php:98
+msgid "Allow friends to nudge me and send me an email."
+msgstr ""
+
+#: actions/facebookremove.php:54
+#, fuzzy
+msgid "Couldn't remove Facebook user."
+msgstr "Nie można zaktualizować użytkownika."
+
+#: actions/favor.php:71
+msgid "Disfavor favorite"
+msgstr ""
+
+#: actions/favorited.php:31 lib/stream.php:45
+#, fuzzy
+msgid "Popular notices"
+msgstr "Brak takiego wpisu."
+
+#: actions/favorited.php:54
+msgid "Showing recently popular notices"
+msgstr ""
+
+#: actions/featured.php:32 actions/featured.php:54 lib/stream.php:41
+msgid "Featured users"
+msgstr ""
+
+#: actions/finishremotesubscribe.php:186
+msgid "That user has blocked you from subscribing."
+msgstr ""
+
+#: actions/microsummary.php:39
+msgid "No current status"
+msgstr ""
+
+#: actions/newnotice.php:93
+#, fuzzy
+msgid "Notice posted"
+msgstr "Wpisy"
+
+#: actions/newnotice.php:116 classes/Channel.php:140
+msgid "Ajax Error"
+msgstr ""
+
+#: actions/nudge.php:52
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
+
+#: actions/nudge.php:61
+msgid "Nudge sent"
+msgstr ""
+
+#: actions/othersettings.php:27
+msgid "Manage various other options."
+msgstr ""
+
+#: actions/othersettings.php:33
+#, fuzzy
+msgid "Other Settings"
+msgstr "Ustawienia"
+
+#: actions/othersettings.php:35
+msgid "URL Auto-shortening"
+msgstr ""
+
+#: actions/othersettings.php:54
+#, fuzzy
+msgid "Service"
+msgstr "Szukaj"
+
+#: actions/othersettings.php:54
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/othersettings.php:155
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Lokalizacja jest za długa (max. 255 znaków)."
+
+#: actions/peopletag.php:33
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "Niewłaściwy adres e-mailowy."
+
+#: actions/peopletag.php:45
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr ""
+
+#: actions/peopletag.php:87
+#, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+msgstr ""
+
+#: actions/profilesettings.php:92
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+
+#: actions/profilesettings.php:246 actions/tagother.php:131
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Błędna strona domowa '%s'"
+
+#: actions/profilesettings.php:328
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "Nie można zapisać profilu."
+
+#: actions/public.php:68
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
+msgstr ""
+
+#: actions/public.php:90
+msgid "Could not retrieve public stream."
+msgstr ""
+
+#: actions/register.php:67 actions/register.php:177
+msgid "Sorry, only invited people can register."
+msgstr ""
+
+#: actions/register.php:156
+msgid "With this form you can create a new account. "
+msgstr ""
+
+#: actions/remotesubscribe.php:136 actions/remotesubscribe.php:141
+msgid "That's a local profile! Login to subscribe."
+msgstr ""
+
+#: actions/subedit.php:68
+#, fuzzy
+msgid "You are not subscribed to that profile."
+msgstr "Ten profil nie był wysłany przez Ciebie"
+
+#: actions/subedit.php:81
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "Nie można obserwować."
+
+#: actions/subscribe.php:53
+#, fuzzy
+msgid "Not a local user."
+msgstr "Brak takiego użytkownika."
+
+#: actions/subscribe.php:67
+#, fuzzy
+msgid "Subscribed"
+msgstr "Subskrybuj"
+
+#: actions/subscriptions.php:72
+#, fuzzy
+msgid "Jabber"
+msgstr "Brak identyfikatora Jabbera."
+
+#: actions/tagother.php:31
+#, fuzzy
+msgid "Not logged in"
+msgstr "Niezalogowany."
+
+#: actions/tagother.php:40
+#, fuzzy
+msgid "No id argument."
+msgstr "Brak takiego dokumentu."
+
+#: actions/tagother.php:56
+msgid "Tag a person"
+msgstr ""
+
+#: actions/tagother.php:98
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
+msgstr ""
+
+#: actions/tagother.php:120
+#, fuzzy
+msgid "No such profile."
+msgstr "Brak takiego wpisu."
+
+#: actions/tagother.php:146
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+
+#: actions/tagother.php:153
+#, fuzzy
+msgid "Could not save tags."
+msgstr "Nie można zapisać informacji o awatarze"
+
+#: actions/tagother.php:188
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
+
+#: actions/tagrss.php:33
+#, fuzzy
+msgid "No such tag."
+msgstr "Brak takiego wpisu."
+
+#: actions/tagrss.php:62
+#, fuzzy, php-format
+msgid "Microblog tagged with %s"
+msgstr "%s – mikroblog"
+
+#: actions/twitapiblocks.php:45
+msgid "Block user failed."
+msgstr ""
+
+#: actions/twitapiblocks.php:66
+msgid "Unblock user failed."
+msgstr ""
+
+#: actions/twitapiusers.php:45
+#, fuzzy
+msgid "Not found."
+msgstr "Nie znaleziono żądania!"
+
+#: actions/twittersettings.php:63
+msgid "Twitter user name"
+msgstr ""
+
+#: actions/twittersettings.php:67
+#, fuzzy
+msgid "Twitter password"
+msgstr "Nowe hasło"
+
+#: actions/twittersettings.php:129
+msgid "Twitter Friends"
+msgstr ""
+
+#: actions/unblock.php:73
+#, fuzzy
+msgid "Error removing the block."
+msgstr "Błąd w zapisie użytkownika."
+
+#: actions/unsubscribe.php:48
+#, fuzzy
+msgid "No profile id in request."
+msgstr "Serwer nie zwrócił żadnego URL-a."
+
+#: actions/unsubscribe.php:55
+#, fuzzy
+msgid "No profile with that id."
+msgstr "Zdalny profil bez odpowiadającego profilu lokalnego"
+
+#: actions/unsubscribe.php:69
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Zrezygnuj z subskrypcji"
+
+#: classes/Notice.php:100
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "Problem z zachowywaniem wpisu."
+
+#: classes/Notice.php:105
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+
+#: classes/Notice.php:112
+msgid "You are banned from posting notices on this site."
+msgstr ""
+
+#: lib/gallery.php:98
+msgid "Filter tags"
+msgstr ""
+
+#: lib/gallery.php:104
+msgid "All"
+msgstr ""
+
+#: lib/gallery.php:108
+msgid "Tag"
+msgstr ""
+
+#: lib/gallery.php:109
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/gallery.php:110
+msgid "Go"
+msgstr ""
+
+#: lib/gallery.php:264
+#, fuzzy
+msgid "Subscriptions navigation"
+msgstr "Subskrypcje"
+
+#: lib/gallery.php:270 lib/gallery.php:292
+msgid "List"
+msgstr ""
+
+#: lib/gallery.php:280 lib/gallery.php:294
+msgid "Icons"
+msgstr ""
+
+#: lib/mail.php:92
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:242
+#, php-format
+msgid "You've been nudged by %s"
+msgstr ""
+
+#: lib/mail.php:246
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+msgstr ""
+
+#: lib/profilelist.php:146
+msgid "(none)"
+msgstr ""
+
+#: lib/stream.php:33
+msgid "Public"
+msgstr "Publiczny"
+
+#: lib/stream.php:36 lib/stream.php:37
+msgid "Recent tags"
+msgstr ""
+
+#: lib/stream.php:40
+msgid "Featured"
+msgstr ""
+
+#: lib/stream.php:44
+#, fuzzy
+msgid "Popular"
+msgstr "Szukaj ludzi"
+
+#: lib/subs.php:51
+#, fuzzy
+msgid "User has blocked you."
+msgstr "Użytkownik nie ma profilu."
+
+#: lib/util.php:2059
+msgid "Send a nudge"
+msgstr ""
+
+#: lib/util.php:2063
+msgid "Nudge sent!"
+msgstr ""
+
+#: lib/util.php:2194
+msgid "Block"
+msgstr ""
+
+#: lib/util.php:2198
+msgid "Unblock"
+msgstr ""
+
+#~ msgid "Couldn't confirm email."
+#~ msgstr "Nie można potwierdzić e-maila."
+
+#~ msgid "Email address"
+#~ msgstr "Adres e-mailowy"
+
+#~ msgid "Error inserting notice"
+#~ msgstr "Błąd przy wprowadzaniu wpisu"
+
+#~ 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 ""
+#~ "Jeśli Twoje hasło gdzieś się zapodziało lub zostało zapomniane to możesz "
+#~ "wygenerować nowe. Zostanie ono wysłane na adres e-mailowy skojarzony z "
+#~ "Twoim kontem."
diff --git a/pt/LC_MESSAGES/laconica.po b/pt/LC_MESSAGES/laconica.po
index 121d7feca5..f8423ca7d5 100644
--- a/pt/LC_MESSAGES/laconica.po
+++ b/pt/LC_MESSAGES/laconica.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"POT-Creation-Date: 2009-01-12 12:10+0000\n"
 "PO-Revision-Date: 2009-01-11 17:39+0000\n"
 "Last-Translator: Tiago Faria <gouki@goukihq.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,23 +17,26 @@ msgstr ""
 "X-Generator: Pootle 1.1.0\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:61
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
 #: actions/finishopenidlogin.php:88 actions/register.php:205
+#: actions/register.php:232
 msgid ""
-" except this private data: password, email address, IM address, phone "
-"number."
+" except this private data: password, email address, IM address, phone number."
 msgstr ""
 
 #: ../actions/showstream.php:400 ../lib/stream.php:109
 #: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+#: lib/facebookaction.php:195 lib/noticelist.php:160
 msgid " from "
 msgstr "de"
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: actions/twitapistatuses.php:341
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
 msgstr ""
@@ -74,7 +77,8 @@ msgid ""
 "Sincerely, %2$s\n"
 msgstr ""
 
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:115
+#: lib/mail.php:117
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s está agora a ouvir os teus comunicados em %2$s."
@@ -91,11 +95,13 @@ msgid ""
 msgstr ""
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#: actions/twitapistatuses.php:344
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
+#: actions/shownotice.php:73
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr ""
@@ -114,26 +120,30 @@ msgstr ""
 #: ../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/twitapistatuses.php:123
 #, php-format
 msgid "%s and friends"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:31
 #, php-format
 msgid "%s public timeline"
 msgstr ""
 
-#: ../lib/mail.php:206 lib/mail.php:212
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:217
 #, php-format
 msgid "%s status"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:195
 #, php-format
 msgid "%s timeline"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:34
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
@@ -144,32 +154,35 @@ msgid ""
 "to confirm your email address.)"
 msgstr ""
 
-#: ../lib/util.php:257 lib/util.php:273
+#: ../lib/util.php:257 lib/util.php:273 lib/util.php:284
 #, 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 ""
 
-#: ../lib/util.php:259 lib/util.php:275
+#: ../lib/util.php:259 lib/util.php:275 lib/util.php:286
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr ""
 
-#: ../lib/util.php:274 lib/util.php:290
+#: ../lib/util.php:274 lib/util.php:290 lib/util.php:301
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 #: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
+#: actions/profilesettings.php:78
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 
 #: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:193
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/profilesettings.php:186
 msgid "6 or more characters"
 msgstr ""
 
@@ -178,17 +191,19 @@ msgid "6 or more characters, and don't forget it!"
 msgstr ""
 
 #: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:195
 msgid "6 or more characters. Required."
 msgstr ""
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, 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
+#: actions/emailsettings.php:234
 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."
@@ -210,7 +225,14 @@ msgstr ""
 #: 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/twitapiusers.php:55 actions/twitapiaccount.php:30
+#: actions/twitapidirect_messages.php:107 actions/twitapifavorites.php:83
+#: actions/twitapifavorites.php:99 actions/twitapifriendships.php:117
+#: actions/twitapihelp.php:42 actions/twitapistatuses.php:77
+#: actions/twitapistatuses.php:144 actions/twitapistatuses.php:224
+#: actions/twitapistatuses.php:234 actions/twitapistatuses.php:386
+#: actions/twitapistatuses.php:395 actions/twitapistatuses.php:421
+#: actions/twitapiusers.php:30
 msgid "API method not found!"
 msgstr ""
 
@@ -228,11 +250,14 @@ msgstr ""
 #: 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/twitapistatuses.php:690 actions/twitapiaccount.php:39
+#: actions/twitapiaccount.php:89 actions/twitapiaccount.php:94
+#: actions/twitapidirect_messages.php:178 actions/twitapifavorites.php:139
+#: actions/twitapihelp.php:49 actions/twitapistatuses.php:549
 msgid "API method under construction."
 msgstr ""
 
-#: ../lib/util.php:324 lib/util.php:340
+#: ../lib/util.php:324 lib/util.php:340 lib/util.php:352
 msgid "About"
 msgstr ""
 
@@ -244,7 +269,7 @@ msgstr ""
 #: ../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/twittersettings.php:85 actions/twittersettings.php:84
 msgid "Add"
 msgstr ""
 
@@ -253,6 +278,7 @@ msgid "Add OpenID"
 msgstr ""
 
 #: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: actions/deleteprofile.php:248
 msgid "Add or remove OpenIDs"
 msgstr ""
 
@@ -267,6 +293,7 @@ msgid "Addresses of friends to invite (one per line)"
 msgstr ""
 
 #: ../actions/showstream.php:273 actions/showstream.php:288
+#: actions/showstream.php:336
 msgid "All subscriptions"
 msgstr ""
 
@@ -276,6 +303,7 @@ msgid "All updates for %s"
 msgstr ""
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:63
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr ""
@@ -287,7 +315,7 @@ msgstr ""
 msgid "Already logged in."
 msgstr ""
 
-#: ../lib/subs.php:42 lib/subs.php:42
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:47
 msgid "Already subscribed!."
 msgstr ""
 
@@ -300,14 +328,14 @@ msgid "Authorize subscription"
 msgstr ""
 
 #: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
+#: actions/register.php:192 actions/register.php:219
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:103
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
@@ -316,6 +344,7 @@ msgid "Avatar"
 msgstr ""
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
+#: actions/profilesettings.php:379
 msgid "Avatar updated."
 msgstr ""
 
@@ -336,18 +365,21 @@ msgstr ""
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
-#: ../lib/util.php:1318 lib/util.php:1452
-msgid "Before »"
+#: ../lib/util.php:1318 lib/util.php:1452 lib/facebookaction.php:259
+#: lib/util.php:1792
+msgid "Before »"
 msgstr ""
 
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
 #: actions/profilesettings.php:82 actions/register.php:184
+#: actions/profilesettings.php:84 actions/register.php:211
 msgid "Bio"
 msgstr ""
 
 #: ../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:222 actions/register.php:98
 msgid "Bio is too long (max 140 chars)."
 msgstr ""
 
@@ -362,6 +394,7 @@ msgstr ""
 
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
+#: actions/profilesettings.php:433
 msgid "Can't save new password."
 msgstr ""
 
@@ -380,14 +413,17 @@ msgid "Cannot normalize that Jabber ID"
 msgstr ""
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:204
 msgid "Cannot normalize that email address"
 msgstr ""
 
 #: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/profilesettings.php:189
 msgid "Change"
 msgstr ""
 
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: actions/deleteprofile.php:245
 msgid "Change email handling"
 msgstr ""
 
@@ -400,6 +436,7 @@ msgid "Change your password"
 msgstr ""
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#: actions/deleteprofile.php:242
 msgid "Change your profile settings"
 msgstr ""
 
@@ -407,6 +444,7 @@ msgstr ""
 #: ../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/profilesettings.php:187 actions/register.php:196
 msgid "Confirm"
 msgstr ""
 
@@ -417,6 +455,7 @@ msgstr ""
 #: ../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:259
 msgid "Confirmation cancelled."
 msgstr ""
 
@@ -455,7 +494,7 @@ msgstr ""
 msgid "Connect existing account"
 msgstr ""
 
-#: ../lib/util.php:332 lib/util.php:348
+#: ../lib/util.php:332 lib/util.php:348 lib/util.php:360
 msgid "Contact"
 msgstr ""
 
@@ -466,11 +505,13 @@ msgstr ""
 
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:46 actions/twitapifriendships.php:62
 #, 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:39
 msgid "Could not follow user: User not found."
 msgstr ""
 
@@ -487,11 +528,11 @@ msgstr ""
 msgid "Could not save new profile info"
 msgstr ""
 
-#: ../lib/subs.php:54 lib/subs.php:61
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:70
 msgid "Could not subscribe other to you."
 msgstr ""
 
-#: ../lib/subs.php:46 lib/subs.php:46
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:55
 msgid "Could not subscribe."
 msgstr ""
 
@@ -500,7 +541,7 @@ msgid "Could not update user with confirmed email address."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101
+#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:112
 msgid "Couldn't convert request tokens to access tokens."
 msgstr ""
 
@@ -508,43 +549,50 @@ msgstr ""
 #: ../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/emailsettings.php:255
 msgid "Couldn't delete email confirmation."
 msgstr ""
 
-#: ../lib/subs.php:103 lib/subs.php:116
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:129
 msgid "Couldn't delete subscription."
 msgstr ""
 
 #: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+#: actions/twitapistatuses.php:82
 msgid "Couldn't find any statuses."
 msgstr ""
 
 #: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
+#: actions/remotesubscribe.php:148
 msgid "Couldn't get a request token."
 msgstr ""
 
 #: ../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:228
 msgid "Couldn't insert confirmation code."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182
+#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:216
 msgid "Couldn't insert new subscription."
 msgstr ""
 
 #: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
 #: actions/profilesettings.php:299 actions/twitapiaccount.php:94
+#: actions/profilesettings.php:319 actions/twitapiaccount.php:74
 msgid "Couldn't save profile."
 msgstr ""
 
 #: ../actions/profilesettings.php:161 actions/profilesettings.php:276
+#: actions/profilesettings.php:296
 msgid "Couldn't update user for autosubscribe."
 msgstr ""
 
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
 #: actions/emailsettings.php:298 actions/emailsettings.php:312
+#: actions/emailsettings.php:301 actions/emailsettings.php:315
 msgid "Couldn't update user record."
 msgstr ""
 
@@ -556,6 +604,8 @@ msgstr ""
 #: 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/emailsettings.php:179 actions/emailsettings.php:280
+#: actions/othersettings.php:173 actions/profilesettings.php:276
 msgid "Couldn't update user."
 msgstr ""
 
@@ -572,6 +622,7 @@ msgid "Create new account"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+#: actions/finishopenidlogin.php:208
 msgid "Creating new account for OpenID that already has a user."
 msgstr ""
 
@@ -588,15 +639,16 @@ msgid "Current confirmed email address."
 msgstr ""
 
 #: ../actions/showstream.php:356 actions/showstream.php:367
+#: actions/showstream.php:418
 msgid "Currently"
 msgstr ""
 
-#: ../classes/Notice.php:72 classes/Notice.php:86
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:87
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr ""
 
-#: ../lib/util.php:1061 lib/util.php:1110
+#: ../lib/util.php:1061 lib/util.php:1110 lib/util.php:1417
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr ""
@@ -607,12 +659,15 @@ msgstr ""
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
+#: actions/profilesettings.php:86 actions/register.php:213
 msgid "Describe yourself and your interests in 140 chars"
 msgstr ""
 
 #: ../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/deleteprofile.php:244 actions/register.php:199
+#: actions/register.php:202
 msgid "Email"
 msgstr ""
 
@@ -624,7 +679,7 @@ msgstr ""
 msgid "Email Settings"
 msgstr ""
 
-#: ../actions/register.php:73 actions/register.php:80
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:89
 msgid "Email address already exists."
 msgstr ""
 
@@ -653,6 +708,7 @@ msgid "Error authorizing token"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
+#: actions/finishopenidlogin.php:274
 msgid "Error connecting user to OpenID."
 msgstr ""
 
@@ -661,17 +717,17 @@ msgid "Error connecting user."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:164
 msgid "Error inserting avatar"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145
+#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:156
 msgid "Error inserting new profile"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:180
 msgid "Error inserting remote profile"
 msgstr ""
 
@@ -692,13 +748,15 @@ msgid "Error saving the user."
 msgstr ""
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/profilesettings.php:428
 msgid "Error saving user; invalid."
 msgstr ""
 
 #: ../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/register.php:108 actions/login.php:54 actions/login.php:80
+#: actions/register.php:117
 msgid "Error setting user."
 msgstr ""
 
@@ -707,7 +765,7 @@ msgid "Error updating profile"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163
+#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:174
 msgid "Error updating remote profile"
 msgstr ""
 
@@ -719,11 +777,12 @@ msgstr ""
 msgid "Existing nickname"
 msgstr ""
 
-#: ../lib/util.php:326 lib/util.php:342
+#: ../lib/util.php:326 lib/util.php:342 lib/util.php:354
 msgid "FAQ"
 msgstr ""
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/profilesettings.php:381
 msgid "Failed updating avatar."
 msgstr ""
 
@@ -739,7 +798,7 @@ msgstr ""
 msgid "Feed for replies to %s"
 msgstr ""
 
-#: ../actions/tag.php:55 actions/tag.php:55
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:54
 #, php-format
 msgid "Feed for tag %s"
 msgstr ""
@@ -760,38 +819,44 @@ msgstr ""
 
 #: ../actions/profilesettings.php:44 ../actions/register.php:164
 #: actions/profilesettings.php:77 actions/register.php:178
+#: actions/profilesettings.php:79 actions/register.php:205
 msgid "Full name"
 msgstr ""
 
 #: ../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/profilesettings.php:219 actions/register.php:95
 msgid "Full name is too long (max 255 chars)."
 msgstr ""
 
-#: ../lib/util.php:322 lib/util.php:338
+#: ../lib/util.php:322 lib/util.php:338 lib/util.php:343 lib/util.php:350
 msgid "Help"
 msgstr ""
 
-#: ../lib/util.php:298 lib/util.php:314
+#: ../lib/util.php:298 lib/util.php:314 lib/util.php:325
 msgid "Home"
 msgstr ""
 
 #: ../actions/profilesettings.php:46 ../actions/register.php:167
 #: actions/profilesettings.php:79 actions/register.php:181
+#: actions/profilesettings.php:81 actions/register.php:208
 msgid "Homepage"
 msgstr ""
 
 #: ../actions/profilesettings.php:95 ../actions/register.php:76
 #: actions/profilesettings.php:210 actions/register.php:83
+#: actions/profilesettings.php:216 actions/register.php:92
 msgid "Homepage is not a valid URL."
 msgstr ""
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+#: actions/emailsettings.php:101
 msgid "I want to post notices by email."
 msgstr ""
 
 #: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+#: actions/deleteprofile.php:253
 msgid "IM"
 msgstr ""
 
@@ -827,14 +892,16 @@ msgid "Incoming email"
 msgstr ""
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+#: actions/emailsettings.php:304
 msgid "Incoming email address removed."
 msgstr ""
 
 #: ../actions/password.php:69 actions/profilesettings.php:388
+#: actions/profilesettings.php:417
 msgid "Incorrect old password"
 msgstr ""
 
-#: ../actions/login.php:67 actions/login.php:67
+#: ../actions/login.php:67 actions/login.php:67 actions/login.php:74
 msgid "Incorrect username or password."
 msgstr ""
 
@@ -865,14 +932,17 @@ msgid "Invalid license URL '%s'"
 msgstr ""
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:63
 msgid "Invalid notice content"
 msgstr ""
 
 #: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:69
 msgid "Invalid notice uri"
 msgstr ""
 
 #: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:74
 msgid "Invalid notice url"
 msgstr ""
 
@@ -886,7 +956,7 @@ msgid "Invalid profile URL (bad format)"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:78
 msgid "Invalid profile URL returned by server."
 msgstr ""
 
@@ -897,6 +967,8 @@ msgstr ""
 #: ../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:256 actions/register.php:112
+#: actions/register.php:130
 msgid "Invalid username or password."
 msgstr ""
 
@@ -908,7 +980,7 @@ msgstr ""
 msgid "Invitation(s) sent to the following people:"
 msgstr ""
 
-#: ../lib/util.php:306 lib/util.php:322
+#: ../lib/util.php:306 lib/util.php:322 lib/util.php:332
 msgid "Invite"
 msgstr ""
 
@@ -916,12 +988,12 @@ msgstr ""
 msgid "Invite new users"
 msgstr ""
 
-#: ../lib/util.php:261 lib/util.php:277
+#: ../lib/util.php:261 lib/util.php:277 lib/util.php:288
 #, 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 ""
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
@@ -936,31 +1008,38 @@ msgid ""
 msgstr ""
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
 msgid "Language"
 msgstr ""
 
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+#: actions/profilesettings.php:234
 msgid "Language is too long (max 50 chars)."
 msgstr ""
 
 #: ../actions/profilesettings.php:52 ../actions/register.php:173
 #: actions/profilesettings.php:85 actions/register.php:187
+#: actions/profilesettings.php:87 actions/register.php:214
 msgid "Location"
 msgstr ""
 
 #: ../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/profilesettings.php:225 actions/register.php:101
 msgid "Location is too long (max 255 chars)."
 msgstr ""
 
 #: ../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/login.php:104 actions/login.php:113 actions/openidlogin.php:88
+#: lib/util.php:336
 msgid "Login"
 msgstr ""
 
 #: ../actions/openidlogin.php:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:60
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr ""
@@ -968,20 +1047,21 @@ msgstr ""
 #: ../actions/login.php:126
 #, 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 ""
 
-#: ../lib/util.php:308 lib/util.php:324
+#: ../lib/util.php:308 lib/util.php:324 lib/util.php:334
 msgid "Logout"
 msgstr ""
 
 #: ../actions/register.php:166 actions/register.php:180
+#: actions/register.php:207
 msgid "Longer name, preferably your \"real\" name"
 msgstr ""
 
-#: ../actions/login.php:110 actions/login.php:110
+#: ../actions/login.php:110 actions/login.php:110 actions/login.php:118
 msgid "Lost or forgotten password?"
 msgstr ""
 
@@ -996,6 +1076,7 @@ msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
 #: ../actions/showstream.php:300 actions/showstream.php:315
+#: actions/showstream.php:363
 msgid "Member since"
 msgstr ""
 
@@ -1013,6 +1094,7 @@ msgstr ""
 
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
 #: actions/finishopenidlogin.php:85 actions/register.php:202
+#: actions/register.php:229
 msgid "My text and files are available under "
 msgstr ""
 
@@ -1021,12 +1103,13 @@ msgstr ""
 msgid "New"
 msgstr ""
 
-#: ../lib/mail.php:144 lib/mail.php:144
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:138
 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+#: actions/emailsettings.php:318
 msgid "New incoming email address added."
 msgstr ""
 
@@ -1035,11 +1118,13 @@ msgid "New nickname"
 msgstr ""
 
 #: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:141
 msgid "New notice"
 msgstr ""
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
 #: actions/profilesettings.php:180 actions/recoverpassword.php:185
+#: actions/profilesettings.php:185
 msgid "New password"
 msgstr ""
 
@@ -1050,12 +1135,16 @@ msgstr ""
 #: ../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:108 actions/profilesettings.php:76
+#: actions/register.php:192
 msgid "Nickname"
 msgstr ""
 
 #: ../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/finishopenidlogin.php:192 actions/profilesettings.php:231
+#: actions/register.php:85
 msgid "Nickname already in use. Try another one."
 msgstr ""
 
@@ -1063,10 +1152,13 @@ msgstr ""
 #: ../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:182 actions/profilesettings.php:209
+#: actions/register.php:83
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:187
 msgid "Nickname not allowed."
 msgstr ""
 
@@ -1079,6 +1171,7 @@ msgid "Nickname or email"
 msgstr ""
 
 #: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:104
 msgid "No"
 msgstr ""
 
@@ -1103,11 +1196,13 @@ msgid "No confirmation code."
 msgstr ""
 
 #: ../actions/newnotice.php:44 actions/newmessage.php:53
-#: actions/newnotice.php:44 classes/Command.php:197
+#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:52
+#: actions/newnotice.php:53
 msgid "No content!"
 msgstr ""
 
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+#: actions/emailsettings.php:197
 msgid "No email address."
 msgstr ""
 
@@ -1116,11 +1211,12 @@ msgid "No id."
 msgstr ""
 
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+#: actions/emailsettings.php:292
 msgid "No incoming email address."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67
+#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:66
 msgid "No nickname provided by remote server."
 msgstr ""
 
@@ -1131,6 +1227,7 @@ msgstr ""
 #: ../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:243
 msgid "No pending confirmation to cancel."
 msgstr ""
 
@@ -1139,7 +1236,7 @@ msgid "No phone number."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74
+#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:73
 msgid "No profile URL returned by server."
 msgstr ""
 
@@ -1153,6 +1250,7 @@ msgstr ""
 
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
 #: actions/noticesearch.php:69 actions/peoplesearch.php:69
+#: actions/noticesearch.php:68 actions/peoplesearch.php:59
 msgid "No results"
 msgstr ""
 
@@ -1161,11 +1259,13 @@ msgid "No size."
 msgstr ""
 
 #: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
+#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:109
+#: actions/twitapistatuses.php:438
 msgid "No status found with that ID."
 msgstr ""
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:411
 msgid "No status with that ID found."
 msgstr ""
 
@@ -1179,7 +1279,8 @@ msgstr ""
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
 #: ../lib/deleteaction.php:30 actions/shownotice.php:32
-#: actions/shownotice.php:83 lib/deleteaction.php:30
+#: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:38
+#: actions/shownotice.php:114
 msgid "No such notice."
 msgstr ""
 
@@ -1206,7 +1307,9 @@ msgstr ""
 #: 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
+#: lib/subs.php:33 lib/subs.php:95 actions/showstream.php:157
+#: classes/Command.php:208 classes/Command.php:242 lib/gallery.php:85
+#: lib/subs.php:105
 msgid "No such user."
 msgstr ""
 
@@ -1228,7 +1331,8 @@ 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:502 lib/twitterapi.php:423 lib/twitterapi.php:450
+#: lib/twitterapi.php:534
 msgid "Not a supported data format."
 msgstr ""
 
@@ -1241,15 +1345,17 @@ msgid "Not a valid OpenID."
 msgstr ""
 
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+#: actions/emailsettings.php:208
 msgid "Not a valid email address"
 msgstr ""
 
-#: ../actions/register.php:63 actions/register.php:70
+#: ../actions/register.php:63 actions/register.php:70 actions/register.php:79
 msgid "Not a valid email address."
 msgstr ""
 
 #: ../actions/profilesettings.php:91 ../actions/register.php:71
 #: actions/profilesettings.php:206 actions/register.php:78
+#: actions/profilesettings.php:212 actions/register.php:87
 msgid "Not a valid nickname."
 msgstr ""
 
@@ -1266,11 +1372,12 @@ msgid "Not a valid profile URL (no YADIS document)."
 msgstr ""
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: actions/profilesettings.php:361
 msgid "Not an image or corrupt file."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:52
 msgid "Not authorized."
 msgstr ""
 
@@ -1280,6 +1387,7 @@ msgid "Not expecting this response!"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+#: actions/twitapistatuses.php:304
 msgid "Not found"
 msgstr ""
 
@@ -1290,11 +1398,12 @@ msgstr ""
 #: 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
+#: lib/settingsaction.php:27 actions/block.php:31 actions/newnotice.php:30
+#: actions/nudge.php:30 actions/subedit.php:31 actions/unblock.php:31
 msgid "Not logged in."
 msgstr ""
 
-#: ../lib/subs.php:91 lib/subs.php:104
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:117
 msgid "Not subscribed!."
 msgstr ""
 
@@ -1303,15 +1412,19 @@ msgid "Notice Search"
 msgstr ""
 
 #: ../actions/showstream.php:82 actions/showstream.php:82
+#: actions/showstream.php:111 actions/showstream.php:118
+#: actions/showstream.php:123
 #, php-format
 msgid "Notice feed for %s"
 msgstr ""
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
+#: actions/shownotice.php:45
 msgid "Notice has no profile"
 msgstr ""
 
 #: ../actions/showstream.php:316 actions/showstream.php:331
+#: actions/showstream.php:379
 msgid "Notices"
 msgstr ""
 
@@ -1322,11 +1435,12 @@ msgid "Notices tagged with %s"
 msgstr ""
 
 #: ../actions/password.php:39 actions/profilesettings.php:178
+#: actions/profilesettings.php:183
 msgid "Old password"
 msgstr ""
 
 #: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
-#: lib/util.php:330
+#: lib/util.php:330 actions/deleteprofile.php:247 lib/util.php:340
 msgid "OpenID"
 msgstr ""
 
@@ -1341,11 +1455,13 @@ msgstr ""
 #: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
 #: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
+#: actions/finishopenidlogin.php:150 actions/openidlogin.php:76
 msgid "OpenID Login"
 msgstr ""
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 #: actions/openidlogin.php:74 actions/openidsettings.php:50
+#: actions/openidlogin.php:82
 msgid "OpenID URL"
 msgstr ""
 
@@ -1378,13 +1494,14 @@ msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: actions/profilesettings.php:350
 msgid "Partial upload."
 msgstr ""
 
 #: ../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/register.php:167 actions/login.php:109 actions/register.php:194
 msgid "Password"
 msgstr ""
 
@@ -1403,11 +1520,13 @@ msgstr ""
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
 #: actions/profilesettings.php:408 actions/recoverpassword.php:326
+#: actions/profilesettings.php:437
 msgid "Password saved."
 msgstr ""
 
 #: ../actions/password.php:61 ../actions/register.php:88
 #: actions/profilesettings.php:380 actions/register.php:98
+#: actions/profilesettings.php:409 actions/register.php:107
 msgid "Passwords don't match."
 msgstr ""
 
@@ -1456,24 +1575,26 @@ msgstr ""
 #: ../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:185 actions/othersettings.php:179
 msgid "Preferences saved."
 msgstr ""
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
 msgid "Preferred language"
 msgstr ""
 
-#: ../lib/util.php:328 lib/util.php:344
+#: ../lib/util.php:328 lib/util.php:344 lib/util.php:356
 msgid "Privacy"
 msgstr ""
 
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119
+#: classes/Notice.php:119 classes/Notice.php:139 classes/Notice.php:149
 msgid "Problem saving notice."
 msgstr ""
 
 #: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
-#: lib/settingsaction.php:84
+#: lib/settingsaction.php:84 actions/deleteprofile.php:241
 msgid "Profile"
 msgstr ""
 
@@ -1490,11 +1611,11 @@ msgstr ""
 msgid "Profile unknown"
 msgstr ""
 
-#: ../actions/public.php:54 actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:77
 msgid "Public Stream Feed"
 msgstr ""
 
-#: ../actions/public.php:33 actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 lib/stream.php:34
 msgid "Public timeline"
 msgstr ""
 
@@ -1503,6 +1624,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:104
 msgid "Publish a MicroID for my email address."
 msgstr ""
 
@@ -1525,14 +1647,17 @@ msgstr ""
 
 #: ../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:181 actions/register.php:234 lib/util.php:338
 msgid "Register"
 msgstr ""
 
 #: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:173
 msgid "Registration not allowed."
 msgstr ""
 
 #: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:241
 msgid "Registration successful"
 msgstr ""
 
@@ -1541,7 +1666,8 @@ msgid "Reject"
 msgstr ""
 
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
-#: actions/register.php:190
+#: actions/register.php:190 actions/login.php:110 actions/openidlogin.php:85
+#: actions/register.php:217
 msgid "Remember me"
 msgstr ""
 
@@ -1559,7 +1685,7 @@ msgstr ""
 #: 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/twittersettings.php:61
 msgid "Remove"
 msgstr ""
 
@@ -1592,6 +1718,7 @@ msgid "Reset password"
 msgstr ""
 
 #: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/deleteprofile.php:250 actions/subscriptions.php:73
 msgid "SMS"
 msgstr ""
 
@@ -1603,7 +1730,7 @@ msgstr ""
 msgid "SMS Settings"
 msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:230
 msgid "SMS confirmation"
 msgstr ""
 
@@ -1612,6 +1739,7 @@ msgid "Same as password above"
 msgstr ""
 
 #: ../actions/register.php:156 actions/register.php:170
+#: actions/register.php:197
 msgid "Same as password above. Required."
 msgstr ""
 
@@ -1619,20 +1747,25 @@ msgstr ""
 #: ../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:107
+#: actions/othersettings.php:56 actions/profilesettings.php:106
+#: actions/subscriptions.php:74 actions/tagother.php:100
+#: actions/twittersettings.php:82
 msgid "Save"
 msgstr ""
 
 #: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316
+#: lib/util.php:316 lib/util.php:327
 msgid "Search"
 msgstr ""
 
 #: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:84
 msgid "Search Stream Feed"
 msgstr ""
 
 #: ../actions/noticesearch.php:30 actions/noticesearch.php:30
+#: actions/noticesearch.php:29
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -1651,7 +1784,7 @@ msgid "Select a carrier"
 msgstr ""
 
 #: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
-#: lib/util.php:1306 lib/util.php:1731
+#: lib/util.php:1306 lib/util.php:1731 lib/util.php:1646 lib/util.php:2158
 msgid "Send"
 msgstr ""
 
@@ -1678,15 +1811,16 @@ msgstr ""
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
-#: ../lib/util.php:304 lib/util.php:320
+#: ../lib/util.php:304 lib/util.php:320 lib/util.php:330
 msgid "Settings"
 msgstr ""
 
 #: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:336
 msgid "Settings saved."
 msgstr ""
 
-#: ../actions/tag.php:60 actions/tag.php:60
+#: ../actions/tag.php:60 actions/tag.php:60 actions/tag.php:59
 msgid "Showing most popular tags from the last week"
 msgstr ""
 
@@ -1707,27 +1841,31 @@ msgstr ""
 msgid "Sorry, that is not your incoming email address."
 msgstr ""
 
-#: ../lib/util.php:330 lib/util.php:346
+#: ../lib/util.php:330 lib/util.php:346 lib/util.php:358
 msgid "Source"
 msgstr ""
 
 #: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:359
 msgid "Statistics"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
 #: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
+#: actions/finishopenidlogin.php:199 actions/finishopenidlogin.php:267
 msgid "Stored OpenID not found."
 msgstr ""
 
 #: ../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:254 lib/util.php:2078
 msgid "Subscribe"
 msgstr ""
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
 #: actions/showstream.php:328 actions/subscribers.php:27
+#: actions/showstream.php:376 lib/gallery.php:136 lib/gallery.php:137
 msgid "Subscribers"
 msgstr ""
 
@@ -1742,15 +1880,20 @@ msgstr ""
 #: ../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:288 actions/showstream.php:370 lib/gallery.php:131
+#: lib/gallery.php:132
 msgid "Subscriptions"
 msgstr ""
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
+#: actions/profilesettings.php:353
 msgid "System error uploading file."
 msgstr ""
 
 #: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317
+#: lib/util.php:317 actions/profilesettings.php:90 actions/showstream.php:382
+#: actions/tag.php:40 actions/tagother.php:96 actions/tagother.php:162
+#: lib/profilelist.php:126 lib/profilelist.php:128
 msgid "Tags"
 msgstr ""
 
@@ -1759,6 +1902,7 @@ msgid "Text"
 msgstr ""
 
 #: ../actions/noticesearch.php:34 actions/noticesearch.php:34
+#: actions/noticesearch.php:33
 msgid "Text search"
 msgstr ""
 
@@ -1775,10 +1919,12 @@ msgid "That confirmation code is not for you!"
 msgstr ""
 
 #: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:214
 msgid "That email address already belongs to another user."
 msgstr ""
 
 #: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: actions/profilesettings.php:346
 msgid "That file is too big."
 msgstr ""
 
@@ -1787,6 +1933,7 @@ msgid "That is already your Jabber ID."
 msgstr ""
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:211
 msgid "That is already your email address."
 msgstr ""
 
@@ -1799,6 +1946,7 @@ msgid "That is not your Jabber ID."
 msgstr ""
 
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+#: actions/emailsettings.php:270
 msgid "That is not your email address."
 msgstr ""
 
@@ -1808,6 +1956,7 @@ msgstr ""
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
 #: actions/emailsettings.php:244 actions/imsettings.php:218
+#: actions/emailsettings.php:247
 msgid "That is the wrong IM address."
 msgstr ""
 
@@ -1821,10 +1970,12 @@ msgstr ""
 
 #: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
 #: actions/newnotice.php:49 actions/twitapistatuses.php:330
+#: actions/newnotice.php:61 actions/twitapistatuses.php:271
 msgid "That's too long. Max notice size is 140 chars."
 msgstr ""
 
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+#: actions/twitapiaccount.php:55
 msgid "That's too long. Max notice size is 255 chars."
 msgstr ""
 
@@ -1836,6 +1987,7 @@ msgstr ""
 #: ../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:285
 msgid "The address was removed."
 msgstr ""
 
@@ -1873,8 +2025,7 @@ msgstr ""
 
 #: ../actions/invite.php:89 actions/invite.php:96
 msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
+"These people are already users and you were automatically subscribed to them:"
 msgstr ""
 
 #: ../actions/recoverpassword.php:88
@@ -1897,44 +2048,50 @@ msgstr ""
 
 #: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511
+#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:94
+#: actions/twitapifriendships.php:82 actions/twitapistatuses.php:428
 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/twitapistatuses.php:303 actions/twitapiaccount.php:46
+#: actions/twitapidirect_messages.php:117 actions/twitapifriendships.php:30
+#: actions/twitapistatuses.php:239
 msgid "This method requires a POST."
 msgstr ""
 
-#: ../lib/util.php:164 lib/util.php:246
+#: ../lib/util.php:164 lib/util.php:246 lib/util.php:257
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
 msgid "Timezone"
 msgstr ""
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:228
 msgid "Timezone not selected."
 msgstr ""
 
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"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 ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: actions/twitapifriendships.php:128
 msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 #: actions/profilesettings.php:81 actions/register.php:183
+#: actions/profilesettings.php:83 actions/register.php:210
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 
@@ -1946,7 +2103,8 @@ msgstr ""
 #: ../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/twittersettings.php:108 actions/emailsettings.php:147
+#: actions/othersettings.php:146 actions/twittersettings.php:199
 msgid "Unexpected form submission."
 msgstr ""
 
@@ -1959,11 +2117,11 @@ msgid "Unknown action"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60
+#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:59
 msgid "Unknown version of OMB protocol."
 msgstr ""
 
-#: ../lib/util.php:269 lib/util.php:285
+#: ../lib/util.php:269 lib/util.php:285 lib/util.php:296
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
@@ -1975,6 +2133,7 @@ msgid "Unrecognized address type %s"
 msgstr ""
 
 #: ../actions/showstream.php:209 actions/showstream.php:219
+#: actions/showstream.php:267 lib/util.php:2094
 msgid "Unsubscribe"
 msgstr ""
 
@@ -1984,28 +2143,34 @@ msgid "Unsupported OMB version"
 msgstr ""
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: actions/profilesettings.php:371
 msgid "Unsupported image file format."
 msgstr ""
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: actions/deleteprofile.php:251
 msgid "Updates by SMS"
 msgstr ""
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: actions/deleteprofile.php:254
 msgid "Updates by instant messenger (IM)"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/twitapistatuses.php:126
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:198
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
 #: ../actions/avatar.php:68 actions/profilesettings.php:161
+#: actions/profilesettings.php:166
 msgid "Upload"
 msgstr ""
 
@@ -2023,17 +2188,17 @@ msgstr ""
 
 #: ../actions/invite.php:114 actions/invite.php:121
 msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
+"Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 
 #: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176
+#: actions/register.php:173 actions/register.php:176 actions/register.php:200
+#: actions/register.php:203
 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:92
 msgid "User being listened to doesn't exist."
 msgstr ""
 
@@ -2046,7 +2211,10 @@ msgstr ""
 #: 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/twitapiusers.php:87 lib/mailbox.php:50 actions/showstream.php:57
+#: actions/twitapiaccount.php:63 actions/twitapifavorites.php:40
+#: actions/twitapistatuses.php:163 actions/twitapistatuses.php:492
+#: lib/twitterapi.php:590
 msgid "User has no profile."
 msgstr ""
 
@@ -2059,16 +2227,18 @@ msgid "User not found."
 msgstr ""
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
 msgid "What timezone are you normally in?"
 msgstr ""
 
-#: ../lib/util.php:1159 lib/util.php:1293
+#: ../lib/util.php:1159 lib/util.php:1293 lib/util.php:1630
 #, php-format
 msgid "What's up, %s?"
 msgstr ""
 
 #: ../actions/profilesettings.php:54 ../actions/register.php:175
 #: actions/profilesettings.php:87 actions/register.php:189
+#: actions/profilesettings.php:89 actions/register.php:216
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 
@@ -2084,6 +2254,7 @@ msgstr ""
 
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
 #: actions/deletenotice.php:64 actions/deletenotice.php:79
+#: actions/block.php:105
 msgid "Yes"
 msgstr ""
 
@@ -2106,6 +2277,7 @@ msgid "You are already subscribed to these users:"
 msgstr ""
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:102
 msgid "You are not friends with the specified user."
 msgstr ""
 
@@ -2131,23 +2303,24 @@ msgstr ""
 #: ../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 ""
-"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
+#: actions/finishremotesubscribe.php:83 actions/finishremotesubscribe.php:99
 msgid "You can use the local subscription!"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
 #: actions/finishopenidlogin.php:38 actions/register.php:68
+#: actions/register.php:77
 msgid "You can't register if you don't agree to the license."
 msgstr ""
 
@@ -2169,6 +2342,7 @@ msgid ""
 msgstr ""
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: actions/twitapistatuses.php:455
 msgid "You may not delete another user's status."
 msgstr ""
 
@@ -2188,6 +2362,7 @@ msgid "You've been identified. Enter a  new password below. "
 msgstr ""
 
 #: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:84
 msgid "Your OpenID URL"
 msgstr ""
 
@@ -2202,77 +2377,82 @@ msgid ""
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
 
-#: ../lib/util.php:943 lib/util.php:992
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:1287
 msgid "a few seconds ago"
 msgstr ""
 
-#: ../lib/util.php:955 lib/util.php:1004
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:1299
 #, php-format
 msgid "about %d days ago"
 msgstr ""
 
-#: ../lib/util.php:951 lib/util.php:1000
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:1295
 #, php-format
 msgid "about %d hours ago"
 msgstr ""
 
-#: ../lib/util.php:947 lib/util.php:996
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:1291
 #, php-format
 msgid "about %d minutes ago"
 msgstr ""
 
-#: ../lib/util.php:959 lib/util.php:1008
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:1303
 #, php-format
 msgid "about %d months ago"
 msgstr ""
 
-#: ../lib/util.php:953 lib/util.php:1002
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:1297
 msgid "about a day ago"
 msgstr ""
 
-#: ../lib/util.php:945 lib/util.php:994
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:1289
 msgid "about a minute ago"
 msgstr ""
 
-#: ../lib/util.php:957 lib/util.php:1006
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:1301
 msgid "about a month ago"
 msgstr ""
 
-#: ../lib/util.php:961 lib/util.php:1010
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:1305
 msgid "about a year ago"
 msgstr ""
 
-#: ../lib/util.php:949 lib/util.php:998
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:1293
 msgid "about an hour ago"
 msgstr ""
 
 #: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
+#: actions/showstream.php:441 lib/stream.php:99 lib/noticelist.php:211
 msgid "delete"
 msgstr ""
 
 #: ../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/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:135
+#: lib/facebookaction.php:202 lib/noticelist.php:189
 msgid "in reply to..."
 msgstr ""
 
 #: ../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/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:142
+#: lib/noticelist.php:199
 msgid "reply"
 msgstr ""
 
 #: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/profilesettings.php:188
 msgid "same as password above"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+#: actions/twitapistatuses.php:543
 msgid "unsupported file type"
 msgstr ""
 
-#: ../lib/util.php:1309 lib/util.php:1443
-msgid "« After"
+#: ../lib/util.php:1309 lib/util.php:1443 lib/facebookaction.php:251
+#: lib/util.php:1783
+msgid "« After"
 msgstr ""
 
 #: actions/deletenotice.php:74 actions/disfavor.php:43
@@ -2284,6 +2464,12 @@ msgstr ""
 #: 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:38 actions/deleteprofile.php:127 actions/disfavor.php:47
+#: actions/emailsettings.php:130 actions/favor.php:49 actions/login.php:45
+#: actions/newmessage.php:44 actions/newnotice.php:36 actions/nudge.php:47
+#: actions/othersettings.php:139 actions/profilesettings.php:49
+#: actions/subedit.php:38 actions/tagother.php:113
+#: actions/twittersettings.php:188 actions/unblock.php:38
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -2307,12 +2493,14 @@ msgstr ""
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142
+#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:54
+#: actions/twitapifavorites.php:115
 msgid "This notice is already a favorite!"
 msgstr ""
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
+#: classes/Command.php:132 actions/favor.php:61
+#: actions/twitapifavorites.php:122
 msgid "Could not create favorite."
 msgstr ""
 
@@ -2321,11 +2509,12 @@ msgid "Disfavor"
 msgstr ""
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:62
 #, php-format
 msgid "%s favorite notices"
 msgstr ""
 
-#: actions/favoritesrss.php:64
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:66
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr ""
@@ -2351,47 +2540,50 @@ msgid ""
 "\n"
 msgstr ""
 
-#: actions/login.php:104
+#: actions/login.php:104 actions/login.php:111 actions/openidlogin.php:86
 msgid "Automatically login in the future; "
 msgstr ""
 
-#: actions/login.php:122
+#: actions/login.php:122 actions/login.php:130
 msgid "For security reasons, please re-enter your "
 msgstr ""
 
-#: actions/login.php:126
+#: actions/login.php:126 actions/login.php:134
 msgid "Login with your username and password. "
 msgstr ""
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+#: actions/newmessage.php:60 actions/twitapidirect_messages.php:136
 msgid "That's too long. Max message size is 140 chars."
 msgstr ""
 
-#: actions/newmessage.php:65
+#: actions/newmessage.php:65 actions/newmessage.php:68
 msgid "No recipient specified."
 msgstr ""
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
+#: classes/Command.php:206 actions/newmessage.php:71
+#: actions/newmessage.php:116 classes/Command.php:211
 msgid "You can't send a message to this user."
 msgstr ""
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
+#: classes/Command.php:209 actions/newmessage.php:74
+#: actions/twitapidirect_messages.php:153 classes/Command.php:214
 msgid ""
-"Don't send a message to yourself; just say it to yourself quietly "
-"instead."
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: actions/newmessage.php:108
+#: actions/newmessage.php:108 actions/microsummary.php:32
+#: actions/newmessage.php:111
 msgid "No such user"
 msgstr ""
 
-#: actions/newmessage.php:117
+#: actions/newmessage.php:117 actions/newmessage.php:120
 msgid "New message"
 msgstr ""
 
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:95 actions/noticesearch.php:94
 msgid "Notice without matching profile"
 msgstr ""
 
@@ -2438,6 +2630,7 @@ msgstr ""
 
 #: actions/profilesettings.php:115 actions/remotesubscribe.php:320
 #: actions/userauthorization.php:159 actions/userrss.php:76
+#: actions/profilesettings.php:120 actions/remotesubscribe.php:333
 msgid "User without matching profile"
 msgstr ""
 
@@ -2465,18 +2658,18 @@ msgstr ""
 msgid "New password successfully saved. "
 msgstr ""
 
-#: actions/register.php:95
+#: actions/register.php:95 actions/register.php:104
 msgid "Password must be 6 or more characters."
 msgstr ""
 
-#: actions/register.php:216
+#: actions/register.php:216 actions/register.php:243
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to..."
 msgstr ""
 
-#: actions/register.php:227
+#: actions/register.php:227 actions/register.php:254
 msgid "(You should receive a message by email momentarily, with "
 msgstr ""
 
@@ -2491,6 +2684,7 @@ msgid "Feed for favorites of %s"
 msgstr ""
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:88 actions/twitapifavorites.php:57
 msgid "Could not retrieve favorite notices."
 msgstr ""
 
@@ -2512,7 +2706,7 @@ msgstr ""
 msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: actions/showstream.php:154
+#: actions/showstream.php:154 lib/util.php:2105
 msgid "Send a message"
 msgstr ""
 
@@ -2521,73 +2715,78 @@ msgstr ""
 msgid "Mobile carrier for your phone. "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:64
 #, php-format
 msgid "Direct messages to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:65
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:69
 msgid "Direct Messages You've Sent"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:70
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:132
 msgid "No message text!"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:145
 msgid "Recipient user not found."
 msgstr ""
 
 #: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:148
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
-#: actions/twitapifavorites.php:92
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:64
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
-#: actions/twitapifavorites.php:95
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:67
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
+#: actions/twitapifavorites.php:158 lib/mail.php:303
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr ""
 
 #: actions/twitapifavorites.php:188 lib/mail.php:276
+#: actions/twitapifavorites.php:159 lib/mail.php:304
 #, php-format
 msgid ""
 "%1$s just added your notice from %2$s as one of their favorites.\n"
 "\n"
 msgstr ""
 
-#: actions/twittersettings.php:27
+#: actions/twittersettings.php:27 actions/twittersettings.php:29
 msgid ""
 "Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 
-#: actions/twittersettings.php:41
+#: actions/twittersettings.php:41 actions/twittersettings.php:43
 msgid "Twitter settings"
 msgstr ""
 
-#: actions/twittersettings.php:48
+#: actions/twittersettings.php:48 actions/twittersettings.php:50
 msgid "Twitter Account"
 msgstr ""
 
-#: actions/twittersettings.php:56
+#: actions/twittersettings.php:56 actions/twittersettings.php:58
 msgid "Current verified Twitter account."
 msgstr ""
 
@@ -2615,46 +2814,50 @@ msgstr ""
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:216
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr ""
 
-#: actions/twittersettings.php:128
+#: actions/twittersettings.php:128 actions/twittersettings.php:221
 msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: actions/twittersettings.php:137 actions/twittersettings.php:228
 #, php-format
 msgid "Unable to retrieve account information for \"%s\" from Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:234 actions/twittersettings.php:253
 msgid "Unable to save your Twitter settings!"
 msgstr ""
 
-#: actions/twittersettings.php:174
+#: actions/twittersettings.php:174 actions/twittersettings.php:261
 msgid "Twitter settings saved."
 msgstr ""
 
-#: actions/twittersettings.php:192
+#: actions/twittersettings.php:192 actions/twittersettings.php:272
 msgid "That is not your Twitter account."
 msgstr ""
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:280
 msgid "Couldn't remove Twitter user."
 msgstr ""
 
-#: actions/twittersettings.php:212
+#: actions/twittersettings.php:212 actions/twittersettings.php:284
 msgid "Twitter account removed."
 msgstr ""
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
+#: actions/twittersettings.php:299 actions/twittersettings.php:310
+#: actions/twittersettings.php:322
 msgid "Couldn't save Twitter preferences."
 msgstr ""
 
-#: actions/twittersettings.php:245
+#: actions/twittersettings.php:245 actions/twittersettings.php:330
 msgid "Twitter preferences saved."
 msgstr ""
 
@@ -2670,15 +2873,15 @@ msgstr ""
 msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#: classes/Channel.php:113
+#: classes/Channel.php:113 classes/Channel.php:129
 msgid "Command results"
 msgstr ""
 
-#: classes/Channel.php:148
+#: classes/Channel.php:148 classes/Channel.php:175
 msgid "Command complete"
 msgstr ""
 
-#: classes/Channel.php:158
+#: classes/Channel.php:158 classes/Channel.php:185
 msgid "Command failed"
 msgstr ""
 
@@ -2691,7 +2894,7 @@ msgstr ""
 msgid "Subscriptions: %1$s\n"
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:247
 msgid "User has no last notice"
 msgstr ""
 
@@ -2724,59 +2927,60 @@ msgstr ""
 msgid "About: %s"
 msgstr ""
 
-#: classes/Command.php:200
+#: classes/Command.php:200 classes/Command.php:202
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: classes/Command.php:214
+#: classes/Command.php:214 classes/Command.php:219
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: classes/Command.php:216
+#: classes/Command.php:216 classes/Command.php:221
 msgid "Error sending direct message."
 msgstr ""
 
-#: classes/Command.php:263
+#: classes/Command.php:263 classes/Command.php:268
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: classes/Command.php:270
+#: classes/Command.php:270 classes/Command.php:275
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: classes/Command.php:288
+#: classes/Command.php:288 classes/Command.php:293
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: classes/Command.php:295
+#: classes/Command.php:295 classes/Command.php:300
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330
+#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:315
+#: classes/Command.php:335
 msgid "Command not yet implemented."
 msgstr ""
 
-#: classes/Command.php:313
+#: classes/Command.php:313 classes/Command.php:318
 msgid "Notification off."
 msgstr ""
 
-#: classes/Command.php:315
+#: classes/Command.php:315 classes/Command.php:320
 msgid "Can't turn off notification."
 msgstr ""
 
-#: classes/Command.php:333
+#: classes/Command.php:333 classes/Command.php:338
 msgid "Notification on."
 msgstr ""
 
-#: classes/Command.php:335
+#: classes/Command.php:335 classes/Command.php:340
 msgid "Can't turn on notification."
 msgstr ""
 
-#: classes/Command.php:344
+#: classes/Command.php:344 classes/Command.php:349
 msgid "Commands:\n"
 msgstr ""
 
@@ -2788,23 +2992,23 @@ msgstr ""
 msgid "Could not update message with new URI."
 msgstr ""
 
-#: lib/gallery.php:46
+#: lib/gallery.php:46 lib/gallery.php:55
 msgid "User without matching profile in system."
 msgstr ""
 
-#: lib/mail.php:147
+#: lib/mail.php:147 lib/mail.php:141
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:249
+#: lib/mail.php:249 lib/mail.php:275
 #, php-format
 msgid "New private message from %s"
 msgstr ""
 
-#: lib/mail.php:253
+#: lib/mail.php:253 lib/mail.php:279
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -2848,18 +3052,411 @@ msgstr ""
 msgid "Your sent messages"
 msgstr ""
 
-#: lib/settingsaction.php:99
+#: lib/settingsaction.php:99 actions/deleteprofile.php:256
 msgid "Twitter"
 msgstr ""
 
-#: lib/settingsaction.php:100
+#: lib/settingsaction.php:100 actions/deleteprofile.php:257
 msgid "Twitter integration options"
 msgstr ""
 
-#: lib/util.php:1718
+#: lib/util.php:1718 lib/util.php:2145
 msgid "To"
 msgstr ""
 
 #: scripts/maildaemon.php:45
 msgid "Could not parse message."
 msgstr ""
+
+#: actions/block.php:45 actions/subedit.php:45 actions/unblock.php:45
+msgid "No profile specified."
+msgstr ""
+
+#: actions/block.php:52 actions/subedit.php:52 actions/tagother.php:45
+#: actions/unblock.php:52
+msgid "No profile with that ID."
+msgstr ""
+
+#: actions/block.php:78
+msgid "Block user"
+msgstr ""
+
+#: actions/block.php:81
+msgid "Are you sure you want to block this user? "
+msgstr ""
+
+#: actions/block.php:117
+msgid "You have already blocked this user."
+msgstr ""
+
+#: actions/block.php:124
+msgid "Failed to save block information."
+msgstr ""
+
+#: actions/deleteprofile.php:25
+msgid "Code not yet ready."
+msgstr ""
+
+#: actions/deleteprofile.php:36
+msgid "Export and delete your user information."
+msgstr ""
+
+#: actions/deleteprofile.php:88 actions/deleteprofile.php:119
+msgid "Delete my account"
+msgstr ""
+
+#: actions/deleteprofile.php:89
+msgid "Delete my account confirmation"
+msgstr ""
+
+#: actions/deleteprofile.php:117
+msgid "Check if you are sure you want to delete your account."
+msgstr ""
+
+#: actions/deleteprofile.php:259 lib/settingsaction.php:102
+msgid "Other"
+msgstr ""
+
+#: actions/deleteprofile.php:260 lib/settingsaction.php:103
+msgid "Other options"
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Add to favorites"
+msgstr ""
+
+#: actions/emailsettings.php:98
+msgid "Allow friends to nudge me and send me an email."
+msgstr ""
+
+#: actions/facebookremove.php:54
+msgid "Couldn't remove Facebook user."
+msgstr ""
+
+#: actions/favor.php:71
+msgid "Disfavor favorite"
+msgstr ""
+
+#: actions/favorited.php:31 lib/stream.php:45
+msgid "Popular notices"
+msgstr ""
+
+#: actions/favorited.php:54
+msgid "Showing recently popular notices"
+msgstr ""
+
+#: actions/featured.php:32 actions/featured.php:54 lib/stream.php:41
+msgid "Featured users"
+msgstr ""
+
+#: actions/finishremotesubscribe.php:186
+msgid "That user has blocked you from subscribing."
+msgstr ""
+
+#: actions/microsummary.php:39
+msgid "No current status"
+msgstr ""
+
+#: actions/newnotice.php:93
+msgid "Notice posted"
+msgstr ""
+
+#: actions/newnotice.php:116 classes/Channel.php:140
+msgid "Ajax Error"
+msgstr ""
+
+#: actions/nudge.php:52
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
+
+#: actions/nudge.php:61
+msgid "Nudge sent"
+msgstr ""
+
+#: actions/othersettings.php:27
+msgid "Manage various other options."
+msgstr ""
+
+#: actions/othersettings.php:33
+msgid "Other Settings"
+msgstr ""
+
+#: actions/othersettings.php:35
+msgid "URL Auto-shortening"
+msgstr ""
+
+#: actions/othersettings.php:54
+msgid "Service"
+msgstr ""
+
+#: actions/othersettings.php:54
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/othersettings.php:155
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr ""
+
+#: actions/peopletag.php:33
+#, php-format
+msgid "Not a valid people tag: %s"
+msgstr ""
+
+#: actions/peopletag.php:45
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr ""
+
+#: actions/peopletag.php:87
+#, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+msgstr ""
+
+#: actions/profilesettings.php:92
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+
+#: actions/profilesettings.php:246 actions/tagother.php:131
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr ""
+
+#: actions/profilesettings.php:328
+msgid "Couldn't save tags."
+msgstr ""
+
+#: actions/public.php:68
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
+msgstr ""
+
+#: actions/public.php:90
+msgid "Could not retrieve public stream."
+msgstr ""
+
+#: actions/register.php:67 actions/register.php:177
+msgid "Sorry, only invited people can register."
+msgstr ""
+
+#: actions/register.php:156
+msgid "With this form you can create a new account. "
+msgstr ""
+
+#: actions/remotesubscribe.php:136 actions/remotesubscribe.php:141
+msgid "That's a local profile! Login to subscribe."
+msgstr ""
+
+#: actions/subedit.php:68
+msgid "You are not subscribed to that profile."
+msgstr ""
+
+#: actions/subedit.php:81
+msgid "Could not save subscription."
+msgstr ""
+
+#: actions/subscribe.php:53
+msgid "Not a local user."
+msgstr ""
+
+#: actions/subscribe.php:67
+msgid "Subscribed"
+msgstr ""
+
+#: actions/subscriptions.php:72
+msgid "Jabber"
+msgstr ""
+
+#: actions/tagother.php:31
+msgid "Not logged in"
+msgstr ""
+
+#: actions/tagother.php:40
+msgid "No id argument."
+msgstr ""
+
+#: actions/tagother.php:56
+msgid "Tag a person"
+msgstr ""
+
+#: actions/tagother.php:98
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
+msgstr ""
+
+#: actions/tagother.php:120
+msgid "No such profile."
+msgstr ""
+
+#: actions/tagother.php:146
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+
+#: actions/tagother.php:153
+msgid "Could not save tags."
+msgstr ""
+
+#: actions/tagother.php:188
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
+
+#: actions/tagrss.php:33
+msgid "No such tag."
+msgstr ""
+
+#: actions/tagrss.php:62
+#, php-format
+msgid "Microblog tagged with %s"
+msgstr ""
+
+#: actions/twitapiblocks.php:45
+msgid "Block user failed."
+msgstr ""
+
+#: actions/twitapiblocks.php:66
+msgid "Unblock user failed."
+msgstr ""
+
+#: actions/twitapiusers.php:45
+msgid "Not found."
+msgstr ""
+
+#: actions/twittersettings.php:63
+msgid "Twitter user name"
+msgstr ""
+
+#: actions/twittersettings.php:67
+msgid "Twitter password"
+msgstr ""
+
+#: actions/twittersettings.php:129
+msgid "Twitter Friends"
+msgstr ""
+
+#: actions/unblock.php:73
+msgid "Error removing the block."
+msgstr ""
+
+#: actions/unsubscribe.php:48
+msgid "No profile id in request."
+msgstr ""
+
+#: actions/unsubscribe.php:55
+msgid "No profile with that id."
+msgstr ""
+
+#: actions/unsubscribe.php:69
+msgid "Unsubscribed"
+msgstr ""
+
+#: classes/Notice.php:100
+msgid "Problem saving notice. Unknown user."
+msgstr ""
+
+#: classes/Notice.php:105
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+
+#: classes/Notice.php:112
+msgid "You are banned from posting notices on this site."
+msgstr ""
+
+#: lib/gallery.php:98
+msgid "Filter tags"
+msgstr ""
+
+#: lib/gallery.php:104
+msgid "All"
+msgstr ""
+
+#: lib/gallery.php:108
+msgid "Tag"
+msgstr ""
+
+#: lib/gallery.php:109
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/gallery.php:110
+msgid "Go"
+msgstr ""
+
+#: lib/gallery.php:264
+msgid "Subscriptions navigation"
+msgstr ""
+
+#: lib/gallery.php:270 lib/gallery.php:292
+msgid "List"
+msgstr ""
+
+#: lib/gallery.php:280 lib/gallery.php:294
+msgid "Icons"
+msgstr ""
+
+#: lib/mail.php:92
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:242
+#, php-format
+msgid "You've been nudged by %s"
+msgstr ""
+
+#: lib/mail.php:246
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+msgstr ""
+
+#: lib/profilelist.php:146
+msgid "(none)"
+msgstr ""
+
+#: lib/stream.php:33
+msgid "Public"
+msgstr ""
+
+#: lib/stream.php:36 lib/stream.php:37
+msgid "Recent tags"
+msgstr ""
+
+#: lib/stream.php:40
+msgid "Featured"
+msgstr ""
+
+#: lib/stream.php:44
+msgid "Popular"
+msgstr ""
+
+#: lib/subs.php:51
+msgid "User has blocked you."
+msgstr ""
+
+#: lib/util.php:2059
+msgid "Send a nudge"
+msgstr ""
+
+#: lib/util.php:2063
+msgid "Nudge sent!"
+msgstr ""
+
+#: lib/util.php:2194
+msgid "Block"
+msgstr ""
+
+#: lib/util.php:2198
+msgid "Unblock"
+msgstr ""
diff --git a/pt_BR/LC_MESSAGES/laconica.po b/pt_BR/LC_MESSAGES/laconica.po
index d8cdba91b2..e2d2d85732 100644
--- a/pt_BR/LC_MESSAGES/laconica.po
+++ b/pt_BR/LC_MESSAGES/laconica.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"POT-Creation-Date: 2009-01-12 12:10+0000\n"
 "PO-Revision-Date: 2009-01-11 14:21+0000\n"
 "Last-Translator: Tiago Faria <gouki@goukihq.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,29 +20,34 @@ msgstr ""
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-Country: BRAZIL\n"
 
-#: ../actions/noticesearchrss.php:64
+#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:61
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr "Pesquisar por \"%s\" no fluxo de mensagens"
 
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: actions/finishopenidlogin.php:88 actions/register.php:205
+#: actions/register.php:232
 msgid ""
-" except this private data: password, email address, IM address, phone "
-"number."
+" except this private data: password, email address, IM address, phone number."
 msgstr ""
 "exceto estes dados privados: senha, endereço de e-mail, endereço de "
 "mensageiro instantâneo, número de telefone."
 
 #: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+#: lib/facebookaction.php:195 lib/noticelist.php:160
 msgid " from "
 msgstr " via "
 
-#: ../actions/twitapistatuses.php:478
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: actions/twitapistatuses.php:341
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
 msgstr "%1$s / Atualizações respondendo à %2$s"
 
-#: ../actions/invite.php:168
+#: ../actions/invite.php:168 actions/invite.php:176
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s convidou você para se juntar ao %2$s"
@@ -82,10 +87,9 @@ msgstr ""
 "%2$s é um serviço de micro-blogging the permite você se manter atualizado "
 "com as pessoas que você conhece e com as que interessam à você.\n"
 "\n"
-"Você também pode compartilhar notícias sobre você mesmo, seus "
-"pensamentos, ou sua vida, com pessoas que conhecem você. Também é ótimo "
-"para conhecer novas pessoas que compartilham os mesmos interesses que "
-"você.\n"
+"Você também pode compartilhar notícias sobre você mesmo, seus pensamentos, "
+"ou sua vida, com pessoas que conhecem você. Também é ótimo para conhecer "
+"novas pessoas que compartilham os mesmos interesses que você.\n"
 "\n"
 "%1$s disse:\n"
 "\n"
@@ -102,9 +106,11 @@ msgstr ""
 "\n"
 "Se não, você pode ignorar esta mensagem. Obrigado por sua paciência e "
 "tempo.\n"
-"\nAtenciosamente, %2$s\n"
+"\n"
+"Atenciosamente, %2$s\n"
 
-#: ../lib/mail.php:124
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:115
+#: lib/mail.php:117
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s agora está acompanhando suas mensagens em %2$s. "
@@ -124,51 +130,60 @@ msgstr ""
 "\t%3$s\n"
 "\n"
 "Atenciosamente,\n"
-"%4$s.\n "
+"%4$s.\n"
+" "
 
-#: ../actions/twitapistatuses.php:482
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#: actions/twitapistatuses.php:344
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "Atualizações de %1$s que respondem a mensagens de %2$s / %3$s."
 
 #  Apesar do termo em inglês ser status, na verdade ele refere-se a uma determinada mensagem.
-#: ../actions/shownotice.php:45
+#: ../actions/shownotice.php:45 actions/shownotice.php:45
+#: actions/shownotice.php:73
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "Mensagem de %1$s em %2$s"
 
-#: ../actions/invite.php:84 ../actions/invite.php:92
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../actions/publicrss.php:62
+#: ../actions/publicrss.php:62 actions/publicrss.php:48
 #, php-format
 msgid "%s Public Stream"
 msgstr "Conteúdo público de %s"
 
 #: ../actions/all.php:47 ../actions/allrss.php:60
-#: ../actions/twitapistatuses.php:238 ../lib/stream.php:51
+#: ../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/twitapistatuses.php:123
 #, php-format
 msgid "%s and friends"
 msgstr "%s e amigos"
 
-#: ../actions/twitapistatuses.php:49
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:31
 #, php-format
 msgid "%s public timeline"
 msgstr "Mensagens públicas de %s"
 
-#: ../lib/mail.php:206
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:217
 #, php-format
 msgid "%s status"
 msgstr "Status de %s"
 
-#: ../actions/twitapistatuses.php:338
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:195
 #, php-format
 msgid "%s timeline"
 msgstr "Mensagens de %s"
 
-#: ../actions/twitapistatuses.php:52
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:34
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s atualizações de todo mundo!"
@@ -178,59 +193,64 @@ msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 msgstr ""
-"(Você receberá uma mensagem por e-mail a qualquer momento, com "
-"instruções sobre como confirmar seu endereço.)"
+"(Você receberá uma mensagem por e-mail a qualquer momento, com instruções "
+"sobre como confirmar seu endereço.)"
 
-#: ../lib/util.php:257
+#: ../lib/util.php:257 lib/util.php:273 lib/util.php:284
 #, 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%%** é um serviço de microblog disponibilizado por "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+"**%%site.name%%** é um serviço de microblog disponibilizado por [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
 
-#: ../lib/util.php:259
+#: ../lib/util.php:259 lib/util.php:275 lib/util.php:286
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** é um serviço de microblog."
 
-#: ../lib/util.php:274
+#: ../lib/util.php:274 lib/util.php:290 lib/util.php:301
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ""
-". Os colaboradores devem ser citados usando seu nome completo ou "
-"apelido."
+". Os colaboradores devem ser citados usando seu nome completo ou apelido."
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
+#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
+#: actions/profilesettings.php:78
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 letras minúsculas ou números, sem pontuações ou espaços"
 
-#: ../actions/register.php:152
+#: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:193
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr "1-64 letras ou números, sem pontuação ou espaços. Obrigatório."
 
-#: ../actions/password.php:42
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/profilesettings.php:186
 msgid "6 or more characters"
 msgstr "6 ou mais caracteres"
 
-#: ../actions/recoverpassword.php:180
+#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 ou mais caracteres. E não se esqueça dela!"
 
-#: ../actions/register.php:154
+#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:195
 msgid "6 or more characters. Required."
 msgstr "6 caracteres ou mais. Obrigatório."
 
-#: ../actions/imsettings.php:197
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, 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 ""
 "Um código de confirmação foi enviado para o endereço de MI que você "
 "adicionou. Você deve permitir que %s envie mensagens para você."
 
-#: ../actions/emailsettings.php:213
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:234
 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."
@@ -239,19 +259,33 @@ msgstr ""
 "informou. Verifique sua caixa de entrada (e de spam!) para o código e "
 "instruções sobre como usá-lo."
 
-#: ../actions/smssettings.php:216
+#: ../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 ""
-"Um código de confirmação foi enviado para o número de telefone de que "
-"você informou. Verifique sua caixa de entrada (e de spam!) para o código e "
+"Um código de confirmação foi enviado para o número de telefone de que você "
+"informou. Verifique sua caixa de entrada (e de spam!) para o código e "
 "instruções sobre como usá-lo."
 
 #: ../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/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:30
+#: actions/twitapidirect_messages.php:107 actions/twitapifavorites.php:83
+#: actions/twitapifavorites.php:99 actions/twitapifriendships.php:117
+#: actions/twitapihelp.php:42 actions/twitapistatuses.php:77
+#: actions/twitapistatuses.php:144 actions/twitapistatuses.php:224
+#: actions/twitapistatuses.php:234 actions/twitapistatuses.php:386
+#: actions/twitapistatuses.php:395 actions/twitapistatuses.php:421
+#: actions/twitapiusers.php:30
 msgid "API method not found!"
 msgstr "Método da API não encontrado!"
 
@@ -264,164 +298,197 @@ msgstr "Método da API não encontrado!"
 #: ../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:39
+#: actions/twitapiaccount.php:89 actions/twitapiaccount.php:94
+#: actions/twitapidirect_messages.php:178 actions/twitapifavorites.php:139
+#: actions/twitapihelp.php:49 actions/twitapistatuses.php:549
 msgid "API method under construction."
 msgstr "Método da API em construção."
 
-#: ../lib/util.php:324
+#: ../lib/util.php:324 lib/util.php:340 lib/util.php:352
 msgid "About"
 msgstr "Sobre"
 
-#: ../actions/userauthorization.php:119
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
 msgid "Accept"
 msgstr "Aceitar"
 
 #: ../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/twittersettings.php:84
 msgid "Add"
 msgstr "Adicionar"
 
-#: ../actions/openidsettings.php:43
+#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
 msgid "Add OpenID"
 msgstr "Adicionar OpenID"
 
-#: ../lib/settingsaction.php:97
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: actions/deleteprofile.php:248
 msgid "Add or remove OpenIDs"
 msgstr "Adicionar/Remover OpenIDs"
 
 #: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
 msgid "Address"
 msgstr "Endereço"
 
-#: ../actions/invite.php:131
+#: ../actions/invite.php:131 actions/invite.php:139
 msgid "Addresses of friends to invite (one per line)"
 msgstr "Endereços dos seus amigos que serão convidados (um por linha)"
 
-#: ../actions/showstream.php:273
+#: ../actions/showstream.php:273 actions/showstream.php:288
+#: actions/showstream.php:336
 msgid "All subscriptions"
 msgstr "Todas as assinaturas"
 
-#: ../actions/publicrss.php:64
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
 #, php-format
 msgid "All updates for %s"
 msgstr "Todas as atualizações para %s"
 
-#: ../actions/noticesearchrss.php:66
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:63
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "Todas as atualizações correspondentes ao termo \"%s\""
 
 #: ../actions/finishopenidlogin.php:29 ../actions/login.php:31
 #: ../actions/openidlogin.php:29 ../actions/register.php:30
+#: actions/finishopenidlogin.php:29 actions/login.php:31
+#: actions/openidlogin.php:29 actions/register.php:30
 msgid "Already logged in."
 msgstr "Já está autenticado."
 
-#: ../lib/subs.php:42
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:47
 msgid "Already subscribed!."
 msgstr "Já foi assinado!"
 
-#: ../actions/deletenotice.php:54
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
 msgid "Are you sure you want to delete this notice?"
 msgstr "Você tem certeza que deseja apagar esta mensagem?"
 
-#: ../actions/userauthorization.php:77
+#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
 msgid "Authorize subscription"
 msgstr "Autorizar assinatura"
 
 #: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192 actions/register.php:219
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Entrar automaticamente no futuro sem pedir a senha. Não use em computadores "
 "compartilhados!"
 
-#: ../actions/profilesettings.php:65
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:103
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "Assinar automaticamente à quem me assinar (melhor para não humanos)"
 
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: actions/profilesettings.php:34
 msgid "Avatar"
 msgstr "Avatar"
 
-#: ../actions/avatar.php:113
+#: ../actions/avatar.php:113 actions/profilesettings.php:350
+#: actions/profilesettings.php:379
 msgid "Avatar updated."
 msgstr "O avatar foi atualizado"
 
-#: ../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 ""
-"Aguardando a confirmação deste endereço. Procure em sua conta de "
-"Jabber/GTalk por uma mensagem com mais instruções (Você adicionou %s à "
-"sua lista de contatos?)"
+"Aguardando a confirmação deste endereço. Procure em sua conta de Jabber/"
+"GTalk por uma mensagem com mais instruções (Você adicionou %s à sua lista de "
+"contatos?)"
 
-#: ../actions/emailsettings.php:54
+#: ../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 ""
-"Aguardando confirmação deste endereço. Verifique sua caixa de entrada (e "
-"de spam!) para novas instruções."
+"Aguardando confirmação deste endereço. Verifique sua caixa de entrada (e de "
+"spam!) para novas instruções."
 
-#: ../actions/smssettings.php:58
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
 msgid "Awaiting confirmation on this phone number."
 msgstr "Aguardando a confirmação deste número de telefone."
 
-#: ../lib/util.php:1318
-msgid "Before »"
+#: ../lib/util.php:1318 lib/util.php:1452 lib/facebookaction.php:259
+#: lib/util.php:1792
+#, fuzzy
+msgid "Before »"
 msgstr "Antes »"
 
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: actions/profilesettings.php:82 actions/register.php:184
+#: actions/profilesettings.php:84 actions/register.php:211
 msgid "Bio"
 msgstr "Descrição"
 
 #: ../actions/profilesettings.php:101 ../actions/register.php:82
-#: ../actions/updateprofile.php:103
+#: ../actions/updateprofile.php:103 actions/profilesettings.php:216
+#: actions/register.php:89 actions/updateprofile.php:104
+#: actions/profilesettings.php:222 actions/register.php:98
 msgid "Bio is too long (max 140 chars)."
 msgstr "Descrição muito extensa (máximo 140 caracteres)."
 
-#: ../lib/deleteaction.php:41
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
 msgid "Can't delete this notice."
 msgstr "Não é possível apagar esta mensagem."
 
-#: ../actions/updateprofile.php:119
+#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "Não foi possível ler o endereço do avatar '%s'"
 
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
+#: actions/profilesettings.php:404 actions/recoverpassword.php:313
+#: actions/profilesettings.php:433
 msgid "Can't save new password."
 msgstr "Não foi possível salvar a nova senha."
 
 #: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62
+#: ../actions/smssettings.php:62 actions/emailsettings.php:58
+#: actions/imsettings.php:59 actions/smssettings.php:62
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../lib/openid.php:121
+#: ../lib/openid.php:121 lib/openid.php:121
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Não foi possível instanciar um objeto do OpenID"
 
-#: ../actions/imsettings.php:163
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
 msgid "Cannot normalize that Jabber ID"
 msgstr "Não foi possível configurar essa ID do Jabber"
 
-#: ../actions/emailsettings.php:181
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:204
 msgid "Cannot normalize that email address"
 msgstr "Não é possível usar este endereço de email"
 
-#: ../actions/password.php:45
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/profilesettings.php:189
 msgid "Change"
 msgstr "Alterar"
 
-#: ../lib/settingsaction.php:88
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: actions/deleteprofile.php:245
 msgid "Change email handling"
 msgstr "Alterar tratamento de emails"
 
-#: ../actions/password.php:32
+#: ../actions/password.php:32 actions/profilesettings.php:36
 msgid "Change password"
 msgstr "Alterar a senha"
 
@@ -429,29 +496,35 @@ msgstr "Alterar a senha"
 msgid "Change your password"
 msgstr "Alterar sua senha"
 
-#: ../lib/settingsaction.php:85
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#: actions/deleteprofile.php:242
 msgid "Change your profile settings"
 msgstr "Alterar suas configurações de perfil"
 
 #: ../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/profilesettings.php:187 actions/register.php:196
 msgid "Confirm"
 msgstr "Confirmar"
 
-#: ../actions/confirmaddress.php:90
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
 msgid "Confirm Address"
 msgstr "Confirmar o endereço"
 
 #: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245
+#: ../actions/smssettings.php:245 actions/emailsettings.php:256
+#: actions/imsettings.php:230 actions/smssettings.php:253
+#: actions/emailsettings.php:259
 msgid "Confirmation cancelled."
 msgstr "A confirmação foi cancelada."
 
-#: ../actions/smssettings.php:63
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
 msgid "Confirmation code"
 msgstr "Código de confirmação"
 
-#: ../actions/confirmaddress.php:38
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
 msgid "Confirmation code not found."
 msgstr "O código de confirmação não foi encontrado."
 
@@ -488,96 +561,113 @@ msgstr ""
 "\n"
 "Obrigado por se cadastrar e esperamos que você aproveite o serviço."
 
-#: ../actions/finishopenidlogin.php:91
+#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
 msgid "Connect"
 msgstr "Conectar"
 
-#: ../actions/finishopenidlogin.php:86
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
 msgid "Connect existing account"
 msgstr "Conecta-se a uma conta já existente"
 
-#: ../lib/util.php:332
+#: ../lib/util.php:332 lib/util.php:348 lib/util.php:360
 msgid "Contact"
 msgstr "Contato"
 
-#: ../lib/openid.php:178
+#: ../lib/openid.php:178 lib/openid.php:178
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "Não foi possível criar o formulário OpenID: %s"
 
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:46 actions/twitapifriendships.php:62
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Não foi possível seguir o usuário: %s já está na sua lista."
 
-#: ../actions/twitapifriendships.php:53
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+#: actions/twitapifriendships.php:39
 msgid "Could not follow user: User not found."
 msgstr "Não é possível acompanhar o usuário: Usuário não encontrado."
 
-#: ../lib/openid.php:160
+#: ../lib/openid.php:160 lib/openid.php:160
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "Não foi possível redirecionar para o servidor: %s"
 
-#: ../actions/updateprofile.php:162
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
 msgid "Could not save avatar info"
 msgstr "Não foi possível salvar as informações do avatar"
 
-#: ../actions/updateprofile.php:155
+#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
 msgid "Could not save new profile info"
 msgstr "Não foi possível salvar as novas informações do perfil"
 
-#: ../lib/subs.php:54
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:70
 msgid "Could not subscribe other to you."
 msgstr "Não é possível que outros o acompanhem."
 
-#: ../lib/subs.php:46
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:55
 msgid "Could not subscribe."
 msgstr "Não foi possível assinar."
 
-#: ../actions/recoverpassword.php:102
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
 msgid "Could not update user with confirmed email address."
 msgstr "Não foi possível atualizar o usuário com o endereço email confirmado."
 
 #: ../actions/finishremotesubscribe.php:99
+#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:112
 msgid "Couldn't convert request tokens to access tokens."
 msgstr "Não foi possível encontrar a página a partir da requisição feita."
 
 #: ../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/emailsettings.php:255
 msgid "Couldn't delete email confirmation."
 msgstr "Não foi possível excluir a confirmação do email."
 
-#: ../lib/subs.php:103
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:129
 msgid "Couldn't delete subscription."
 msgstr "Não foi possível excluir a assinatura."
 
-#: ../actions/twitapistatuses.php:93
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+#: actions/twitapistatuses.php:82
 msgid "Couldn't find any statuses."
 msgstr "Não foi possível encontrar nenhum status."
 
-#: ../actions/remotesubscribe.php:127
+#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
+#: actions/remotesubscribe.php:148
 msgid "Couldn't get a request token."
 msgstr "Não foi possível processar a requisição."
 
 #: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206
+#: ../actions/smssettings.php:206 actions/emailsettings.php:223
+#: actions/imsettings.php:195 actions/smssettings.php:214
+#: actions/emailsettings.php:228
 msgid "Couldn't insert confirmation code."
 msgstr "Não foi possível inserir o código de confirmação."
 
 #: ../actions/finishremotesubscribe.php:180
+#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:216
 msgid "Couldn't insert new subscription."
 msgstr "Não foi possível inserir a nova assinatura."
 
 #: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
+#: actions/profilesettings.php:319 actions/twitapiaccount.php:74
 msgid "Couldn't save profile."
 msgstr "Não foi possível salvar o perfil."
 
-#: ../actions/profilesettings.php:161
+#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
+#: actions/profilesettings.php:296
 msgid "Couldn't update user for autosubscribe."
 msgstr "Não foi possível atualizar o usuário para assinar automaticamente."
 
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+#: actions/emailsettings.php:301 actions/emailsettings.php:315
 msgid "Couldn't update user record."
 msgstr "Não foi possível atualizar os registros do usuário."
 
@@ -585,189 +675,214 @@ msgstr "Não foi possível atualizar os registros do usuário."
 #: ../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/emailsettings.php:179 actions/emailsettings.php:280
+#: actions/othersettings.php:173 actions/profilesettings.php:276
 msgid "Couldn't update user."
 msgstr "Não foi possível atualizar o usuário."
 
-#: ../actions/finishopenidlogin.php:84
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
 msgid "Create"
 msgstr "Criar"
 
-#: ../actions/finishopenidlogin.php:70
+#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
 msgid "Create a new user with this nickname."
 msgstr "Criar um novo usuário com este apelido."
 
-#: ../actions/finishopenidlogin.php:68
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
 msgid "Create new account"
 msgstr "Criar uma nova conta"
 
-#: ../actions/finishopenidlogin.php:191
+#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+#: actions/finishopenidlogin.php:208
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Criando uma nova conta para um OpenID que já tem um usuário."
 
-#: ../actions/imsettings.php:45
+#: ../actions/imsettings.php:45 actions/imsettings.php:46
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Endereço atual de Jabber/GTalk confirmado."
 
-#: ../actions/smssettings.php:46
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Telefone atualmente habilitado para receber SMS."
 
-#: ../actions/emailsettings.php:44
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
 msgid "Current confirmed email address."
 msgstr "Endereço confirmado de e-mail."
 
-#: ../actions/showstream.php:356
+#: ../actions/showstream.php:356 actions/showstream.php:367
+#: actions/showstream.php:418
 msgid "Currently"
 msgstr "Nesse momento"
 
-#: ../classes/Notice.php:72
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:87
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr "Erro no banco de dados durante a inserção da etiqueta: %s"
 
-#: ../lib/util.php:1061
+#: ../lib/util.php:1061 lib/util.php:1110 lib/util.php:1417
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Erro no banco de dados na inserção da reposta: %s"
 
-#: ../actions/deletenotice.php:41
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
 msgid "Delete notice"
 msgstr "Excluir mensagem"
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: actions/profilesettings.php:84 actions/register.php:186
+#: actions/profilesettings.php:86 actions/register.php:213
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Descreva você mesmo e seus interesses em 140 caracteres."
 
 #: ../actions/register.php:158 ../actions/register.php:161
-#: ../lib/settingsaction.php:87
+#: ../lib/settingsaction.php:87 actions/register.php:172
+#: actions/register.php:175 lib/settingsaction.php:87
+#: actions/deleteprofile.php:244 actions/register.php:199
+#: actions/register.php:202
 msgid "Email"
 msgstr "E-mail"
 
-#: ../actions/emailsettings.php:59
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
 msgid "Email Address"
 msgstr "Endereço de e-mail"
 
-#: ../actions/emailsettings.php:32
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
 msgid "Email Settings"
 msgstr "Configurações do e-mail"
 
-#: ../actions/register.php:73
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:89
 msgid "Email address already exists."
 msgstr "O endereço de e-mail já existe."
 
-#: ../lib/mail.php:90
+#: ../lib/mail.php:90 lib/mail.php:90
 msgid "Email address confirmation"
 msgstr "Confirmação do endereço de e-mail"
 
-#: ../actions/emailsettings.php:61
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Endereço de email, ex: \"usuário@exemplo.org\""
 
-#: ../actions/invite.php:129
+#: ../actions/invite.php:129 actions/invite.php:137
 msgid "Email addresses"
 msgstr "Endereço de email"
 
-#: ../actions/recoverpassword.php:191
+#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
 msgid "Enter a nickname or email address."
 msgstr "Informe um apelido ou endereço de e-mail."
 
-#: ../actions/smssettings.php:64
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
 msgid "Enter the code you received on your phone."
 msgstr "Informe o código que você recebeu no seu telefone."
 
-#: ../actions/userauthorization.php:137
+#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
 msgid "Error authorizing token"
 msgstr "Erro na autorização do token"
 
-#: ../actions/finishopenidlogin.php:253
+#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
+#: actions/finishopenidlogin.php:274
 msgid "Error connecting user to OpenID."
 msgstr "Erro na conexão do usuário ao OpenID."
 
-#: ../actions/finishaddopenid.php:78
+#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
 msgid "Error connecting user."
 msgstr "Erro na conexão do usuário."
 
 #: ../actions/finishremotesubscribe.php:151
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:164
 msgid "Error inserting avatar"
 msgstr "Erro na inserção do avatar"
 
 #: ../actions/finishremotesubscribe.php:143
+#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:156
 msgid "Error inserting new profile"
 msgstr "Erro na inserção do novo perfil"
 
 #: ../actions/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:180
 msgid "Error inserting remote profile"
 msgstr "Erro na inserção do perfil remoto"
 
-#: ../actions/recoverpassword.php:240
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
 msgid "Error saving address confirmation."
 msgstr "Erro no salvamento do endereço de confirmação"
 
-#: ../actions/userauthorization.php:140
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
 msgid "Error saving remote profile"
 msgstr "Erro no salvamento do perfil remoto"
 
-#: ../lib/openid.php:226
+#: ../lib/openid.php:226 lib/openid.php:226
 msgid "Error saving the profile."
 msgstr "Erro no salvamento do perfil."
 
-#: ../lib/openid.php:237
+#: ../lib/openid.php:237 lib/openid.php:237
 msgid "Error saving the user."
 msgstr "Erro no salvamento do usuário."
 
-#: ../actions/password.php:80
+#: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/profilesettings.php:428
 msgid "Error saving user; invalid."
 msgstr "Erro no salvamento do usuário; inválido."
 
 #: ../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:54 actions/login.php:80
+#: actions/register.php:117
 msgid "Error setting user."
 msgstr "Erro na configuração do usuário."
 
-#: ../actions/finishaddopenid.php:83
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
 msgid "Error updating profile"
 msgstr "Erro na atualização do perfil"
 
 #: ../actions/finishremotesubscribe.php:161
+#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:174
 msgid "Error updating remote profile"
 msgstr "Erro na atualização do perfil remoto"
 
-#: ../actions/recoverpassword.php:80
+#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
 msgid "Error with confirmation code."
 msgstr "Erro com o código de confirmação."
 
-#: ../actions/finishopenidlogin.php:89
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
 msgid "Existing nickname"
 msgstr "Esse apelido já existe"
 
-#: ../lib/util.php:326
+#: ../lib/util.php:326 lib/util.php:342 lib/util.php:354
 msgid "FAQ"
 msgstr "FAQ"
 
-#: ../actions/avatar.php:115
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/profilesettings.php:381
 msgid "Failed updating avatar."
 msgstr "Não foi possível atualizar o avatar."
 
-#: ../actions/all.php:61 ../actions/allrss.php:64
+#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
+#: actions/allrss.php:64
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Mensagens dos amigos de %s"
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
+#: actions/replies.php:65 actions/repliesrss.php:66
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Respostas de %s"
 
-#: ../actions/tag.php:55
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:54
 #, php-format
 msgid "Feed for tag %s"
 msgstr "Mensagens com a etiqueta %s"
 
-#: ../lib/searchaction.php:105
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
 msgid "Find content of notices"
 msgstr "Pesquisar o conteúdo das mensagens"
 
-#: ../lib/searchaction.php:101
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
 msgid "Find people on this site"
 msgstr "Encontrar pessoas neste site"
 
@@ -776,51 +891,61 @@ msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
-"Por razões de segurança, por favor, digite novamente seu nome de usuário "
-"e senha antes de alterar suas configurações."
+"Por razões de segurança, por favor, digite novamente seu nome de usuário e "
+"senha antes de alterar suas configurações."
 
 #: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: actions/profilesettings.php:77 actions/register.php:178
+#: actions/profilesettings.php:79 actions/register.php:205
 msgid "Full name"
 msgstr "Nome completo"
 
 #: ../actions/profilesettings.php:98 ../actions/register.php:79
-#: ../actions/updateprofile.php:93
+#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
+#: actions/register.php:86 actions/updateprofile.php:94
+#: actions/profilesettings.php:219 actions/register.php:95
 msgid "Full name is too long (max 255 chars)."
 msgstr "Nome completo muito longo (máx. 255 caracteres)"
 
-#: ../lib/util.php:322
+#: ../lib/util.php:322 lib/util.php:338 lib/util.php:343 lib/util.php:350
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:298 lib/util.php:314 lib/util.php:325
 msgid "Home"
 msgstr "Início"
 
 #: ../actions/profilesettings.php:46 ../actions/register.php:167
+#: actions/profilesettings.php:79 actions/register.php:181
+#: actions/profilesettings.php:81 actions/register.php:208
 msgid "Homepage"
 msgstr "Sítio de Internet"
 
 #: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: actions/profilesettings.php:210 actions/register.php:83
+#: actions/profilesettings.php:216 actions/register.php:92
 msgid "Homepage is not a valid URL."
 msgstr "A URL informada não é válida."
 
-#: ../actions/emailsettings.php:91
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+#: actions/emailsettings.php:101
 msgid "I want to post notices by email."
 msgstr "Eu quero publicar mensagens por e-mail."
 
-#: ../lib/settingsaction.php:102
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+#: actions/deleteprofile.php:253
 msgid "IM"
 msgstr "IM"
 
-#: ../actions/imsettings.php:60
+#: ../actions/imsettings.php:60 actions/imsettings.php:61
 msgid "IM Address"
 msgstr "Endereço do mensageiro instantâneo"
 
-#: ../actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
 msgid "IM Settings"
 msgstr "Configuração do mensageiro instantâneo"
 
-#: ../actions/finishopenidlogin.php:88
+#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -841,22 +966,25 @@ msgid ""
 "If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
 msgstr ""
-"Se você esqueceu ou perdeu sua senha, você pode ter uma nova enviada para "
-"o endereço de email informado em seu cadastro."
+"Se você esqueceu ou perdeu sua senha, você pode ter uma nova enviada para o "
+"endereço de email informado em seu cadastro."
 
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
+#: actions/emailsettings.php:68 actions/smssettings.php:76
 msgid "Incoming email"
 msgstr "E-mail de recebimento"
 
-#: ../actions/emailsettings.php:283
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+#: actions/emailsettings.php:304
 msgid "Incoming email address removed."
 msgstr "O endereço de e-mail de recebimento foi removido."
 
-#: ../actions/password.php:69
+#: ../actions/password.php:69 actions/profilesettings.php:388
+#: actions/profilesettings.php:417
 msgid "Incorrect old password"
 msgstr "A senha antiga está incorreta"
 
-#: ../actions/login.php:67
+#: ../actions/login.php:67 actions/login.php:67 actions/login.php:74
 msgid "Incorrect username or password."
 msgstr "Nome de usuário e/ou senha incorreto(s)"
 
@@ -865,95 +993,102 @@ msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
-"As instruções para recuperar sua senha foram enviadas para o endereço de "
-"e-mail registrado no seu cadastro."
+"As instruções para recuperar sua senha foram enviadas para o endereço de e-"
+"mail registrado no seu cadastro."
 
-#: ../actions/updateprofile.php:114
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "A URL '%s' para a imagem de exibição é inválida"
 
-#: ../actions/invite.php:55
+#: ../actions/invite.php:55 actions/invite.php:62
 #, php-format
 msgid "Invalid email address: %s"
 msgstr "Não é um endereço de email válido: %s"
 
-#: ../actions/updateprofile.php:98
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "O site '%s' é inválido"
 
-#: ../actions/updateprofile.php:82
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "A URL '%s' da licença é inválida"
 
-#: ../actions/postnotice.php:61
+#: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:63
 msgid "Invalid notice content"
 msgstr "O conteúdo da mensagem é inválido"
 
-#: ../actions/postnotice.php:67
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:69
 msgid "Invalid notice uri"
 msgstr "A URI da mensagem é inválida"
 
-#: ../actions/postnotice.php:72
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:74
 msgid "Invalid notice url"
 msgstr "A URL da mensagem é inválida"
 
-#: ../actions/updateprofile.php:87
+#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "URL de perfil inválida '%s'."
 
-#: ../actions/remotesubscribe.php:96
+#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
 msgid "Invalid profile URL (bad format)"
 msgstr "A URL do perfil é inválida (formato inválido)"
 
 #: ../actions/finishremotesubscribe.php:77
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:78
 msgid "Invalid profile URL returned by server."
 msgstr "A URL do perfil retornada pelo servidor é inválida."
 
-#: ../actions/avatarbynickname.php:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
 msgid "Invalid size."
 msgstr "Tamanho inválido"
 
 #: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
-#: ../actions/register.php:111
+#: ../actions/register.php:111 actions/finishopenidlogin.php:241
+#: actions/register.php:103 actions/register.php:121
+#: actions/finishopenidlogin.php:256 actions/register.php:112
+#: actions/register.php:130
 msgid "Invalid username or password."
 msgstr "Nome de usuário e/ou senha inválido(s)"
 
-#: ../actions/invite.php:79
+#: ../actions/invite.php:79 actions/invite.php:86
 msgid "Invitation(s) sent"
 msgstr "Convite(s) enviado(s)"
 
-#: ../actions/invite.php:97
+#: ../actions/invite.php:97 actions/invite.php:104
 msgid "Invitation(s) sent to the following people:"
 msgstr "Convite(s) enviado(s) para as seguintes pessoas:"
 
-#: ../lib/util.php:306
+#: ../lib/util.php:306 lib/util.php:322 lib/util.php:332
 msgid "Invite"
 msgstr "Convidar"
 
-#: ../actions/invite.php:123
+#: ../actions/invite.php:123 actions/invite.php:130
 msgid "Invite new users"
 msgstr "Convidar novos usuários"
 
-#: ../lib/util.php:261
+#: ../lib/util.php:261 lib/util.php:277 lib/util.php:288
 #, 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 ""
 "Ele funciona sob o software de microblog [Laconica](http://laconi.ca/), "
-"versão %s, disponível sob a [GNU Affero General Public License] "
-"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"versão %s, disponível sob a [GNU Affero General Public License] (http://www."
+"fsf.org/licensing/licenses/agpl-3.0.html)."
 
-#: ../actions/imsettings.php:173
+#: ../actions/imsettings.php:173 actions/imsettings.php:181
 msgid "Jabber ID already belongs to another user."
 msgstr "Este ID do Jabber já pertence à outro usuário."
 
-#: ../actions/imsettings.php:62
+#: ../actions/imsettings.php:62 actions/imsettings.php:63
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -963,29 +1098,39 @@ msgstr ""
 "certifique-se de adicionar %s à sua lista de contatos no seu cliente de IM "
 "ou no GTalk."
 
-#: ../actions/profilesettings.php:57
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
 msgid "Language"
 msgstr "Idioma"
 
-#: ../actions/profilesettings.php:113
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+#: actions/profilesettings.php:234
 msgid "Language is too long (max 50 chars)."
 msgstr "Nome do idioma muito extenso (máx. 50 caracteres)."
 
 #: ../actions/profilesettings.php:52 ../actions/register.php:173
+#: actions/profilesettings.php:85 actions/register.php:187
+#: actions/profilesettings.php:87 actions/register.php:214
 msgid "Location"
 msgstr "Localização"
 
 #: ../actions/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108
+#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
+#: actions/register.php:92 actions/updateprofile.php:109
+#: actions/profilesettings.php:225 actions/register.php:101
 msgid "Location is too long (max 255 chars)."
 msgstr "A localização é muito longa (máx. 255 caracteres)."
 
 #: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310
+#: ../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/login.php:104 actions/login.php:113 actions/openidlogin.php:88
+#: lib/util.php:336
 msgid "Login"
 msgstr "Autenticação"
 
-#: ../actions/openidlogin.php:44
+#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:60
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Autentique-se com uma conta [OpenID](%%doc.openid%%)."
@@ -993,40 +1138,43 @@ msgstr "Autentique-se com uma conta [OpenID](%%doc.openid%%)."
 #: ../actions/login.php:126
 #, 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 ""
 "Autentique-se com seus nome de usuário e senha. Não tem um usuário ainda? "
-"[Registre](%%action.register%%) uma nova conta, ou use uma "
-"[OpenID](%%action.openidlogin%%)."
+"[Registre](%%action.register%%) uma nova conta, ou use uma [OpenID](%%action."
+"openidlogin%%)."
 
-#: ../lib/util.php:308
+#: ../lib/util.php:308 lib/util.php:324 lib/util.php:334
 msgid "Logout"
 msgstr "Sair"
 
-#: ../actions/register.php:166
+#: ../actions/register.php:166 actions/register.php:180
+#: actions/register.php:207
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Nome completo, de preferência seu nome \"real\""
 
-#: ../actions/login.php:110
+#: ../actions/login.php:110 actions/login.php:110 actions/login.php:118
 msgid "Lost or forgotten password?"
 msgstr "Perdeu ou esqueceu sua senha?"
 
 #: ../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 "Cria um novo endereço de email para publicar e cancela o antigo."
 
-#: ../actions/emailsettings.php:27
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Gerenciar como você recebe emails do %%site.name%%."
 
-#: ../actions/showstream.php:300
+#: ../actions/showstream.php:300 actions/showstream.php:315
+#: actions/showstream.php:363
 msgid "Member since"
 msgstr "Membro desde"
 
-#: ../actions/userrss.php:70
+#: ../actions/userrss.php:70 actions/userrss.php:67
 #, php-format
 msgid "Microblog by %s"
 msgstr "Microblog por %s"
@@ -1037,38 +1185,44 @@ 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 ""
-"Operadora móvel do seu celular. Se você conhece uma operadora que aceita "
-"SMS via e-mail, mas não está listada aqui, informe-nos enviando um e-mail "
-"para %s."
+"Operadora móvel do seu celular. Se você conhece uma operadora que aceita SMS "
+"via e-mail, mas não está listada aqui, informe-nos enviando um e-mail para %"
+"s."
 
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php:85 actions/register.php:202
+#: actions/register.php:229
 msgid "My text and files are available under "
 msgstr "Meus textos e arquivos estão disponíveis sob"
 
 #: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
 msgid "New"
 msgstr "Novo"
 
-#: ../lib/mail.php:144
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:138
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Novo endereço de email para postar no %s"
 
-#: ../actions/emailsettings.php:297
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+#: actions/emailsettings.php:318
 msgid "New incoming email address added."
 msgstr ""
-"Foi adicionado um novo endereço de e-mail para recebimento de "
-"mensagens."
+"Foi adicionado um novo endereço de e-mail para recebimento de mensagens."
 
-#: ../actions/finishopenidlogin.php:71
+#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
 msgid "New nickname"
 msgstr "Novo apelido"
 
-#: ../actions/newnotice.php:87
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:141
 msgid "New notice"
 msgstr "Nova mensagem"
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
+#: actions/profilesettings.php:180 actions/recoverpassword.php:185
+#: actions/profilesettings.php:185
 msgid "New password"
 msgstr "Nova senha"
 
@@ -1079,137 +1233,164 @@ msgstr ""
 "autenticado."
 
 #: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:151
+#: ../actions/register.php:151 actions/login.php:101
+#: actions/profilesettings.php:74 actions/register.php:165
+#: actions/login.php:108 actions/profilesettings.php:76
+#: actions/register.php:192
 msgid "Nickname"
 msgstr "Apelido"
 
 #: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:69
+#: ../actions/register.php:69 actions/finishopenidlogin.php:181
+#: actions/profilesettings.php:225 actions/register.php:76
+#: actions/finishopenidlogin.php:192 actions/profilesettings.php:231
+#: actions/register.php:85
 msgid "Nickname already in use. Try another one."
 msgstr "Esse apelido já está em uso. Tente outro."
 
 #: ../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:182 actions/profilesettings.php:209
+#: actions/register.php:83
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
-"O apelido deve conter apenas letras minúsculas e/ou números e não pode "
-"ter espaços."
+"O apelido deve conter apenas letras minúsculas e/ou números e não pode ter "
+"espaços."
 
-#: ../actions/finishopenidlogin.php:170
+#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:187
 msgid "Nickname not allowed."
 msgstr "Esse apelido não é permitido."
 
-#: ../actions/remotesubscribe.php:72
+#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
 msgid "Nickname of the user you want to follow"
 msgstr "Apelido do usuário que você quer seguir"
 
-#: ../actions/recoverpassword.php:162
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
 msgid "Nickname or email"
 msgstr "Apelido ou e-mail"
 
-#: ../actions/deletenotice.php:59
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:104
 msgid "No"
 msgstr "Não"
 
-#: ../actions/imsettings.php:156
+#: ../actions/imsettings.php:156 actions/imsettings.php:164
 msgid "No Jabber ID."
 msgstr "Nenhuma ID de Jabber."
 
-#: ../actions/userauthorization.php:129
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
 msgid "No authorization request!"
 msgstr "Nenhum pedido de autorização!"
 
-#: ../actions/smssettings.php:181
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
 msgid "No carrier selected."
 msgstr "Não foi selecionada nenhuma operadora."
 
-#: ../actions/smssettings.php:316
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
 msgid "No code entered"
 msgstr "Não foi informado nenhum código"
 
-#: ../actions/confirmaddress.php:33
+#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
 msgid "No confirmation code."
 msgstr "Nenhum código de confirmação."
 
-#: ../actions/newnotice.php:44
+#: ../actions/newnotice.php:44 actions/newmessage.php:53
+#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:52
+#: actions/newnotice.php:53
 msgid "No content!"
 msgstr "Nenhum conteúdo!"
 
-#: ../actions/emailsettings.php:174
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+#: actions/emailsettings.php:197
 msgid "No email address."
 msgstr "Nenhum endereço de e-mail."
 
-#: ../actions/userbyid.php:32
+#: ../actions/userbyid.php:32 actions/userbyid.php:32
 msgid "No id."
 msgstr "Nenhuma ID."
 
-#: ../actions/emailsettings.php:271
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+#: actions/emailsettings.php:292
 msgid "No incoming email address."
 msgstr "Nenhum endereço de e-mail para recebimentos."
 
 #: ../actions/finishremotesubscribe.php:65
+#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:66
 msgid "No nickname provided by remote server."
 msgstr "Nenhum apelido fornecido pelo servidor remoto."
 
-#: ../actions/avatarbynickname.php:27
+#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 msgid "No nickname."
 msgstr "Sem apelido."
 
 #: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229
+#: ../actions/smssettings.php:229 actions/emailsettings.php:240
+#: actions/imsettings.php:214 actions/smssettings.php:237
+#: actions/emailsettings.php:243
 msgid "No pending confirmation to cancel."
 msgstr "Nenhuma confirmação para cancelar."
 
-#: ../actions/smssettings.php:176
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
 msgid "No phone number."
 msgstr "Nenhum telefone cadastrado."
 
 #: ../actions/finishremotesubscribe.php:72
+#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:73
 msgid "No profile URL returned by server."
 msgstr "Nenhuma URL de perfil retornada pelo servidor."
 
-#: ../actions/recoverpassword.php:226
+#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
 msgid "No registered email address for that user."
 msgstr "Nenhum endereço de e-mail registrado para esse usuário."
 
-#: ../actions/userauthorization.php:49
+#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
 msgid "No request found!"
 msgstr "Não foi encontrada nenhuma requisição!"
 
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
+#: actions/noticesearch.php:69 actions/peoplesearch.php:69
+#: actions/noticesearch.php:68 actions/peoplesearch.php:59
 msgid "No results"
 msgstr "Não foi encontrado nenhum resultado"
 
-#: ../actions/avatarbynickname.php:32
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
 msgid "No size."
 msgstr "Sem tamanho definido."
 
-#: ../actions/twitapistatuses.php:595
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:109
+#: actions/twitapistatuses.php:438
 msgid "No status found with that ID."
 msgstr "Nenhum status foi encontrado com esse ID."
 
-#: ../actions/twitapistatuses.php:555
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:411
 msgid "No status with that ID found."
 msgstr "Nenhum status com esse ID foi encontrado."
 
-#: ../actions/openidsettings.php:135
+#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
 msgid "No such OpenID."
 msgstr "Essa OpenID não existe."
 
-#: ../actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29
 msgid "No such document."
 msgstr "Esse documento não existe."
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30
+#: ../lib/deleteaction.php:30 actions/shownotice.php:32
+#: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:38
+#: actions/shownotice.php:114
 msgid "No such notice."
 msgstr "Essa mensagem não existe."
 
-#: ../actions/recoverpassword.php:56
+#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
 msgid "No such recovery code."
 msgstr "Esse código de recuperação não existe."
 
-#: ../actions/postnotice.php:56
+#: ../actions/postnotice.php:56 actions/postnotice.php:57
 msgid "No such subscription"
 msgstr "Essa assinatura não existe."
 
@@ -1219,213 +1400,259 @@ msgstr "Essa assinatura não existe."
 #: ../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
+#: ../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/showstream.php:157
+#: classes/Command.php:208 classes/Command.php:242 lib/gallery.php:85
+#: lib/subs.php:105
 msgid "No such user."
 msgstr "Usuário não encontrado."
 
-#: ../actions/recoverpassword.php:211
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
 msgid "No user with that email address or username."
 msgstr "Não foi encontrado um usuário com este login ou endereço de email."
 
-#: ../lib/gallery.php:80
+#: ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
 msgstr "Ninguém para exibir!"
 
-#: ../actions/recoverpassword.php:60
+#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
 msgid "Not a recovery code."
 msgstr "Não é um código de recuperação"
 
-#: ../scripts/maildaemon.php:50
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
 msgid "Not a registered user."
 msgstr "Não é um usuário registrado."
 
 #: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332
+#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
+#: lib/twitterapi.php:502 lib/twitterapi.php:423 lib/twitterapi.php:450
+#: lib/twitterapi.php:534
 msgid "Not a supported data format."
 msgstr "Formato de dados não suportado."
 
-#: ../actions/imsettings.php:167
+#: ../actions/imsettings.php:167 actions/imsettings.php:175
 msgid "Not a valid Jabber ID"
 msgstr "Não é uma ID válida de Jabber"
 
-#: ../lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131
 msgid "Not a valid OpenID."
 msgstr "Não é uma OpenID válida."
 
-#: ../actions/emailsettings.php:185
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+#: actions/emailsettings.php:208
 msgid "Not a valid email address"
 msgstr "Não é um endereço de e-mail válido."
 
-#: ../actions/register.php:63
+#: ../actions/register.php:63 actions/register.php:70 actions/register.php:79
 msgid "Not a valid email address."
 msgstr "Não é um endereço de e-mail válido."
 
 #: ../actions/profilesettings.php:91 ../actions/register.php:71
+#: actions/profilesettings.php:206 actions/register.php:78
+#: actions/profilesettings.php:212 actions/register.php:87
 msgid "Not a valid nickname."
 msgstr "Não é um apelido válido."
 
-#: ../actions/remotesubscribe.php:120
+#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
 msgid "Not a valid profile URL (incorrect services)."
 msgstr "Não é uma URL de perfil válida (serviço incorreto)."
 
-#: ../actions/remotesubscribe.php:113
+#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr "Não é uma URL de perfil válida (nenhum XRDS definido)."
 
-#: ../actions/remotesubscribe.php:104
+#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
 msgid "Not a valid profile URL (no YADIS document)."
 msgstr "Não é uma URL de perfil válida (nenhum documento YADIS)."
 
-#: ../actions/avatar.php:95
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: actions/profilesettings.php:361
 msgid "Not an image or corrupt file."
 msgstr "Imagem inválida ou arquivo corrompido."
 
 #: ../actions/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:52
 msgid "Not authorized."
 msgstr "Não autorizado."
 
 #: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38
 msgid "Not expecting this response!"
 msgstr "Não esperava por esta resposta!"
 
-#: ../actions/twitapistatuses.php:422
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+#: actions/twitapistatuses.php:304
 msgid "Not found"
 msgstr "Não encontrado"
 
 #: ../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
+#: ../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:31 actions/newnotice.php:30
+#: actions/nudge.php:30 actions/subedit.php:31 actions/unblock.php:31
 msgid "Not logged in."
 msgstr "Você não está logado"
 
-#: ../lib/subs.php:91
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:117
 msgid "Not subscribed!."
 msgstr "Não é assinado!"
 
-#: ../actions/opensearch.php:35
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
 msgid "Notice Search"
 msgstr "Pesquisar por mensagem"
 
-#: ../actions/showstream.php:82
+#: ../actions/showstream.php:82 actions/showstream.php:82
+#: actions/showstream.php:111 actions/showstream.php:118
+#: actions/showstream.php:123
 #, php-format
 msgid "Notice feed for %s"
 msgstr "Mensagens de %s"
 
-#: ../actions/shownotice.php:39
+#: ../actions/shownotice.php:39 actions/shownotice.php:39
+#: actions/shownotice.php:45
 msgid "Notice has no profile"
 msgstr "A mensagem não está associada a nenhum perfil"
 
-#: ../actions/showstream.php:316
+#: ../actions/showstream.php:316 actions/showstream.php:331
+#: actions/showstream.php:379
 msgid "Notices"
 msgstr "Mensagens"
 
-#: ../actions/tag.php:35 ../actions/tag.php:81
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Feed de mensagens com %s"
 
-#: ../actions/password.php:39
+#: ../actions/password.php:39 actions/profilesettings.php:178
+#: actions/profilesettings.php:183
 msgid "Old password"
 msgstr "Senha antiga"
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314
+#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
+#: lib/util.php:330 actions/deleteprofile.php:247 lib/util.php:340
 msgid "OpenID"
 msgstr "OpenID"
 
-#: ../actions/finishopenidlogin.php:61
+#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
 msgid "OpenID Account Setup"
 msgstr "Configuração da conta OpenID"
 
-#: ../lib/openid.php:180
+#: ../lib/openid.php:180 lib/openid.php:180
 msgid "OpenID Auto-Submit"
 msgstr "Submissão automática da OpenID"
 
 #: ../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/finishopenidlogin.php:150 actions/openidlogin.php:76
 msgid "OpenID Login"
 msgstr "Autenticar-se via OpenID"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
+#: actions/openidlogin.php:74 actions/openidsettings.php:50
+#: actions/openidlogin.php:82
 msgid "OpenID URL"
 msgstr "URL da OpenID"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
+#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 msgid "OpenID authentication cancelled."
 msgstr "A autenticação pela OpenID foi cancelada."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
+#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "Não foi possível autenticar via OpenID: %s"
 
-#: ../lib/openid.php:133
+#: ../lib/openid.php:133 lib/openid.php:133
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "Falha no OpenID: %s"
 
-#: ../actions/openidsettings.php:144
+#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
 msgid "OpenID removed."
 msgstr "A OpenID foi removida."
 
-#: ../actions/openidsettings.php:37
+#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
 msgid "OpenID settings"
 msgstr "Configurações da OpenID"
 
-#: ../actions/invite.php:135
+#: ../actions/invite.php:135 actions/invite.php:143
 msgid "Optionally add a personal message to the invitation."
 msgstr "Opcionalmente adicione uma mensagem pessoal ao convite."
 
-#: ../actions/avatar.php:84
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: actions/profilesettings.php:350
 msgid "Partial upload."
 msgstr "Envio parcial."
 
 #: ../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/login.php:109 actions/register.php:194
 msgid "Password"
 msgstr "Senha"
 
-#: ../actions/recoverpassword.php:288
+#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
 msgid "Password and confirmation do not match."
 msgstr "A senha e a confirmação não coincidem."
 
-#: ../actions/recoverpassword.php:284
+#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
 msgid "Password must be 6 chars or more."
 msgstr "A senha deve ter 6 caracteres ou mais."
 
 #: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 msgid "Password recovery requested"
 msgstr "Foi solicitada a recuperação da senha"
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: actions/profilesettings.php:408 actions/recoverpassword.php:326
+#: actions/profilesettings.php:437
 msgid "Password saved."
 msgstr "A senha foi salva."
 
 #: ../actions/password.php:61 ../actions/register.php:88
+#: actions/profilesettings.php:380 actions/register.php:98
+#: actions/profilesettings.php:409 actions/register.php:107
 msgid "Passwords don't match."
 msgstr "As senhas não coincidem."
 
-#: ../lib/searchaction.php:100
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
 msgid "People"
 msgstr "Pessoas"
 
-#: ../actions/opensearch.php:33
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
 msgid "People Search"
 msgstr "Busca por pessoas"
 
-#: ../actions/peoplesearch.php:33
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
 msgid "People search"
 msgstr "Procurar pessoas"
 
-#: ../lib/stream.php:50
+#: ../lib/stream.php:50 lib/personal.php:50
 msgid "Personal"
 msgstr "Pessoal"
 
-#: ../actions/invite.php:133
+#: ../actions/invite.php:133 actions/invite.php:141
 msgid "Personal message"
 msgstr "Mensagem pessoal"
 
-#: ../actions/smssettings.php:69
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Número de telefone, sem pontuação ou espaços, com código de área"
 
@@ -1436,118 +1663,138 @@ msgid ""
 "click \"Cancel\"."
 msgstr ""
 "Por favor, verifique estes detalhes para ter certeza que você quer assinar "
-"as mensagens deste usuário. Se você não solicitou a assinatura das "
-"mensagens de ninguém, clique em \"Cancelar\"."
+"as mensagens deste usuário. Se você não solicitou a assinatura das mensagens "
+"de ninguém, clique em \"Cancelar\"."
 
-#: ../actions/imsettings.php:73
+#: ../actions/imsettings.php:73 actions/imsettings.php:74
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Informar minhas mudanças de estado no Jabber/GTalk como uma mensagem."
 
 #: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94
+#: ../actions/smssettings.php:94 actions/emailsettings.php:86
+#: actions/imsettings.php:68 actions/smssettings.php:94
+#: actions/twittersettings.php:70
 msgid "Preferences"
 msgstr "Preferências"
 
 #: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163
+#: ../actions/smssettings.php:163 actions/emailsettings.php:180
+#: actions/imsettings.php:152 actions/smssettings.php:171
+#: actions/emailsettings.php:185 actions/othersettings.php:179
 msgid "Preferences saved."
 msgstr "As preferências foram salvas."
 
-#: ../actions/profilesettings.php:57
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
 msgid "Preferred language"
 msgstr "Idioma"
 
-#: ../lib/util.php:328
+#: ../lib/util.php:328 lib/util.php:344 lib/util.php:356
 msgid "Privacy"
 msgstr "Privacidade"
 
-#: ../classes/Notice.php:95 ../classes/Notice.php:106
+#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
+#: classes/Notice.php:119 classes/Notice.php:139 classes/Notice.php:149
 msgid "Problem saving notice."
 msgstr "Problema no salvamento da mensagem."
 
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60
+#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
+#: lib/settingsaction.php:84 actions/deleteprofile.php:241
 msgid "Profile"
 msgstr "Perfil"
 
-#: ../actions/remotesubscribe.php:73
+#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
 msgid "Profile URL"
 msgstr "URL do Perfil"
 
-#: ../actions/profilesettings.php:34
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
 msgid "Profile settings"
 msgstr "Configurações de perfil"
 
 #: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
+#: actions/postnotice.php:52 actions/updateprofile.php:53
 msgid "Profile unknown"
 msgstr "Perfil desconhecido"
 
-#: ../actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:77
 msgid "Public Stream Feed"
 msgstr "Fluxo de mensagens públicas"
 
-#: ../actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 lib/stream.php:34
 msgid "Public timeline"
 msgstr "Mensagens públicas"
 
-#: ../actions/imsettings.php:79
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publique um MicroID com meu Endereço de Jabber/Gtalk."
 
-#: ../actions/emailsettings.php:94
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:104
 msgid "Publish a MicroID for my email address."
 msgstr "Publique um MicroID para meu endereço de email."
 
-#: ../actions/tag.php:75 ../actions/tag.php:76
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
 msgid "Recent Tags"
 msgstr "Tags recentes"
 
-#: ../actions/recoverpassword.php:166
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
 msgid "Recover"
 msgstr "Recuperar"
 
-#: ../actions/recoverpassword.php:156
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
 msgid "Recover password"
 msgstr "Recuperar a senha"
 
-#: ../actions/recoverpassword.php:67
+#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
 msgid "Recovery code for unknown user."
 msgstr "Código de confirmação para usuário desconhecido."
 
 #: ../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:181 actions/register.php:234 lib/util.php:338
 msgid "Register"
 msgstr "Registrar"
 
-#: ../actions/register.php:28
+#: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:173
 msgid "Registration not allowed."
 msgstr "Cadastro não permitido."
 
-#: ../actions/register.php:200
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:241
 msgid "Registration successful"
 msgstr "Registro completo"
 
-#: ../actions/userauthorization.php:120
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
 msgid "Reject"
 msgstr "Recusar"
 
-#: ../actions/login.php:103 ../actions/register.php:176
+#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
+#: actions/register.php:190 actions/login.php:110 actions/openidlogin.php:85
+#: actions/register.php:217
 msgid "Remember me"
 msgstr "Lembrar minha autenticação nesse computador"
 
-#: ../actions/updateprofile.php:70
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
 msgid "Remote profile with no matching profile"
 msgstr "Perfil remoto sem referencia local"
 
-#: ../actions/remotesubscribe.php:65
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
 msgid "Remote subscribe"
 msgstr "Assinatura remota"
 
 #: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
 #: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php:48 actions/emailsettings.php:76
+#: actions/imsettings.php:49 actions/openidsettings.php:108
+#: actions/smssettings.php:50 actions/smssettings.php:84
+#: actions/twittersettings.php:59 actions/twittersettings.php:61
 msgid "Remove"
 msgstr "Remover"
 
-#: ../actions/openidsettings.php:68
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
 msgid "Remove OpenID"
 msgstr "Remover OpenID"
 
@@ -1559,61 +1806,73 @@ msgstr ""
 "Remover a sua única OpenID pode fazer com que seja impossível você se "
 "autenticar novamente! Se deseja realmente, adicione outra OpenID antes."
 
-#: ../lib/stream.php:55
+#: ../lib/stream.php:55 lib/personal.php:55
 msgid "Replies"
 msgstr "Respostas"
 
 #: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
+#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #, php-format
 msgid "Replies to %s"
 msgstr "Respostas para %s"
 
-#: ../actions/recoverpassword.php:183
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
 msgid "Reset"
 msgstr "Restaurar"
 
-#: ../actions/recoverpassword.php:173
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
 msgid "Reset password"
 msgstr "Restaurar a senha"
 
-#: ../lib/settingsaction.php:99
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/deleteprofile.php:250 actions/subscriptions.php:73
 msgid "SMS"
 msgstr "SMS"
 
-#: ../actions/smssettings.php:67
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
 msgid "SMS Phone number"
 msgstr "Telefone para SMS"
 
-#: ../actions/smssettings.php:33
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
 msgid "SMS Settings"
 msgstr "Configuração de SMS"
 
-#: ../lib/mail.php:219
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:230
 msgid "SMS confirmation"
 msgstr "Confirmação de SMS"
 
-#: ../actions/recoverpassword.php:182
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
 msgid "Same as password above"
 msgstr "Igual à senha acima"
 
-#: ../actions/register.php:156
+#: ../actions/register.php:156 actions/register.php:170
+#: actions/register.php:197
 msgid "Same as password above. Required."
 msgstr "Igual à senha acima. Obrigatório"
 
 #: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
 #: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
+#: actions/emailsettings.php:104 actions/imsettings.php:82
+#: actions/profilesettings.php:101 actions/smssettings.php:100
+#: actions/twittersettings.php:83 actions/emailsettings.php:107
+#: actions/othersettings.php:56 actions/profilesettings.php:106
+#: actions/subscriptions.php:74 actions/tagother.php:100
+#: actions/twittersettings.php:82
 msgid "Save"
 msgstr "Salvar"
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300
+#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
+#: lib/util.php:316 lib/util.php:327
 msgid "Search"
 msgstr "Pesquisar"
 
-#: ../actions/noticesearch.php:80
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:84
 msgid "Search Stream Feed"
 msgstr "Pesquisar no fluxo de mensagens"
 
-#: ../actions/noticesearch.php:30
+#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
+#: actions/noticesearch.php:29
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -1632,27 +1891,29 @@ msgstr ""
 "interesses. Separe os termos da busca com espaços; eles devem ter 3 "
 "caracteres ou mais."
 
-#: ../actions/smssettings.php:296
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
 msgid "Select a carrier"
 msgstr "Escolha uma operadora"
 
-#: ../actions/invite.php:137 ../lib/util.php:1172
+#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
+#: lib/util.php:1306 lib/util.php:1731 lib/util.php:1646 lib/util.php:2158
 msgid "Send"
 msgstr "Enviar"
 
 #: ../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."
 msgstr "Envie emails para esse endereço para postar novas mensagens."
 
-#: ../actions/emailsettings.php:88
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
 msgid "Send me notices of new subscriptions through email."
 msgstr "Me envie as mensagens de novos seguidores via email."
 
-#: ../actions/imsettings.php:70
+#: ../actions/imsettings.php:70 actions/imsettings.php:71
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Envie-me as mensagens via Jabber/GTalk."
 
-#: ../actions/smssettings.php:97
+#: ../actions/smssettings.php:97 actions/smssettings.php:97
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -1660,161 +1921,189 @@ msgstr ""
 "Me envie mensagens via SMS; Eu entendo que isso pode gerar contas "
 "exorbitantes de minha operadora."
 
-#: ../actions/imsettings.php:76
+#: ../actions/imsettings.php:76 actions/imsettings.php:77
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "Me envie respostas através do Jabber/GTalk de pessoas que eu não estou "
 "seguindo."
 
-#: ../lib/util.php:304
+#: ../lib/util.php:304 lib/util.php:320 lib/util.php:330
 msgid "Settings"
 msgstr "Configurações"
 
-#: ../actions/profilesettings.php:192
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:336
 msgid "Settings saved."
 msgstr "As configurações foram salvas."
 
-#: ../actions/tag.php:60
+#: ../actions/tag.php:60 actions/tag.php:60 actions/tag.php:59
 msgid "Showing most popular tags from the last week"
 msgstr "Exibindo tags mais populares da última semana"
 
-#: ../actions/finishaddopenid.php:66
+#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
 msgid "Someone else already has this OpenID."
 msgstr "Alguém já está usando esta OpenID."
 
 #: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
+#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
 msgid "Something weird happened."
 msgstr "Aconteceu alguma coisa estranha..."
 
-#: ../scripts/maildaemon.php:58
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
 msgid "Sorry, no incoming email allowed."
 msgstr "Infelizmente não é permitido o recebimento de emails."
 
-#: ../scripts/maildaemon.php:54
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
 msgid "Sorry, that is not your incoming email address."
 msgstr "Infelizmente este não é seu endeço para postagem via email."
 
-#: ../lib/util.php:330
+#: ../lib/util.php:330 lib/util.php:346 lib/util.php:358
 msgid "Source"
 msgstr "Fonte"
 
-#: ../actions/showstream.php:296
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:359
 msgid "Statistics"
 msgstr "Estatísticas"
 
 #: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
+#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
+#: actions/finishopenidlogin.php:199 actions/finishopenidlogin.php:267
 msgid "Stored OpenID not found."
 msgstr "O OpenID armazenado não foi encontrado."
 
 #: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197
+#: ../actions/showstream.php:197 actions/remotesubscribe.php:84
+#: actions/showstream.php:197 actions/showstream.php:206
+#: actions/showstream.php:254 lib/util.php:2078
 msgid "Subscribe"
 msgstr "Assinar"
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
+#: actions/showstream.php:328 actions/subscribers.php:27
+#: actions/showstream.php:376 lib/gallery.php:136 lib/gallery.php:137
 msgid "Subscribers"
 msgstr "Assinantes"
 
-#: ../actions/userauthorization.php:310
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
 msgid "Subscription authorized"
 msgstr "A assinatura foi autorizada"
 
-#: ../actions/userauthorization.php:320
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
 msgid "Subscription rejected"
 msgstr "A assinatura foi recusada"
 
 #: ../actions/showstream.php:230 ../actions/showstream.php:307
-#: ../actions/subscriptions.php:27
+#: ../actions/subscriptions.php:27 actions/showstream.php:240
+#: actions/showstream.php:322 actions/subscriptions.php:27
+#: actions/showstream.php:288 actions/showstream.php:370 lib/gallery.php:131
+#: lib/gallery.php:132
 msgid "Subscriptions"
 msgstr "Assinaturas"
 
-#: ../actions/avatar.php:87
+#: ../actions/avatar.php:87 actions/profilesettings.php:324
+#: actions/profilesettings.php:353
 msgid "System error uploading file."
 msgstr "Erro no sistema durante o envio do arquivo."
 
-#: ../actions/tag.php:41 ../lib/util.php:301
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317 actions/profilesettings.php:90 actions/showstream.php:382
+#: actions/tag.php:40 actions/tagother.php:96 actions/tagother.php:162
+#: lib/profilelist.php:126 lib/profilelist.php:128
 msgid "Tags"
 msgstr "Tags"
 
-#: ../lib/searchaction.php:104
+#: ../lib/searchaction.php:104 lib/searchaction.php:104
 msgid "Text"
 msgstr "Texto"
 
-#: ../actions/noticesearch.php:34
+#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
+#: actions/noticesearch.php:33
 msgid "Text search"
 msgstr "Pesquisa no conteúdo"
 
-#: ../actions/openidsettings.php:140
+#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
 msgid "That OpenID does not belong to you."
 msgstr "Essa OpenID não pertence à você."
 
-#: ../actions/confirmaddress.php:52
+#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
 msgid "That address has already been confirmed."
 msgstr "Esse endereço já foi confirmado."
 
-#: ../actions/confirmaddress.php:43
+#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
 msgid "That confirmation code is not for you!"
 msgstr "Esse código de confirmação não é seu!"
 
-#: ../actions/emailsettings.php:191
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:214
 msgid "That email address already belongs to another user."
 msgstr "Este endereço de email já pertence à outro usuário."
 
-#: ../actions/avatar.php:80
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: actions/profilesettings.php:346
 msgid "That file is too big."
 msgstr "Esse arquivo é muito grande."
 
-#: ../actions/imsettings.php:170
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
 msgid "That is already your Jabber ID."
 msgstr "Essa já é sua ID do Jabber."
 
-#: ../actions/emailsettings.php:188
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:211
 msgid "That is already your email address."
 msgstr "Este já é seu endereço de email."
 
-#: ../actions/smssettings.php:188
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
 msgid "That is already your phone number."
 msgstr "Este já é seu número de telefone."
 
-#: ../actions/imsettings.php:233
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
 msgid "That is not your Jabber ID."
 msgstr "Essa não é sua ID do Jabber."
 
-#: ../actions/emailsettings.php:249
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+#: actions/emailsettings.php:270
 msgid "That is not your email address."
 msgstr "Este não é seu endereço de email."
 
-#: ../actions/smssettings.php:257
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
 msgid "That is not your phone number."
 msgstr "Este não é seu número de telefone."
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
+#: actions/emailsettings.php:244 actions/imsettings.php:218
+#: actions/emailsettings.php:247
 msgid "That is the wrong IM address."
 msgstr "Esse endereço do comunicador instantâneo está incorreto."
 
-#: ../actions/smssettings.php:233
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
 msgid "That is the wrong confirmation number."
 msgstr "O código de confirmação informado está incorreto."
 
-#: ../actions/smssettings.php:191
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
 msgid "That phone number already belongs to another user."
 msgstr "Este número de telefone já pertence à outro usuário."
 
 #: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: actions/newnotice.php:49 actions/twitapistatuses.php:330
+#: actions/newnotice.php:61 actions/twitapistatuses.php:271
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "Está muito extenso. O tamanho máximo é de 140 caracteres."
 
-#: ../actions/twitapiaccount.php:74
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+#: actions/twitapiaccount.php:55
 msgid "That's too long. Max notice size is 255 chars."
 msgstr "Está muito longo.. O tamanho máximo é de 255 caracteres."
 
-#: ../actions/confirmaddress.php:92
+#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "O endereço \"%s\" foi confirmado para sua conta."
 
 #: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
-#: ../actions/smssettings.php:274
+#: ../actions/smssettings.php:274 actions/emailsettings.php:282
+#: actions/imsettings.php:258 actions/smssettings.php:282
+#: actions/emailsettings.php:285
 msgid "The address was removed."
 msgstr "O endereço foi removido."
 
@@ -1825,8 +2114,8 @@ msgid ""
 "subscription. Your subscription token is:"
 msgstr ""
 "A assinatura foi autorizada, mas não foi informada nenhuma URL de retorno "
-"válida. Verifique as instruções do site para detalhes sobre como "
-"autorizar a assinatura. Seu código de assinatura é:"
+"válida. Verifique as instruções do site para detalhes sobre como autorizar a "
+"assinatura. Seu código de assinatura é:"
 
 #: ../actions/userauthorization.php:322
 msgid ""
@@ -1838,28 +2127,27 @@ msgstr ""
 "válida. Verifique as instruções do site para maiores detalhes em como "
 "rejeitar completamente a assinatura."
 
-#: ../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 "Estas são as pessoas que acompanham as mensagens de %s."
 
-#: ../actions/subscribers.php:33
+#: ../actions/subscribers.php:33 actions/subscribers.php:33
 msgid "These are the people who listen to your notices."
 msgstr "Estas são as pessoas que acompanham as suas mensagens."
 
-#: ../actions/subscriptions.php:35
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Estas são as pessoas cujas mensagens %s acompanha."
 
-#: ../actions/subscriptions.php:33
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
 msgid "These are the people whose notices you listen to."
 msgstr "Estas são as pessoas cujas mensagens você acompanha."
 
-#: ../actions/invite.php:89
+#: ../actions/invite.php:89 actions/invite.php:96
 msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
+"These people are already users and you were automatically subscribed to them:"
 msgstr "Estas pessoas já são usuários e você está automaticamente seguindo a "
 
 #: ../actions/recoverpassword.php:88
@@ -1871,84 +2159,100 @@ msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
 msgstr ""
-"Este formulário deve enviar-se automaticamente. Caso isso não ocorra, "
-"clique no botão \"Enviar\" para ir para seu provedor de OpenID."
+"Este formulário deve enviar-se automaticamente. Caso isso não ocorra, clique "
+"no botão \"Enviar\" para ir para seu provedor de OpenID."
 
-#: ../actions/finishopenidlogin.php:56
+#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
 #, 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 ""
-"Esta é a primeira vez que você autenticou-se em %s. Por isso nós "
-"precisamos conectar sua OpenID a uma conta local. Você pode criar uma conta "
-"nova, ou conectar a uma conta sua já existente, caso tenha uma."
+"Esta é a primeira vez que você autenticou-se em %s. Por isso nós precisamos "
+"conectar sua OpenID a uma conta local. Você pode criar uma conta nova, ou "
+"conectar a uma conta sua já existente, caso tenha uma."
 
 #: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:94
+#: actions/twitapifriendships.php:82 actions/twitapistatuses.php:428
 msgid "This method requires a POST or DELETE."
 msgstr "Este método requer POST ou DELETE."
 
 #: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381
+#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
+#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
+#: actions/twitapistatuses.php:303 actions/twitapiaccount.php:46
+#: actions/twitapidirect_messages.php:117 actions/twitapifriendships.php:30
+#: actions/twitapistatuses.php:239
 msgid "This method requires a POST."
 msgstr "Este método requer um POST."
 
-#: ../lib/util.php:164
+#: ../lib/util.php:164 lib/util.php:246 lib/util.php:257
 msgid "This page is not available in a media type you accept"
 msgstr "Esta página não está disponível em um tipo de mídia que você aceita"
 
-#: ../actions/profilesettings.php:63
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
 msgid "Timezone"
 msgstr "Fuso horário"
 
-#: ../actions/profilesettings.php:107
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:228
 msgid "Timezone not selected."
 msgstr "Fuso horário não selecionado."
 
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"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 ""
-"Para assinar, você pode [autenticar-se](%%action.login%%), ou "
-"[registrar](%%action.register%%) uma nova conta. Se você já tem uma conta "
-"em um [site de microblog compatível](%%doc.openmublog%%),  informe a URL do "
-"seu perfil abaixo."
+"Para assinar, você pode [autenticar-se](%%action.login%%), ou [registrar](%%"
+"action.register%%) uma nova conta. Se você já tem uma conta em um [site de "
+"microblog compatível](%%doc.openmublog%%),  informe a URL do seu perfil "
+"abaixo."
 
-#: ../actions/twitapifriendships.php:163
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: actions/twitapifriendships.php:128
 msgid "Two user ids or screen_names must be supplied."
 msgstr "Dois usuários com IDs ou logins devem ser informados."
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
+#: actions/profilesettings.php:81 actions/register.php:183
+#: actions/profilesettings.php:83 actions/register.php:210
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL para seu site, blog ou perfil em outro site"
 
-#: ../actions/remotesubscribe.php:74
+#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL para seu perfil em outro serviço de microblog compatível"
 
 #: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
 #: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
+#: actions/emailsettings.php:144 actions/imsettings.php:118
+#: actions/recoverpassword.php:39 actions/smssettings.php:143
+#: actions/twittersettings.php:108 actions/emailsettings.php:147
+#: actions/othersettings.php:146 actions/twittersettings.php:199
 msgid "Unexpected form submission."
 msgstr "Submissão inesperada de formulário."
 
-#: ../actions/recoverpassword.php:276
+#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
 msgid "Unexpected password reset."
 msgstr "Restauração inesperada de senha."
 
-#: ../index.php:57
+#: ../index.php:57 index.php:57
 msgid "Unknown action"
 msgstr "Ação desconhecida"
 
 #: ../actions/finishremotesubscribe.php:58
+#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:59
 msgid "Unknown version of OMB protocol."
 msgstr "Versão desconhecida do protocolo OMB."
 
-#: ../lib/util.php:269
+#: ../lib/util.php:269 lib/util.php:285 lib/util.php:296
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
@@ -1956,42 +2260,50 @@ msgstr ""
 "Caso não seja especificado, os colaboradores deste site possuem direito "
 "autoral sobre seu conteúdo e ele está disponível sob"
 
-#: ../actions/confirmaddress.php:48
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr "Tipo de endereço %s desconhecido"
 
-#: ../actions/showstream.php:209
+#: ../actions/showstream.php:209 actions/showstream.php:219
+#: actions/showstream.php:267 lib/util.php:2094
 msgid "Unsubscribe"
 msgstr "Cancelar"
 
 #: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
+#: actions/postnotice.php:45 actions/updateprofile.php:46
 msgid "Unsupported OMB version"
 msgstr "Versão do OMB não suportada"
 
-#: ../actions/avatar.php:105
+#: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: actions/profilesettings.php:371
 msgid "Unsupported image file format."
 msgstr "Formato de imagem não suportado."
 
-#: ../lib/settingsaction.php:100
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: actions/deleteprofile.php:251
 msgid "Updates by SMS"
 msgstr "Atualizações via SMS"
 
-#: ../lib/settingsaction.php:103
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: actions/deleteprofile.php:254
 msgid "Updates by instant messenger (IM)"
 msgstr "Atualizações via mensageiro instantâneo (IM)"
 
-#: ../actions/twitapistatuses.php:241
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/twitapistatuses.php:126
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Atualizações de %1$s e amigos no %2$s!"
 
-#: ../actions/twitapistatuses.php:341
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:198
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Atualizações de %1$s no %2$s!"
 
-#: ../actions/avatar.php:68
+#: ../actions/avatar.php:68 actions/profilesettings.php:161
+#: actions/profilesettings.php:166
 msgid "Upload"
 msgstr "Enviar"
 
@@ -2003,27 +2315,29 @@ msgid ""
 "share."
 msgstr ""
 "Envie um novo avatar (imagem do usuário) aqui. Você não poderá editar a "
-"imagem depois que enviar, então certifique-se que o formato dela esteja "
-"mais ou menos quadrado. Ela deve estar sob a mesma licença também. Use uma "
-"imagem que pertença a você e que você queira compartilhar."
+"imagem depois que enviar, então certifique-se que o formato dela esteja mais "
+"ou menos quadrado. Ela deve estar sob a mesma licença também. Use uma imagem "
+"que pertença a você e que você queira compartilhar."
 
 #: ../lib/settingsaction.php:91
 msgid "Upload a new profile image"
 msgstr "Envie uma nova imagem de exibição"
 
-#: ../actions/invite.php:114
+#: ../actions/invite.php:114 actions/invite.php:121
 msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
+"Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 "Use esse formulário para convidar seus amigos e colegas para usar este "
 "serviço."
 
 #: ../actions/register.php:159 ../actions/register.php:162
+#: actions/register.php:173 actions/register.php:176 actions/register.php:200
+#: actions/register.php:203
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Usado apenas para atualizações, anúncios e recuperações de senha"
 
 #: ../actions/finishremotesubscribe.php:86
+#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:92
 msgid "User being listened to doesn't exist."
 msgstr "O usuário que está está sendo acompanhado não existe."
 
@@ -2031,66 +2345,80 @@ msgstr "O usuário que está está sendo acompanhado não existe."
 #: ../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/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/showstream.php:57
+#: actions/twitapiaccount.php:63 actions/twitapifavorites.php:40
+#: actions/twitapistatuses.php:163 actions/twitapistatuses.php:492
+#: lib/twitterapi.php:590
 msgid "User has no profile."
 msgstr "O usuário não tem perfil."
 
-#: ../actions/remotesubscribe.php:71
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
 msgid "User nickname"
 msgstr "Apelido do usuário"
 
-#: ../actions/twitapiusers.php:75
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
 msgid "User not found."
 msgstr "Usuário não encontrado."
 
-#: ../actions/profilesettings.php:63
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
 msgid "What timezone are you normally in?"
 msgstr "Que fuso horário você normalmente está?"
 
-#: ../lib/util.php:1159
+#: ../lib/util.php:1159 lib/util.php:1293 lib/util.php:1630
 #, php-format
 msgid "What's up, %s?"
 msgstr "E aí, %s?"
 
 #: ../actions/profilesettings.php:54 ../actions/register.php:175
+#: actions/profilesettings.php:87 actions/register.php:189
+#: actions/profilesettings.php:89 actions/register.php:216
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Onde você está, ex: \"cidade, estado, país\""
 
-#: ../actions/updateprofile.php:128
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Tipo de imagem errado para '%s'"
 
-#: ../actions/updateprofile.php:123
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Tamanho da imagem errado em '%s'"
 
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+#: actions/block.php:105
 msgid "Yes"
 msgstr "Sim"
 
-#: ../actions/finishaddopenid.php:64
+#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
 msgid "You already have this OpenID!"
 msgstr "Você já tem esta OpenID!"
 
-#: ../actions/deletenotice.php:37
+#: ../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 ""
-"Você está prestes a apagar permanentemente uma mensagem. Uma vez feito, "
-"não poderá ser desfeito."
+"Você está prestes a apagar permanentemente uma mensagem. Uma vez feito, não "
+"poderá ser desfeito."
 
-#: ../actions/recoverpassword.php:31
+#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
 msgid "You are already logged in!"
 msgstr "Você já está autenticado!"
 
-#: ../actions/invite.php:81
+#: ../actions/invite.php:81 actions/invite.php:88
 msgid "You are already subscribed to these users:"
 msgstr "Você já segue à esses usuários:"
 
-#: ../actions/twitapifriendships.php:128
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:102
 msgid "You are not friends with the specified user."
 msgstr "Você não é amigo do usuário especificado."
 
@@ -2098,11 +2426,11 @@ msgstr "Você não é amigo do usuário especificado."
 msgid "You can change your password here. Choose a good one!"
 msgstr "Você pode alterar sua senha aqui. Faça uma boa escolha!"
 
-#: ../actions/register.php:135
+#: ../actions/register.php:135 actions/register.php:145
 msgid "You can create a new account to start posting notices."
 msgstr "Você pode criar uma nova conta para começar a publicar mensagens."
 
-#: ../actions/smssettings.php:28
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Você pode receber mensagens SMS do %%site.name%% através de email."
@@ -2112,36 +2440,37 @@ msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr ""
-"Você pode remover uma OpenID da sua conta, clicando no botão "
-"\"Remover\"."
+"Você pode remover uma OpenID da sua conta, clicando no botão \"Remover\"."
 
-#: ../actions/imsettings.php:28
+#: ../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 ""
-"Você pode enviar e receber mensagens através dos [mensageiros "
-"instantâneos](%%doc.im%%) Jabber/GTalk. Configure seu endereço e opções "
-"abaixo."
+"Você pode enviar e receber mensagens através dos [mensageiros instantâneos](%"
+"%doc.im%%) Jabber/GTalk. Configure seu endereço e opções abaixo."
 
 #: ../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 ""
 "Você pode atualizar suas informações pessoais aqui, para que as pessoas "
 "saibam mais sobre você."
 
 #: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
+#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
+#: actions/finishremotesubscribe.php:83 actions/finishremotesubscribe.php:99
 msgid "You can use the local subscription!"
 msgstr "Você pode usar a assinatura local!"
 
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
+#: actions/finishopenidlogin.php:38 actions/register.php:68
+#: actions/register.php:77
 msgid "You can't register if you don't agree to the license."
 msgstr "Você não pode se registrar se não aceitar a licença."
 
-#: ../actions/updateprofile.php:63
+#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
 msgid "You did not send us that profile"
 msgstr "Você não nos enviou esse perfil"
 
@@ -2163,18 +2492,20 @@ msgstr ""
 "\n"
 "Mais instruções em %3$s.\n"
 "\n"
-"Atenciosamente,\n%4$s"
+"Atenciosamente,\n"
+"%4$s"
 
-#: ../actions/twitapistatuses.php:612
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: actions/twitapistatuses.php:455
 msgid "You may not delete another user's status."
 msgstr "Você não pode apagar o status de outro usuário."
 
-#: ../actions/invite.php:31
+#: ../actions/invite.php:31 actions/invite.php:31
 #, php-format
 msgid "You must be logged in to invite other users to use %s"
 msgstr "Você deve estar logado para convidar outros usuários para o %s"
 
-#: ../actions/invite.php:103
+#: ../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!"
@@ -2186,7 +2517,8 @@ msgstr ""
 msgid "You've been identified. Enter a  new password below. "
 msgstr "Você foi identificado. Informe uma nova senha abaixo."
 
-#: ../actions/openidlogin.php:67
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:84
 msgid "Your OpenID URL"
 msgstr "Sua URL de OpenID"
 
@@ -2203,74 +2535,83 @@ msgstr ""
 "A [OpenID](%%doc.openid%%) permite que você autentique-se em vários sites "
 "com a mesma conta de usuário. Gerencie suas OpenIDs associadas aqui."
 
-#: ../lib/util.php:943
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:1287
 msgid "a few seconds ago"
 msgstr "a poucos segundos atrás"
 
-#: ../lib/util.php:955
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:1299
 #, php-format
 msgid "about %d days ago"
 msgstr "aproximadamente %d dias atrás"
 
-#: ../lib/util.php:951
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:1295
 #, php-format
 msgid "about %d hours ago"
 msgstr "aproximadamente %d horas atrás"
 
-#: ../lib/util.php:947
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:1291
 #, php-format
 msgid "about %d minutes ago"
 msgstr "aproximadamente %d minutos atrás"
 
-#: ../lib/util.php:959
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:1303
 #, php-format
 msgid "about %d months ago"
 msgstr "aproximadamente %d meses atrás"
 
-#: ../lib/util.php:953
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:1297
 msgid "about a day ago"
 msgstr "aproximadamente um dia atrás"
 
-#: ../lib/util.php:945
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:1289
 msgid "about a minute ago"
 msgstr "aproximadamente um minuto atrás"
 
-#: ../lib/util.php:957
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:1301
 msgid "about a month ago"
 msgstr "aproximadamente um mes atrás"
 
-#: ../lib/util.php:961
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:1305
 msgid "about a year ago"
 msgstr "aproximadamente um ano atrás"
 
-#: ../lib/util.php:949
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:1293
 msgid "about an hour ago"
 msgstr "aproximadamente uma hora atrás"
 
 #: ../actions/showstream.php:423 ../lib/stream.php:132
+#: actions/showstream.php:441 lib/stream.php:99 lib/noticelist.php:211
 msgid "delete"
 msgstr "apagar"
 
 #: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117
+#: ../lib/stream.php:117 actions/noticesearch.php:136
+#: actions/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:135
+#: lib/facebookaction.php:202 lib/noticelist.php:189
 msgid "in reply to..."
 msgstr "em resposta à..."
 
 #: ../actions/noticesearch.php:137 ../actions/showstream.php:415
-#: ../lib/stream.php:124
+#: ../lib/stream.php:124 actions/noticesearch.php:143
+#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:142
+#: lib/noticelist.php:199
 msgid "reply"
 msgstr "responder"
 
-#: ../actions/password.php:44
+#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/profilesettings.php:188
 msgid "same as password above"
 msgstr "igual à senha acima"
 
-#: ../actions/twitapistatuses.php:755
+#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+#: actions/twitapistatuses.php:543
 msgid "unsupported file type"
 msgstr "Formato de imagem não suportado"
 
-#: ../lib/util.php:1309
-msgid "« After"
+#: ../lib/util.php:1309 lib/util.php:1443 lib/facebookaction.php:251
+#: lib/util.php:1783
+#, fuzzy
+msgid "« After"
 msgstr "« Depois"
 
 #: actions/deletenotice.php:74 actions/disfavor.php:43
@@ -2282,8 +2623,15 @@ msgstr "« Depois"
 #: 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:38 actions/deleteprofile.php:127 actions/disfavor.php:47
+#: actions/emailsettings.php:130 actions/favor.php:49 actions/login.php:45
+#: actions/newmessage.php:44 actions/newnotice.php:36 actions/nudge.php:47
+#: actions/othersettings.php:139 actions/profilesettings.php:49
+#: actions/subedit.php:38 actions/tagother.php:113
+#: actions/twittersettings.php:188 actions/unblock.php:38
 msgid "There was a problem with your session token. Try again, please."
-msgstr "Houve um problema com a sua senha de sessão. Por favor tente novamente."
+msgstr ""
+"Houve um problema com a sua senha de sessão. Por favor tente novamente."
 
 #: actions/disfavor.php:55
 msgid "This notice is not a favorite!"
@@ -2305,12 +2653,14 @@ msgstr ""
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142
+#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:54
+#: actions/twitapifavorites.php:115
 msgid "This notice is already a favorite!"
 msgstr ""
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
+#: classes/Command.php:132 actions/favor.php:61
+#: actions/twitapifavorites.php:122
 msgid "Could not create favorite."
 msgstr ""
 
@@ -2319,11 +2669,12 @@ msgid "Disfavor"
 msgstr ""
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:62
 #, php-format
 msgid "%s favorite notices"
 msgstr ""
 
-#: actions/favoritesrss.php:64
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:66
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr ""
@@ -2349,47 +2700,50 @@ msgid ""
 "\n"
 msgstr ""
 
-#: actions/login.php:104
+#: actions/login.php:104 actions/login.php:111 actions/openidlogin.php:86
 msgid "Automatically login in the future; "
 msgstr ""
 
-#: actions/login.php:122
+#: actions/login.php:122 actions/login.php:130
 msgid "For security reasons, please re-enter your "
 msgstr ""
 
-#: actions/login.php:126
+#: actions/login.php:126 actions/login.php:134
 msgid "Login with your username and password. "
 msgstr ""
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+#: actions/newmessage.php:60 actions/twitapidirect_messages.php:136
 msgid "That's too long. Max message size is 140 chars."
 msgstr ""
 
-#: actions/newmessage.php:65
+#: actions/newmessage.php:65 actions/newmessage.php:68
 msgid "No recipient specified."
 msgstr ""
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
+#: classes/Command.php:206 actions/newmessage.php:71
+#: actions/newmessage.php:116 classes/Command.php:211
 msgid "You can't send a message to this user."
 msgstr ""
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
+#: classes/Command.php:209 actions/newmessage.php:74
+#: actions/twitapidirect_messages.php:153 classes/Command.php:214
 msgid ""
-"Don't send a message to yourself; just say it to yourself quietly "
-"instead."
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: actions/newmessage.php:108
+#: actions/newmessage.php:108 actions/microsummary.php:32
+#: actions/newmessage.php:111
 msgid "No such user"
 msgstr ""
 
-#: actions/newmessage.php:117
+#: actions/newmessage.php:117 actions/newmessage.php:120
 msgid "New message"
 msgstr ""
 
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:95 actions/noticesearch.php:94
 msgid "Notice without matching profile"
 msgstr ""
 
@@ -2436,6 +2790,7 @@ msgstr ""
 
 #: actions/profilesettings.php:115 actions/remotesubscribe.php:320
 #: actions/userauthorization.php:159 actions/userrss.php:76
+#: actions/profilesettings.php:120 actions/remotesubscribe.php:333
 msgid "User without matching profile"
 msgstr ""
 
@@ -2463,18 +2818,18 @@ msgstr ""
 msgid "New password successfully saved. "
 msgstr ""
 
-#: actions/register.php:95
+#: actions/register.php:95 actions/register.php:104
 msgid "Password must be 6 or more characters."
 msgstr ""
 
-#: actions/register.php:216
+#: actions/register.php:216 actions/register.php:243
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to..."
 msgstr ""
 
-#: actions/register.php:227
+#: actions/register.php:227 actions/register.php:254
 msgid "(You should receive a message by email momentarily, with "
 msgstr ""
 
@@ -2489,6 +2844,7 @@ msgid "Feed for favorites of %s"
 msgstr ""
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:88 actions/twitapifavorites.php:57
 msgid "Could not retrieve favorite notices."
 msgstr ""
 
@@ -2510,7 +2866,7 @@ msgstr ""
 msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: actions/showstream.php:154
+#: actions/showstream.php:154 lib/util.php:2105
 msgid "Send a message"
 msgstr ""
 
@@ -2519,73 +2875,78 @@ msgstr ""
 msgid "Mobile carrier for your phone. "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:64
 #, php-format
 msgid "Direct messages to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:65
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:69
 msgid "Direct Messages You've Sent"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:70
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:132
 msgid "No message text!"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:145
 msgid "Recipient user not found."
 msgstr ""
 
 #: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:148
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
-#: actions/twitapifavorites.php:92
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:64
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
-#: actions/twitapifavorites.php:95
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:67
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
+#: actions/twitapifavorites.php:158 lib/mail.php:303
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr ""
 
 #: actions/twitapifavorites.php:188 lib/mail.php:276
+#: actions/twitapifavorites.php:159 lib/mail.php:304
 #, php-format
 msgid ""
 "%1$s just added your notice from %2$s as one of their favorites.\n"
 "\n"
 msgstr ""
 
-#: actions/twittersettings.php:27
+#: actions/twittersettings.php:27 actions/twittersettings.php:29
 msgid ""
 "Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 
-#: actions/twittersettings.php:41
+#: actions/twittersettings.php:41 actions/twittersettings.php:43
 msgid "Twitter settings"
 msgstr ""
 
-#: actions/twittersettings.php:48
+#: actions/twittersettings.php:48 actions/twittersettings.php:50
 msgid "Twitter Account"
 msgstr ""
 
-#: actions/twittersettings.php:56
+#: actions/twittersettings.php:56 actions/twittersettings.php:58
 msgid "Current verified Twitter account."
 msgstr ""
 
@@ -2613,46 +2974,50 @@ msgstr ""
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:216
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr ""
 
-#: actions/twittersettings.php:128
+#: actions/twittersettings.php:128 actions/twittersettings.php:221
 msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: actions/twittersettings.php:137 actions/twittersettings.php:228
 #, php-format
 msgid "Unable to retrieve account information for \"%s\" from Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:234 actions/twittersettings.php:253
 msgid "Unable to save your Twitter settings!"
 msgstr ""
 
-#: actions/twittersettings.php:174
+#: actions/twittersettings.php:174 actions/twittersettings.php:261
 msgid "Twitter settings saved."
 msgstr ""
 
-#: actions/twittersettings.php:192
+#: actions/twittersettings.php:192 actions/twittersettings.php:272
 msgid "That is not your Twitter account."
 msgstr ""
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:280
 msgid "Couldn't remove Twitter user."
 msgstr ""
 
-#: actions/twittersettings.php:212
+#: actions/twittersettings.php:212 actions/twittersettings.php:284
 msgid "Twitter account removed."
 msgstr ""
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
+#: actions/twittersettings.php:299 actions/twittersettings.php:310
+#: actions/twittersettings.php:322
 msgid "Couldn't save Twitter preferences."
 msgstr ""
 
-#: actions/twittersettings.php:245
+#: actions/twittersettings.php:245 actions/twittersettings.php:330
 msgid "Twitter preferences saved."
 msgstr ""
 
@@ -2668,15 +3033,15 @@ msgstr ""
 msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#: classes/Channel.php:113
+#: classes/Channel.php:113 classes/Channel.php:129
 msgid "Command results"
 msgstr ""
 
-#: classes/Channel.php:148
+#: classes/Channel.php:148 classes/Channel.php:175
 msgid "Command complete"
 msgstr ""
 
-#: classes/Channel.php:158
+#: classes/Channel.php:158 classes/Channel.php:185
 msgid "Command failed"
 msgstr ""
 
@@ -2689,7 +3054,7 @@ msgstr ""
 msgid "Subscriptions: %1$s\n"
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:247
 msgid "User has no last notice"
 msgstr ""
 
@@ -2722,59 +3087,60 @@ msgstr ""
 msgid "About: %s"
 msgstr ""
 
-#: classes/Command.php:200
+#: classes/Command.php:200 classes/Command.php:202
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: classes/Command.php:214
+#: classes/Command.php:214 classes/Command.php:219
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: classes/Command.php:216
+#: classes/Command.php:216 classes/Command.php:221
 msgid "Error sending direct message."
 msgstr ""
 
-#: classes/Command.php:263
+#: classes/Command.php:263 classes/Command.php:268
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: classes/Command.php:270
+#: classes/Command.php:270 classes/Command.php:275
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: classes/Command.php:288
+#: classes/Command.php:288 classes/Command.php:293
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: classes/Command.php:295
+#: classes/Command.php:295 classes/Command.php:300
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330
+#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:315
+#: classes/Command.php:335
 msgid "Command not yet implemented."
 msgstr ""
 
-#: classes/Command.php:313
+#: classes/Command.php:313 classes/Command.php:318
 msgid "Notification off."
 msgstr ""
 
-#: classes/Command.php:315
+#: classes/Command.php:315 classes/Command.php:320
 msgid "Can't turn off notification."
 msgstr ""
 
-#: classes/Command.php:333
+#: classes/Command.php:333 classes/Command.php:338
 msgid "Notification on."
 msgstr ""
 
-#: classes/Command.php:335
+#: classes/Command.php:335 classes/Command.php:340
 msgid "Can't turn on notification."
 msgstr ""
 
-#: classes/Command.php:344
+#: classes/Command.php:344 classes/Command.php:349
 msgid "Commands:\n"
 msgstr ""
 
@@ -2786,23 +3152,23 @@ msgstr ""
 msgid "Could not update message with new URI."
 msgstr ""
 
-#: lib/gallery.php:46
+#: lib/gallery.php:46 lib/gallery.php:55
 msgid "User without matching profile in system."
 msgstr ""
 
-#: lib/mail.php:147
+#: lib/mail.php:147 lib/mail.php:141
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:249
+#: lib/mail.php:249 lib/mail.php:275
 #, php-format
 msgid "New private message from %s"
 msgstr ""
 
-#: lib/mail.php:253
+#: lib/mail.php:253 lib/mail.php:279
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -2846,18 +3212,451 @@ msgstr ""
 msgid "Your sent messages"
 msgstr ""
 
-#: lib/settingsaction.php:99
+#: lib/settingsaction.php:99 actions/deleteprofile.php:256
 msgid "Twitter"
 msgstr ""
 
-#: lib/settingsaction.php:100
+#: lib/settingsaction.php:100 actions/deleteprofile.php:257
 msgid "Twitter integration options"
 msgstr ""
 
-#: lib/util.php:1718
+#: lib/util.php:1718 lib/util.php:2145
 msgid "To"
 msgstr ""
 
 #: scripts/maildaemon.php:45
 msgid "Could not parse message."
 msgstr ""
+
+#: actions/block.php:45 actions/subedit.php:45 actions/unblock.php:45
+#, fuzzy
+msgid "No profile specified."
+msgstr "Não foi selecionada nenhuma operadora."
+
+#: actions/block.php:52 actions/subedit.php:52 actions/tagother.php:45
+#: actions/unblock.php:52
+#, fuzzy
+msgid "No profile with that ID."
+msgstr "Nenhum status foi encontrado com esse ID."
+
+#: actions/block.php:78
+#, fuzzy
+msgid "Block user"
+msgstr "Usuário não encontrado."
+
+#: actions/block.php:81
+#, fuzzy
+msgid "Are you sure you want to block this user? "
+msgstr "Você tem certeza que deseja apagar esta mensagem?"
+
+#: actions/block.php:117
+#, fuzzy
+msgid "You have already blocked this user."
+msgstr "Você já segue à esses usuários:"
+
+#: actions/block.php:124
+msgid "Failed to save block information."
+msgstr ""
+
+#: actions/deleteprofile.php:25
+msgid "Code not yet ready."
+msgstr ""
+
+#: actions/deleteprofile.php:36
+msgid "Export and delete your user information."
+msgstr ""
+
+#: actions/deleteprofile.php:88 actions/deleteprofile.php:119
+#, fuzzy
+msgid "Delete my account"
+msgstr "Criar uma nova conta"
+
+#: actions/deleteprofile.php:89
+#, fuzzy
+msgid "Delete my account confirmation"
+msgstr "Não foi possível excluir a confirmação do email."
+
+#: actions/deleteprofile.php:117
+#, fuzzy
+msgid "Check if you are sure you want to delete your account."
+msgstr "Você tem certeza que deseja apagar esta mensagem?"
+
+#: actions/deleteprofile.php:259 lib/settingsaction.php:102
+msgid "Other"
+msgstr ""
+
+#: actions/deleteprofile.php:260 lib/settingsaction.php:103
+msgid "Other options"
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Add to favorites"
+msgstr ""
+
+#: actions/emailsettings.php:98
+msgid "Allow friends to nudge me and send me an email."
+msgstr ""
+
+#: actions/facebookremove.php:54
+#, fuzzy
+msgid "Couldn't remove Facebook user."
+msgstr "Não foi possível atualizar o usuário."
+
+#: actions/favor.php:71
+msgid "Disfavor favorite"
+msgstr ""
+
+#: actions/favorited.php:31 lib/stream.php:45
+#, fuzzy
+msgid "Popular notices"
+msgstr "Essa mensagem não existe."
+
+#: actions/favorited.php:54
+#, fuzzy
+msgid "Showing recently popular notices"
+msgstr "Pesquisar o conteúdo das mensagens"
+
+#: actions/featured.php:32 actions/featured.php:54 lib/stream.php:41
+msgid "Featured users"
+msgstr ""
+
+#: actions/finishremotesubscribe.php:186
+msgid "That user has blocked you from subscribing."
+msgstr ""
+
+#: actions/microsummary.php:39
+msgid "No current status"
+msgstr ""
+
+#: actions/newnotice.php:93
+#, fuzzy
+msgid "Notice posted"
+msgstr "Mensagens"
+
+#: actions/newnotice.php:116 classes/Channel.php:140
+msgid "Ajax Error"
+msgstr ""
+
+#: actions/nudge.php:52
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
+
+#: actions/nudge.php:61
+msgid "Nudge sent"
+msgstr ""
+
+#: actions/othersettings.php:27
+msgid "Manage various other options."
+msgstr ""
+
+#: actions/othersettings.php:33
+#, fuzzy
+msgid "Other Settings"
+msgstr "Configurações"
+
+#: actions/othersettings.php:35
+msgid "URL Auto-shortening"
+msgstr ""
+
+#: actions/othersettings.php:54
+#, fuzzy
+msgid "Service"
+msgstr "Pesquisar"
+
+#: actions/othersettings.php:54
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/othersettings.php:155
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Nome do idioma muito extenso (máx. 50 caracteres)."
+
+#: actions/peopletag.php:33
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "Não é um endereço de e-mail válido."
+
+#: actions/peopletag.php:45
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr ""
+
+#: actions/peopletag.php:87
+#, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+msgstr ""
+
+#: actions/profilesettings.php:92
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+
+#: actions/profilesettings.php:246 actions/tagother.php:131
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "O site '%s' é inválido"
+
+#: actions/profilesettings.php:328
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "Não foi possível salvar o perfil."
+
+#: actions/public.php:68
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
+msgstr ""
+
+#: actions/public.php:90
+#, fuzzy
+msgid "Could not retrieve public stream."
+msgstr "Não foi possível assinar."
+
+#: actions/register.php:67 actions/register.php:177
+msgid "Sorry, only invited people can register."
+msgstr ""
+
+#: actions/register.php:156
+msgid "With this form you can create a new account. "
+msgstr ""
+
+#: actions/remotesubscribe.php:136 actions/remotesubscribe.php:141
+msgid "That's a local profile! Login to subscribe."
+msgstr ""
+
+#: actions/subedit.php:68
+#, fuzzy
+msgid "You are not subscribed to that profile."
+msgstr "Você não nos enviou esse perfil"
+
+#: actions/subedit.php:81
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "Não foi possível excluir a assinatura."
+
+#: actions/subscribe.php:53
+#, fuzzy
+msgid "Not a local user."
+msgstr "Usuário não encontrado."
+
+#: actions/subscribe.php:67
+#, fuzzy
+msgid "Subscribed"
+msgstr "Assinar"
+
+#: actions/subscriptions.php:72
+#, fuzzy
+msgid "Jabber"
+msgstr "Nenhuma ID de Jabber."
+
+#: actions/tagother.php:31
+#, fuzzy
+msgid "Not logged in"
+msgstr "Você não está logado"
+
+#: actions/tagother.php:40
+#, fuzzy
+msgid "No id argument."
+msgstr "Esse documento não existe."
+
+#: actions/tagother.php:56
+msgid "Tag a person"
+msgstr ""
+
+#: actions/tagother.php:98
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
+msgstr ""
+
+#: actions/tagother.php:120
+#, fuzzy
+msgid "No such profile."
+msgstr "Essa mensagem não existe."
+
+#: actions/tagother.php:146
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+
+#: actions/tagother.php:153
+#, fuzzy
+msgid "Could not save tags."
+msgstr "Não foi possível salvar as informações do avatar"
+
+#: actions/tagother.php:188
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
+
+#: actions/tagrss.php:33
+#, fuzzy
+msgid "No such tag."
+msgstr "Essa mensagem não existe."
+
+#: actions/tagrss.php:62
+#, fuzzy, php-format
+msgid "Microblog tagged with %s"
+msgstr "Feed de mensagens com %s"
+
+#: actions/twitapiblocks.php:45
+msgid "Block user failed."
+msgstr ""
+
+#: actions/twitapiblocks.php:66
+msgid "Unblock user failed."
+msgstr ""
+
+#: actions/twitapiusers.php:45
+#, fuzzy
+msgid "Not found."
+msgstr "Não encontrado"
+
+#: actions/twittersettings.php:63
+msgid "Twitter user name"
+msgstr ""
+
+#: actions/twittersettings.php:67
+#, fuzzy
+msgid "Twitter password"
+msgstr "Nova senha"
+
+#: actions/twittersettings.php:129
+msgid "Twitter Friends"
+msgstr ""
+
+#: actions/unblock.php:73
+#, fuzzy
+msgid "Error removing the block."
+msgstr "Erro no salvamento do usuário."
+
+#: actions/unsubscribe.php:48
+#, fuzzy
+msgid "No profile id in request."
+msgstr "Nenhuma URL de perfil retornada pelo servidor."
+
+#: actions/unsubscribe.php:55
+#, fuzzy
+msgid "No profile with that id."
+msgstr "Nenhum status foi encontrado com esse ID."
+
+#: actions/unsubscribe.php:69
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Cancelar"
+
+#: classes/Notice.php:100
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "Problema no salvamento da mensagem."
+
+#: classes/Notice.php:105
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+
+#: classes/Notice.php:112
+msgid "You are banned from posting notices on this site."
+msgstr ""
+
+#: lib/gallery.php:98
+#, fuzzy
+msgid "Filter tags"
+msgstr "Mensagens com a etiqueta %s"
+
+#: lib/gallery.php:104
+msgid "All"
+msgstr ""
+
+#: lib/gallery.php:108
+#, fuzzy
+msgid "Tag"
+msgstr "Tags"
+
+#: lib/gallery.php:109
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/gallery.php:110
+msgid "Go"
+msgstr ""
+
+#: lib/gallery.php:264
+#, fuzzy
+msgid "Subscriptions navigation"
+msgstr "Assinaturas"
+
+#: lib/gallery.php:270 lib/gallery.php:292
+msgid "List"
+msgstr ""
+
+#: lib/gallery.php:280 lib/gallery.php:294
+msgid "Icons"
+msgstr ""
+
+#: lib/mail.php:92
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:242
+#, php-format
+msgid "You've been nudged by %s"
+msgstr ""
+
+#: lib/mail.php:246
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+msgstr ""
+
+#: lib/profilelist.php:146
+msgid "(none)"
+msgstr ""
+
+#: lib/stream.php:33
+msgid "Public"
+msgstr ""
+
+#: lib/stream.php:36 lib/stream.php:37
+#, fuzzy
+msgid "Recent tags"
+msgstr "Tags recentes"
+
+#: lib/stream.php:40
+msgid "Featured"
+msgstr ""
+
+#: lib/stream.php:44
+#, fuzzy
+msgid "Popular"
+msgstr "Pessoas"
+
+#: lib/subs.php:51
+#, fuzzy
+msgid "User has blocked you."
+msgstr "O usuário não tem perfil."
+
+#: lib/util.php:2059
+msgid "Send a nudge"
+msgstr ""
+
+#: lib/util.php:2063
+msgid "Nudge sent!"
+msgstr ""
+
+#: lib/util.php:2194
+msgid "Block"
+msgstr ""
+
+#: lib/util.php:2198
+msgid "Unblock"
+msgstr ""
diff --git a/ru_RU/LC_MESSAGES/laconica.po b/ru_RU/LC_MESSAGES/laconica.po
index fc08785b7a..fb65389031 100644
--- a/ru_RU/LC_MESSAGES/laconica.po
+++ b/ru_RU/LC_MESSAGES/laconica.po
@@ -7,52 +7,47 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"#-#-#-#-#  laconica.po (0.6)  #-#-#-#-#\n"
-"Project-Id-Version: 0.6\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-27 14:57-0400\n"
-"PO-Revision-Date: \n"
-"Last-Translator: Doktor Bro <admin@stosorok.com>\n"
-"Language-Team: Doktor Bro <info@stosorok.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Russian\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"POT-Creation-Date: 2009-01-12 12:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"#-#-#-#-#  laconica.po (0.6)  #-#-#-#-#\n"
+"X-Poedit-Language: Russian\n"
+"X-Poedit-SourceCharset: utf-8\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:61
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: actions/finishopenidlogin.php:88 actions/register.php:205
+#: actions/register.php:232
 msgid ""
-" except this private data: password, email address, IM address, phone "
-"number."
+" except this private data: password, email address, IM address, phone number."
 msgstr ""
-", за исключением моих частных данных: "
-"пароль, почта, мессенджер, телефон."
+", за исключением моих частных данных: пароль, почта, мессенджер, телефон."
 
 #: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+#: lib/facebookaction.php:195 lib/noticelist.php:160
 msgid " from "
 msgstr " из"
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: actions/twitapistatuses.php:341
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
 msgstr ""
 
-#: ../actions/invite.php:168
+#: ../actions/invite.php:168 actions/invite.php:176
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s приглашает тебя записаться на %2$s"
@@ -87,23 +82,35 @@ msgid ""
 "\n"
 "Sincerely, %2$s\n"
 msgstr ""
-"%1$s приглашает тебя записаться на %2$s "
-"(%3$s).\n"
+"%1$s приглашает тебя записаться на %2$s (%3$s).\n"
 "\n"
-"%2$s — это открытый сервис, который "
-"позволяет быть в курсе последних событий "
-"из жизни людей, которых ты знаешь или "
-"которые тебя интересуют.\n"
+"%2$s — это открытый сервис, который позволяет быть в курсе последних событий "
+"из жизни людей, которых ты знаешь или которые тебя интересуют.\n"
 "\n"
-"Ты также можешь рассказывать другим о "
-"себе: о твоих делах, мыслях и "
-"впечатлениях. У нас ты сможешь завести "
-"новые знакомства с людьми, которые "
+"Ты также можешь рассказывать другим о себе: о твоих делах, мыслях и "
+"впечатлениях. У нас ты сможешь завести новые знакомства с людьми, которые "
 "разделяют твои интересы.\n"
 "\n"
-"%1$s сказал(а):\n\n%4$s\n\nПрофиль %1$s на %2$s можно посмотреть здесь:\n\n%5$s\n\nЕсли ты хочешь попробовать наш сервис, нажми на нижнюю ссылку, чтобы принять приглашение.\n\n%6$s\n\nЕсли нет, просто проигнорируй это письмо. Спасибо за твоё терпение и время.\n\nС уважением,\n%2$s\n"
+"%1$s сказал(а):\n"
+"\n"
+"%4$s\n"
+"\n"
+"Профиль %1$s на %2$s можно посмотреть здесь:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Если ты хочешь попробовать наш сервис, нажми на нижнюю ссылку, чтобы принять "
+"приглашение.\n"
+"\n"
+"%6$s\n"
+"\n"
+"Если нет, просто проигнорируй это письмо. Спасибо за твоё терпение и время.\n"
+"\n"
+"С уважением,\n"
+"%2$s\n"
 
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:115
+#: lib/mail.php:117
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr ""
@@ -122,14 +129,17 @@ msgstr ""
 "\n"
 "\t%3$s\n"
 "\n"
-"С уважением,\n%4$s.\n"
+"С уважением,\n"
+"%4$s.\n"
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#: actions/twitapistatuses.php:344
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
+#: actions/shownotice.php:73
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr ""
@@ -146,27 +156,32 @@ msgid "%s Public Stream"
 msgstr ""
 
 #: ../actions/all.php:47 ../actions/allrss.php:60
-#: ../actions/twitapistatuses.php:238 ../lib/stream.php:51
+#: ../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/twitapistatuses.php:123
 #, php-format
 msgid "%s and friends"
 msgstr "%s и друзья"
 
 #: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:31
 #, php-format
 msgid "%s public timeline"
 msgstr ""
 
-#: ../lib/mail.php:206 lib/mail.php:212
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:217
 #, php-format
 msgid "%s status"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:195
 #, php-format
 msgid "%s timeline"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:34
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
@@ -177,33 +192,37 @@ msgid ""
 "to confirm your email address.)"
 msgstr ""
 
-#: ../lib/util.php:257 lib/util.php:273
+#: ../lib/util.php:257 lib/util.php:273 lib/util.php:284
 #, 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 ""
 
-#: ../lib/util.php:259 lib/util.php:275
+#: ../lib/util.php:259 lib/util.php:275 lib/util.php:286
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr ""
 
-#: ../lib/util.php:274 lib/util.php:290
+#: ../lib/util.php:274 lib/util.php:290 lib/util.php:301
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
+#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
+#: actions/profilesettings.php:78
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 латинских строчных букв или цифр, без "
 
-#: ../actions/register.php:152
+#: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:193
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
-"1-64 латинских строчных букв или цифр, без "
-"пробелов и знаков препинания. Обязательно."
+"1-64 латинских строчных букв или цифр, без пробелов и знаков препинания. "
+"Обязательно."
 
-#: ../actions/password.php:42
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/profilesettings.php:186
 msgid "6 or more characters"
 msgstr "6 или больше знаков"
 
@@ -211,18 +230,20 @@ msgstr "6 или больше знаков"
 msgid "6 or more characters, and don't forget it!"
 msgstr ""
 
-#: ../actions/register.php:154
+#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:195
 msgid "6 or more characters. Required."
 msgstr "6 или больше букв. Обязательно."
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, 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
+#: actions/emailsettings.php:234
 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."
@@ -244,7 +265,14 @@ msgstr ""
 #: 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/twitapiusers.php:55 actions/twitapiaccount.php:30
+#: actions/twitapidirect_messages.php:107 actions/twitapifavorites.php:83
+#: actions/twitapifavorites.php:99 actions/twitapifriendships.php:117
+#: actions/twitapihelp.php:42 actions/twitapistatuses.php:77
+#: actions/twitapistatuses.php:144 actions/twitapistatuses.php:224
+#: actions/twitapistatuses.php:234 actions/twitapistatuses.php:386
+#: actions/twitapistatuses.php:395 actions/twitapistatuses.php:421
+#: actions/twitapiusers.php:30
 msgid "API method not found!"
 msgstr ""
 
@@ -262,20 +290,26 @@ msgstr ""
 #: 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/twitapistatuses.php:690 actions/twitapiaccount.php:39
+#: actions/twitapiaccount.php:89 actions/twitapiaccount.php:94
+#: actions/twitapidirect_messages.php:178 actions/twitapifavorites.php:139
+#: actions/twitapihelp.php:49 actions/twitapistatuses.php:549
 msgid "API method under construction."
 msgstr ""
 
-#: ../lib/util.php:324
+#: ../lib/util.php:324 lib/util.php:340 lib/util.php:352
 msgid "About"
 msgstr "О проекте"
 
-#: ../actions/userauthorization.php:119
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
 msgid "Accept"
 msgstr "Принять"
 
 #: ../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/twittersettings.php:84
 msgid "Add"
 msgstr "Добавить"
 
@@ -284,19 +318,22 @@ msgid "Add OpenID"
 msgstr ""
 
 #: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: actions/deleteprofile.php:248
 msgid "Add or remove OpenIDs"
 msgstr ""
 
 #: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
 msgid "Address"
 msgstr "Адрес"
 
-#: ../actions/invite.php:131
+#: ../actions/invite.php:131 actions/invite.php:139
 msgid "Addresses of friends to invite (one per line)"
 msgstr "Адреса друзей, которых ты хочешь пригласить (по одному на строчку)"
 
-#: ../actions/showstream.php:273
+#: ../actions/showstream.php:273 actions/showstream.php:288
+#: actions/showstream.php:336
 msgid "All subscriptions"
 msgstr "Все подписки"
 
@@ -306,6 +343,7 @@ msgid "All updates for %s"
 msgstr ""
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:63
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr ""
@@ -317,11 +355,11 @@ msgstr ""
 msgid "Already logged in."
 msgstr ""
 
-#: ../lib/subs.php:42 lib/subs.php:42
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:47
 msgid "Already subscribed!."
 msgstr ""
 
-#: ../actions/deletenotice.php:54
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
 msgid "Are you sure you want to delete this notice?"
 msgstr "Ты точно хочешь удалить эту заметку?"
 
@@ -330,20 +368,23 @@ msgid "Authorize subscription"
 msgstr ""
 
 #: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192 actions/register.php:219
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "В следующий раз зайти автоматически. Не для общественных компьютеров!"
 
-#: ../actions/profilesettings.php:65
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:103
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "Автоматически подписываться на всех, кто "
 
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: actions/profilesettings.php:34
 msgid "Avatar"
 msgstr "Аватар"
 
-#: ../actions/avatar.php:113
+#: ../actions/avatar.php:113 actions/profilesettings.php:350
+#: actions/profilesettings.php:379
 msgid "Avatar updated."
 msgstr "Аватар обновлён."
 
@@ -354,33 +395,38 @@ msgid ""
 "message with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 
-#: ../actions/emailsettings.php:54
+#: ../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 ""
-"Ждём подтверждения этого адреса. Проверь "
-"свой почтовый ящик (и папку для спама!), там будут дальнейшие инструкции."
+"Ждём подтверждения этого адреса. Проверь свой почтовый ящик (и папку для "
+"спама!), там будут дальнейшие инструкции."
 
 #: ../actions/smssettings.php:58 actions/smssettings.php:58
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
-#: ../lib/util.php:1318
-msgid "Before »"
+#: ../lib/util.php:1318 lib/util.php:1452 lib/facebookaction.php:259
+#: lib/util.php:1792
+#, fuzzy
+msgid "Before »"
 msgstr "Предыдущие »"
 
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: actions/profilesettings.php:82 actions/register.php:184
+#: actions/profilesettings.php:84 actions/register.php:211
 msgid "Bio"
 msgstr "Интересы"
 
 #: ../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:222 actions/register.php:98
 msgid "Bio is too long (max 140 chars)."
 msgstr ""
 
-#: ../lib/deleteaction.php:41
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
 msgid "Can't delete this notice."
 msgstr "Заметка не удаляется."
 
@@ -391,11 +437,13 @@ msgstr ""
 
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
+#: actions/profilesettings.php:433
 msgid "Can't save new password."
 msgstr ""
 
 #: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62
+#: ../actions/smssettings.php:62 actions/emailsettings.php:58
+#: actions/imsettings.php:59 actions/smssettings.php:62
 msgid "Cancel"
 msgstr "Отменить"
 
@@ -408,18 +456,21 @@ msgid "Cannot normalize that Jabber ID"
 msgstr ""
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:204
 msgid "Cannot normalize that email address"
 msgstr ""
 
-#: ../actions/password.php:45
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/profilesettings.php:189
 msgid "Change"
 msgstr "Изменить"
 
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: actions/deleteprofile.php:245
 msgid "Change email handling"
 msgstr ""
 
-#: ../actions/password.php:32
+#: ../actions/password.php:32 actions/profilesettings.php:36
 msgid "Change password"
 msgstr "Изменить пароль"
 
@@ -427,22 +478,27 @@ msgstr "Изменить пароль"
 msgid "Change your password"
 msgstr "Изменить пароль"
 
-#: ../lib/settingsaction.php:85
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#: actions/deleteprofile.php:242
 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/profilesettings.php:187 actions/register.php:196
 msgid "Confirm"
 msgstr "Подтвердить"
 
-#: ../actions/confirmaddress.php:90
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
 msgid "Confirm Address"
 msgstr "Подтвердить адрес"
 
 #: ../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:259
 msgid "Confirmation cancelled."
 msgstr ""
 
@@ -473,7 +529,7 @@ msgid ""
 "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
 msgid "Connect"
 msgstr "Соединить"
 
@@ -481,7 +537,7 @@ msgstr "Соединить"
 msgid "Connect existing account"
 msgstr ""
 
-#: ../lib/util.php:332
+#: ../lib/util.php:332 lib/util.php:348 lib/util.php:360
 msgid "Contact"
 msgstr "Связь"
 
@@ -492,11 +548,13 @@ msgstr ""
 
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:46 actions/twitapifriendships.php:62
 #, 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:39
 msgid "Could not follow user: User not found."
 msgstr ""
 
@@ -513,11 +571,11 @@ msgstr ""
 msgid "Could not save new profile info"
 msgstr ""
 
-#: ../lib/subs.php:54 lib/subs.php:61
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:70
 msgid "Could not subscribe other to you."
 msgstr ""
 
-#: ../lib/subs.php:46 lib/subs.php:46
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:55
 msgid "Could not subscribe."
 msgstr ""
 
@@ -526,7 +584,7 @@ msgid "Could not update user with confirmed email address."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101
+#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:112
 msgid "Couldn't convert request tokens to access tokens."
 msgstr ""
 
@@ -534,43 +592,50 @@ msgstr ""
 #: ../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/emailsettings.php:255
 msgid "Couldn't delete email confirmation."
 msgstr ""
 
-#: ../lib/subs.php:103 lib/subs.php:116
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:129
 msgid "Couldn't delete subscription."
 msgstr ""
 
 #: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+#: actions/twitapistatuses.php:82
 msgid "Couldn't find any statuses."
 msgstr ""
 
 #: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
+#: actions/remotesubscribe.php:148
 msgid "Couldn't get a request token."
 msgstr ""
 
 #: ../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:228
 msgid "Couldn't insert confirmation code."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182
+#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:216
 msgid "Couldn't insert new subscription."
 msgstr ""
 
 #: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
 #: actions/profilesettings.php:299 actions/twitapiaccount.php:94
+#: actions/profilesettings.php:319 actions/twitapiaccount.php:74
 msgid "Couldn't save profile."
 msgstr ""
 
 #: ../actions/profilesettings.php:161 actions/profilesettings.php:276
+#: actions/profilesettings.php:296
 msgid "Couldn't update user for autosubscribe."
 msgstr ""
 
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
 #: actions/emailsettings.php:298 actions/emailsettings.php:312
+#: actions/emailsettings.php:301 actions/emailsettings.php:315
 msgid "Couldn't update user record."
 msgstr ""
 
@@ -582,10 +647,12 @@ msgstr ""
 #: 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/emailsettings.php:179 actions/emailsettings.php:280
+#: actions/othersettings.php:173 actions/profilesettings.php:276
 msgid "Couldn't update user."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:84
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
 msgid "Create"
 msgstr "Создать"
 
@@ -593,11 +660,12 @@ msgstr "Создать"
 msgid "Create a new user with this nickname."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:68
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
 msgid "Create new account"
 msgstr "Создать новый учёт"
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+#: actions/finishopenidlogin.php:208
 msgid "Creating new account for OpenID that already has a user."
 msgstr ""
 
@@ -613,42 +681,48 @@ msgstr ""
 msgid "Current confirmed email address."
 msgstr ""
 
-#: ../actions/showstream.php:356
+#: ../actions/showstream.php:356 actions/showstream.php:367
+#: actions/showstream.php:418
 msgid "Currently"
 msgstr "Сейчас"
 
-#: ../classes/Notice.php:72 classes/Notice.php:86
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:87
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr ""
 
-#: ../lib/util.php:1061 lib/util.php:1110
+#: ../lib/util.php:1061 lib/util.php:1110 lib/util.php:1417
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr ""
 
-#: ../actions/deletenotice.php:41
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
 msgid "Delete notice"
 msgstr "Удалить заметку"
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: actions/profilesettings.php:84 actions/register.php:186
+#: actions/profilesettings.php:86 actions/register.php:213
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Опиши себя и свои увлечения с помощью 140 букв"
 
 #: ../actions/register.php:158 ../actions/register.php:161
-#: ../lib/settingsaction.php:87
+#: ../lib/settingsaction.php:87 actions/register.php:172
+#: actions/register.php:175 lib/settingsaction.php:87
+#: actions/deleteprofile.php:244 actions/register.php:199
+#: actions/register.php:202
 msgid "Email"
 msgstr "Почта"
 
-#: ../actions/emailsettings.php:59
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
 msgid "Email Address"
 msgstr "Почтовый адрес"
 
-#: ../actions/emailsettings.php:32
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
 msgid "Email Settings"
 msgstr "Настройка почты"
 
-#: ../actions/register.php:73 actions/register.php:80
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:89
 msgid "Email address already exists."
 msgstr ""
 
@@ -660,7 +734,7 @@ msgstr ""
 msgid "Email address, like \"UserName@example.org\""
 msgstr ""
 
-#: ../actions/invite.php:129
+#: ../actions/invite.php:129 actions/invite.php:137
 msgid "Email addresses"
 msgstr "Почтовые адреса"
 
@@ -677,6 +751,7 @@ msgid "Error authorizing token"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
+#: actions/finishopenidlogin.php:274
 msgid "Error connecting user to OpenID."
 msgstr ""
 
@@ -685,17 +760,17 @@ msgid "Error connecting user."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:164
 msgid "Error inserting avatar"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145
+#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:156
 msgid "Error inserting new profile"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:180
 msgid "Error inserting remote profile"
 msgstr ""
 
@@ -716,13 +791,15 @@ msgid "Error saving the user."
 msgstr ""
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/profilesettings.php:428
 msgid "Error saving user; invalid."
 msgstr ""
 
 #: ../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/register.php:108 actions/login.php:54 actions/login.php:80
+#: actions/register.php:117
 msgid "Error setting user."
 msgstr ""
 
@@ -731,7 +808,7 @@ msgid "Error updating profile"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163
+#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:174
 msgid "Error updating remote profile"
 msgstr ""
 
@@ -743,11 +820,12 @@ msgstr ""
 msgid "Existing nickname"
 msgstr ""
 
-#: ../lib/util.php:326
+#: ../lib/util.php:326 lib/util.php:342 lib/util.php:354
 msgid "FAQ"
 msgstr "ЧАВО"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/profilesettings.php:381
 msgid "Failed updating avatar."
 msgstr ""
 
@@ -763,7 +841,7 @@ msgstr ""
 msgid "Feed for replies to %s"
 msgstr ""
 
-#: ../actions/tag.php:55 actions/tag.php:55
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:54
 #, php-format
 msgid "Feed for tag %s"
 msgstr ""
@@ -783,36 +861,45 @@ msgid ""
 msgstr ""
 
 #: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: actions/profilesettings.php:77 actions/register.php:178
+#: actions/profilesettings.php:79 actions/register.php:205
 msgid "Full name"
 msgstr "Полное имя"
 
 #: ../actions/profilesettings.php:98 ../actions/register.php:79
-#: ../actions/updateprofile.php:93
+#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
+#: actions/register.php:86 actions/updateprofile.php:94
+#: actions/profilesettings.php:219 actions/register.php:95
 msgid "Full name is too long (max 255 chars)."
 msgstr "Полное имя слишком длинное (максимум 255 букв)."
 
-#: ../lib/util.php:322
+#: ../lib/util.php:322 lib/util.php:338 lib/util.php:343 lib/util.php:350
 msgid "Help"
 msgstr "Помощь"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:298 lib/util.php:314 lib/util.php:325
 msgid "Home"
 msgstr "Моё"
 
 #: ../actions/profilesettings.php:46 ../actions/register.php:167
+#: actions/profilesettings.php:79 actions/register.php:181
+#: actions/profilesettings.php:81 actions/register.php:208
 msgid "Homepage"
 msgstr "Страница"
 
 #: ../actions/profilesettings.php:95 ../actions/register.php:76
 #: actions/profilesettings.php:210 actions/register.php:83
+#: actions/profilesettings.php:216 actions/register.php:92
 msgid "Homepage is not a valid URL."
 msgstr ""
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+#: actions/emailsettings.php:101
 msgid "I want to post notices by email."
 msgstr ""
 
 #: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+#: actions/deleteprofile.php:253
 msgid "IM"
 msgstr ""
 
@@ -848,14 +935,16 @@ msgid "Incoming email"
 msgstr ""
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+#: actions/emailsettings.php:304
 msgid "Incoming email address removed."
 msgstr ""
 
 #: ../actions/password.php:69 actions/profilesettings.php:388
+#: actions/profilesettings.php:417
 msgid "Incorrect old password"
 msgstr ""
 
-#: ../actions/login.php:67 actions/login.php:67
+#: ../actions/login.php:67 actions/login.php:67 actions/login.php:74
 msgid "Incorrect username or password."
 msgstr ""
 
@@ -886,14 +975,17 @@ msgid "Invalid license URL '%s'"
 msgstr ""
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:63
 msgid "Invalid notice content"
 msgstr ""
 
 #: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:69
 msgid "Invalid notice uri"
 msgstr ""
 
 #: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:74
 msgid "Invalid notice url"
 msgstr ""
 
@@ -907,7 +999,7 @@ msgid "Invalid profile URL (bad format)"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:78
 msgid "Invalid profile URL returned by server."
 msgstr ""
 
@@ -918,6 +1010,8 @@ msgstr ""
 #: ../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:256 actions/register.php:112
+#: actions/register.php:130
 msgid "Invalid username or password."
 msgstr ""
 
@@ -929,7 +1023,7 @@ msgstr ""
 msgid "Invitation(s) sent to the following people:"
 msgstr ""
 
-#: ../lib/util.php:306
+#: ../lib/util.php:306 lib/util.php:322 lib/util.php:332
 msgid "Invite"
 msgstr "Пригласить"
 
@@ -937,12 +1031,12 @@ msgstr "Пригласить"
 msgid "Invite new users"
 msgstr ""
 
-#: ../lib/util.php:261 lib/util.php:277
+#: ../lib/util.php:261 lib/util.php:277 lib/util.php:288
 #, 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 ""
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
@@ -956,30 +1050,39 @@ msgid ""
 "add %s to your buddy list in your IM client or on GTalk."
 msgstr ""
 
-#: ../actions/profilesettings.php:57
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
 msgid "Language"
 msgstr "Язык"
 
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+#: actions/profilesettings.php:234
 msgid "Language is too long (max 50 chars)."
 msgstr ""
 
 #: ../actions/profilesettings.php:52 ../actions/register.php:173
+#: actions/profilesettings.php:85 actions/register.php:187
+#: actions/profilesettings.php:87 actions/register.php:214
 msgid "Location"
 msgstr "Место жительства"
 
 #: ../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/profilesettings.php:225 actions/register.php:101
 msgid "Location is too long (max 255 chars)."
 msgstr ""
 
 #: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310
+#: ../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/login.php:104 actions/login.php:113 actions/openidlogin.php:88
+#: lib/util.php:336
 msgid "Login"
 msgstr "Вход"
 
 #: ../actions/openidlogin.php:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:60
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr ""
@@ -987,20 +1090,21 @@ msgstr ""
 #: ../actions/login.php:126
 #, 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 ""
 
-#: ../lib/util.php:308
+#: ../lib/util.php:308 lib/util.php:324 lib/util.php:334
 msgid "Logout"
 msgstr "Выйти"
 
-#: ../actions/register.php:166
+#: ../actions/register.php:166 actions/register.php:180
+#: actions/register.php:207
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Полное имя, лучше всего настоящее"
 
-#: ../actions/login.php:110 actions/login.php:110
+#: ../actions/login.php:110 actions/login.php:110 actions/login.php:118
 msgid "Lost or forgotten password?"
 msgstr ""
 
@@ -1014,7 +1118,8 @@ msgstr ""
 msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
-#: ../actions/showstream.php:300
+#: ../actions/showstream.php:300 actions/showstream.php:315
+#: actions/showstream.php:363
 msgid "Member since"
 msgstr "Регистрация"
 
@@ -1031,6 +1136,8 @@ msgid ""
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php:85 actions/register.php:202
+#: actions/register.php:229
 msgid "My text and files are available under "
 msgstr "Мои тексты и файлы находятся под лицензией"
 
@@ -1039,12 +1146,13 @@ msgstr "Мои тексты и файлы находятся под лиценз
 msgid "New"
 msgstr ""
 
-#: ../lib/mail.php:144 lib/mail.php:144
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:138
 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+#: actions/emailsettings.php:318
 msgid "New incoming email address added."
 msgstr ""
 
@@ -1053,10 +1161,13 @@ msgid "New nickname"
 msgstr ""
 
 #: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:141
 msgid "New notice"
 msgstr ""
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
+#: actions/profilesettings.php:180 actions/recoverpassword.php:185
+#: actions/profilesettings.php:185
 msgid "New password"
 msgstr "Новый пароль"
 
@@ -1065,13 +1176,18 @@ msgid "New password successfully saved. You are now logged in."
 msgstr ""
 
 #: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:151
+#: ../actions/register.php:151 actions/login.php:101
+#: actions/profilesettings.php:74 actions/register.php:165
+#: actions/login.php:108 actions/profilesettings.php:76
+#: actions/register.php:192
 msgid "Nickname"
 msgstr "Кличка"
 
 #: ../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/finishopenidlogin.php:192 actions/profilesettings.php:231
+#: actions/register.php:85
 msgid "Nickname already in use. Try another one."
 msgstr ""
 
@@ -1079,10 +1195,13 @@ msgstr ""
 #: ../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:182 actions/profilesettings.php:209
+#: actions/register.php:83
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:187
 msgid "Nickname not allowed."
 msgstr ""
 
@@ -1094,7 +1213,8 @@ msgstr ""
 msgid "Nickname or email"
 msgstr ""
 
-#: ../actions/deletenotice.php:59
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:104
 msgid "No"
 msgstr "Нет"
 
@@ -1119,11 +1239,13 @@ msgid "No confirmation code."
 msgstr ""
 
 #: ../actions/newnotice.php:44 actions/newmessage.php:53
-#: actions/newnotice.php:44 classes/Command.php:197
+#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:52
+#: actions/newnotice.php:53
 msgid "No content!"
 msgstr ""
 
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+#: actions/emailsettings.php:197
 msgid "No email address."
 msgstr ""
 
@@ -1132,11 +1254,12 @@ msgid "No id."
 msgstr ""
 
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+#: actions/emailsettings.php:292
 msgid "No incoming email address."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67
+#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:66
 msgid "No nickname provided by remote server."
 msgstr ""
 
@@ -1147,6 +1270,7 @@ msgstr ""
 #: ../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:243
 msgid "No pending confirmation to cancel."
 msgstr ""
 
@@ -1155,7 +1279,7 @@ msgid "No phone number."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74
+#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:73
 msgid "No profile URL returned by server."
 msgstr ""
 
@@ -1169,6 +1293,7 @@ msgstr ""
 
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
 #: actions/noticesearch.php:69 actions/peoplesearch.php:69
+#: actions/noticesearch.php:68 actions/peoplesearch.php:59
 msgid "No results"
 msgstr ""
 
@@ -1177,11 +1302,13 @@ msgid "No size."
 msgstr ""
 
 #: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
+#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:109
+#: actions/twitapistatuses.php:438
 msgid "No status found with that ID."
 msgstr ""
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:411
 msgid "No status with that ID found."
 msgstr ""
 
@@ -1195,7 +1322,8 @@ msgstr ""
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
 #: ../lib/deleteaction.php:30 actions/shownotice.php:32
-#: actions/shownotice.php:83 lib/deleteaction.php:30
+#: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:38
+#: actions/shownotice.php:114
 msgid "No such notice."
 msgstr ""
 
@@ -1222,7 +1350,9 @@ msgstr ""
 #: 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
+#: lib/subs.php:33 lib/subs.php:95 actions/showstream.php:157
+#: classes/Command.php:208 classes/Command.php:242 lib/gallery.php:85
+#: lib/subs.php:105
 msgid "No such user."
 msgstr ""
 
@@ -1244,7 +1374,8 @@ 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:502 lib/twitterapi.php:423 lib/twitterapi.php:450
+#: lib/twitterapi.php:534
 msgid "Not a supported data format."
 msgstr ""
 
@@ -1257,15 +1388,17 @@ msgid "Not a valid OpenID."
 msgstr ""
 
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+#: actions/emailsettings.php:208
 msgid "Not a valid email address"
 msgstr ""
 
-#: ../actions/register.php:63 actions/register.php:70
+#: ../actions/register.php:63 actions/register.php:70 actions/register.php:79
 msgid "Not a valid email address."
 msgstr ""
 
 #: ../actions/profilesettings.php:91 ../actions/register.php:71
 #: actions/profilesettings.php:206 actions/register.php:78
+#: actions/profilesettings.php:212 actions/register.php:87
 msgid "Not a valid nickname."
 msgstr ""
 
@@ -1282,11 +1415,12 @@ msgid "Not a valid profile URL (no YADIS document)."
 msgstr ""
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: actions/profilesettings.php:361
 msgid "Not an image or corrupt file."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:52
 msgid "Not authorized."
 msgstr ""
 
@@ -1295,7 +1429,8 @@ msgstr ""
 msgid "Not expecting this response!"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:422
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+#: actions/twitapistatuses.php:304
 msgid "Not found"
 msgstr "Не нашли"
 
@@ -1306,11 +1441,12 @@ msgstr "Не нашли"
 #: 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
+#: lib/settingsaction.php:27 actions/block.php:31 actions/newnotice.php:30
+#: actions/nudge.php:30 actions/subedit.php:31 actions/unblock.php:31
 msgid "Not logged in."
 msgstr ""
 
-#: ../lib/subs.php:91 lib/subs.php:104
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:117
 msgid "Not subscribed!."
 msgstr ""
 
@@ -1319,15 +1455,19 @@ msgid "Notice Search"
 msgstr ""
 
 #: ../actions/showstream.php:82 actions/showstream.php:82
+#: actions/showstream.php:111 actions/showstream.php:118
+#: actions/showstream.php:123
 #, php-format
 msgid "Notice feed for %s"
 msgstr ""
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
+#: actions/shownotice.php:45
 msgid "Notice has no profile"
 msgstr ""
 
-#: ../actions/showstream.php:316
+#: ../actions/showstream.php:316 actions/showstream.php:331
+#: actions/showstream.php:379
 msgid "Notices"
 msgstr "Заметки"
 
@@ -1337,12 +1477,13 @@ msgstr "Заметки"
 msgid "Notices tagged with %s"
 msgstr ""
 
-#: ../actions/password.php:39
+#: ../actions/password.php:39 actions/profilesettings.php:178
+#: actions/profilesettings.php:183
 msgid "Old password"
 msgstr "Старый пароль"
 
 #: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
-#: lib/util.php:330
+#: lib/util.php:330 actions/deleteprofile.php:247 lib/util.php:340
 msgid "OpenID"
 msgstr ""
 
@@ -1357,11 +1498,13 @@ msgstr ""
 #: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
 #: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
+#: actions/finishopenidlogin.php:150 actions/openidlogin.php:76
 msgid "OpenID Login"
 msgstr ""
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 #: actions/openidlogin.php:74 actions/openidsettings.php:50
+#: actions/openidlogin.php:82
 msgid "OpenID URL"
 msgstr ""
 
@@ -1389,16 +1532,19 @@ msgstr ""
 msgid "OpenID settings"
 msgstr ""
 
-#: ../actions/invite.php:135
+#: ../actions/invite.php:135 actions/invite.php:143
 msgid "Optionally add a personal message to the invitation."
 msgstr "Дополнительно добавь к приглашению личное сообщение."
 
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: actions/profilesettings.php:350
 msgid "Partial upload."
 msgstr ""
 
 #: ../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/login.php:109 actions/register.php:194
 msgid "Password"
 msgstr "Пароль"
 
@@ -1417,15 +1563,17 @@ msgstr ""
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
 #: actions/profilesettings.php:408 actions/recoverpassword.php:326
+#: actions/profilesettings.php:437
 msgid "Password saved."
 msgstr ""
 
 #: ../actions/password.php:61 ../actions/register.php:88
 #: actions/profilesettings.php:380 actions/register.php:98
+#: actions/profilesettings.php:409 actions/register.php:107
 msgid "Passwords don't match."
 msgstr ""
 
-#: ../lib/searchaction.php:100
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
 msgid "People"
 msgstr "Люди"
 
@@ -1437,11 +1585,11 @@ msgstr ""
 msgid "People search"
 msgstr ""
 
-#: ../lib/stream.php:50
+#: ../lib/stream.php:50 lib/personal.php:50
 msgid "Personal"
 msgstr "Свои"
 
-#: ../actions/invite.php:133
+#: ../actions/invite.php:133 actions/invite.php:141
 msgid "Personal message"
 msgstr "Личное сообщение"
 
@@ -1461,30 +1609,35 @@ msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
 #: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94
+#: ../actions/smssettings.php:94 actions/emailsettings.php:86
+#: actions/imsettings.php:68 actions/smssettings.php:94
+#: actions/twittersettings.php:70
 msgid "Preferences"
 msgstr "Предпочтения"
 
 #: ../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:185 actions/othersettings.php:179
 msgid "Preferences saved."
 msgstr ""
 
-#: ../actions/profilesettings.php:57
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
 msgid "Preferred language"
 msgstr "Любимый язык"
 
-#: ../lib/util.php:328
+#: ../lib/util.php:328 lib/util.php:344 lib/util.php:356
 msgid "Privacy"
 msgstr "Частное"
 
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119
+#: classes/Notice.php:119 classes/Notice.php:139 classes/Notice.php:149
 msgid "Problem saving notice."
 msgstr ""
 
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60
+#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
+#: lib/settingsaction.php:84 actions/deleteprofile.php:241
 msgid "Profile"
 msgstr "Профиль"
 
@@ -1492,7 +1645,7 @@ msgstr "Профиль"
 msgid "Profile URL"
 msgstr ""
 
-#: ../actions/profilesettings.php:34
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
 msgid "Profile settings"
 msgstr "Настройки профиля"
 
@@ -1501,11 +1654,11 @@ msgstr "Настройки профиля"
 msgid "Profile unknown"
 msgstr ""
 
-#: ../actions/public.php:54 actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:77
 msgid "Public Stream Feed"
 msgstr ""
 
-#: ../actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 lib/stream.php:34
 msgid "Public timeline"
 msgstr "Публичная дорожка"
 
@@ -1514,6 +1667,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:104
 msgid "Publish a MicroID for my email address."
 msgstr ""
 
@@ -1535,14 +1689,18 @@ msgid "Recovery code for unknown user."
 msgstr ""
 
 #: ../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:181 actions/register.php:234 lib/util.php:338
 msgid "Register"
 msgstr "Учёт"
 
 #: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:173
 msgid "Registration not allowed."
 msgstr ""
 
 #: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:241
 msgid "Registration successful"
 msgstr ""
 
@@ -1550,7 +1708,9 @@ msgstr ""
 msgid "Reject"
 msgstr ""
 
-#: ../actions/login.php:103 ../actions/register.php:176
+#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
+#: actions/register.php:190 actions/login.php:110 actions/openidlogin.php:85
+#: actions/register.php:217
 msgid "Remember me"
 msgstr "Запомнить меня"
 
@@ -1568,7 +1728,7 @@ msgstr ""
 #: 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/twittersettings.php:61
 msgid "Remove"
 msgstr ""
 
@@ -1582,7 +1742,7 @@ msgid ""
 "remove it, add another OpenID first."
 msgstr ""
 
-#: ../lib/stream.php:55
+#: ../lib/stream.php:55 lib/personal.php:55
 msgid "Replies"
 msgstr "Ответы"
 
@@ -1601,6 +1761,7 @@ msgid "Reset password"
 msgstr ""
 
 #: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/deleteprofile.php:250 actions/subscriptions.php:73
 msgid "SMS"
 msgstr ""
 
@@ -1612,7 +1773,7 @@ msgstr ""
 msgid "SMS Settings"
 msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:230
 msgid "SMS confirmation"
 msgstr ""
 
@@ -1620,31 +1781,41 @@ msgstr ""
 msgid "Same as password above"
 msgstr ""
 
-#: ../actions/register.php:156
+#: ../actions/register.php:156 actions/register.php:170
+#: actions/register.php:197
 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/twittersettings.php:83 actions/emailsettings.php:107
+#: actions/othersettings.php:56 actions/profilesettings.php:106
+#: actions/subscriptions.php:74 actions/tagother.php:100
+#: actions/twittersettings.php:82
 msgid "Save"
 msgstr "Сохранить"
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300
+#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
+#: lib/util.php:316 lib/util.php:327
 msgid "Search"
 msgstr "Поиск"
 
 #: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:84
 msgid "Search Stream Feed"
 msgstr ""
 
-#: ../actions/noticesearch.php:30
+#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
+#: actions/noticesearch.php:29
 #, 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 ""
-"Поиск по содержанию заметок на %%site.name%%. "
-"Между терминами ставь пробелы. Минимальная длина слова — 3 буквы."
+"Поиск по содержанию заметок на %%site.name%%. Между терминами ставь пробелы. "
+"Минимальная длина слова — 3 буквы."
 
 #: ../actions/peoplesearch.php:28
 #, php-format
@@ -1652,15 +1823,15 @@ 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 ""
-"Поиск людей на %%site.name%% по имени, "
-"жительству или интересам. Между "
+"Поиск людей на %%site.name%% по имени, жительству или интересам. Между "
 "терминами ставь пробелы. Минимальная длина слова — 3 буквы."
 
 #: ../actions/smssettings.php:296 actions/smssettings.php:304
 msgid "Select a carrier"
 msgstr ""
 
-#: ../actions/invite.php:137 ../lib/util.php:1172
+#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
+#: lib/util.php:1306 lib/util.php:1731 lib/util.php:1646 lib/util.php:2158
 msgid "Send"
 msgstr "Послать"
 
@@ -1669,7 +1840,7 @@ msgstr "Послать"
 msgid "Send email to this address to post new notices."
 msgstr ""
 
-#: ../actions/emailsettings.php:88
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
 msgid "Send me notices of new subscriptions through email."
 msgstr "Уведомлять меня о новых подписчиках по почте."
 
@@ -1687,15 +1858,16 @@ msgstr ""
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
-#: ../lib/util.php:304
+#: ../lib/util.php:304 lib/util.php:320 lib/util.php:330
 msgid "Settings"
 msgstr "Настройки"
 
-#: ../actions/profilesettings.php:192
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:336
 msgid "Settings saved."
 msgstr "Настройки сохранены."
 
-#: ../actions/tag.php:60 actions/tag.php:60
+#: ../actions/tag.php:60 actions/tag.php:60 actions/tag.php:59
 msgid "Showing most popular tags from the last week"
 msgstr ""
 
@@ -1716,25 +1888,31 @@ msgstr ""
 msgid "Sorry, that is not your incoming email address."
 msgstr ""
 
-#: ../lib/util.php:330
+#: ../lib/util.php:330 lib/util.php:346 lib/util.php:358
 msgid "Source"
 msgstr "Исходник"
 
-#: ../actions/showstream.php:296
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:359
 msgid "Statistics"
 msgstr "Статистика"
 
 #: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
 #: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
+#: actions/finishopenidlogin.php:199 actions/finishopenidlogin.php:267
 msgid "Stored OpenID not found."
 msgstr ""
 
 #: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197
+#: ../actions/showstream.php:197 actions/remotesubscribe.php:84
+#: actions/showstream.php:197 actions/showstream.php:206
+#: actions/showstream.php:254 lib/util.php:2078
 msgid "Subscribe"
 msgstr "Подписаться"
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
+#: actions/showstream.php:328 actions/subscribers.php:27
+#: actions/showstream.php:376 lib/gallery.php:136 lib/gallery.php:137
 msgid "Subscribers"
 msgstr "Подписчики"
 
@@ -1747,23 +1925,31 @@ msgid "Subscription rejected"
 msgstr ""
 
 #: ../actions/showstream.php:230 ../actions/showstream.php:307
-#: ../actions/subscriptions.php:27
+#: ../actions/subscriptions.php:27 actions/showstream.php:240
+#: actions/showstream.php:322 actions/subscriptions.php:27
+#: actions/showstream.php:288 actions/showstream.php:370 lib/gallery.php:131
+#: lib/gallery.php:132
 msgid "Subscriptions"
 msgstr "Подписка"
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
+#: actions/profilesettings.php:353
 msgid "System error uploading file."
 msgstr ""
 
-#: ../actions/tag.php:41 ../lib/util.php:301
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317 actions/profilesettings.php:90 actions/showstream.php:382
+#: actions/tag.php:40 actions/tagother.php:96 actions/tagother.php:162
+#: lib/profilelist.php:126 lib/profilelist.php:128
 msgid "Tags"
 msgstr "Метки"
 
-#: ../lib/searchaction.php:104
+#: ../lib/searchaction.php:104 lib/searchaction.php:104
 msgid "Text"
 msgstr "Текст"
 
 #: ../actions/noticesearch.php:34 actions/noticesearch.php:34
+#: actions/noticesearch.php:33
 msgid "Text search"
 msgstr ""
 
@@ -1780,10 +1966,12 @@ msgid "That confirmation code is not for you!"
 msgstr ""
 
 #: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:214
 msgid "That email address already belongs to another user."
 msgstr ""
 
 #: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: actions/profilesettings.php:346
 msgid "That file is too big."
 msgstr ""
 
@@ -1792,6 +1980,7 @@ msgid "That is already your Jabber ID."
 msgstr ""
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:211
 msgid "That is already your email address."
 msgstr ""
 
@@ -1804,6 +1993,7 @@ msgid "That is not your Jabber ID."
 msgstr ""
 
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+#: actions/emailsettings.php:270
 msgid "That is not your email address."
 msgstr ""
 
@@ -1813,6 +2003,7 @@ msgstr ""
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
 #: actions/emailsettings.php:244 actions/imsettings.php:218
+#: actions/emailsettings.php:247
 msgid "That is the wrong IM address."
 msgstr ""
 
@@ -1826,10 +2017,12 @@ msgstr ""
 
 #: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
 #: actions/newnotice.php:49 actions/twitapistatuses.php:330
+#: actions/newnotice.php:61 actions/twitapistatuses.php:271
 msgid "That's too long. Max notice size is 140 chars."
 msgstr ""
 
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+#: actions/twitapiaccount.php:55
 msgid "That's too long. Max notice size is 255 chars."
 msgstr ""
 
@@ -1841,6 +2034,7 @@ msgstr ""
 #: ../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:285
 msgid "The address was removed."
 msgstr ""
 
@@ -1878,8 +2072,7 @@ msgstr ""
 
 #: ../actions/invite.php:89 actions/invite.php:96
 msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
+"These people are already users and you were automatically subscribed to them:"
 msgstr ""
 
 #: ../actions/recoverpassword.php:88
@@ -1902,43 +2095,50 @@ msgstr ""
 
 #: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511
+#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:94
+#: actions/twitapifriendships.php:82 actions/twitapistatuses.php:428
 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/twitapistatuses.php:303 actions/twitapiaccount.php:46
+#: actions/twitapidirect_messages.php:117 actions/twitapifriendships.php:30
+#: actions/twitapistatuses.php:239
 msgid "This method requires a POST."
 msgstr ""
 
-#: ../lib/util.php:164 lib/util.php:246
+#: ../lib/util.php:164 lib/util.php:246 lib/util.php:257
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
-#: ../actions/profilesettings.php:63
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
 msgid "Timezone"
 msgstr "Часовой пояс"
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:228
 msgid "Timezone not selected."
 msgstr ""
 
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"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 ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: actions/twitapifriendships.php:128
 msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
+#: actions/profilesettings.php:81 actions/register.php:183
+#: actions/profilesettings.php:83 actions/register.php:210
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "Адрес твоей страницы, дневника или профиля на другом портале"
 
@@ -1950,7 +2150,8 @@ msgstr ""
 #: ../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/twittersettings.php:108 actions/emailsettings.php:147
+#: actions/othersettings.php:146 actions/twittersettings.php:199
 msgid "Unexpected form submission."
 msgstr ""
 
@@ -1963,11 +2164,11 @@ msgid "Unknown action"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60
+#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:59
 msgid "Unknown version of OMB protocol."
 msgstr ""
 
-#: ../lib/util.php:269 lib/util.php:285
+#: ../lib/util.php:269 lib/util.php:285 lib/util.php:296
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
@@ -1978,7 +2179,8 @@ msgstr ""
 msgid "Unrecognized address type %s"
 msgstr ""
 
-#: ../actions/showstream.php:209
+#: ../actions/showstream.php:209 actions/showstream.php:219
+#: actions/showstream.php:267 lib/util.php:2094
 msgid "Unsubscribe"
 msgstr "Аннулировать подписку"
 
@@ -1988,28 +2190,34 @@ msgid "Unsupported OMB version"
 msgstr ""
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: actions/profilesettings.php:371
 msgid "Unsupported image file format."
 msgstr ""
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: actions/deleteprofile.php:251
 msgid "Updates by SMS"
 msgstr ""
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: actions/deleteprofile.php:254
 msgid "Updates by instant messenger (IM)"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/twitapistatuses.php:126
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:198
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
-#: ../actions/avatar.php:68
+#: ../actions/avatar.php:68 actions/profilesettings.php:161
+#: actions/profilesettings.php:166
 msgid "Upload"
 msgstr "Загрузить"
 
@@ -2025,18 +2233,19 @@ msgstr ""
 msgid "Upload a new profile image"
 msgstr ""
 
-#: ../actions/invite.php:114
+#: ../actions/invite.php:114 actions/invite.php:121
 msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
+"Use this form to invite your friends and colleagues to use this service."
 msgstr "В этом формуляре ты можешь пригласить друзей и коллег на наш сервис."
 
 #: ../actions/register.php:159 ../actions/register.php:162
+#: actions/register.php:173 actions/register.php:176 actions/register.php:200
+#: actions/register.php:203
 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:92
 msgid "User being listened to doesn't exist."
 msgstr ""
 
@@ -2049,7 +2258,10 @@ msgstr ""
 #: 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/twitapiusers.php:87 lib/mailbox.php:50 actions/showstream.php:57
+#: actions/twitapiaccount.php:63 actions/twitapifavorites.php:40
+#: actions/twitapistatuses.php:163 actions/twitapistatuses.php:492
+#: lib/twitterapi.php:590
 msgid "User has no profile."
 msgstr ""
 
@@ -2057,20 +2269,23 @@ msgstr ""
 msgid "User nickname"
 msgstr ""
 
-#: ../actions/twitapiusers.php:75
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
 msgid "User not found."
 msgstr "Пользователь не найден."
 
-#: ../actions/profilesettings.php:63
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
 msgid "What timezone are you normally in?"
 msgstr "В каком часовом поясе ты обычно находишься?"
 
-#: ../lib/util.php:1159
+#: ../lib/util.php:1159 lib/util.php:1293 lib/util.php:1630
 #, php-format
 msgid "What's up, %s?"
 msgstr "Что слышно, %s?"
 
 #: ../actions/profilesettings.php:54 ../actions/register.php:175
+#: actions/profilesettings.php:87 actions/register.php:189
+#: actions/profilesettings.php:89 actions/register.php:216
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Где ты находишься, например «Город, Страна»"
 
@@ -2085,6 +2300,8 @@ msgid "Wrong size image at '%s'"
 msgstr ""
 
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+#: actions/block.php:105
 msgid "Yes"
 msgstr "Да"
 
@@ -2107,6 +2324,7 @@ msgid "You are already subscribed to these users:"
 msgstr ""
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:102
 msgid "You are not friends with the specified user."
 msgstr ""
 
@@ -2114,7 +2332,7 @@ msgstr ""
 msgid "You can change your password here. Choose a good one!"
 msgstr ""
 
-#: ../actions/register.php:135
+#: ../actions/register.php:135 actions/register.php:145
 msgid "You can create a new account to start posting notices."
 msgstr "Ты можешь встать на учёт и писать свои заметки."
 
@@ -2132,22 +2350,24 @@ msgstr ""
 #: ../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 ""
-"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
+#: actions/finishremotesubscribe.php:83 actions/finishremotesubscribe.php:99
 msgid "You can use the local subscription!"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
+#: actions/finishopenidlogin.php:38 actions/register.php:68
+#: actions/register.php:77
 msgid "You can't register if you don't agree to the license."
 msgstr "Ты не можешь встать на учёт, если ты не согласен с лицензией."
 
@@ -2169,6 +2389,7 @@ msgid ""
 msgstr ""
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: actions/twitapistatuses.php:455
 msgid "You may not delete another user's status."
 msgstr ""
 
@@ -2188,6 +2409,7 @@ msgid "You've been identified. Enter a  new password below. "
 msgstr ""
 
 #: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:84
 msgid "Your OpenID URL"
 msgstr ""
 
@@ -2202,74 +2424,83 @@ msgid ""
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
 
-#: ../lib/util.php:943
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:1287
 msgid "a few seconds ago"
 msgstr "пару секунд назад"
 
-#: ../lib/util.php:955
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:1299
 #, php-format
 msgid "about %d days ago"
 msgstr "%d дней назад"
 
-#: ../lib/util.php:951
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:1295
 #, php-format
 msgid "about %d hours ago"
 msgstr "%d часов назад"
 
-#: ../lib/util.php:947
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:1291
 #, php-format
 msgid "about %d minutes ago"
 msgstr "%d минут назад"
 
-#: ../lib/util.php:959
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:1303
 #, php-format
 msgid "about %d months ago"
 msgstr "%d месяцев назад"
 
-#: ../lib/util.php:953
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:1297
 msgid "about a day ago"
 msgstr "день назад"
 
-#: ../lib/util.php:945
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:1289
 msgid "about a minute ago"
 msgstr "минуту назад"
 
-#: ../lib/util.php:957
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:1301
 msgid "about a month ago"
 msgstr "месяц назад"
 
-#: ../lib/util.php:961
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:1305
 msgid "about a year ago"
 msgstr "год назад"
 
-#: ../lib/util.php:949
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:1293
 msgid "about an hour ago"
 msgstr "час назад"
 
 #: ../actions/showstream.php:423 ../lib/stream.php:132
+#: actions/showstream.php:441 lib/stream.php:99 lib/noticelist.php:211
 msgid "delete"
 msgstr "удалить"
 
 #: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117
+#: ../lib/stream.php:117 actions/noticesearch.php:136
+#: actions/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:135
+#: lib/facebookaction.php:202 lib/noticelist.php:189
 msgid "in reply to..."
 msgstr "в ответ на..."
 
 #: ../actions/noticesearch.php:137 ../actions/showstream.php:415
-#: ../lib/stream.php:124
+#: ../lib/stream.php:124 actions/noticesearch.php:143
+#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:142
+#: lib/noticelist.php:199
 msgid "reply"
 msgstr "ответить"
 
-#: ../actions/password.php:44
+#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/profilesettings.php:188
 msgid "same as password above"
 msgstr "повторить пароль сверху"
 
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+#: actions/twitapistatuses.php:543
 msgid "unsupported file type"
 msgstr ""
 
-#: ../lib/util.php:1309
-msgid "« After"
+#: ../lib/util.php:1309 lib/util.php:1443 lib/facebookaction.php:251
+#: lib/util.php:1783
+#, fuzzy
+msgid "« After"
 msgstr "« Следующие"
 
 #: actions/deletenotice.php:74 actions/disfavor.php:43
@@ -2281,6 +2512,12 @@ msgstr "« Следующие"
 #: 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:38 actions/deleteprofile.php:127 actions/disfavor.php:47
+#: actions/emailsettings.php:130 actions/favor.php:49 actions/login.php:45
+#: actions/newmessage.php:44 actions/newnotice.php:36 actions/nudge.php:47
+#: actions/othersettings.php:139 actions/profilesettings.php:49
+#: actions/subedit.php:38 actions/tagother.php:113
+#: actions/twittersettings.php:188 actions/unblock.php:38
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -2304,12 +2541,14 @@ msgstr ""
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142
+#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:54
+#: actions/twitapifavorites.php:115
 msgid "This notice is already a favorite!"
 msgstr ""
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
+#: classes/Command.php:132 actions/favor.php:61
+#: actions/twitapifavorites.php:122
 msgid "Could not create favorite."
 msgstr ""
 
@@ -2318,11 +2557,12 @@ msgid "Disfavor"
 msgstr ""
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:62
 #, php-format
 msgid "%s favorite notices"
 msgstr ""
 
-#: actions/favoritesrss.php:64
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:66
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr ""
@@ -2348,47 +2588,50 @@ msgid ""
 "\n"
 msgstr ""
 
-#: actions/login.php:104
+#: actions/login.php:104 actions/login.php:111 actions/openidlogin.php:86
 msgid "Automatically login in the future; "
 msgstr ""
 
-#: actions/login.php:122
+#: actions/login.php:122 actions/login.php:130
 msgid "For security reasons, please re-enter your "
 msgstr ""
 
-#: actions/login.php:126
+#: actions/login.php:126 actions/login.php:134
 msgid "Login with your username and password. "
 msgstr ""
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+#: actions/newmessage.php:60 actions/twitapidirect_messages.php:136
 msgid "That's too long. Max message size is 140 chars."
 msgstr ""
 
-#: actions/newmessage.php:65
+#: actions/newmessage.php:65 actions/newmessage.php:68
 msgid "No recipient specified."
 msgstr ""
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
+#: classes/Command.php:206 actions/newmessage.php:71
+#: actions/newmessage.php:116 classes/Command.php:211
 msgid "You can't send a message to this user."
 msgstr ""
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
+#: classes/Command.php:209 actions/newmessage.php:74
+#: actions/twitapidirect_messages.php:153 classes/Command.php:214
 msgid ""
-"Don't send a message to yourself; just say it to yourself quietly "
-"instead."
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: actions/newmessage.php:108
+#: actions/newmessage.php:108 actions/microsummary.php:32
+#: actions/newmessage.php:111
 msgid "No such user"
 msgstr ""
 
-#: actions/newmessage.php:117
+#: actions/newmessage.php:117 actions/newmessage.php:120
 msgid "New message"
 msgstr ""
 
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:95 actions/noticesearch.php:94
 msgid "Notice without matching profile"
 msgstr ""
 
@@ -2435,6 +2678,7 @@ msgstr ""
 
 #: actions/profilesettings.php:115 actions/remotesubscribe.php:320
 #: actions/userauthorization.php:159 actions/userrss.php:76
+#: actions/profilesettings.php:120 actions/remotesubscribe.php:333
 msgid "User without matching profile"
 msgstr ""
 
@@ -2462,18 +2706,18 @@ msgstr ""
 msgid "New password successfully saved. "
 msgstr ""
 
-#: actions/register.php:95
+#: actions/register.php:95 actions/register.php:104
 msgid "Password must be 6 or more characters."
 msgstr ""
 
-#: actions/register.php:216
+#: actions/register.php:216 actions/register.php:243
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to..."
 msgstr ""
 
-#: actions/register.php:227
+#: actions/register.php:227 actions/register.php:254
 msgid "(You should receive a message by email momentarily, with "
 msgstr ""
 
@@ -2488,6 +2732,7 @@ msgid "Feed for favorites of %s"
 msgstr ""
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:88 actions/twitapifavorites.php:57
 msgid "Could not retrieve favorite notices."
 msgstr ""
 
@@ -2509,7 +2754,7 @@ msgstr ""
 msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: actions/showstream.php:154
+#: actions/showstream.php:154 lib/util.php:2105
 msgid "Send a message"
 msgstr ""
 
@@ -2518,73 +2763,78 @@ msgstr ""
 msgid "Mobile carrier for your phone. "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:64
 #, php-format
 msgid "Direct messages to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:65
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:69
 msgid "Direct Messages You've Sent"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:70
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:132
 msgid "No message text!"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:145
 msgid "Recipient user not found."
 msgstr ""
 
 #: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:148
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
-#: actions/twitapifavorites.php:92
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:64
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
-#: actions/twitapifavorites.php:95
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:67
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
+#: actions/twitapifavorites.php:158 lib/mail.php:303
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr ""
 
 #: actions/twitapifavorites.php:188 lib/mail.php:276
+#: actions/twitapifavorites.php:159 lib/mail.php:304
 #, php-format
 msgid ""
 "%1$s just added your notice from %2$s as one of their favorites.\n"
 "\n"
 msgstr ""
 
-#: actions/twittersettings.php:27
+#: actions/twittersettings.php:27 actions/twittersettings.php:29
 msgid ""
 "Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 
-#: actions/twittersettings.php:41
+#: actions/twittersettings.php:41 actions/twittersettings.php:43
 msgid "Twitter settings"
 msgstr ""
 
-#: actions/twittersettings.php:48
+#: actions/twittersettings.php:48 actions/twittersettings.php:50
 msgid "Twitter Account"
 msgstr ""
 
-#: actions/twittersettings.php:56
+#: actions/twittersettings.php:56 actions/twittersettings.php:58
 msgid "Current verified Twitter account."
 msgstr ""
 
@@ -2612,46 +2862,50 @@ msgstr ""
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:216
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr ""
 
-#: actions/twittersettings.php:128
+#: actions/twittersettings.php:128 actions/twittersettings.php:221
 msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: actions/twittersettings.php:137 actions/twittersettings.php:228
 #, php-format
 msgid "Unable to retrieve account information for \"%s\" from Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:234 actions/twittersettings.php:253
 msgid "Unable to save your Twitter settings!"
 msgstr ""
 
-#: actions/twittersettings.php:174
+#: actions/twittersettings.php:174 actions/twittersettings.php:261
 msgid "Twitter settings saved."
 msgstr ""
 
-#: actions/twittersettings.php:192
+#: actions/twittersettings.php:192 actions/twittersettings.php:272
 msgid "That is not your Twitter account."
 msgstr ""
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:280
 msgid "Couldn't remove Twitter user."
 msgstr ""
 
-#: actions/twittersettings.php:212
+#: actions/twittersettings.php:212 actions/twittersettings.php:284
 msgid "Twitter account removed."
 msgstr ""
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
+#: actions/twittersettings.php:299 actions/twittersettings.php:310
+#: actions/twittersettings.php:322
 msgid "Couldn't save Twitter preferences."
 msgstr ""
 
-#: actions/twittersettings.php:245
+#: actions/twittersettings.php:245 actions/twittersettings.php:330
 msgid "Twitter preferences saved."
 msgstr ""
 
@@ -2667,15 +2921,15 @@ msgstr ""
 msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#: classes/Channel.php:113
+#: classes/Channel.php:113 classes/Channel.php:129
 msgid "Command results"
 msgstr ""
 
-#: classes/Channel.php:148
+#: classes/Channel.php:148 classes/Channel.php:175
 msgid "Command complete"
 msgstr ""
 
-#: classes/Channel.php:158
+#: classes/Channel.php:158 classes/Channel.php:185
 msgid "Command failed"
 msgstr ""
 
@@ -2688,7 +2942,7 @@ msgstr ""
 msgid "Subscriptions: %1$s\n"
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:247
 msgid "User has no last notice"
 msgstr ""
 
@@ -2721,59 +2975,60 @@ msgstr ""
 msgid "About: %s"
 msgstr ""
 
-#: classes/Command.php:200
+#: classes/Command.php:200 classes/Command.php:202
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: classes/Command.php:214
+#: classes/Command.php:214 classes/Command.php:219
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: classes/Command.php:216
+#: classes/Command.php:216 classes/Command.php:221
 msgid "Error sending direct message."
 msgstr ""
 
-#: classes/Command.php:263
+#: classes/Command.php:263 classes/Command.php:268
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: classes/Command.php:270
+#: classes/Command.php:270 classes/Command.php:275
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: classes/Command.php:288
+#: classes/Command.php:288 classes/Command.php:293
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: classes/Command.php:295
+#: classes/Command.php:295 classes/Command.php:300
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330
+#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:315
+#: classes/Command.php:335
 msgid "Command not yet implemented."
 msgstr ""
 
-#: classes/Command.php:313
+#: classes/Command.php:313 classes/Command.php:318
 msgid "Notification off."
 msgstr ""
 
-#: classes/Command.php:315
+#: classes/Command.php:315 classes/Command.php:320
 msgid "Can't turn off notification."
 msgstr ""
 
-#: classes/Command.php:333
+#: classes/Command.php:333 classes/Command.php:338
 msgid "Notification on."
 msgstr ""
 
-#: classes/Command.php:335
+#: classes/Command.php:335 classes/Command.php:340
 msgid "Can't turn on notification."
 msgstr ""
 
-#: classes/Command.php:344
+#: classes/Command.php:344 classes/Command.php:349
 msgid "Commands:\n"
 msgstr ""
 
@@ -2785,23 +3040,23 @@ msgstr ""
 msgid "Could not update message with new URI."
 msgstr ""
 
-#: lib/gallery.php:46
+#: lib/gallery.php:46 lib/gallery.php:55
 msgid "User without matching profile in system."
 msgstr ""
 
-#: lib/mail.php:147
+#: lib/mail.php:147 lib/mail.php:141
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:249
+#: lib/mail.php:249 lib/mail.php:275
 #, php-format
 msgid "New private message from %s"
 msgstr ""
 
-#: lib/mail.php:253
+#: lib/mail.php:253 lib/mail.php:279
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -2845,18 +3100,426 @@ msgstr ""
 msgid "Your sent messages"
 msgstr ""
 
-#: lib/settingsaction.php:99
+#: lib/settingsaction.php:99 actions/deleteprofile.php:256
 msgid "Twitter"
 msgstr ""
 
-#: lib/settingsaction.php:100
+#: lib/settingsaction.php:100 actions/deleteprofile.php:257
 msgid "Twitter integration options"
 msgstr ""
 
-#: lib/util.php:1718
+#: lib/util.php:1718 lib/util.php:2145
 msgid "To"
 msgstr ""
 
 #: scripts/maildaemon.php:45
 msgid "Could not parse message."
 msgstr ""
+
+#: actions/block.php:45 actions/subedit.php:45 actions/unblock.php:45
+msgid "No profile specified."
+msgstr ""
+
+#: actions/block.php:52 actions/subedit.php:52 actions/tagother.php:45
+#: actions/unblock.php:52
+msgid "No profile with that ID."
+msgstr ""
+
+#: actions/block.php:78
+msgid "Block user"
+msgstr ""
+
+#: actions/block.php:81
+#, fuzzy
+msgid "Are you sure you want to block this user? "
+msgstr "Ты точно хочешь удалить эту заметку?"
+
+#: actions/block.php:117
+msgid "You have already blocked this user."
+msgstr ""
+
+#: actions/block.php:124
+msgid "Failed to save block information."
+msgstr ""
+
+#: actions/deleteprofile.php:25
+msgid "Code not yet ready."
+msgstr ""
+
+#: actions/deleteprofile.php:36
+msgid "Export and delete your user information."
+msgstr ""
+
+#: actions/deleteprofile.php:88 actions/deleteprofile.php:119
+#, fuzzy
+msgid "Delete my account"
+msgstr "Создать новый учёт"
+
+#: actions/deleteprofile.php:89
+msgid "Delete my account confirmation"
+msgstr ""
+
+#: actions/deleteprofile.php:117
+#, fuzzy
+msgid "Check if you are sure you want to delete your account."
+msgstr "Ты точно хочешь удалить эту заметку?"
+
+#: actions/deleteprofile.php:259 lib/settingsaction.php:102
+msgid "Other"
+msgstr ""
+
+#: actions/deleteprofile.php:260 lib/settingsaction.php:103
+msgid "Other options"
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Add to favorites"
+msgstr ""
+
+#: actions/emailsettings.php:98
+msgid "Allow friends to nudge me and send me an email."
+msgstr ""
+
+#: actions/facebookremove.php:54
+msgid "Couldn't remove Facebook user."
+msgstr ""
+
+#: actions/favor.php:71
+msgid "Disfavor favorite"
+msgstr ""
+
+#: actions/favorited.php:31 lib/stream.php:45
+msgid "Popular notices"
+msgstr ""
+
+#: actions/favorited.php:54
+msgid "Showing recently popular notices"
+msgstr ""
+
+#: actions/featured.php:32 actions/featured.php:54 lib/stream.php:41
+msgid "Featured users"
+msgstr ""
+
+#: actions/finishremotesubscribe.php:186
+msgid "That user has blocked you from subscribing."
+msgstr ""
+
+#: actions/microsummary.php:39
+msgid "No current status"
+msgstr ""
+
+#: actions/newnotice.php:93
+#, fuzzy
+msgid "Notice posted"
+msgstr "Заметки"
+
+#: actions/newnotice.php:116 classes/Channel.php:140
+msgid "Ajax Error"
+msgstr ""
+
+#: actions/nudge.php:52
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
+
+#: actions/nudge.php:61
+msgid "Nudge sent"
+msgstr ""
+
+#: actions/othersettings.php:27
+msgid "Manage various other options."
+msgstr ""
+
+#: actions/othersettings.php:33
+#, fuzzy
+msgid "Other Settings"
+msgstr "Настройки"
+
+#: actions/othersettings.php:35
+msgid "URL Auto-shortening"
+msgstr ""
+
+#: actions/othersettings.php:54
+#, fuzzy
+msgid "Service"
+msgstr "Поиск"
+
+#: actions/othersettings.php:54
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/othersettings.php:155
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Полное имя слишком длинное (максимум 255 букв)."
+
+#: actions/peopletag.php:33
+#, php-format
+msgid "Not a valid people tag: %s"
+msgstr ""
+
+#: actions/peopletag.php:45
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr ""
+
+#: actions/peopletag.php:87
+#, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+msgstr ""
+
+#: actions/profilesettings.php:92
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+
+#: actions/profilesettings.php:246 actions/tagother.php:131
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr ""
+
+#: actions/profilesettings.php:328
+msgid "Couldn't save tags."
+msgstr ""
+
+#: actions/public.php:68
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
+msgstr ""
+
+#: actions/public.php:90
+msgid "Could not retrieve public stream."
+msgstr ""
+
+#: actions/register.php:67 actions/register.php:177
+msgid "Sorry, only invited people can register."
+msgstr ""
+
+#: actions/register.php:156
+msgid "With this form you can create a new account. "
+msgstr ""
+
+#: actions/remotesubscribe.php:136 actions/remotesubscribe.php:141
+msgid "That's a local profile! Login to subscribe."
+msgstr ""
+
+#: actions/subedit.php:68
+msgid "You are not subscribed to that profile."
+msgstr ""
+
+#: actions/subedit.php:81
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "Все подписки"
+
+#: actions/subscribe.php:53
+msgid "Not a local user."
+msgstr ""
+
+#: actions/subscribe.php:67
+#, fuzzy
+msgid "Subscribed"
+msgstr "Подписаться"
+
+#: actions/subscriptions.php:72
+msgid "Jabber"
+msgstr ""
+
+#: actions/tagother.php:31
+msgid "Not logged in"
+msgstr ""
+
+#: actions/tagother.php:40
+msgid "No id argument."
+msgstr ""
+
+#: actions/tagother.php:56
+msgid "Tag a person"
+msgstr ""
+
+#: actions/tagother.php:98
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
+msgstr ""
+
+#: actions/tagother.php:120
+msgid "No such profile."
+msgstr ""
+
+#: actions/tagother.php:146
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+
+#: actions/tagother.php:153
+msgid "Could not save tags."
+msgstr ""
+
+#: actions/tagother.php:188
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
+
+#: actions/tagrss.php:33
+msgid "No such tag."
+msgstr ""
+
+#: actions/tagrss.php:62
+#, php-format
+msgid "Microblog tagged with %s"
+msgstr ""
+
+#: actions/twitapiblocks.php:45
+msgid "Block user failed."
+msgstr ""
+
+#: actions/twitapiblocks.php:66
+msgid "Unblock user failed."
+msgstr ""
+
+#: actions/twitapiusers.php:45
+#, fuzzy
+msgid "Not found."
+msgstr "Не нашли"
+
+#: actions/twittersettings.php:63
+msgid "Twitter user name"
+msgstr ""
+
+#: actions/twittersettings.php:67
+#, fuzzy
+msgid "Twitter password"
+msgstr "Новый пароль"
+
+#: actions/twittersettings.php:129
+msgid "Twitter Friends"
+msgstr ""
+
+#: actions/unblock.php:73
+msgid "Error removing the block."
+msgstr ""
+
+#: actions/unsubscribe.php:48
+msgid "No profile id in request."
+msgstr ""
+
+#: actions/unsubscribe.php:55
+msgid "No profile with that id."
+msgstr ""
+
+#: actions/unsubscribe.php:69
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Аннулировать подписку"
+
+#: classes/Notice.php:100
+msgid "Problem saving notice. Unknown user."
+msgstr ""
+
+#: classes/Notice.php:105
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+
+#: classes/Notice.php:112
+msgid "You are banned from posting notices on this site."
+msgstr ""
+
+#: lib/gallery.php:98
+msgid "Filter tags"
+msgstr ""
+
+#: lib/gallery.php:104
+msgid "All"
+msgstr ""
+
+#: lib/gallery.php:108
+#, fuzzy
+msgid "Tag"
+msgstr "Метки"
+
+#: lib/gallery.php:109
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/gallery.php:110
+msgid "Go"
+msgstr ""
+
+#: lib/gallery.php:264
+#, fuzzy
+msgid "Subscriptions navigation"
+msgstr "Подписка"
+
+#: lib/gallery.php:270 lib/gallery.php:292
+msgid "List"
+msgstr ""
+
+#: lib/gallery.php:280 lib/gallery.php:294
+msgid "Icons"
+msgstr ""
+
+#: lib/mail.php:92
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:242
+#, php-format
+msgid "You've been nudged by %s"
+msgstr ""
+
+#: lib/mail.php:246
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+msgstr ""
+
+#: lib/profilelist.php:146
+msgid "(none)"
+msgstr ""
+
+#: lib/stream.php:33
+msgid "Public"
+msgstr ""
+
+#: lib/stream.php:36 lib/stream.php:37
+msgid "Recent tags"
+msgstr ""
+
+#: lib/stream.php:40
+msgid "Featured"
+msgstr ""
+
+#: lib/stream.php:44
+#, fuzzy
+msgid "Popular"
+msgstr "Люди"
+
+#: lib/subs.php:51
+msgid "User has blocked you."
+msgstr ""
+
+#: lib/util.php:2059
+msgid "Send a nudge"
+msgstr ""
+
+#: lib/util.php:2063
+msgid "Nudge sent!"
+msgstr ""
+
+#: lib/util.php:2194
+msgid "Block"
+msgstr ""
+
+#: lib/util.php:2198
+msgid "Unblock"
+msgstr ""
diff --git a/sv_SE/LC_MESSAGES/laconica.po b/sv_SE/LC_MESSAGES/laconica.po
index 0b73e98fa2..50a5ca27b8 100644
--- a/sv_SE/LC_MESSAGES/laconica.po
+++ b/sv_SE/LC_MESSAGES/laconica.po
@@ -6,46 +6,111 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-14 21:07+1200\n"
+"POT-Creation-Date: 2009-01-12 12:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\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"
-"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"
 
-#: ../actions/noticesearchrss.php:64
+#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:61
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr "Sök i strömmen efter \"%s\""
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: actions/finishopenidlogin.php:88 actions/register.php:205
+#: actions/register.php:232
 msgid ""
-" except this private data: password, email address, IM address, phone "
-"number."
+" except this private data: password, email address, IM address, phone number."
 msgstr ""
 "förutom det här, som är privat: lösenord, epostadress, IM-adress, "
 "telefonnummer."
 
-#: ../actions/subscribe.php:84
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+#: lib/facebookaction.php:195 lib/noticelist.php:160
+msgid " from "
+msgstr "från"
+
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: actions/twitapistatuses.php:341
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr "%1$s / Uppdateringar med svar till %2$s"
+
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "%1$s har bjudit in dig till %2$s"
+
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+"%1$s har bjudit in dig till %2$s (%3$s).\n"
+"\n"
+"%2$s är en mikroblogg service som låter dig via sidan hålla direktkontakt "
+"med människor du känner eller intresserar dig.\n"
+"\n"
+"Du kan även dela med dig utav nyheter om dig själv, dina tankar, eller ditt "
+"liv online som känner igen dig. Det är också perfekt för att möta nya "
+"personer som delar ditt intresse.\n"
+"\n"
+"%1$s sa:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Du kan se %1$s's profilsida på %2$s här:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Om du vill prova på denna service, klicka på länken nedan för att acceptera "
+"denna inbjudan.\n"
+"\n"
+"%6$s\n"
+"\n"
+"Om inte, då kan du ignorera detta meddelande. Tack för att du tog dig\n"
+
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:115
+#: lib/mail.php:117
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s lyssnar nu på dina meddelanden i %2$s."
 
-#: ../actions/subscribe.php:86
+#: ../lib/mail.php:126
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -60,545 +125,961 @@ msgstr ""
 "\tHälsningar,\n"
 "%4$s.\n"
 
-#: ../actions/shownotice.php:45
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#: actions/twitapistatuses.php:344
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr "%1$s uppdateringar med svar till uppdatering från %2$s / %3$s."
+
+#: ../actions/shownotice.php:45 actions/shownotice.php:45
+#: actions/shownotice.php:73
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1$s's status den %2$s"
 
-#: ../actions/publicrss.php:60
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr "%s(%s)"
+
+#: ../actions/publicrss.php:62 actions/publicrss.php:48
 #, php-format
 msgid "%s Public Stream"
 msgstr "%s Publik Ström"
 
-#: ../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/twitapistatuses.php:123
 #, php-format
 msgid "%s and friends"
 msgstr "%s med vänner"
 
-#: ../lib/util.php:233
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:31
+#, php-format
+msgid "%s public timeline"
+msgstr "%s publika tidslinje"
+
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:217
+#, php-format
+msgid "%s status"
+msgstr "%s status"
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:195
+#, php-format
+msgid "%s timeline"
+msgstr "%s tidslinje"
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:34
+#, php-format
+msgid "%s updates from everyone!"
+msgstr "%s uppdateringar ifrån allihop!"
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+"(Du kommer få ett meddelande med email inom kort med instruktioner hur du "
+"bekräftar din emailadress)"
+
+#: ../lib/util.php:257 lib/util.php:273 lib/util.php:284
 #, 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%%** är en mikroblogg service för dig ifrån "
-"[%%site.broughtby%%](%%site.broughtbyurl%%)"
+"**%%site.name%%** är en mikroblogg service för dig ifrån [%%site.broughtby%%]"
+"(%%site.broughtbyurl%%)"
 
-#: ../lib/util.php:235
+#: ../lib/util.php:259 lib/util.php:275 lib/util.php:286
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** är en mikroblogg service."
 
-#: ../lib/util.php:250
+#: ../lib/util.php:274 lib/util.php:290 lib/util.php:301
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ". Användarna är tydligt markerade med sitt fulla namn eller smeknamn."
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: ../actions/register.php:176
+#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
+#: actions/profilesettings.php:78
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 små bokstäver eller nummer, inga punkter eller mellanslag"
 
-#: ../actions/password.php:42 ../actions/register.php:178
+#: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:193
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+"1-64 små bokstäver eller nummer, inga punkter eller mellanslag. Måste fyllas "
+"i."
+
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/profilesettings.php:186
 msgid "6 or more characters"
 msgstr "Minst 6 tecken"
 
-#: ../actions/recoverpassword.php:165
+#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
 msgid "6 or more characters, and don't forget it!"
 msgstr "Minst 6 tecken och glöm inte bort det!"
 
-#: ../actions/imsettings.php:188
+#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:195
+msgid "6 or more characters. Required."
+msgstr "6 eller fler tecken. MÃ¥ste fyllas i."
+
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, 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 ""
 "En bekräftelsekod har skickats till den IM-adress som du angav. Du måste "
 "godkänna att %s får skicka meddelanden till dig."
 
-#: ../lib/util.php:296
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:234
+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 ""
+"En bekräftelsekod har skickats ut till email adressen du fyllde i. "
+"Kontrollera din inbox (och spamlådan!) efter kod och instruktioner hur du "
+"använder den."
+
+#: ../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 ""
+"En bekräftelsekod har skickats ut till telefonnumret du fyllde i. "
+"Kontrollera din inbox (och spamlådan!) efter kod och instruktioner hur du "
+"använder den."
+
+#: ../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:30
+#: actions/twitapidirect_messages.php:107 actions/twitapifavorites.php:83
+#: actions/twitapifavorites.php:99 actions/twitapifriendships.php:117
+#: actions/twitapihelp.php:42 actions/twitapistatuses.php:77
+#: actions/twitapistatuses.php:144 actions/twitapistatuses.php:224
+#: actions/twitapistatuses.php:234 actions/twitapistatuses.php:386
+#: actions/twitapistatuses.php:395 actions/twitapistatuses.php:421
+#: actions/twitapiusers.php:30
+msgid "API method not found!"
+msgstr "API metoden hittades inte!"
+
+#: ../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:39
+#: actions/twitapiaccount.php:89 actions/twitapiaccount.php:94
+#: actions/twitapidirect_messages.php:178 actions/twitapifavorites.php:139
+#: actions/twitapihelp.php:49 actions/twitapistatuses.php:549
+msgid "API method under construction."
+msgstr "API metoden är under uppbyggnad."
+
+#: ../lib/util.php:324 lib/util.php:340 lib/util.php:352
 msgid "About"
 msgstr "Om"
 
-#: ../actions/userauthorization.php:118
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
 msgid "Accept"
 msgstr "Acceptera"
 
-#: ../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/twittersettings.php:84
 msgid "Add"
 msgstr "Lägg till"
 
-#: ../actions/openidsettings.php:43
+#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
 msgid "Add OpenID"
 msgstr "Lägg till OpenID"
 
-#: ../actions/imsettings.php:39
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: actions/deleteprofile.php:248
+msgid "Add or remove OpenIDs"
+msgstr "Lägg till eller tabort OpenIDs"
+
+#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
 msgid "Address"
 msgstr "Adress"
 
-#: ../actions/showstream.php:254
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr "Adresser till vänner att bjuda in (en rad per adress)"
+
+#: ../actions/showstream.php:273 actions/showstream.php:288
+#: actions/showstream.php:336
 msgid "All subscriptions"
 msgstr "Alla prenumerationer"
 
-#: ../actions/publicrss.php:62
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
 #, php-format
 msgid "All updates for %s"
 msgstr "%s alla uppdateringar"
 
-#: ../actions/noticesearchrss.php:66
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:63
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "Alla uppdateringar som matchar söksträngen \"%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
 msgid "Already logged in."
 msgstr "Redan inloggad."
 
-#: ../actions/subscribe.php:48
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:47
 msgid "Already subscribed!."
 msgstr "Det finns redan en prenumeration!"
 
-#: ../actions/userauthorization.php:76
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+msgid "Are you sure you want to delete this notice?"
+msgstr "Är du säker på att du vill tabort detta inlägg?"
+
+#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
 msgid "Authorize subscription"
 msgstr "Tillåt prenumeration."
 
-#: ../actions/login.php:100 ../actions/register.php:184
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192 actions/register.php:219
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Logga in automatiskt i framtiden; Ej för publika datorer!"
 
-#: ../actions/avatar.php:32
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:103
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
+"Automatisk prenummeration på den som prenumererar på mig. (Bäst för icke "
+"mänsklig användare) "
+
+#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: actions/profilesettings.php:34
 msgid "Avatar"
 msgstr "Användarbild"
 
-#: ../actions/avatar.php:113
+#: ../actions/avatar.php:113 actions/profilesettings.php:350
+#: actions/profilesettings.php:379
 msgid "Avatar updated."
 msgstr "Användarbilden uppdaterad."
 
-#: ../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 ""
-"Väntar bekräftelse på denna adress. Kontrollera ditt Jabber/GTalk konto "
-"för vidare instruktioner. (La du till %s i din vännerlista?)"
+"Väntar bekräftelse på denna adress. Kontrollera ditt Jabber/GTalk konto för "
+"vidare instruktioner. (La du till %s i din vännerlista?)"
+
+#: ../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 ""
+"Väntar bekräftelse på denna adress. Kontrollera din inbox (och spamlådan!) "
+"efter meddelande om vidare instruktioner."
 
-#: ../lib/util.php:1136
-msgid "Before »"
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+msgid "Awaiting confirmation on this phone number."
+msgstr "Väntar bekräftelse på detta telefonnummer. "
+
+#: ../lib/util.php:1318 lib/util.php:1452 lib/facebookaction.php:259
+#: lib/util.php:1792
+#, fuzzy
+msgid "Before »"
 msgstr "Tidigare »"
 
-#: ../actions/profilesettings.php:52
+#: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: actions/profilesettings.php:82 actions/register.php:184
+#: actions/profilesettings.php:84 actions/register.php:211
 msgid "Bio"
 msgstr "Biografi"
 
-#: ../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:222 actions/register.php:98
 msgid "Bio is too long (max 140 chars)."
 msgstr "Biografin är för lång (max 140 tecken)"
 
-#: ../actions/updateprofile.php:118
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+msgid "Can't delete this notice."
+msgstr "Kan inte tabort detta inlägg."
+
+#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "Kan inte läsa användarbild 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/profilesettings.php:433
 msgid "Can't save new password."
 msgstr "Kan inte spara nya lösenordet."
 
-#: ../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
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../lib/openid.php:121
+#: ../lib/openid.php:121 lib/openid.php:121
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Kan inte initiera OpenID objekt."
 
-#: ../actions/imsettings.php:154
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
 msgid "Cannot normalize that Jabber ID"
 msgstr "Kan inte normalisera det Jabber ID"
 
-#: ../actions/password.php:45
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:204
+msgid "Cannot normalize that email address"
+msgstr "Kan inte normalisera den emailadressen"
+
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/profilesettings.php:189
 msgid "Change"
 msgstr "Ändra"
 
-#: ../actions/password.php:32
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: actions/deleteprofile.php:245
+msgid "Change email handling"
+msgstr "Ändra email hantering"
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
 msgid "Change password"
 msgstr "Byt lösenord"
 
-#: ../actions/password.php:43 ../actions/recoverpassword.php:166
-#: ../actions/register.php:179
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr "Ändra ditt lösenord"
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#: actions/deleteprofile.php:242
+msgid "Change your profile settings"
+msgstr "Ändra dina profil inställningar"
+
+#: ../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/profilesettings.php:187 actions/register.php:196
 msgid "Confirm"
 msgstr "Bekräfta"
 
-#: ../actions/confirmaddress.php:84
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
 msgid "Confirm Address"
 msgstr "Bekräfta adress"
 
-#: ../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:259
 msgid "Confirmation cancelled."
 msgstr "Verifikation avbruten"
 
-#: ../actions/confirmaddress.php:38
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+msgid "Confirmation code"
+msgstr "Bekräftelsekod"
+
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
 msgid "Confirmation code not found."
 msgstr "Verifikation koden finns ej."
 
-#: ../actions/finishopenidlogin.php:91
+#: ../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 ""
+"Grattis, %s! Välkommen till %%%%site.name%%%%. Härifrån, kanske du vill...\n"
+"\n"
+"* Gå till [din profil](%s) och göra ditt första inlägg.\n"
+"* Lägg till en [Jabber/GTalk adress](%%%%action.imsettings%%%%) så du kan "
+"skicka inlägg med en IM klient.\n"
+"* [Sök efter personer](%%%%action.peoplesearch%%%%) som du kanske känner "
+"eller delar dina intressen. \n"
+"* Uppdatera din [profil inställning](%%%%action.profilesettings%%%%) för att "
+"berätta lite mer om dig själv för andra här. \n"
+"* Läs igenom [online dok](%%%%doc.help%%%%) efter funktioner som du kanske "
+"missat. \n"
+"\n"
+"Tack för att du registrerade dig och vi hoppas du kommer trivas med denna "
+"service."
+
+#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
 msgid "Connect"
 msgstr "Anslut"
 
-#: ../actions/finishopenidlogin.php:86
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
 msgid "Connect existing account"
 msgstr "Anslut till existerande konto"
 
-#: ../lib/util.php:304
+#: ../lib/util.php:332 lib/util.php:348 lib/util.php:360
 msgid "Contact"
 msgstr "Kontakta"
 
-#: ../lib/openid.php:178
+#: ../lib/openid.php:178 lib/openid.php:178
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "Kan inte skapa OpenID formulär: %s"
 
-#: ../lib/openid.php:160
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:46 actions/twitapifriendships.php:62
 #, php-format
-msgid "Could not redirect to server: %s"
-msgstr "Kunde inte skicka vidare till servern: %s"
+msgid "Could not follow user: %s is already on your list."
+msgstr "Kunde inte följa användaren: %s finns redan i din lista."
 
-#: ../actions/updateprofile.php:161
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+#: actions/twitapifriendships.php:39
+msgid "Could not follow user: User not found."
+msgstr "Kunde inte följa användaren: Användaren kunde inte hittas."
+
+#: ../lib/openid.php:160 lib/openid.php:160
+#, php-format
+msgid "Could not redirect to server: %s"
+msgstr "Kunde inte skicka vidare till servern: %s"
+
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
 msgid "Could not save avatar info"
 msgstr "Kunde inte spara informationen om användarbild"
 
-#: ../actions/updateprofile.php:154
+#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
 msgid "Could not save new profile info"
 msgstr "Kunde inte spara informationen om den nya profilen"
 
-#: ../actions/profilesettings.php:146
-msgid "Couldn't confirm email."
-msgstr "Kunde inte bekräfta epost"
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:70
+msgid "Could not subscribe other to you."
+msgstr "Kunde inte prenumerera på annat åt dig."
+
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:55
+msgid "Could not subscribe."
+msgstr "Kunde inte prenumerera."
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr "Kunde inte uppdatera användaren med bekräftad emailadress."
 
 #: ../actions/finishremotesubscribe.php:99
+#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:112
 msgid "Couldn't convert request tokens to access tokens."
 msgstr "Kunde inte konvertera förfrågan tokens till Access tokens."
 
-#: ../actions/subscribe.php:59
-msgid "Couldn't create subscription."
-msgstr "Kunde inte skapa prenumeration."
-
-#: ../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/emailsettings.php:255
 msgid "Couldn't delete email confirmation."
 msgstr "Kunde inte radera epost bekräftelsen."
 
-#: ../actions/unsubscribe.php:56
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:129
 msgid "Couldn't delete subscription."
 msgstr "Kunde inte radera prenumerationen. "
 
-#: ../actions/remotesubscribe.php:125 ../actions/remotesubscribe.php:127
-#: actions/remotesubscribe.php:136
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+#: actions/twitapistatuses.php:82
+msgid "Couldn't find any statuses."
+msgstr "Kunde inte få fram status."
+
+#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
+#: actions/remotesubscribe.php:148
 msgid "Couldn't get a request token."
 msgstr "Kunde inte få en förfrågan 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:228
 msgid "Couldn't insert confirmation code."
 msgstr "Kunde inte lägga till bekräftelsekoden."
 
 #: ../actions/finishremotesubscribe.php:180
+#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:216
 msgid "Couldn't insert new subscription."
 msgstr "Kunde inte lägga till ny prenumeration."
 
-#: ../actions/profilesettings.php:175
+#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
+#: actions/profilesettings.php:319 actions/twitapiaccount.php:74
 msgid "Couldn't save profile."
 msgstr "Kunde inte spara profil."
 
-#: ../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:296
+msgid "Couldn't update user for autosubscribe."
+msgstr "Kunde inte uppdatera användaren för automatisk prenumeration."
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+#: actions/emailsettings.php:301 actions/emailsettings.php:315
+msgid "Couldn't update user record."
+msgstr "Kunde inte uppdatera användarens inställningar."
+
+#: ../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/emailsettings.php:179 actions/emailsettings.php:280
+#: actions/othersettings.php:173 actions/profilesettings.php:276
 msgid "Couldn't update user."
 msgstr "Kunde inte uppdatera användare."
 
-#: ../actions/finishopenidlogin.php:84
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
 msgid "Create"
 msgstr "Skapa"
 
-#: ../actions/finishopenidlogin.php:70
+#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
 msgid "Create a new user with this nickname."
 msgstr "Skapa en ny användare med det här smeknamnet"
 
-#: ../actions/finishopenidlogin.php:68
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
 msgid "Create new account"
 msgstr "Skapa ett nytt konto"
 
-#: ../actions/finishopenidlogin.php:191
+#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+#: actions/finishopenidlogin.php:208
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Skapar ett nytt konto för OpenID som redan har en användare"
 
-#: ../actions/imsettings.php:45
+#: ../actions/imsettings.php:45 actions/imsettings.php:46
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Aktuell bekräftad Jabber/Gtalk-adress."
 
-#: ../actions/showstream.php:337
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+msgid "Current confirmed SMS-enabled phone number."
+msgstr "Nuvarande bekäftat SMS telefonnummer"
+
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+msgid "Current confirmed email address."
+msgstr "Nuvarande bekräftade emailadress."
+
+#: ../actions/showstream.php:356 actions/showstream.php:367
+#: actions/showstream.php:418
 msgid "Currently"
 msgstr "Just nu"
 
-#: ../lib/util.php:893
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:87
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr "DB error vid infog av hashtag: %s"
+
+#: ../lib/util.php:1061 lib/util.php:1110 lib/util.php:1417
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Databasfel för svar: %s"
 
-#: ../actions/profilesettings.php:54
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+msgid "Delete notice"
+msgstr "Tabort inlägg"
+
+#: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: actions/profilesettings.php:84 actions/register.php:186
+#: actions/profilesettings.php:86 actions/register.php:213
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Berätta om dig själv och dina intressen inom 140 tecken"
 
-#: ../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/deleteprofile.php:244 actions/register.php:199
+#: actions/register.php:202
 msgid "Email"
 msgstr "Epost"
 
-#: ../actions/profilesettings.php:46
-msgid "Email address"
-msgstr "Epostadress"
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+msgid "Email Address"
+msgstr "Emailadress"
+
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+msgid "Email Settings"
+msgstr "Email inställningar"
 
-#: ../actions/profilesettings.php:102 ../actions/register.php:63
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:89
 msgid "Email address already exists."
 msgstr "Epostadressen finns redan."
 
-#: ../lib/mail.php:82
+#: ../lib/mail.php:90 lib/mail.php:90
 msgid "Email address confirmation"
 msgstr "Bekräfta epostadress"
 
-#: ../actions/recoverpassword.php:176
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+msgid "Email address, like \"UserName@example.org\""
+msgstr "Emailadress såsom \"användare@exempel.se\""
+
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr "Emailadresser"
+
+#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
 msgid "Enter a nickname or email address."
 msgstr "Skriv in ett smeknamn eller en epostadress."
 
-#: ../actions/userauthorization.php:136 ../actions/userauthorization.php:137
-#: actions/userauthorization.php:144
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+msgid "Enter the code you received on your phone."
+msgstr "Fyll i koden du mottog i din telefon."
+
+#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
 msgid "Error authorizing token"
 msgstr "Felaktig bekräftelse av token"
 
-#: ../actions/finishopenidlogin.php:282
+#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
+#: actions/finishopenidlogin.php:274
 msgid "Error connecting user to OpenID."
 msgstr "Lyckades inte ansluta användaren till OpenID."
 
-#: ../actions/finishaddopenid.php:78
+#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
 msgid "Error connecting user."
 msgstr "Lyckades inte ansluta användaren."
 
 #: ../actions/finishremotesubscribe.php:151
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:164
 msgid "Error inserting avatar"
 msgstr "Fel uppstog när användarbild skulle läggas till"
 
 #: ../actions/finishremotesubscribe.php:143
+#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:156
 msgid "Error inserting new profile"
 msgstr "Fel uppstog när nya profilen skulle läggas till"
 
-#: ../actions/postnotice.php:88
-msgid "Error inserting notice"
-msgstr "Fel uppstog när inlägget skulle läggas till"
-
 #: ../actions/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:180
 msgid "Error inserting remote profile"
 msgstr "Fel uppstog när fjärrprofilen skulle läggas till"
 
-#: ../actions/recoverpassword.php:201
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
 msgid "Error saving address confirmation."
 msgstr "Fel uppstog när adressen skulle bekräftas."
 
-#: ../actions/userauthorization.php:139
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
 msgid "Error saving remote profile"
 msgstr "Fel uppstog när fjärrprofil skulle sparas"
 
-#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
+#: ../lib/openid.php:226 lib/openid.php:226
 msgid "Error saving the profile."
 msgstr "Fel uppstog när profilen skulle sparas."
 
-#: ../lib/openid.php:237
+#: ../lib/openid.php:237 lib/openid.php:237
 msgid "Error saving the user."
 msgstr "Fel uppstog när användaren skulle sparas."
 
-#: ../actions/password.php:80
+#: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/profilesettings.php:428
 msgid "Error saving user; invalid."
 msgstr "Fel uppstog när användare skulle sparas."
 
-#: ../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:54 actions/login.php:80
+#: actions/register.php:117
 msgid "Error setting user."
 msgstr "Fel uppstog i användarens inställning"
 
-#: ../actions/finishaddopenid.php:83
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
 msgid "Error updating profile"
 msgstr "Fel uppstog vid uppdatering av profilen"
 
 #: ../actions/finishremotesubscribe.php:161
+#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:174
 msgid "Error updating remote profile"
 msgstr "Fel uppstog under uppdatering av fjärranvändare"
 
-#: ../actions/recoverpassword.php:79
+#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
 msgid "Error with confirmation code."
 msgstr "Fel uppstog med bekräftelsekoden."
 
-#: ../actions/finishopenidlogin.php:89
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
 msgid "Existing nickname"
 msgstr "Nuvarande smeknamn"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:326 lib/util.php:342 lib/util.php:354
 msgid "FAQ"
 msgstr "Frågor & svar"
 
-#: ../actions/avatar.php:115
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/profilesettings.php:381
 msgid "Failed updating avatar."
 msgstr "Uppdatering av profilbild misslyckades."
 
-#: ../actions/all.php:61 ../actions/allrss.php:74
+#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
+#: actions/allrss.php:64
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Flöden för $s vänner"
 
-#: ../actions/replies.php:61 ../actions/repliesrss.php:80
+#: ../actions/replies.php:65 ../actions/repliesrss.php:80
+#: actions/replies.php:65 actions/repliesrss.php:66
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Flöde för svar till %s"
 
-#: ../actions/login.php:118
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:54
+#, php-format
+msgid "Feed for tag %s"
+msgstr "Feed för taggar %s"
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+msgid "Find content of notices"
+msgstr "Sök innehåll i inlägg"
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+msgid "Find people on this site"
+msgstr "Sök personer på denna sida"
+
+#: ../actions/login.php:122
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
-"Av säkerhetsskäl, var vänlig skriv in ditt användarnamn och lösenord "
-"innan du ändrar dina inställningar."
+"Av säkerhetsskäl, var vänlig skriv in ditt användarnamn och lösenord innan "
+"du ändrar dina inställningar."
 
-#: ../actions/profilesettings.php:44
+#: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: actions/profilesettings.php:77 actions/register.php:178
+#: actions/profilesettings.php:79 actions/register.php:205
 msgid "Full name"
 msgstr "Ditt fulla namn."
 
-#: ../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/profilesettings.php:219 actions/register.php:95
 msgid "Full name is too long (max 255 chars)."
 msgstr "Ditt namn är för långt (max 255 tecken)."
 
-#: ../lib/util.php:279
+#: ../lib/util.php:322 lib/util.php:338 lib/util.php:343 lib/util.php:350
 msgid "Help"
 msgstr "Hjälp"
 
-#: ../lib/util.php:274
+#: ../lib/util.php:298 lib/util.php:314 lib/util.php:325
 msgid "Home"
 msgstr "Hem"
 
-#: ../actions/profilesettings.php:49
+#: ../actions/profilesettings.php:46 ../actions/register.php:167
+#: actions/profilesettings.php:79 actions/register.php:181
+#: actions/profilesettings.php:81 actions/register.php:208
 msgid "Homepage"
 msgstr "Hemsida"
 
-#: ../actions/profilesettings.php:87
+#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: actions/profilesettings.php:210 actions/register.php:83
+#: actions/profilesettings.php:216 actions/register.php:92
 msgid "Homepage is not a valid URL."
 msgstr "Hemsidan har ingen giltig URL"
 
-#: ../actions/imsettings.php:61
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+#: actions/emailsettings.php:101
+msgid "I want to post notices by email."
+msgstr "Jag vill posta inlägg via min email."
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+#: actions/deleteprofile.php:253
+msgid "IM"
+msgstr "IM"
+
+#: ../actions/imsettings.php:60 actions/imsettings.php:61
 msgid "IM Address"
 msgstr "IM adress"
 
-#: ../actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
 msgid "IM Settings"
 msgstr "IM inställningar"
 
-#: ../actions/finishopenidlogin.php:88
+#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
 msgstr ""
-"Om du redan har ett konto, logga in med ditt användarnamn och lösenord "
-"för att koppla det till ditt OpenID"
+"Om du redan har ett konto, logga in med ditt användarnamn och lösenord för "
+"att koppla det till ditt OpenID"
 
 #: ../actions/openidsettings.php:45
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
 msgstr ""
-"Om du vill lägga till OpenID till ditt konto, fyll i fältet nedan och "
-"tryck på \"Add\""
+"Om du vill lägga till OpenID till ditt konto, fyll i fältet nedan och tryck "
+"på \"Add\""
 
-#: ../actions/recoverpassword.php:122
+#: ../actions/recoverpassword.php:137
 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 ""
-"Om du har förlorat eller glömt bort ditt lösenord så kan du få ett nytt "
-"skickat till din epost, kopplat till ditt konto."
+"Om du glömt eller tappat bort ditt lösenord så kan du få ett nytt skickat "
+"till den emailadress du sparat till ditt konto."
+
+#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
+#: actions/emailsettings.php:68 actions/smssettings.php:76
+msgid "Incoming email"
+msgstr "Inkommande email"
 
-#: ../actions/password.php:69
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+#: actions/emailsettings.php:304
+msgid "Incoming email address removed."
+msgstr "Inkommande emailadress borttagen."
+
+#: ../actions/password.php:69 actions/profilesettings.php:388
+#: actions/profilesettings.php:417
 msgid "Incorrect old password"
 msgstr "Felaktigt, gammalt lösenord"
 
-#: ../actions/login.php:63
+#: ../actions/login.php:67 actions/login.php:67 actions/login.php:74
 msgid "Incorrect username or password."
 msgstr "Felaktigt användarnamn eller lösenord."
 
-#: ../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."
 msgstr ""
-"Instruktioner om hur du återställer ditt lösenord har sänts till din "
-"e-postadress "
+"Instruktioner om hur du återställer ditt lösenord har sänts till din e-"
+"postadress "
 
-#: ../actions/updateprofile.php:113
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "Ogiltig användarbild URL '%s'"
 
-#: ../actions/updateprofile.php:97
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr "Ogiltig emailadress: %s"
+
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "Ogiltig hemsideadress '%s'"
 
-#: ../actions/updateprofile.php:81
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "Ogiltig licens URL '%s'"
 
-#: ../actions/postnotice.php:61
+#: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:63
 msgid "Invalid notice content"
 msgstr "Ogiltig innehåll i inlägget "
 
-#: ../actions/postnotice.php:67
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:69
 msgid "Invalid notice uri"
 msgstr "Ogiltig inlägg uri"
 
-#: ../actions/postnotice.php:72
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:74
 msgid "Invalid notice url"
 msgstr "Ogiltig inlägg url"
 
-#: ../actions/updateprofile.php:86
+#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "Ogiltig profil URL '%s' "
 
-#: ../actions/remotesubscribe.php:96
+#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
 msgid "Invalid profile URL (bad format)"
 msgstr "Nåt är fel med profil URL (Format fel)"
 
 #: ../actions/finishremotesubscribe.php:77
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:78
 msgid "Invalid profile URL returned by server."
 msgstr "Felaktig profil URL skickades åter av servern."
 
-#: ../actions/avatarbynickname.php:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
 msgid "Invalid size."
 msgstr "Felaktig storlek"
 
-#: ../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:256 actions/register.php:112
+#: actions/register.php:130
 msgid "Invalid username or password."
 msgstr "Felaktigt användarnamn eller lösenord."
 
-#: ../lib/util.php:237
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr "Inbjudan(ar) skickad"
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr "Inbjudan(ar) är skickade till följande personer:"
+
+#: ../lib/util.php:306 lib/util.php:322 lib/util.php:332
+msgid "Invite"
+msgstr "Bjud in"
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr "Bjud in nya användare"
+
+#: ../lib/util.php:261 lib/util.php:277 lib/util.php:288
 #, 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 ""
-"Det drivs med [Laconica](http://laconi.ca/) mikroblogging software, version "
-"%s, tillgängligt under [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"Det drivs med [Laconica](http://laconi.ca/) mikroblogging software, version %"
+"s, tillgängligt under [GNU Affero General Public License](http://www.fsf.org/"
+"licensing/licenses/agpl-3.0.html)."
 
-#: ../actions/imsettings.php:164
+#: ../actions/imsettings.php:173 actions/imsettings.php:181
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID används redan utav en annan användare."
 
-#: ../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 "
@@ -607,339 +1088,561 @@ msgstr ""
 "Jabber eller GTalk adress liknande \"användare@exempel.se\". Först se till "
 "att lägga till %s i din vännerlista i IM klienten eller GTalk."
 
-#: ../actions/profilesettings.php:55
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
+msgid "Language"
+msgstr "Språk"
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr "Språket är för långt(max 50 tecken)."
+
+#: ../actions/profilesettings.php:52 ../actions/register.php:173
+#: actions/profilesettings.php:85 actions/register.php:187
+#: actions/profilesettings.php:87 actions/register.php:214
 msgid "Location"
 msgstr "Plats"
 
-#: ../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/profilesettings.php:225 actions/register.php:101
 msgid "Location is too long (max 255 chars)."
 msgstr "Platse är för lång (max 255 tecken)."
 
-#: ../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/login.php:104 actions/login.php:113 actions/openidlogin.php:88
+#: lib/util.php:336
 msgid "Login"
 msgstr "Logga in"
 
-#: ../actions/openidlogin.php:44
+#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:60
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Logga in med ett [OpenID](%%doc.openid%%) konto."
 
-#: ../actions/login.php:122
+#: ../actions/login.php:126
 #, 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 ""
-"Logga in med ditt användarnamn och lösenord. Har du inget användarnamn "
-"ännu? [Registrera](%%action.register%%) ett nytt konto, eller testa "
-"[OpenID](%%action.openidlogin%%)."
+"Logga in med ditt användarnamn och lösenord. Har du inget användarnamn ännu? "
+"[Registrera](%%action.register%%) ett nytt konto, eller testa [OpenID](%%"
+"action.openidlogin%%)."
 
-#: ../lib/util.php:284
+#: ../lib/util.php:308 lib/util.php:324 lib/util.php:334
 msgid "Logout"
 msgstr "Logga ut"
 
-#: ../actions/login.php:106
+#: ../actions/register.php:166 actions/register.php:180
+#: actions/register.php:207
+msgid "Longer name, preferably your \"real\" name"
+msgstr "Långt namn, förslagsvis ditt \"riktiga\" namn"
+
+#: ../actions/login.php:110 actions/login.php:110 actions/login.php:118
 msgid "Lost or forgotten password?"
 msgstr "Glömt bort lösenord?"
 
-#: ../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 "Skapa en ny emailadress för att posta till, avaktiverar den gamla"
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr "Ställ in hur du tar emot email ifrån %%site.name%%"
+
+#: ../actions/showstream.php:300 actions/showstream.php:315
+#: actions/showstream.php:363
 msgid "Member since"
 msgstr "Medlem sedan"
 
-#: ../actions/userrss.php:70
+#: ../actions/userrss.php:70 actions/userrss.php:67
 #, php-format
 msgid "Microblog by %s"
 msgstr "Mikroblogg av %s"
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
+#: ../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 ""
+"Mobiloperatör för din telefon. Vet du nån operatör som kan taemot SMS över "
+"email som inte finns med i listan, skicka ett email till oss och tala det "
+"hit %s"
+
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php:85 actions/register.php:202
+#: actions/register.php:229
 msgid "My text and files are available under "
 msgstr "Min text och filer finns tillgängliga under"
 
-#: ../actions/finishopenidlogin.php:71
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+msgid "New"
+msgstr "Ny"
+
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:138
+#, php-format
+msgid "New email address for posting to %s"
+msgstr "Ny emailadress för att skicka till %s"
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+#: actions/emailsettings.php:318
+msgid "New incoming email address added."
+msgstr "Ny inkommande emailadress inlagd."
+
+#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
 msgid "New nickname"
 msgstr "Nytt användarnamn"
 
-#: ../actions/newnotice.php:100
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:141
 msgid "New notice"
 msgstr "Nytt inlägg"
 
-#: ../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/profilesettings.php:185
 msgid "New password"
 msgstr "Nytt lösenord"
 
-#: ../actions/recoverpassword.php:275
+#: ../actions/recoverpassword.php:314
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nya lösenordet har blivit sparat. Du är nu även inloggad."
 
-#: ../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:108 actions/profilesettings.php:76
+#: actions/register.php:192
 msgid "Nickname"
 msgstr "Smeknamn"
 
-#: ../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/finishopenidlogin.php:192 actions/profilesettings.php:231
+#: actions/register.php:85
 msgid "Nickname already in use. Try another one."
 msgstr "Användarnamnet används redan, försök med ett annat."
 
-#: ../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:182 actions/profilesettings.php:209
+#: actions/register.php:83
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
-"Smeknamnet får endast innehålla små bokstäver eller siffror, inga "
-"mellanslag."
+"Smeknamnet får endast innehålla små bokstäver eller siffror, inga mellanslag."
 
-#: ../actions/finishopenidlogin.php:170
+#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:187
 msgid "Nickname not allowed."
 msgstr "Inget giltigt smeknamn."
 
-#: ../actions/remotesubscribe.php:72
+#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
 msgid "Nickname of the user you want to follow"
 msgstr "Smeknamnet på användaren du vill följa"
 
-#: ../actions/recoverpassword.php:147
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
 msgid "Nickname or email"
 msgstr "Smeknamn eller epost"
 
-#: ../actions/imsettings.php:147
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:104
+msgid "No"
+msgstr "Nej"
+
+#: ../actions/imsettings.php:156 actions/imsettings.php:164
 msgid "No Jabber ID."
 msgstr "Inget Jabber ID."
 
-#: ../actions/userauthorization.php:128
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
 msgid "No authorization request!"
 msgstr "Ingen rättighet förfrågan!"
 
-#: ../actions/confirmaddress.php:33
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+msgid "No carrier selected."
+msgstr "Ingen operatör vald."
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+msgid "No code entered"
+msgstr "Ingen kod är ifylld"
+
+#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
 msgid "No confirmation code."
 msgstr "Ingen bekräftelsekod."
 
-#: ../actions/newnotice.php:49
+#: ../actions/newnotice.php:44 actions/newmessage.php:53
+#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:52
+#: actions/newnotice.php:53
 msgid "No content!"
 msgstr "Inget innehåll!"
 
-#: ../actions/userbyid.php:27
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+#: actions/emailsettings.php:197
+msgid "No email address."
+msgstr "Ingen emailadress."
+
+#: ../actions/userbyid.php:32 actions/userbyid.php:32
 msgid "No id."
 msgstr "Inget id."
 
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+#: actions/emailsettings.php:292
+msgid "No incoming email address."
+msgstr "Ingen inkommande emailadress."
+
 #: ../actions/finishremotesubscribe.php:65
+#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:66
 msgid "No nickname provided by remote server."
 msgstr "Inget smeknamn lämnades ut av fjärrservern."
 
-#: ../actions/avatarbynickname.php:27
+#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 msgid "No nickname."
 msgstr "Inget användarnamn"
 
-#: ../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:243
 msgid "No pending confirmation to cancel."
 msgstr "Ingen väntande bekräftelse att avbryta."
 
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+msgid "No phone number."
+msgstr "Inget telefonnummer."
+
 #: ../actions/finishremotesubscribe.php:72
+#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:73
 msgid "No profile URL returned by server."
 msgstr "Ingen profil URL lämnades ut av servern."
 
-#: ../actions/recoverpassword.php:189
+#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
 msgid "No registered email address for that user."
 msgstr "Ingen registrerad epost adress för den användaren."
 
-#: ../actions/userauthorization.php:48
+#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
 msgid "No request found!"
 msgstr "Ingen begäran funnen!"
 
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
+#: actions/noticesearch.php:69 actions/peoplesearch.php:69
+#: actions/noticesearch.php:68 actions/peoplesearch.php:59
 msgid "No results"
 msgstr "Inget resultat"
 
-#: ../actions/avatarbynickname.php:32
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
 msgid "No size."
 msgstr "Ingen storlek"
 
-#: ../actions/openidsettings.php:135
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:109
+#: actions/twitapistatuses.php:438
+msgid "No status found with that ID."
+msgstr "Ingen status hittad med det ID"
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:411
+msgid "No status with that ID found."
+msgstr "Ingen status med det ID hittades."
+
+#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
 msgid "No such OpenID."
 msgstr "Det existerar inget sådant OpenID"
 
-#: ../actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29
 msgid "No such document."
 msgstr "Inget sådant dokument."
 
-#: ../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:38
+#: actions/shownotice.php:114
 msgid "No such notice."
 msgstr "Inget sådant inlägg."
 
-#: ../actions/recoverpassword.php:56
+#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
 msgid "No such recovery code."
 msgstr "Ingen sådan återställningskod. "
 
-#: ../actions/postnotice.php:56
+#: ../actions/postnotice.php:56 actions/postnotice.php:57
 msgid "No such subscription"
 msgstr "Ingen sådan prenumeration"
 
 #: ../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/showstream.php:157
+#: classes/Command.php:208 classes/Command.php:242 lib/gallery.php:85
+#: lib/subs.php:105
 msgid "No such user."
 msgstr "Ingen sådan användare"
 
-#: ../lib/gallery.php:76
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr "Ingen användare med den emailadressen eller användarnamn."
+
+#: ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
 msgstr "Finns inget att visa!"
 
-#: ../actions/recoverpassword.php:60
+#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
 msgid "Not a recovery code."
 msgstr "Det är ingen kod för återställning."
 
-#: ../actions/imsettings.php:158
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+msgid "Not a registered user."
+msgstr "Inte registrerad användare."
+
+#: ../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:423 lib/twitterapi.php:450
+#: lib/twitterapi.php:534
+msgid "Not a supported data format."
+msgstr "Ingen support för det formatet."
+
+#: ../actions/imsettings.php:167 actions/imsettings.php:175
 msgid "Not a valid Jabber ID"
 msgstr "Det är inget giltigt Jabber ID"
 
-#: ../lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131
 msgid "Not a valid OpenID."
 msgstr "Det är inget giltigt OpenID."
 
-#: ../actions/profilesettings.php:75 ../actions/register.php:53
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+#: actions/emailsettings.php:208
+msgid "Not a valid email address"
+msgstr "Ingen giltig emailadress"
+
+#: ../actions/register.php:63 actions/register.php:70 actions/register.php:79
 msgid "Not a valid email address."
 msgstr "Det är ingen giltig epost adress."
 
-#: ../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/profilesettings.php:212 actions/register.php:87
 msgid "Not a valid nickname."
 msgstr "Det är inget giltigt användarnamn."
 
-#: ../actions/remotesubscribe.php:118
+#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
 msgid "Not a valid profile URL (incorrect services)."
 msgstr "Det är ingen giltig profil URL (felaktig service)."
 
-#: ../actions/remotesubscribe.php:111
+#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr "Det är ingen giltig profil URL (ingen XRDS angiven)."
 
-#: ../actions/remotesubscribe.php:104
+#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
 msgid "Not a valid profile URL (no YADIS document)."
 msgstr "Det är ingen giltig profil URL (ingen YADIS angiven)."
 
-#: ../actions/avatar.php:95
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: actions/profilesettings.php:361
 msgid "Not an image or corrupt file."
 msgstr "Det verkar inte vara en bildfil, annars korrupt."
 
 #: ../actions/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:52
 msgid "Not authorized."
 msgstr "Inte tillstånd ännu."
 
 #: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38
 msgid "Not expecting this response!"
 msgstr "Väntade mig inte detta svar!"
 
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
-#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+#: actions/twitapistatuses.php:304
+msgid "Not found"
+msgstr "Hittades inte"
+
+#: ../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:31 actions/newnotice.php:30
+#: actions/nudge.php:30 actions/subedit.php:31 actions/unblock.php:31
 msgid "Not logged in."
 msgstr "Inte inloggad."
 
-#: ../actions/unsubscribe.php:43
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:117
 msgid "Not subscribed!."
 msgstr "Ingen prenumerant!"
 
-#: ../actions/showstream.php:82
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+msgid "Notice Search"
+msgstr "Inlägg sökning"
+
+#: ../actions/showstream.php:82 actions/showstream.php:82
+#: actions/showstream.php:111 actions/showstream.php:118
+#: actions/showstream.php:123
 #, php-format
 msgid "Notice feed for %s"
 msgstr "Inlägg flöde för %s"
 
-#: ../actions/shownotice.php:39
+#: ../actions/shownotice.php:39 actions/shownotice.php:39
+#: actions/shownotice.php:45
 msgid "Notice has no profile"
 msgstr "Inlägget har ingen profil"
 
-#: ../actions/showstream.php:297
+#: ../actions/showstream.php:316 actions/showstream.php:331
+#: actions/showstream.php:379
 msgid "Notices"
 msgstr "Inlägg"
 
-#: ../actions/password.php:39
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
+#, php-format
+msgid "Notices tagged with %s"
+msgstr "Inlägg taggade med %s"
+
+#: ../actions/password.php:39 actions/profilesettings.php:178
+#: actions/profilesettings.php:183
 msgid "Old password"
 msgstr "Gammalt lösenord"
 
-#: ../lib/util.php:288
+#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
+#: lib/util.php:330 actions/deleteprofile.php:247 lib/util.php:340
 msgid "OpenID"
 msgstr "OpenID"
 
-#: ../actions/finishopenidlogin.php:61
+#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
 msgid "OpenID Account Setup"
 msgstr "OpenID konto setup"
 
-#: ../lib/openid.php:180
+#: ../lib/openid.php:180 lib/openid.php:180
 msgid "OpenID Auto-Submit"
 msgstr "OpenID skicka automatiskt"
 
 #: ../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/finishopenidlogin.php:150 actions/openidlogin.php:76
 msgid "OpenID Login"
 msgstr "OpenID inloggning"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
+#: actions/openidlogin.php:74 actions/openidsettings.php:50
+#: actions/openidlogin.php:82
 msgid "OpenID URL"
 msgstr "OpenID URL"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
+#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 msgid "OpenID authentication cancelled."
 msgstr "OpenID bekäftelse ångrad."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
+#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "OpenID bekräftelse misslyckad: %s"
 
-#: ../lib/openid.php:133
+#: ../lib/openid.php:133 lib/openid.php:133
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "OpenID misslyckades: %s"
 
-#: ../actions/openidsettings.php:144
+#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
 msgid "OpenID removed."
 msgstr "OpenID borttagen."
 
-#: ../actions/openidsettings.php:37
+#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
 msgid "OpenID settings"
 msgstr "OpenID inställningar"
 
-#: ../actions/avatar.php:84
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr "Om du vill, skriv ett personligt meddelande med inbjudan."
+
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: actions/profilesettings.php:350
 msgid "Partial upload."
 msgstr "Bitvis uppladdad."
 
-#: ../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/login.php:109 actions/register.php:194
 msgid "Password"
 msgstr "Lösenord"
 
-#: ../actions/recoverpassword.php:249
+#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
 msgid "Password and confirmation do not match."
 msgstr "Lösenord och bekräftelse matchar inte."
 
-#: ../actions/recoverpassword.php:245
+#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
 msgid "Password must be 6 chars or more."
 msgstr "Lösenordet måste vara 6 tecken eller fler."
 
-#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
+#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 msgid "Password recovery requested"
 msgstr "Förfrågan om återställning av lösenord"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:274
+#: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: actions/profilesettings.php:408 actions/recoverpassword.php:326
+#: actions/profilesettings.php:437
 msgid "Password saved."
 msgstr "Lösenord är sparat."
 
-#: ../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/profilesettings.php:409 actions/register.php:107
 msgid "Passwords don't match."
 msgstr "Lösenorden matchar inte."
 
-#: ../actions/peoplesearch.php:33
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+msgid "People"
+msgstr "Personer"
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+msgid "People Search"
+msgstr "Personer sökning"
+
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
 msgid "People search"
 msgstr "Sökning personer"
 
-#: ../lib/stream.php:44
+#: ../lib/stream.php:50 lib/personal.php:50
 msgid "Personal"
 msgstr "Personlig"
 
-#: ../actions/userauthorization.php:77
+#: ../actions/invite.php:133 actions/invite.php:141
+msgid "Personal message"
+msgstr "Personligt meddelande"
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr "Telefonnummer, inga punkter eller mellanslag, med landskod"
+
+#: ../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, "
@@ -949,91 +1652,135 @@ msgstr ""
 "prenumerera på denna användares inlägg. Om du inte frågade efter att "
 "prenumerera på någons inlägg, klicka på \"Cancel\""
 
-#: ../actions/imsettings.php:74
+#: ../actions/imsettings.php:73 actions/imsettings.php:74
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Posta ett inlägg när min Jabber/GTalk status ändras."
 
-#: ../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
 msgid "Preferences"
 msgstr "Inställningar"
 
-#: ../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:185 actions/othersettings.php:179
 msgid "Preferences saved."
 msgstr "Inställningar sparade."
 
-#: ../lib/util.php:300 ../lib/util.php:328 lib/util.php:344
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
+msgid "Preferred language"
+msgstr "Språkval"
+
+#: ../lib/util.php:328 lib/util.php:344 lib/util.php:356
 msgid "Privacy"
 msgstr "Sekretesspolicy"
 
-#: ../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:139 classes/Notice.php:149
 msgid "Problem saving notice."
 msgstr "Det var ett problem när inlägget sparades."
 
-#: ../lib/stream.php:54
+#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
+#: lib/settingsaction.php:84 actions/deleteprofile.php:241
 msgid "Profile"
 msgstr "Profil"
 
-#: ../actions/remotesubscribe.php:73
+#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
 msgid "Profile URL"
 msgstr "Profil URL"
 
-#: ../actions/profilesettings.php:34
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
 msgid "Profile settings"
 msgstr "Profil inställningar"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
+#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
+#: actions/postnotice.php:52 actions/updateprofile.php:53
 msgid "Profile unknown"
 msgstr "Okänd profil"
 
-#: ../lib/util.php:276
-msgid "Public"
-msgstr "Publik"
-
-#: ../actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:77
 msgid "Public Stream Feed"
 msgstr "Publik ström"
 
-#: ../actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 lib/stream.php:34
 msgid "Public timeline"
 msgstr "Publik tidslinje"
 
-#: ../actions/recoverpassword.php:151
-msgid "Recover"
-msgstr "Återställ"
-
-#: ../actions/recoverpassword.php:141
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr "Publicera ett MicroID för min Jabber/GTalk adress."
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:104
+msgid "Publish a MicroID for my email address."
+msgstr "Publicera ett MicroID för min emailadress."
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr "Tidigare taggar"
+
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
+msgid "Recover"
+msgstr "Återställ"
+
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
 msgid "Recover password"
 msgstr "Återställ lösenord"
 
-#: ../actions/recoverpassword.php:67
+#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
 msgid "Recovery code for unknown user."
 msgstr "Kod för återställning av okänd användare."
 
-#: ../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:181 actions/register.php:234 lib/util.php:338
 msgid "Register"
 msgstr "Registrera"
 
-#: ../actions/userauthorization.php:119
+#: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:173
+msgid "Registration not allowed."
+msgstr "Registrering är inte möjlig."
+
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:241
+msgid "Registration successful"
+msgstr "Registreringen är genomförd"
+
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
 msgid "Reject"
 msgstr "Avvisa"
 
-#: ../actions/login.php:99 ../actions/register.php:183
+#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
+#: actions/register.php:190 actions/login.php:110 actions/openidlogin.php:85
+#: actions/register.php:217
 msgid "Remember me"
 msgstr "Kom ihåg mig"
 
-#: ../actions/updateprofile.php:69
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
 msgid "Remote profile with no matching profile"
 msgstr "Fjärrprofil utan motsvarande profil"
 
-#: ../actions/remotesubscribe.php:65
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
 msgid "Remote subscribe"
 msgstr "Fjärrprenumerera"
 
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php:48 actions/emailsettings.php:76
+#: actions/imsettings.php:49 actions/openidsettings.php:108
+#: actions/smssettings.php:50 actions/smssettings.php:84
+#: actions/twittersettings.php:59 actions/twittersettings.php:61
 msgid "Remove"
 msgstr "Ta bort"
 
-#: ../actions/openidsettings.php:68
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
 msgid "Remove OpenID"
 msgstr "Ta bort OpenID"
 
@@ -1042,43 +1789,76 @@ msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
 msgstr ""
-"Tar du bort din OpenID så gör du det omöjligt att logga in! Om du "
-"behöver ta bort den, lägg till en annan OpenID först."
+"Tar du bort din OpenID så gör du det omöjligt att logga in! Om du behöver ta "
+"bort den, lägg till en annan OpenID först."
 
-#: ../lib/stream.php:49
+#: ../lib/stream.php:55 lib/personal.php:55
 msgid "Replies"
 msgstr "Svar"
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:50
+#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
+#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #, php-format
 msgid "Replies to %s"
 msgstr "Svarat på %s"
 
-#: ../actions/recoverpassword.php:168
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
 msgid "Reset"
 msgstr "Återställ"
 
-#: ../actions/recoverpassword.php:158
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
 msgid "Reset password"
 msgstr "Återställ lösenord"
 
-#: ../actions/recoverpassword.php:167 ../actions/register.php:180
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/deleteprofile.php:250 actions/subscriptions.php:73
+msgid "SMS"
+msgstr "SMS"
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+msgid "SMS Phone number"
+msgstr "SMS Telefonnummer"
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+msgid "SMS Settings"
+msgstr "SMS Inställningar"
+
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:230
+msgid "SMS confirmation"
+msgstr "SMS Bekräftelse"
+
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
 msgid "Same as password above"
 msgstr "Samma som lösenordet ovan"
 
-#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
+#: ../actions/register.php:156 actions/register.php:170
+#: actions/register.php:197
+msgid "Same as password above. Required."
+msgstr "Samma som lösenordet ovan. Måste fyllas i."
+
+#: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
+#: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
+#: actions/emailsettings.php:104 actions/imsettings.php:82
+#: actions/profilesettings.php:101 actions/smssettings.php:100
+#: actions/twittersettings.php:83 actions/emailsettings.php:107
+#: actions/othersettings.php:56 actions/profilesettings.php:106
+#: actions/subscriptions.php:74 actions/tagother.php:100
+#: actions/twittersettings.php:82
 msgid "Save"
 msgstr "Spara"
 
-#: ../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/util.php:327
 msgid "Search"
 msgstr "Sök"
 
-#: ../actions/noticesearch.php:80
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:84
 msgid "Search Stream Feed"
 msgstr "Sök strömflöde"
 
-#: ../actions/noticesearch.php:30
+#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
+#: actions/noticesearch.php:29
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -1093,1051 +1873,168 @@ 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 ""
-"Sök efter personer på %%site.name%% efter deras namn, plats eller "
-"intressen. Skilj söktermerna åt med mellanslag; de måste vara minst tre "
-"tecken långa. "
+"Sök efter personer på %%site.name%% efter deras namn, plats eller intressen. "
+"Skilj söktermerna åt med mellanslag; de måste vara minst tre tecken långa. "
+
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+msgid "Select a carrier"
+msgstr "Välj en operatör"
 
-#: ../lib/util.php:982
+#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
+#: lib/util.php:1306 lib/util.php:1731 lib/util.php:1646 lib/util.php:2158
 msgid "Send"
 msgstr "Skicka"
 
-#: ../actions/imsettings.php:71
+#: ../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."
+msgstr "Skicka email till denna adress för att posta ett nya inlägg."
+
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+msgid "Send me notices of new subscriptions through email."
+msgstr "Skicka meddelande till mig via email vid nya prenumerationer."
+
+#: ../actions/imsettings.php:70 actions/imsettings.php:71
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Skicka inlägg till mig via Jabber/GTalk."
 
-#: ../lib/util.php:282
+#: ../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 ""
+"Skicka inlägg till mig via SMS; Jag är införstådd att min operatör kan "
+"debitera mig."
+
+#: ../actions/imsettings.php:76 actions/imsettings.php:77
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr ""
+"Skicka svar till mig via Jabber/GTalk från personer som inte jag "
+"prenumererar på."
+
+#: ../lib/util.php:304 lib/util.php:320 lib/util.php:330
 msgid "Settings"
 msgstr "Inställningar"
 
-#: ../actions/profilesettings.php:183
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:336
 msgid "Settings saved."
 msgstr "Inställningar sparade."
 
-#: ../actions/finishaddopenid.php:66
+#: ../actions/tag.php:60 actions/tag.php:60 actions/tag.php:59
+msgid "Showing most popular tags from the last week"
+msgstr "Visar dom populäraste taggarna ifrån den senaste veckan."
+
+#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
 msgid "Someone else already has this OpenID."
 msgstr "Någon annan använder redan denna OpenID."
 
 #: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
+#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
 msgid "Something weird happened."
 msgstr "Någonting konstigt inträffade."
 
-#: ../lib/util.php:302
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr "Ledsen, men inga inkommande email är tillåtna."
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr "Ledsen, men det är inte din inkommande emailadress."
+
+#: ../lib/util.php:330 lib/util.php:346 lib/util.php:358
 msgid "Source"
 msgstr "Källa"
 
-#: ../actions/showstream.php:277
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:359
 msgid "Statistics"
 msgstr "Statistik"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
+#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
+#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
+#: actions/finishopenidlogin.php:199 actions/finishopenidlogin.php:267
 msgid "Stored OpenID not found."
 msgstr "Sparade OpenID kunde inte hittas."
 
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:172
-#: ../actions/showstream.php:181
+#: ../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:254 lib/util.php:2078
 msgid "Subscribe"
 msgstr "Prenumerera"
 
-#: ../actions/showstream.php:294 ../actions/subscribers.php:27
+#: ../actions/showstream.php:313 ../actions/subscribers.php:27
+#: actions/showstream.php:328 actions/subscribers.php:27
+#: actions/showstream.php:376 lib/gallery.php:136 lib/gallery.php:137
 msgid "Subscribers"
 msgstr "Prenumerant"
 
-#: ../actions/userauthorization.php:309
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
 msgid "Subscription authorized"
 msgstr "Prenumeration accepterad"
 
-#: ../actions/userauthorization.php:319
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
 msgid "Subscription rejected"
 msgstr "Prenumeration avvisad"
 
-#: ../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:288 actions/showstream.php:370 lib/gallery.php:131
+#: lib/gallery.php:132
 msgid "Subscriptions"
 msgstr "Prenumerationer"
 
-#: ../actions/avatar.php:87
+#: ../actions/avatar.php:87 actions/profilesettings.php:324
+#: actions/profilesettings.php:353
 msgid "System error uploading file."
 msgstr "Systemfel när filen laddades upp."
 
-#: ../actions/noticesearch.php:34
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317 actions/profilesettings.php:90 actions/showstream.php:382
+#: actions/tag.php:40 actions/tagother.php:96 actions/tagother.php:162
+#: lib/profilelist.php:126 lib/profilelist.php:128
+msgid "Tags"
+msgstr "Taggar"
+
+#: ../lib/searchaction.php:104 lib/searchaction.php:104
+msgid "Text"
+msgstr "Text"
+
+#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
+#: actions/noticesearch.php:33
 msgid "Text search"
 msgstr "Text sökning"
 
-#: ../actions/openidsettings.php:140
+#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
 msgid "That OpenID does not belong to you."
 msgstr "Det OpenID du angav tillhör inte dig."
 
-#: ../actions/confirmaddress.php:52
+#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
 msgid "That address has already been confirmed."
 msgstr "Den adressen har redan blivit bekräftad en gång."
 
-#: ../actions/confirmaddress.php:43
+#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
 msgid "That confirmation code is not for you!"
 msgstr "Den bekräftelsekoden är inte för dig!"
 
-#: ../actions/avatar.php:80
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:214
+msgid "That email address already belongs to another user."
+msgstr "Den emailadressen tillhör redan en annan användare."
+
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: actions/profilesettings.php:346
 msgid "That file is too big."
 msgstr "Filen är för stor."
 
-#: ../actions/imsettings.php:161
-msgid "That is already your Jabber ID."
-msgstr "Det är redan din Jabber ID."
-
-#: ../actions/imsettings.php:224
-msgid "That is not your Jabber ID."
-msgstr "Det är inte ditt Jabber ID."
-
-#: ../actions/imsettings.php:201
-msgid "That is the wrong IM address."
-msgstr "Det är fel IM adress."
-
-#: ../actions/newnotice.php:52
-msgid "That's too long. Max notice size is 140 chars."
-msgstr "För långt. Maximalt 140 tecken"
-
-#: ../actions/confirmaddress.php:86
-#, php-format
-msgid "The address \"%s\" has been confirmed for your account."
-msgstr "Adressen \"%s\" har blivit bekräftad för ditt konto."
-
-#: ../actions/imsettings.php:241
-msgid "The address was removed."
-msgstr "Adressen är borttagen."
-
-#: ../actions/userauthorization.php:311 ../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 ""
-"Prenumerationen har blivit bekräftad, men ingen URL har gått igenom. Kolla "
-"med sidans instruktioner hur du bekräftar en prenumeration. Din "
-"prenumerering token är:"
-
-#: ../actions/userauthorization.php:321 ../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 ""
-"Prenumerationen har blivit avvisad, men inga URL har gått igenom. Kolla med "
-"sidans instruktioner hur du avvisar en prenumeration."
-
-#: ../actions/subscribers.php:35
-#, php-format
-msgid "These are the people who listen to %s's notices."
-msgstr "Dessa personer är dom som lyssnar på %s inlägg."
-
-#: ../actions/subscribers.php:33
-msgid "These are the people who listen to your notices."
-msgstr "Dessa personer är dom som lyssnar på dina inlägg."
-
-#: ../actions/subscriptions.php:35
-#, php-format
-msgid "These are the people whose notices %s listens to."
-msgstr "Detta är personer och inlägg som %s lyssnar på."
-
-#: ../actions/subscriptions.php:33
-msgid "These are the people whose notices you listen to."
-msgstr "Detta är personer och inlägg som du lyssnar på."
-
-#: ../actions/recoverpassword.php:87
-msgid "This confirmation code is too old. Please start again."
-msgstr "Denna bekräftelsekod är för gammal. Du får starta om på nytt igen."
-
-#: ../lib/openid.php:195
-msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
-msgstr ""
-"Detta formulär skall automatiskt skicka själv. Om den inte gör det, "
-"klicka på skicka för att gå dit där du skapade ditt OpenID."
-
-#: ../actions/finishopenidlogin.php:56
-#, 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 ""
-"Detta är första gången du loggade in till %s så vi måste koppla sitt "
-"OpenID till ett lokalt konto. Du kan antingen skapa ett nytt konto eller med "
-"ett existerande konto, om du har något."
-
-#: ../lib/util.php:147
-msgid "This page is not available in a media type you accept"
-msgstr "Denna sida är inte tillgänglig i den mediatyp du accepterat"
-
-#: ../actions/remotesubscribe.php:43
-#, php-format
-msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
-msgstr ""
-"För att prenumerera så kan du [logga in](%%action.login%%) eller "
-"[registrera](%%action.register%%) ett nytt konto. Om du redan har ett konto "
-"på en [kompatibel mikroblogg sida](%%doc.openmublog%%) fyll i din profils "
-"URL nedan."
-
-#: ../actions/profilesettings.php:51
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "URL till din hemsida, blog eller profil på en annan sida."
-
-#: ../actions/remotesubscribe.php:74
-msgid "URL of your profile on another compatible microblogging service"
-msgstr "URL till din profil på en annan kompatibel mikroblogg"
-
-#: ../actions/imsettings.php:105 ../actions/recoverpassword.php:39
-#: ../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
-msgid "Unexpected form submission."
-msgstr "Oväntat utskick av formuläret."
-
-#: ../actions/recoverpassword.php:237
-msgid "Unexpected password reset."
-msgstr "Oväntad rensning av lösenord."
-
-#: ../actions/finishremotesubscribe.php:58
-msgid "Unknown version of OMB protocol."
-msgstr "Okänd version av OMB protokollet."
-
-#: ../lib/util.php:245
-msgid ""
-"Unless otherwise specified, contents of this site are copyright by the "
-"contributors and available under the "
-msgstr ""
-"Om inget annat anges, innehåll på denna sida skyddas utav copyright ifrån "
-"användarna och tillgängliga under"
-
-#: ../actions/confirmaddress.php:48
-#, php-format
-msgid "Unrecognized address type %s"
-msgstr "Adresstypen känns inte igen %s"
-
-#: ../actions/showstream.php:193
-msgid "Unsubscribe"
-msgstr "Lämnar pren."
-
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
-msgid "Unsupported OMB version"
-msgstr "OMB versionen stöds inte"
-
-#: ../actions/avatar.php:105
-msgid "Unsupported image file format."
-msgstr "Bildfilens format stödjs inte."
-
-#: ../actions/avatar.php:68
-msgid "Upload"
-msgstr "Ladda upp"
-
-#: ../actions/avatar.php:27
-msgid ""
-"Upload a new \"avatar\" (user image) here. You can't edit the picture after "
-"you upload it, so make sure it's more or less square. It must be under the "
-"site license, also. Use a picture that belongs to you and that you want to "
-"share."
-msgstr ""
-"Ladda upp en ny \"avatar\" (användarbild) här. Du kan inte göra "
-"ändringar i bilden efter uppladdning, försök att se till att den är så "
-"fykantig som möjligt. Den måste följa licensvillkoren, använd en bild "
-"som du äger och som du vill dela med dig utav."
-
-#: ../actions/profilesettings.php:48 ../actions/register.php:182
-msgid "Used only for updates, announcements, and password recovery"
-msgstr ""
-"Används endast för uppdateringar, annonsering och återställning av "
-"lösenord"
-
-#: ../actions/finishremotesubscribe.php:86
-msgid "User being listened to doesn't exist."
-msgstr "Användaren som avlyssnas existerar inte."
-
-#: ../actions/all.php:41 ../actions/avatarbynickname.php:48
-#: ../actions/foaf.php:43 ../actions/replies.php:41
-#: ../actions/showstream.php:44
-msgid "User has no profile."
-msgstr "Användaren har ingen profil."
-
-#: ../actions/remotesubscribe.php:71
-msgid "User nickname"
-msgstr "Användarens smeknamn"
-
-#: ../lib/util.php:969
-#, php-format
-msgid "What's up, %s?"
-msgstr "Vad är på gång, %s?"
-
-#: ../actions/profilesettings.php:57
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "Var du håller till, såsom \"Stad, Län, Land\""
-
-#: ../actions/updateprofile.php:127
-#, php-format
-msgid "Wrong image type for '%s'"
-msgstr "Fel filtyp för bild '%s'"
-
-#: ../actions/updateprofile.php:122
-#, php-format
-msgid "Wrong size image at '%s'"
-msgstr "Fel bildstorlek för '%s'"
-
-#: ../actions/finishaddopenid.php:64
-msgid "You already have this OpenID!"
-msgstr "Du handhar redan denna OpenID!"
-
-#: ../actions/recoverpassword.php:31
-msgid "You are already logged in!"
-msgstr "Du är redan inloggad!"
-
-#: ../actions/password.php:27
-msgid "You can change your password here. Choose a good one!"
-msgstr "Du kan ändra ditt lösenord här. Välj ett bra!"
-
-#: ../actions/register.php:164
-msgid "You can create a new account to start posting notices."
-msgstr "Du kan skapa ett nytt konto och börja skriva inlägg."
-
-#: ../actions/openidsettings.php:86
-msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
-msgstr ""
-"Du kan ta bort en OpenID ifrån ditt konto genom att klicka på knappen "
-"\"Remove\""
-
-#: ../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."
-msgstr ""
-"Du kan skicka och ta emot inlägg genom Jabber/GTalk [instant "
-"messages](%%doc.im%%). Konfigurera din adress och inställningar nedan. "
-
-#: ../actions/profilesettings.php:27
-msgid ""
-"You can update your personal profile info here so people know more about "
-"you."
-msgstr ""
-"Du kan uppdatera din personliga profil här så personer får veta mer om "
-"dig."
-
-#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
-msgid "You can use the local subscription!"
-msgstr "Du kan använda lokala prenumerationer!"
-
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:51
-msgid "You can't register if you don't agree to the license."
-msgstr "Du kan inte registrera dig om du inte godkänner licensvillkor."
-
-#: ../actions/updateprofile.php:62
-msgid "You did not send us that profile"
-msgstr "Du skickade inte oss den profilen"
-
-#: ../actions/recoverpassword.php:134
-msgid "You've been identified. Enter a  new password below. "
-msgstr "Du är identifierad. Skriv ett nytt lösenord nedan."
-
-#: ../actions/openidlogin.php:67
-msgid "Your OpenID URL"
-msgstr "Din OpenID URL"
-
-#: ../actions/recoverpassword.php:149
-msgid "Your nickname on this server, or your registered email address."
-msgstr "Ditt användarnamn på denna server eller registrerad epost adress."
-
-#: ../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%%) låter dig logga in på flera sidor med samma "
-"konto. Ställ in ditt OpenID konto härifrån."
-
-#: ../lib/util.php:814
-msgid "a few seconds ago"
-msgstr "ett par sekunder sedan"
-
-#: ../lib/util.php:826
-#, php-format
-msgid "about %d days ago"
-msgstr "för %d dagar sedan"
-
-#: ../lib/util.php:822
-#, php-format
-msgid "about %d hours ago"
-msgstr "för %d timmar sedan"
-
-#: ../lib/util.php:818
-#, php-format
-msgid "about %d minutes ago"
-msgstr "för %d minuter sedan"
-
-#: ../lib/util.php:830
-#, php-format
-msgid "about %d months ago"
-msgstr "för %d månader sedan"
-
-#: ../lib/util.php:824
-msgid "about a day ago"
-msgstr "för en dag sedan"
-
-#: ../lib/util.php:816
-msgid "about a minute ago"
-msgstr "för nån minut sedan"
-
-#: ../lib/util.php:828
-msgid "about a month ago"
-msgstr "för en månad sedan"
-
-#: ../lib/util.php:832
-msgid "about a year ago"
-msgstr "för ett år sedan"
-
-#: ../lib/util.php:820
-msgid "about an hour ago"
-msgstr "för en timma sedan"
-
-#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
-#: ../lib/stream.php:101
-msgid "in reply to..."
-msgstr "svar till..."
-
-#: ../actions/noticesearch.php:133 ../actions/showstream.php:390
-#: ../lib/stream.php:108
-msgid "reply"
-msgstr "svar"
-
-#: ../actions/password.php:44
-msgid "same as password above"
-msgstr "samma som lösenordet ovan"
-
-#: ../lib/util.php:1127
-msgid "« After"
-msgstr "« Nyare"
-
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr "från"
-
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr "%1$s / Uppdateringar med svar till %2$s"
-
-#: ../actions/invite.php:168 actions/invite.php:176
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s har bjudit in dig till %2$s"
-
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-"%1$s har bjudit in dig till %2$s (%3$s).\n"
-"\n"
-"%2$s är en mikroblogg service som låter dig via sidan hålla direktkontakt "
-"med människor du känner eller intresserar dig.\n"
-"\n"
-"Du kan även dela med dig utav nyheter om dig själv, dina tankar, eller "
-"ditt liv online som känner igen dig. Det är också perfekt för att möta "
-"nya personer som delar ditt intresse.\n"
-"\n"
-"%1$s sa:\n"
-"\n"
-"%4$s\n"
-"\n"
-"Du kan se %1$s's profilsida på %2$s här:\n"
-"\n"
-"%5$s\n"
-"\n"
-"Om du vill prova på denna service, klicka på länken nedan för att "
-"acceptera denna inbjudan.\n"
-"\n"
-"%6$s\n"
-"\n"
-"Om inte, då kan du ignorera detta meddelande. Tack för att du tog dig\n"
-
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr "%1$s uppdateringar med svar till uppdatering från %2$s / %3$s."
-
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
-#, php-format
-msgid "%s (%s)"
-msgstr "%s(%s)"
-
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#, php-format
-msgid "%s public timeline"
-msgstr "%s publika tidslinje"
-
-#: ../lib/mail.php:206 lib/mail.php:212
-#, php-format
-msgid "%s status"
-msgstr "%s status"
-
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#, php-format
-msgid "%s timeline"
-msgstr "%s tidslinje"
-
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
-msgstr "%s uppdateringar ifrån allihop!"
-
-#: ../actions/register.php:213
-msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
-msgstr ""
-"(Du kommer få ett meddelande med email inom kort med instruktioner hur du "
-"bekräftar din emailadress)"
-
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 små bokstäver eller nummer, inga punkter eller mellanslag. Måste "
-"fyllas i."
-
-#: ../actions/register.php:154 actions/register.php:168
-msgid "6 or more characters. Required."
-msgstr "6 eller fler tecken. MÃ¥ste fyllas i."
-
-#: ../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 ""
-"En bekräftelsekod har skickats ut till email adressen du fyllde i. "
-"Kontrollera din inbox (och spamlådan!) efter kod och instruktioner hur du "
-"använder den."
-
-#: ../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 ""
-"En bekräftelsekod har skickats ut till telefonnumret du fyllde i. "
-"Kontrollera din inbox (och spamlådan!) efter kod och instruktioner hur du "
-"använder den."
-
-#: ../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!"
-msgstr "API metoden hittades inte!"
-
-#: ../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 "API metoden är under uppbyggnad."
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-msgid "Add or remove OpenIDs"
-msgstr "Lägg till eller tabort OpenIDs"
-
-#: ../actions/invite.php:131 actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
-msgstr "Adresser till vänner att bjuda in (en rad per adress)"
-
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-msgid "Are you sure you want to delete this notice?"
-msgstr "Är du säker på att du vill tabort detta inlägg?"
-
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
-msgstr ""
-"Automatisk prenummeration på den som prenumererar på mig. (Bäst för icke "
-"mänsklig användare) "
-
-#: ../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 ""
-"Väntar bekräftelse på denna adress. Kontrollera din inbox (och "
-"spamlådan!) efter meddelande om vidare instruktioner."
-
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr "Väntar bekräftelse på detta telefonnummer. "
-
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
-msgid "Can't delete this notice."
-msgstr "Kan inte tabort detta inlägg."
-
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-msgid "Cannot normalize that email address"
-msgstr "Kan inte normalisera den emailadressen"
-
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr "Ändra email hantering"
-
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
-msgstr "Ändra ditt lösenord"
-
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-msgid "Change your profile settings"
-msgstr "Ändra dina profil inställningar"
-
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-msgid "Confirmation code"
-msgstr "Bekräftelsekod"
-
-#: ../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 ""
-"Grattis, %s! Välkommen till %%%%site.name%%%%. Härifrån, kanske du "
-"vill...\n"
-"\n"
-"* Gå till [din profil](%s) och göra ditt första inlägg.\n"
-"* Lägg till en [Jabber/GTalk adress](%%%%action.imsettings%%%%) så du kan "
-"skicka inlägg med en IM klient.\n"
-"* [Sök efter personer](%%%%action.peoplesearch%%%%) som du kanske känner "
-"eller delar dina intressen. \n"
-"* Uppdatera din [profil inställning](%%%%action.profilesettings%%%%) för "
-"att berätta lite mer om dig själv för andra här. \n"
-"* Läs igenom [online dok](%%%%doc.help%%%%) efter funktioner som du kanske "
-"missat. \n"
-"\n"
-"Tack för att du registrerade dig och vi hoppas du kommer trivas med denna service."
-
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr "Kunde inte följa användaren: %s finns redan i din lista."
-
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
-msgstr "Kunde inte följa användaren: Användaren kunde inte hittas."
-
-#: ../lib/subs.php:54 lib/subs.php:61
-msgid "Could not subscribe other to you."
-msgstr "Kunde inte prenumerera på annat åt dig."
-
-#: ../lib/subs.php:46 lib/subs.php:46
-msgid "Could not subscribe."
-msgstr "Kunde inte prenumerera."
-
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-msgid "Could not update user with confirmed email address."
-msgstr "Kunde inte uppdatera användaren med bekräftad emailadress."
-
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-msgid "Couldn't find any statuses."
-msgstr "Kunde inte få fram status."
-
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-msgid "Couldn't update user for autosubscribe."
-msgstr "Kunde inte uppdatera användaren för automatisk prenumeration."
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-msgid "Couldn't update user record."
-msgstr "Kunde inte uppdatera användarens inställningar."
-
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
-msgstr "Nuvarande bekäftat SMS telefonnummer"
-
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-msgid "Current confirmed email address."
-msgstr "Nuvarande bekräftade emailadress."
-
-#: ../classes/Notice.php:72 classes/Notice.php:86
-#, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr "DB error vid infog av hashtag: %s"
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-msgid "Delete notice"
-msgstr "Tabort inlägg"
-
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-msgid "Email Address"
-msgstr "Emailadress"
-
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-msgid "Email Settings"
-msgstr "Email inställningar"
-
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-msgid "Email address, like \"UserName@example.org\""
-msgstr "Emailadress såsom \"användare@exempel.se\""
-
-#: ../actions/invite.php:129 actions/invite.php:137
-msgid "Email addresses"
-msgstr "Emailadresser"
-
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
-msgstr "Fyll i koden du mottog i din telefon."
-
-#: ../actions/tag.php:55 actions/tag.php:55
-#, php-format
-msgid "Feed for tag %s"
-msgstr "Feed för taggar %s"
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr "Sök innehåll i inlägg"
-
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr "Sök personer på denna sida"
-
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-msgid "I want to post notices by email."
-msgstr "Jag vill posta inlägg via min email."
-
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
-msgstr "IM"
-
-#: ../actions/recoverpassword.php:137
-msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
-"email address you have stored  in your account."
-msgstr ""
-"Om du glömt eller tappat bort ditt lösenord så kan du få ett nytt "
-"skickat till den emailadress du sparat till ditt konto."
-
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-msgid "Incoming email"
-msgstr "Inkommande email"
-
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-msgid "Incoming email address removed."
-msgstr "Inkommande emailadress borttagen."
-
-#: ../actions/invite.php:55 actions/invite.php:62
-#, php-format
-msgid "Invalid email address: %s"
-msgstr "Ogiltig emailadress: %s"
-
-#: ../actions/invite.php:79 actions/invite.php:86
-msgid "Invitation(s) sent"
-msgstr "Inbjudan(ar) skickad"
-
-#: ../actions/invite.php:97 actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
-msgstr "Inbjudan(ar) är skickade till följande personer:"
-
-#: ../lib/util.php:306 lib/util.php:322
-msgid "Invite"
-msgstr "Bjud in"
-
-#: ../actions/invite.php:123 actions/invite.php:130
-msgid "Invite new users"
-msgstr "Bjud in nya användare"
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Language"
-msgstr "Språk"
-
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-msgid "Language is too long (max 50 chars)."
-msgstr "Språket är för långt(max 50 tecken)."
-
-#: ../actions/register.php:166 actions/register.php:180
-msgid "Longer name, preferably your \"real\" name"
-msgstr "Långt namn, förslagsvis ditt \"riktiga\" namn"
-
-#: ../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 "Skapa en ny emailadress för att posta till, avaktiverar den gamla"
-
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr "Ställ in hur du tar emot email ifrån %%site.name%%"
-
-#: ../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 ""
-"Mobiloperatör för din telefon. Vet du nån operatör som kan taemot SMS "
-"över email som inte finns med i listan, skicka ett email till oss och tala "
-"det hit %s"
-
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-msgid "New"
-msgstr "Ny"
-
-#: ../lib/mail.php:144 lib/mail.php:144
-#, php-format
-msgid "New email address for posting to %s"
-msgstr "Ny emailadress för att skicka till %s"
-
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-msgid "New incoming email address added."
-msgstr "Ny inkommande emailadress inlagd."
-
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-msgid "No"
-msgstr "Nej"
-
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-msgid "No carrier selected."
-msgstr "Ingen operatör vald."
-
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-msgid "No code entered"
-msgstr "Ingen kod är ifylld"
-
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-msgid "No email address."
-msgstr "Ingen emailadress."
-
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-msgid "No incoming email address."
-msgstr "Ingen inkommande emailadress."
-
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-msgid "No phone number."
-msgstr "Inget telefonnummer."
-
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-msgid "No status found with that ID."
-msgstr "Ingen status hittad med det ID"
-
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-msgid "No status with that ID found."
-msgstr "Ingen status med det ID hittades."
-
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-msgid "No user with that email address or username."
-msgstr "Ingen användare med den emailadressen eller användarnamn."
-
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-msgid "Not a registered user."
-msgstr "Inte registrerad användare."
-
-#: ../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."
-msgstr "Ingen support för det formatet."
-
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-msgid "Not a valid email address"
-msgstr "Ingen giltig emailadress"
-
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-msgid "Not found"
-msgstr "Hittades inte"
-
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-msgid "Notice Search"
-msgstr "Inlägg sökning"
-
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81
-#, php-format
-msgid "Notices tagged with %s"
-msgstr "Inlägg taggade med %s"
-
-#: ../actions/invite.php:135 actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
-msgstr "Om du vill, skriv ett personligt meddelande med inbjudan."
-
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-msgid "People"
-msgstr "Personer"
-
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-msgid "People Search"
-msgstr "Personer sökning"
-
-#: ../actions/invite.php:133 actions/invite.php:141
-msgid "Personal message"
-msgstr "Personligt meddelande"
-
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "Telefonnummer, inga punkter eller mellanslag, med landskod"
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Preferred language"
-msgstr "Språkval"
-
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Publicera ett MicroID för min Jabber/GTalk adress."
-
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-msgid "Publish a MicroID for my email address."
-msgstr "Publicera ett MicroID för min emailadress."
-
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr "Tidigare taggar"
-
-#: ../actions/register.php:28 actions/register.php:28
-msgid "Registration not allowed."
-msgstr "Registrering är inte möjlig."
-
-#: ../actions/register.php:200 actions/register.php:214
-msgid "Registration successful"
-msgstr "Registreringen är genomförd"
-
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
-msgstr "SMS"
-
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-msgid "SMS Phone number"
-msgstr "SMS Telefonnummer"
-
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-msgid "SMS Settings"
-msgstr "SMS Inställningar"
-
-#: ../lib/mail.php:219 lib/mail.php:225
-msgid "SMS confirmation"
-msgstr "SMS Bekräftelse"
-
-#: ../actions/register.php:156 actions/register.php:170
-msgid "Same as password above. Required."
-msgstr "Samma som lösenordet ovan. Måste fyllas i."
-
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-msgid "Select a carrier"
-msgstr "Välj en operatör"
-
-#: ../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."
-msgstr "Skicka email till denna adress för att posta ett nya inlägg."
-
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-msgid "Send me notices of new subscriptions through email."
-msgstr "Skicka meddelande till mig via email vid nya prenumerationer."
-
-#: ../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 ""
-"Skicka inlägg till mig via SMS; Jag är införstådd att min operatör kan "
-"debitera mig."
-
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr ""
-"Skicka svar till mig via Jabber/GTalk från personer som inte jag "
-"prenumererar på."
-
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr "Visar dom populäraste taggarna ifrån den senaste veckan."
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr "Ledsen, men inga inkommande email är tillåtna."
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
-msgstr "Ledsen, men det är inte din inkommande emailadress."
-
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317
-msgid "Tags"
-msgstr "Taggar"
-
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr "Text"
-
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr "Den emailadressen tillhör redan en annan användare."
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
+msgid "That is already your Jabber ID."
+msgstr "Det är redan din Jabber ID."
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:211
 msgid "That is already your email address."
 msgstr "Det är redan din emailadress."
 
@@ -2145,7 +2042,12 @@ msgstr "Det är redan din emailadress."
 msgid "That is already your phone number."
 msgstr "Det är redan ditt telefonnummer."
 
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
+msgid "That is not your Jabber ID."
+msgstr "Det är inte ditt Jabber ID."
+
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+#: actions/emailsettings.php:270
 msgid "That is not your email address."
 msgstr "Det är inte din emailadress."
 
@@ -2153,6 +2055,12 @@ msgstr "Det är inte din emailadress."
 msgid "That is not your phone number."
 msgstr "Det är inte ditt telefonnummer."
 
+#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
+#: actions/emailsettings.php:244 actions/imsettings.php:218
+#: actions/emailsettings.php:247
+msgid "That is the wrong IM address."
+msgstr "Det är fel IM adress."
+
 #: ../actions/smssettings.php:233 actions/smssettings.php:241
 msgid "That is the wrong confirmation number."
 msgstr "Det är fel nummer i bekräftelsen"
@@ -2161,111 +2069,398 @@ msgstr "Det är fel nummer i bekräftelsen"
 msgid "That phone number already belongs to another user."
 msgstr "Det numret tillhör en annan användare."
 
+#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: actions/newnotice.php:49 actions/twitapistatuses.php:330
+#: actions/newnotice.php:61 actions/twitapistatuses.php:271
+msgid "That's too long. Max notice size is 140 chars."
+msgstr "För långt. Maximalt 140 tecken"
+
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+#: actions/twitapiaccount.php:55
 msgid "That's too long. Max notice size is 255 chars."
 msgstr "Det är för långt. Max antal tecken är 255."
 
+#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr "Adressen \"%s\" har blivit bekräftad för ditt konto."
+
+#: ../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:285
+msgid "The address was removed."
+msgstr "Adressen är borttagen."
+
+#: ../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 ""
+"Prenumerationen har blivit bekräftad, men ingen URL har gått igenom. Kolla "
+"med sidans instruktioner hur du bekräftar en prenumeration. Din "
+"prenumerering token är:"
+
+#: ../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 ""
+"Prenumerationen har blivit avvisad, men inga URL har gått igenom. Kolla med "
+"sidans instruktioner hur du avvisar en prenumeration."
+
+#: ../actions/subscribers.php:35 actions/subscribers.php:35
+#, php-format
+msgid "These are the people who listen to %s's notices."
+msgstr "Dessa personer är dom som lyssnar på %s inlägg."
+
+#: ../actions/subscribers.php:33 actions/subscribers.php:33
+msgid "These are the people who listen to your notices."
+msgstr "Dessa personer är dom som lyssnar på dina inlägg."
+
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#, php-format
+msgid "These are the people whose notices %s listens to."
+msgstr "Detta är personer och inlägg som %s lyssnar på."
+
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+msgid "These are the people whose notices you listen to."
+msgstr "Detta är personer och inlägg som du lyssnar på."
+
 #: ../actions/invite.php:89 actions/invite.php:96
 msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
+"These people are already users and you were automatically subscribed to them:"
 msgstr ""
 "Dom personerna är redan registrerade användare och du blev nu automatiskt "
 "prenumerant till dom:"
 
+#: ../actions/recoverpassword.php:88
+msgid "This confirmation code is too old. Please start again."
+msgstr "Denna bekräftelsekod är för gammal. Du får starta om på nytt igen."
+
+#: ../lib/openid.php:195
+msgid ""
+"This form should automatically submit itself. If not, click the submit "
+"button to go to your OpenID provider."
+msgstr ""
+"Detta formulär skall automatiskt skicka själv. Om den inte gör det, klicka "
+"på skicka för att gå dit där du skapade ditt OpenID."
+
+#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
+#, 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 ""
+"Detta är första gången du loggade in till %s så vi måste koppla sitt OpenID "
+"till ett lokalt konto. Du kan antingen skapa ett nytt konto eller med ett "
+"existerande konto, om du har något."
+
 #: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511
+#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:94
+#: actions/twitapifriendships.php:82 actions/twitapistatuses.php:428
 msgid "This method requires a POST or DELETE."
 msgstr "Denna metod kräver antingen skicka eller tabort."
 
 #: ../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/twitapistatuses.php:303 actions/twitapiaccount.php:46
+#: actions/twitapidirect_messages.php:117 actions/twitapifriendships.php:30
+#: actions/twitapistatuses.php:239
 msgid "This method requires a POST."
 msgstr "Denna metod kräver skicka."
 
+#: ../lib/util.php:164 lib/util.php:246 lib/util.php:257
+msgid "This page is not available in a media type you accept"
+msgstr "Denna sida är inte tillgänglig i den mediatyp du accepterat"
+
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
 msgid "Timezone"
 msgstr "Tidszon"
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:228
 msgid "Timezone not selected."
 msgstr "Du har inte valt tidszon"
 
+#: ../actions/remotesubscribe.php:43
+#, php-format
+msgid ""
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
+msgstr ""
+"För att prenumerera så kan du [logga in](%%action.login%%) eller [registrera]"
+"(%%action.register%%) ett nytt konto. Om du redan har ett konto på en "
+"[kompatibel mikroblogg sida](%%doc.openmublog%%) fyll i din profils URL "
+"nedan."
+
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: actions/twitapifriendships.php:128
 msgid "Two user ids or screen_names must be supplied."
 msgstr "Två användarid eller namn måste läggas till."
 
+#: ../actions/profilesettings.php:48 ../actions/register.php:169
+#: actions/profilesettings.php:81 actions/register.php:183
+#: actions/profilesettings.php:83 actions/register.php:210
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "URL till din hemsida, blog eller profil på en annan sida."
+
+#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
+msgid "URL of your profile on another compatible microblogging service"
+msgstr "URL till din profil på en annan kompatibel mikroblogg"
+
+#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
+#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
+#: actions/emailsettings.php:144 actions/imsettings.php:118
+#: actions/recoverpassword.php:39 actions/smssettings.php:143
+#: actions/twittersettings.php:108 actions/emailsettings.php:147
+#: actions/othersettings.php:146 actions/twittersettings.php:199
+msgid "Unexpected form submission."
+msgstr "Oväntat utskick av formuläret."
+
+#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
+msgid "Unexpected password reset."
+msgstr "Oväntad rensning av lösenord."
+
 #: ../index.php:57 index.php:57
 msgid "Unknown action"
 msgstr "Okänd funktion"
 
+#: ../actions/finishremotesubscribe.php:58
+#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:59
+msgid "Unknown version of OMB protocol."
+msgstr "Okänd version av OMB protokollet."
+
+#: ../lib/util.php:269 lib/util.php:285 lib/util.php:296
+msgid ""
+"Unless otherwise specified, contents of this site are copyright by the "
+"contributors and available under the "
+msgstr ""
+"Om inget annat anges, innehåll på denna sida skyddas utav copyright ifrån "
+"användarna och tillgängliga under"
+
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
+#, php-format
+msgid "Unrecognized address type %s"
+msgstr "Adresstypen känns inte igen %s"
+
+#: ../actions/showstream.php:209 actions/showstream.php:219
+#: actions/showstream.php:267 lib/util.php:2094
+msgid "Unsubscribe"
+msgstr "Lämnar pren."
+
+#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
+#: actions/postnotice.php:45 actions/updateprofile.php:46
+msgid "Unsupported OMB version"
+msgstr "OMB versionen stöds inte"
+
+#: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: actions/profilesettings.php:371
+msgid "Unsupported image file format."
+msgstr "Bildfilens format stödjs inte."
+
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: actions/deleteprofile.php:251
 msgid "Updates by SMS"
 msgstr "Uppdateringar via SMS"
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: actions/deleteprofile.php:254
 msgid "Updates by instant messenger (IM)"
 msgstr "Uppdateringar via instant messenger (IM)"
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/twitapistatuses.php:126
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Uppdateringar från %1$s och vänner på %2$s!"
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:198
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Uppdateringar från %1$s på %2$s!"
 
+#: ../actions/avatar.php:68 actions/profilesettings.php:161
+#: actions/profilesettings.php:166
+msgid "Upload"
+msgstr "Ladda upp"
+
+#: ../actions/avatar.php:27
+msgid ""
+"Upload a new \"avatar\" (user image) here. You can't edit the picture after "
+"you upload it, so make sure it's more or less square. It must be under the "
+"site license, also. Use a picture that belongs to you and that you want to "
+"share."
+msgstr ""
+"Ladda upp en ny \"avatar\" (användarbild) här. Du kan inte göra ändringar i "
+"bilden efter uppladdning, försök att se till att den är så fykantig som "
+"möjligt. Den måste följa licensvillkoren, använd en bild som du äger och som "
+"du vill dela med dig utav."
+
 #: ../lib/settingsaction.php:91
 msgid "Upload a new profile image"
 msgstr "Ladda upp en ny profilbild"
 
 #: ../actions/invite.php:114 actions/invite.php:121
 msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
+"Use this form to invite your friends and colleagues to use this service."
+msgstr ""
+"Använd detta formulär för att bjuda in dina vänner och kollegor till denna "
+"sida."
+
+#: ../actions/register.php:159 ../actions/register.php:162
+#: actions/register.php:173 actions/register.php:176 actions/register.php:200
+#: actions/register.php:203
+msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
-"Använd detta formulär för att bjuda in dina vänner och kollegor till "
-"denna sida."
+"Används endast för uppdateringar, annonsering och återställning av lösenord"
+
+#: ../actions/finishremotesubscribe.php:86
+#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:92
+msgid "User being listened to doesn't exist."
+msgstr "Användaren som avlyssnas existerar inte."
+
+#: ../actions/all.php:41 ../actions/avatarbynickname.php:48
+#: ../actions/foaf.php:47 ../actions/replies.php:41
+#: ../actions/showstream.php:44 ../actions/twitapiaccount.php:82
+#: ../actions/twitapistatuses.php:319 ../actions/twitapistatuses.php:685
+#: ../actions/twitapiusers.php:82 actions/all.php:41
+#: actions/avatarbynickname.php:48 actions/foaf.php:47 actions/replies.php:41
+#: actions/showfavorites.php:41 actions/showstream.php:44
+#: actions/twitapiaccount.php:80 actions/twitapifavorites.php:68
+#: actions/twitapistatuses.php:235 actions/twitapistatuses.php:609
+#: actions/twitapiusers.php:87 lib/mailbox.php:50 actions/showstream.php:57
+#: actions/twitapiaccount.php:63 actions/twitapifavorites.php:40
+#: actions/twitapistatuses.php:163 actions/twitapistatuses.php:492
+#: lib/twitterapi.php:590
+msgid "User has no profile."
+msgstr "Användaren har ingen profil."
+
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
+msgid "User nickname"
+msgstr "Användarens smeknamn"
 
 #: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
 msgid "User not found."
 msgstr "Användare hittades inte."
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
 msgid "What timezone are you normally in?"
 msgstr "Vilken tidszon befinner du dig normalt?"
 
+#: ../lib/util.php:1159 lib/util.php:1293 lib/util.php:1630
+#, php-format
+msgid "What's up, %s?"
+msgstr "Vad är på gång, %s?"
+
+#: ../actions/profilesettings.php:54 ../actions/register.php:175
+#: actions/profilesettings.php:87 actions/register.php:189
+#: actions/profilesettings.php:89 actions/register.php:216
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr "Var du håller till, såsom \"Stad, Län, Land\""
+
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
+#, php-format
+msgid "Wrong image type for '%s'"
+msgstr "Fel filtyp för bild '%s'"
+
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
+#, php-format
+msgid "Wrong size image at '%s'"
+msgstr "Fel bildstorlek för '%s'"
+
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
 #: actions/deletenotice.php:64 actions/deletenotice.php:79
+#: actions/block.php:105
 msgid "Yes"
 msgstr "Ja"
 
+#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
+msgid "You already have this OpenID!"
+msgstr "Du handhar redan denna OpenID!"
+
 #: ../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 ""
-"Du håller på att tabort inlägget permanent. När det väl är gjort kan "
-"du inte ångra dig."
+"Du håller på att tabort inlägget permanent. När det väl är gjort kan du inte "
+"Ã¥ngra dig."
+
+#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
+msgid "You are already logged in!"
+msgstr "Du är redan inloggad!"
 
 #: ../actions/invite.php:81 actions/invite.php:88
 msgid "You are already subscribed to these users:"
 msgstr "Du prenumererar redan på dessa användare:"
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:102
 msgid "You are not friends with the specified user."
 msgstr "Du är inte vän med den användaren."
 
+#: ../actions/password.php:27
+msgid "You can change your password here. Choose a good one!"
+msgstr "Du kan ändra ditt lösenord här. Välj ett bra!"
+
+#: ../actions/register.php:135 actions/register.php:145
+msgid "You can create a new account to start posting notices."
+msgstr "Du kan skapa ett nytt konto och börja skriva inlägg."
+
 #: ../actions/smssettings.php:28 actions/smssettings.php:28
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Du kan ta emot SMS meddelande via email från %%site.name%%."
 
+#: ../actions/openidsettings.php:86
+msgid ""
+"You can remove an OpenID from your account by clicking the button marked "
+"\"Remove\"."
+msgstr ""
+"Du kan ta bort en OpenID ifrån ditt konto genom att klicka på knappen "
+"\"Remove\""
+
+#: ../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."
+msgstr ""
+"Du kan skicka och ta emot inlägg genom Jabber/GTalk [instant messages](%%doc."
+"im%%). Konfigurera din adress och inställningar nedan. "
+
+#: ../actions/profilesettings.php:27
+msgid ""
+"You can update your personal profile info here so people know more about you."
+msgstr ""
+"Du kan uppdatera din personliga profil här så personer får veta mer om dig."
+
+#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
+#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
+#: actions/finishremotesubscribe.php:83 actions/finishremotesubscribe.php:99
+msgid "You can use the local subscription!"
+msgstr "Du kan använda lokala prenumerationer!"
+
+#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
+#: actions/finishopenidlogin.php:38 actions/register.php:68
+#: actions/register.php:77
+msgid "You can't register if you don't agree to the license."
+msgstr "Du kan inte registrera dig om du inte godkänner licensvillkor."
+
+#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
+msgid "You did not send us that profile"
+msgstr "Du skickade inte oss den profilen"
+
 #: ../lib/mail.php:147
 #, php-format
 msgid ""
@@ -2284,9 +2479,11 @@ msgstr ""
 "\n"
 "Mer information får du på %3$s.\n"
 "\n"
-"Mvh,\n%4$s"
+"Mvh,\n"
+"%4$s"
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: actions/twitapistatuses.php:455
 msgid "You may not delete another user's status."
 msgstr "Du kan inte tabort nån annan användares status."
 
@@ -2303,15 +2500,107 @@ msgstr ""
 "du kommer bli meddelad när någon du bjudit in accepterar inbjudan och "
 "registrerar sig. Tack för att du hjälper oss växa!"
 
+#: ../actions/recoverpassword.php:149
+msgid "You've been identified. Enter a  new password below. "
+msgstr "Du är identifierad. Skriv ett nytt lösenord nedan."
+
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:84
+msgid "Your OpenID URL"
+msgstr "Din OpenID URL"
+
+#: ../actions/recoverpassword.php:164
+msgid "Your nickname on this server, or your registered email address."
+msgstr "Ditt användarnamn på denna server eller registrerad epost adress."
+
+#: ../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%%) låter dig logga in på flera sidor med samma konto. "
+"Ställ in ditt OpenID konto härifrån."
+
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:1287
+msgid "a few seconds ago"
+msgstr "ett par sekunder sedan"
+
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:1299
+#, php-format
+msgid "about %d days ago"
+msgstr "för %d dagar sedan"
+
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:1295
+#, php-format
+msgid "about %d hours ago"
+msgstr "för %d timmar sedan"
+
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:1291
+#, php-format
+msgid "about %d minutes ago"
+msgstr "för %d minuter sedan"
+
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:1303
+#, php-format
+msgid "about %d months ago"
+msgstr "för %d månader sedan"
+
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:1297
+msgid "about a day ago"
+msgstr "för en dag sedan"
+
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:1289
+msgid "about a minute ago"
+msgstr "för nån minut sedan"
+
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:1301
+msgid "about a month ago"
+msgstr "för en månad sedan"
+
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:1305
+msgid "about a year ago"
+msgstr "för ett år sedan"
+
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:1293
+msgid "about an hour ago"
+msgstr "för en timma sedan"
+
 #: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
+#: actions/showstream.php:441 lib/stream.php:99 lib/noticelist.php:211
 msgid "delete"
 msgstr "Tabort"
 
+#: ../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:135
+#: lib/facebookaction.php:202 lib/noticelist.php:189
+msgid "in reply to..."
+msgstr "svar till..."
+
+#: ../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:142
+#: lib/noticelist.php:199
+msgid "reply"
+msgstr "svar"
+
+#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/profilesettings.php:188
+msgid "same as password above"
+msgstr "samma som lösenordet ovan"
+
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+#: actions/twitapistatuses.php:543
 msgid "unsupported file type"
 msgstr "okänd fil typ"
 
+#: ../lib/util.php:1309 lib/util.php:1443 lib/facebookaction.php:251
+#: lib/util.php:1783
+#, fuzzy
+msgid "« After"
+msgstr "« Nyare"
+
 #: actions/deletenotice.php:74 actions/disfavor.php:43
 #: actions/emailsettings.php:127 actions/favor.php:45
 #: actions/finishopenidlogin.php:33 actions/imsettings.php:105
@@ -2321,6 +2610,12 @@ msgstr "okänd fil typ"
 #: 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:38 actions/deleteprofile.php:127 actions/disfavor.php:47
+#: actions/emailsettings.php:130 actions/favor.php:49 actions/login.php:45
+#: actions/newmessage.php:44 actions/newnotice.php:36 actions/nudge.php:47
+#: actions/othersettings.php:139 actions/profilesettings.php:49
+#: actions/subedit.php:38 actions/tagother.php:113
+#: actions/twittersettings.php:188 actions/unblock.php:38
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Det var något problem med din session. Försök igen, tack."
 
@@ -2344,12 +2639,14 @@ msgstr "Skicka mig ett email när någon lägger till mitt inlägg som favorit."
 msgid "Send me email when someone sends me a private message."
 msgstr "Skicka mig ett email när någon sänder ett privat meddelande."
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142
+#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:54
+#: actions/twitapifavorites.php:115
 msgid "This notice is already a favorite!"
 msgstr "Detta inlägg är redan en favorit!"
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
+#: classes/Command.php:132 actions/favor.php:61
+#: actions/twitapifavorites.php:122
 msgid "Could not create favorite."
 msgstr "Kunde inte skapa favorit."
 
@@ -2358,11 +2655,12 @@ msgid "Disfavor"
 msgstr "Avfavorisera"
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:62
 #, php-format
 msgid "%s favorite notices"
 msgstr "%s favoriter"
 
-#: actions/favoritesrss.php:64
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:66
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr "Feed över %s favoriter"
@@ -2390,47 +2688,50 @@ msgstr ""
 "%1$s har bjudit in dig till %2$s(%3$s).\n"
 "\n"
 
-#: actions/login.php:104
+#: actions/login.php:104 actions/login.php:111 actions/openidlogin.php:86
 msgid "Automatically login in the future; "
 msgstr "Logga in automatiskt;"
 
-#: actions/login.php:122
+#: actions/login.php:122 actions/login.php:130
 msgid "For security reasons, please re-enter your "
 msgstr "För säkerhets skull, skriv in dina"
 
-#: actions/login.php:126
+#: actions/login.php:126 actions/login.php:134
 msgid "Login with your username and password. "
 msgstr "Logga in med ditt användarnamn och lösenord."
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+#: actions/newmessage.php:60 actions/twitapidirect_messages.php:136
 msgid "That's too long. Max message size is 140 chars."
 msgstr "Det är för långt. Max är 140 tecken. "
 
-#: actions/newmessage.php:65
+#: actions/newmessage.php:65 actions/newmessage.php:68
 msgid "No recipient specified."
 msgstr "Ingen mottagare tillagd."
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
+#: classes/Command.php:206 actions/newmessage.php:71
+#: actions/newmessage.php:116 classes/Command.php:211
 msgid "You can't send a message to this user."
 msgstr "Du kan inte skicka meddelande till den användaren."
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
+#: classes/Command.php:209 actions/newmessage.php:74
+#: actions/twitapidirect_messages.php:153 classes/Command.php:214
 msgid ""
-"Don't send a message to yourself; just say it to yourself quietly "
-"instead."
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Skicka inte meddelande till dig själv, viska lite tyst istället."
 
-#: actions/newmessage.php:108
+#: actions/newmessage.php:108 actions/microsummary.php:32
+#: actions/newmessage.php:111
 msgid "No such user"
 msgstr "Ingen sådan användare"
 
-#: actions/newmessage.php:117
+#: actions/newmessage.php:117 actions/newmessage.php:120
 msgid "New message"
 msgstr "Nytt meddelande"
 
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:95 actions/noticesearch.php:94
 msgid "Notice without matching profile"
 msgstr "Inlägg utan matchande profil"
 
@@ -2470,8 +2771,7 @@ msgstr "Detta är din outbox som innehåller meddelanden som du skickat."
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
 msgstr ""
-"Sök efter personer på %%site.name%% efter deras namn, plats eller "
-"intressen."
+"Sök efter personer på %%site.name%% efter deras namn, plats eller intressen."
 
 #: actions/profilesettings.php:27
 msgid "You can update your personal profile info here "
@@ -2479,6 +2779,7 @@ msgstr "Du kan uppdatera din personliga profil här"
 
 #: actions/profilesettings.php:115 actions/remotesubscribe.php:320
 #: actions/userauthorization.php:159 actions/userrss.php:76
+#: actions/profilesettings.php:120 actions/remotesubscribe.php:333
 msgid "User without matching profile"
 msgstr "Användare utan matchande profil"
 
@@ -2506,20 +2807,19 @@ msgstr "Instruktioner för att återfå ditt lösenord"
 msgid "New password successfully saved. "
 msgstr "Nya lösenordet är sparat."
 
-#: actions/register.php:95
+#: actions/register.php:95 actions/register.php:104
 msgid "Password must be 6 or more characters."
 msgstr "Lösenordet måste vara minst 6 tecken."
 
-#: actions/register.php:216
+#: actions/register.php:216 actions/register.php:243
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to..."
 msgstr ""
-"Gratulerar, %s! Välkommen till %%%%site.name%%%%. Härifrån vill du "
-"kanske..."
+"Gratulerar, %s! Välkommen till %%%%site.name%%%%. Härifrån vill du kanske..."
 
-#: actions/register.php:227
+#: actions/register.php:227 actions/register.php:254
 msgid "(You should receive a message by email momentarily, with "
 msgstr "(Du kommer inom kort få ett email med"
 
@@ -2534,6 +2834,7 @@ msgid "Feed for favorites of %s"
 msgstr "Feed för %s favoriter"
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:88 actions/twitapifavorites.php:57
 msgid "Could not retrieve favorite notices."
 msgstr "Kunde inte ta emot favoritinläggen."
 
@@ -2555,7 +2856,7 @@ msgstr "Meddelande till %1$s på %2$s"
 msgid "Message from %1$s on %2$s"
 msgstr "Meddelande från %1$s på %2$s"
 
-#: actions/showstream.php:154
+#: actions/showstream.php:154 lib/util.php:2105
 msgid "Send a message"
 msgstr "Skicka ett meddelande"
 
@@ -2564,77 +2865,83 @@ msgstr "Skicka ett meddelande"
 msgid "Mobile carrier for your phone. "
 msgstr "Mobiloperatören för din telefon."
 
-#: actions/twitapidirect_messages.php:76
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:64
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Direktmeddelande till %s"
 
-#: actions/twitapidirect_messages.php:77
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:65
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "Alla direktmeddelanden skickade till %s"
 
-#: actions/twitapidirect_messages.php:81
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:69
 msgid "Direct Messages You've Sent"
 msgstr "Direktmeddelanden du skickat"
 
-#: actions/twitapidirect_messages.php:82
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:70
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "Alla direktmeddelanden skickade ifrån %s"
 
 #: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:132
 msgid "No message text!"
 msgstr "Ingen meddelande text!"
 
 #: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:145
 msgid "Recipient user not found."
 msgstr "Mottagaren kunde inte hittas."
 
 #: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:148
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
-"Kan inte skicka direktmeddelanden till användare som inte är dina "
-"vänner."
+"Kan inte skicka direktmeddelanden till användare som inte är dina vänner."
 
-#: actions/twitapifavorites.php:92
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:64
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s / Favoriter från %s"
 
-#: actions/twitapifavorites.php:95
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:67
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "%s uppdaterade favoriter av %s / %s."
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
+#: actions/twitapifavorites.php:158 lib/mail.php:303
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr "%s la till ditt inlägg som favorit"
 
 #: actions/twitapifavorites.php:188 lib/mail.php:276
+#: actions/twitapifavorites.php:159 lib/mail.php:304
 #, php-format
 msgid ""
 "%1$s just added your notice from %2$s as one of their favorites.\n"
 "\n"
-msgstr "%1$s la just in ditt inlägg ifrån %2$s som en av deras favorit.\n\n"
+msgstr ""
+"%1$s la just in ditt inlägg ifrån %2$s som en av deras favorit.\n"
+"\n"
 
-#: actions/twittersettings.php:27
+#: actions/twittersettings.php:27 actions/twittersettings.php:29
 msgid ""
 "Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 "Lägg till ditt Twitter konto för att automatiskt skicka dina inlägg till "
 "Twitter,"
 
-#: actions/twittersettings.php:41
+#: actions/twittersettings.php:41 actions/twittersettings.php:43
 msgid "Twitter settings"
 msgstr "Twitter inställningar"
 
-#: actions/twittersettings.php:48
+#: actions/twittersettings.php:48 actions/twittersettings.php:50
 msgid "Twitter Account"
 msgstr "Twitter konto"
 
-#: actions/twittersettings.php:56
+#: actions/twittersettings.php:56 actions/twittersettings.php:58
 msgid "Current verified Twitter account."
 msgstr "Verifierat Twitter konto."
 
@@ -2662,7 +2969,7 @@ msgstr "Skicka lokala \"@\" svar till Twitter."
 msgid "Subscribe to my Twitter friends here."
 msgstr "Prenumerera på mina Twitter vänner här."
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:216
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
@@ -2670,40 +2977,44 @@ msgstr ""
 "Användarnamn får bara innehålla nummer, stora och små bokstäver, och "
 "underscore(_). 15 tecken max."
 
-#: actions/twittersettings.php:128
+#: actions/twittersettings.php:128 actions/twittersettings.php:221
 msgid "Could not verify your Twitter credentials!"
 msgstr "Kunde inte verifiera din Twitter!"
 
-#: actions/twittersettings.php:137
+#: actions/twittersettings.php:137 actions/twittersettings.php:228
 #, php-format
 msgid "Unable to retrieve account information for \"%s\" from Twitter."
 msgstr "Kunde inte mottaga konto information för \"%s\" Twitter."
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:234 actions/twittersettings.php:253
 msgid "Unable to save your Twitter settings!"
 msgstr "Kunde inte spara dina Twitter inställningar!"
 
-#: actions/twittersettings.php:174
+#: actions/twittersettings.php:174 actions/twittersettings.php:261
 msgid "Twitter settings saved."
 msgstr "Twitter inställningar sparade."
 
-#: actions/twittersettings.php:192
+#: actions/twittersettings.php:192 actions/twittersettings.php:272
 msgid "That is not your Twitter account."
 msgstr "Det är inte ditt Twitter konto."
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:280
 msgid "Couldn't remove Twitter user."
 msgstr "Kunde inte tabort Twitter användaren."
 
-#: actions/twittersettings.php:212
+#: actions/twittersettings.php:212 actions/twittersettings.php:284
 msgid "Twitter account removed."
 msgstr "Twitterkontot borttaget."
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
+#: actions/twittersettings.php:299 actions/twittersettings.php:310
+#: actions/twittersettings.php:322
 msgid "Couldn't save Twitter preferences."
 msgstr "Kunde inte spara Twitter inställningar."
 
-#: actions/twittersettings.php:245
+#: actions/twittersettings.php:245 actions/twittersettings.php:330
 msgid "Twitter preferences saved."
 msgstr ""
 
@@ -2719,15 +3030,15 @@ msgstr ""
 msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#: classes/Channel.php:113
+#: classes/Channel.php:113 classes/Channel.php:129
 msgid "Command results"
 msgstr ""
 
-#: classes/Channel.php:148
+#: classes/Channel.php:148 classes/Channel.php:175
 msgid "Command complete"
 msgstr ""
 
-#: classes/Channel.php:158
+#: classes/Channel.php:158 classes/Channel.php:185
 msgid "Command failed"
 msgstr ""
 
@@ -2740,7 +3051,7 @@ msgstr ""
 msgid "Subscriptions: %1$s\n"
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:247
 msgid "User has no last notice"
 msgstr ""
 
@@ -2773,59 +3084,60 @@ msgstr "Hemsida: %s"
 msgid "About: %s"
 msgstr "Om: %s"
 
-#: classes/Command.php:200
+#: classes/Command.php:200 classes/Command.php:202
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: classes/Command.php:214
+#: classes/Command.php:214 classes/Command.php:219
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: classes/Command.php:216
+#: classes/Command.php:216 classes/Command.php:221
 msgid "Error sending direct message."
 msgstr ""
 
-#: classes/Command.php:263
+#: classes/Command.php:263 classes/Command.php:268
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: classes/Command.php:270
+#: classes/Command.php:270 classes/Command.php:275
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: classes/Command.php:288
+#: classes/Command.php:288 classes/Command.php:293
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: classes/Command.php:295
+#: classes/Command.php:295 classes/Command.php:300
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330
+#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:315
+#: classes/Command.php:335
 msgid "Command not yet implemented."
 msgstr ""
 
-#: classes/Command.php:313
+#: classes/Command.php:313 classes/Command.php:318
 msgid "Notification off."
 msgstr ""
 
-#: classes/Command.php:315
+#: classes/Command.php:315 classes/Command.php:320
 msgid "Can't turn off notification."
 msgstr ""
 
-#: classes/Command.php:333
+#: classes/Command.php:333 classes/Command.php:338
 msgid "Notification on."
 msgstr ""
 
-#: classes/Command.php:335
+#: classes/Command.php:335 classes/Command.php:340
 msgid "Can't turn on notification."
 msgstr ""
 
-#: classes/Command.php:344
+#: classes/Command.php:344 classes/Command.php:349
 msgid "Commands:\n"
 msgstr ""
 
@@ -2837,23 +3149,23 @@ msgstr ""
 msgid "Could not update message with new URI."
 msgstr ""
 
-#: lib/gallery.php:46
+#: lib/gallery.php:46 lib/gallery.php:55
 msgid "User without matching profile in system."
 msgstr ""
 
-#: lib/mail.php:147
+#: lib/mail.php:147 lib/mail.php:141
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:249
+#: lib/mail.php:249 lib/mail.php:275
 #, php-format
 msgid "New private message from %s"
 msgstr ""
 
-#: lib/mail.php:253
+#: lib/mail.php:253 lib/mail.php:279
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -2897,18 +3209,473 @@ msgstr ""
 msgid "Your sent messages"
 msgstr ""
 
-#: lib/settingsaction.php:99
+#: lib/settingsaction.php:99 actions/deleteprofile.php:256
 msgid "Twitter"
 msgstr ""
 
-#: lib/settingsaction.php:100
+#: lib/settingsaction.php:100 actions/deleteprofile.php:257
 msgid "Twitter integration options"
 msgstr ""
 
-#: lib/util.php:1718
+#: lib/util.php:1718 lib/util.php:2145
 msgid "To"
 msgstr ""
 
 #: scripts/maildaemon.php:45
 msgid "Could not parse message."
 msgstr ""
+
+#: actions/block.php:45 actions/subedit.php:45 actions/unblock.php:45
+#, fuzzy
+msgid "No profile specified."
+msgstr "Ingen mottagare tillagd."
+
+#: actions/block.php:52 actions/subedit.php:52 actions/tagother.php:45
+#: actions/unblock.php:52
+#, fuzzy
+msgid "No profile with that ID."
+msgstr "Ingen status hittad med det ID"
+
+#: actions/block.php:78
+#, fuzzy
+msgid "Block user"
+msgstr "Ingen sådan användare"
+
+#: actions/block.php:81
+#, fuzzy
+msgid "Are you sure you want to block this user? "
+msgstr "Är du säker på att du vill tabort detta inlägg?"
+
+#: actions/block.php:117
+#, fuzzy
+msgid "You have already blocked this user."
+msgstr "Du prenumererar redan på dessa användare:"
+
+#: actions/block.php:124
+msgid "Failed to save block information."
+msgstr ""
+
+#: actions/deleteprofile.php:25
+#, fuzzy
+msgid "Code not yet ready."
+msgstr "Kunde inte tabort favoriten."
+
+#: actions/deleteprofile.php:36
+msgid "Export and delete your user information."
+msgstr ""
+
+#: actions/deleteprofile.php:88 actions/deleteprofile.php:119
+#, fuzzy
+msgid "Delete my account"
+msgstr "Skapa ett nytt konto"
+
+#: actions/deleteprofile.php:89
+#, fuzzy
+msgid "Delete my account confirmation"
+msgstr "Kunde inte radera epost bekräftelsen."
+
+#: actions/deleteprofile.php:117
+#, fuzzy
+msgid "Check if you are sure you want to delete your account."
+msgstr "Är du säker på att du vill tabort detta inlägg?"
+
+#: actions/deleteprofile.php:259 lib/settingsaction.php:102
+msgid "Other"
+msgstr ""
+
+#: actions/deleteprofile.php:260 lib/settingsaction.php:103
+msgid "Other options"
+msgstr ""
+
+#: actions/disfavor.php:72
+#, fuzzy
+msgid "Add to favorites"
+msgstr "Feed för %s favoriter"
+
+#: actions/emailsettings.php:98
+msgid "Allow friends to nudge me and send me an email."
+msgstr ""
+
+#: actions/facebookremove.php:54
+#, fuzzy
+msgid "Couldn't remove Facebook user."
+msgstr "Kunde inte tabort Twitter användaren."
+
+#: actions/favor.php:71
+#, fuzzy
+msgid "Disfavor favorite"
+msgstr "Avfavorisera"
+
+#: actions/favorited.php:31 lib/stream.php:45
+#, fuzzy
+msgid "Popular notices"
+msgstr "Inget sådant inlägg."
+
+#: actions/favorited.php:54
+#, fuzzy
+msgid "Showing recently popular notices"
+msgstr "Sök innehåll i inlägg"
+
+#: actions/featured.php:32 actions/featured.php:54 lib/stream.php:41
+msgid "Featured users"
+msgstr ""
+
+#: actions/finishremotesubscribe.php:186
+msgid "That user has blocked you from subscribing."
+msgstr ""
+
+#: actions/microsummary.php:39
+msgid "No current status"
+msgstr ""
+
+#: actions/newnotice.php:93
+#, fuzzy
+msgid "Notice posted"
+msgstr "Inlägg"
+
+#: actions/newnotice.php:116 classes/Channel.php:140
+msgid "Ajax Error"
+msgstr ""
+
+#: actions/nudge.php:52
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
+
+#: actions/nudge.php:61
+msgid "Nudge sent"
+msgstr ""
+
+#: actions/othersettings.php:27
+msgid "Manage various other options."
+msgstr ""
+
+#: actions/othersettings.php:33
+#, fuzzy
+msgid "Other Settings"
+msgstr "Twitter inställningar"
+
+#: actions/othersettings.php:35
+msgid "URL Auto-shortening"
+msgstr ""
+
+#: actions/othersettings.php:54
+#, fuzzy
+msgid "Service"
+msgstr "Sök"
+
+#: actions/othersettings.php:54
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/othersettings.php:155
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Språket är för långt(max 50 tecken)."
+
+#: actions/peopletag.php:33
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "Ingen giltig emailadress"
+
+#: actions/peopletag.php:45
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr ""
+
+#: actions/peopletag.php:87
+#, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+msgstr ""
+
+#: actions/profilesettings.php:92
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+
+#: actions/profilesettings.php:246 actions/tagother.php:131
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Ogiltig hemsideadress '%s'"
+
+#: actions/profilesettings.php:328
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "Kunde inte spara profil."
+
+#: actions/public.php:68
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
+msgstr ""
+
+#: actions/public.php:90
+#, fuzzy
+msgid "Could not retrieve public stream."
+msgstr "Kunde inte ta emot favoritinläggen."
+
+#: actions/register.php:67 actions/register.php:177
+msgid "Sorry, only invited people can register."
+msgstr ""
+
+#: actions/register.php:156
+msgid "With this form you can create a new account. "
+msgstr ""
+
+#: actions/remotesubscribe.php:136 actions/remotesubscribe.php:141
+msgid "That's a local profile! Login to subscribe."
+msgstr ""
+
+#: actions/subedit.php:68
+#, fuzzy
+msgid "You are not subscribed to that profile."
+msgstr "Du skickade inte oss den profilen"
+
+#: actions/subedit.php:81
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "Kunde inte skapa prenumeration."
+
+#: actions/subscribe.php:53
+#, fuzzy
+msgid "Not a local user."
+msgstr "Ingen sådan användare"
+
+#: actions/subscribe.php:67
+#, fuzzy
+msgid "Subscribed"
+msgstr "Prenumerera"
+
+#: actions/subscriptions.php:72
+#, fuzzy
+msgid "Jabber"
+msgstr "Inget Jabber ID."
+
+#: actions/tagother.php:31
+#, fuzzy
+msgid "Not logged in"
+msgstr "Inte inloggad."
+
+#: actions/tagother.php:40
+#, fuzzy
+msgid "No id argument."
+msgstr "Inget sådant dokument."
+
+#: actions/tagother.php:56
+msgid "Tag a person"
+msgstr ""
+
+#: actions/tagother.php:98
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
+msgstr ""
+
+#: actions/tagother.php:120
+#, fuzzy
+msgid "No such profile."
+msgstr "Inget sådant inlägg."
+
+#: actions/tagother.php:146
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+
+#: actions/tagother.php:153
+#, fuzzy
+msgid "Could not save tags."
+msgstr "Kunde inte spara informationen om användarbild"
+
+#: actions/tagother.php:188
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
+
+#: actions/tagrss.php:33
+#, fuzzy
+msgid "No such tag."
+msgstr "Inget sådant meddelande."
+
+#: actions/tagrss.php:62
+#, fuzzy, php-format
+msgid "Microblog tagged with %s"
+msgstr "Inlägg taggade med %s"
+
+#: actions/twitapiblocks.php:45
+msgid "Block user failed."
+msgstr ""
+
+#: actions/twitapiblocks.php:66
+msgid "Unblock user failed."
+msgstr ""
+
+#: actions/twitapiusers.php:45
+#, fuzzy
+msgid "Not found."
+msgstr "Hittades inte"
+
+#: actions/twittersettings.php:63
+#, fuzzy
+msgid "Twitter user name"
+msgstr "Twitter användarnamn"
+
+#: actions/twittersettings.php:67
+#, fuzzy
+msgid "Twitter password"
+msgstr "Twitter lösenord"
+
+#: actions/twittersettings.php:129
+#, fuzzy
+msgid "Twitter Friends"
+msgstr "Twitter inställningar"
+
+#: actions/unblock.php:73
+#, fuzzy
+msgid "Error removing the block."
+msgstr "Fel uppstog när användaren skulle sparas."
+
+#: actions/unsubscribe.php:48
+#, fuzzy
+msgid "No profile id in request."
+msgstr "Ingen profil URL lämnades ut av servern."
+
+#: actions/unsubscribe.php:55
+#, fuzzy
+msgid "No profile with that id."
+msgstr "Ingen status hittad med det ID"
+
+#: actions/unsubscribe.php:69
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Lämnar pren."
+
+#: classes/Notice.php:100
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "Det var ett problem när inlägget sparades."
+
+#: classes/Notice.php:105
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+
+#: classes/Notice.php:112
+msgid "You are banned from posting notices on this site."
+msgstr ""
+
+#: lib/gallery.php:98
+#, fuzzy
+msgid "Filter tags"
+msgstr "Feed för taggar %s"
+
+#: lib/gallery.php:104
+msgid "All"
+msgstr ""
+
+#: lib/gallery.php:108
+#, fuzzy
+msgid "Tag"
+msgstr "Taggar"
+
+#: lib/gallery.php:109
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/gallery.php:110
+msgid "Go"
+msgstr ""
+
+#: lib/gallery.php:264
+#, fuzzy
+msgid "Subscriptions navigation"
+msgstr "Prenumerationer"
+
+#: lib/gallery.php:270 lib/gallery.php:292
+msgid "List"
+msgstr ""
+
+#: lib/gallery.php:280 lib/gallery.php:294
+msgid "Icons"
+msgstr ""
+
+#: lib/mail.php:92
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:242
+#, fuzzy, php-format
+msgid "You've been nudged by %s"
+msgstr "Du är identifierad. Skriv in"
+
+#: lib/mail.php:246
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+msgstr ""
+
+#: lib/profilelist.php:146
+msgid "(none)"
+msgstr ""
+
+#: lib/stream.php:33
+msgid "Public"
+msgstr "Publik"
+
+#: lib/stream.php:36 lib/stream.php:37
+#, fuzzy
+msgid "Recent tags"
+msgstr "Tidigare taggar"
+
+#: lib/stream.php:40
+msgid "Featured"
+msgstr ""
+
+#: lib/stream.php:44
+#, fuzzy
+msgid "Popular"
+msgstr "Personer"
+
+#: lib/subs.php:51
+#, fuzzy
+msgid "User has blocked you."
+msgstr "Användaren har ingen profil."
+
+#: lib/util.php:2059
+#, fuzzy
+msgid "Send a nudge"
+msgstr "Skicka ett meddelande"
+
+#: lib/util.php:2063
+msgid "Nudge sent!"
+msgstr ""
+
+#: lib/util.php:2194
+msgid "Block"
+msgstr ""
+
+#: lib/util.php:2198
+msgid "Unblock"
+msgstr ""
+
+#~ msgid "Couldn't confirm email."
+#~ msgstr "Kunde inte bekräfta epost"
+
+#~ msgid "Email address"
+#~ msgstr "Epostadress"
+
+#~ msgid "Error inserting notice"
+#~ msgstr "Fel uppstog när inlägget skulle läggas till"
+
+#~ 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 ""
+#~ "Om du har förlorat eller glömt bort ditt lösenord så kan du få ett nytt "
+#~ "skickat till din epost, kopplat till ditt konto."
diff --git a/te_IN/LC_MESSAGES/laconica.po b/te_IN/LC_MESSAGES/laconica.po
index 98ee165619..72f29386c8 100644
--- a/te_IN/LC_MESSAGES/laconica.po
+++ b/te_IN/LC_MESSAGES/laconica.po
@@ -13,47 +13,86 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-14 21:07+1200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Veeven <veeven@gmail.com>\n"
-"Language-Team: Telugu <l10n@etelugu.org>\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"
-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"POT-Creation-Date: 2009-01-12 12:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/noticesearchrss.php:64
+#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:61
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr "\"%s\"కై అన్వేషణ వాహిని"
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: actions/finishopenidlogin.php:88 actions/register.php:205
+#: actions/register.php:232
+msgid ""
+" except this private data: password, email address, IM address, phone number."
+msgstr "ఈ అంతరంగిక భోగట్టా తప్ప: సంకేతపదం, ఈమెయిల్ చిరునామా, IM చిరునామా, ఫోన్ నంబర్."
+
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+#: lib/facebookaction.php:195 lib/noticelist.php:160
+msgid " from "
+msgstr ""
+
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: actions/twitapistatuses.php:341
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr ""
+
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
+
+#: ../actions/invite.php:170
+#, php-format
 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 ""
-"ఈ అంతరంగిక భోగట్టా తప్ప: "
-"సంకేతపదం, ఈమెయిల్ చిరునామా, IM చిరునామా, ఫోన్ నంబర్."
 
-#: ../actions/subscribe.php:84 ../lib/mail.php:124 lib/mail.php:124
-#: lib/mail.php:126
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:115
+#: lib/mail.php:117
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr ""
 
-#: ../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"
@@ -64,118 +103,259 @@ msgid ""
 "%4$s.\n"
 msgstr ""
 
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#: actions/twitapistatuses.php:344
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
+
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
+#: actions/shownotice.php:73
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr ""
 
-#: ../actions/publicrss.php:60
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../actions/publicrss.php:62 actions/publicrss.php:48
 #, php-format
 msgid "%s Public Stream"
 msgstr "%s ప్రజా వాహిని"
 
-#: ../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/twitapistatuses.php:123
 #, php-format
 msgid "%s and friends"
 msgstr "%s మరియు మిత్రులు"
 
-#: ../lib/util.php:233 ../lib/util.php:257 lib/util.php:273
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:31
 #, php-format
-#, fuzzy
+msgid "%s public timeline"
+msgstr ""
+
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:217
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:195
+#, php-format
+msgid "%s timeline"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:34
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+
+#: ../lib/util.php:257 lib/util.php:273 lib/util.php:284
+#, fuzzy, 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.broughtby%%](%%site.broughtbyurl%%) వారు "
-"అందిస్తున్న ఈ **%%site.name%%** అనేది మైక్రో బ్లాగింగు సదుపాయం."
+"[%%site.broughtby%%](%%site.broughtbyurl%%) వారు అందిస్తున్న ఈ **%%site.name%%** "
+"అనేది మైక్రో బ్లాగింగు సదుపాయం."
 
-#: ../lib/util.php:235
+#: ../lib/util.php:259 lib/util.php:275 lib/util.php:286
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** అనేది మైక్రో బ్లాగింగు సదుపాయం."
 
-#: ../lib/util.php:250 ../lib/util.php:274 lib/util.php:290
+#: ../lib/util.php:274 lib/util.php:290 lib/util.php:301
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: ../actions/register.php:176
+#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
+#: actions/profilesettings.php:78
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అంకెలు, విరామచిహ్నాలు మరియు ఖాళీలు తప్ప"
 
-#: ../actions/password.php:42 ../actions/register.php:178
+#: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:193
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/profilesettings.php:186
 msgid "6 or more characters"
 msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు"
 
-#: ../actions/recoverpassword.php:165
+#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు, మర్చిపోకండి!"
 
-#: ../actions/imsettings.php:188 ../actions/imsettings.php:197
-#: actions/imsettings.php:205
+#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:195
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, 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
+#: actions/emailsettings.php:234
+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 ""
+
+#: ../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/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:30
+#: actions/twitapidirect_messages.php:107 actions/twitapifavorites.php:83
+#: actions/twitapifavorites.php:99 actions/twitapifriendships.php:117
+#: actions/twitapihelp.php:42 actions/twitapistatuses.php:77
+#: actions/twitapistatuses.php:144 actions/twitapistatuses.php:224
+#: actions/twitapistatuses.php:234 actions/twitapistatuses.php:386
+#: actions/twitapistatuses.php:395 actions/twitapistatuses.php:421
+#: actions/twitapiusers.php:30
+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:39
+#: actions/twitapiaccount.php:89 actions/twitapiaccount.php:94
+#: actions/twitapidirect_messages.php:178 actions/twitapifavorites.php:139
+#: actions/twitapihelp.php:49 actions/twitapistatuses.php:549
+msgid "API method under construction."
 msgstr ""
 
-#: ../lib/util.php:296
+#: ../lib/util.php:324 lib/util.php:340 lib/util.php:352
 msgid "About"
 msgstr "గురించి"
 
-#: ../actions/userauthorization.php:118
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
 msgid "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/twittersettings.php:84
 msgid "Add"
 msgstr "చేర్చు"
 
-#: ../actions/openidsettings.php:43
+#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
 msgid "Add OpenID"
 msgstr "ఓపెన్ఐడీని చేర్చు"
 
-#: ../actions/imsettings.php:39
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: actions/deleteprofile.php:248
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
 msgid "Address"
 msgstr "చిరునామా"
 
-#: ../actions/showstream.php:254
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
+
+#: ../actions/showstream.php:273 actions/showstream.php:288
+#: actions/showstream.php:336
 msgid "All subscriptions"
 msgstr "అన్ని చందాలు"
 
-#: ../actions/publicrss.php:62
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
 #, php-format
 msgid "All updates for %s"
 msgstr "%s కోసం అన్ని తాజాకరణలూ"
 
-#: ../actions/noticesearchrss.php:66
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:63
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "\"%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
 msgid "Already logged in."
 msgstr "ఇప్పటికే లోనికి ప్రవేశించారు."
 
-#: ../actions/subscribe.php:48
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:47
 msgid "Already subscribed!."
 msgstr "ఇప్పటికే చేరారు!"
 
-#: ../actions/userauthorization.php:76 ../actions/userauthorization.php:77
-#: actions/userauthorization.php:83
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+msgid "Are you sure you want to delete this notice?"
+msgstr ""
+
+#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
 msgid "Authorize subscription"
 msgstr ""
 
-#: ../actions/login.php:100 ../actions/register.php:184
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192 actions/register.php:219
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "భవిష్యత్తులో ఆటోమెటిగ్గా లోనికి ప్రవేశించు; బయటి కంప్యూర్ల కొరకు కాదు!"
 
-#: ../actions/avatar.php:32
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:103
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
+
+#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: actions/profilesettings.php:34
 msgid "Avatar"
 msgstr "అవతారం"
 
-#: ../actions/avatar.php:113
+#: ../actions/avatar.php:113 actions/profilesettings.php:350
+#: actions/profilesettings.php:379
 msgid "Avatar updated."
 msgstr "అవతారాన్ని తాజాకరించాం."
 
@@ -186,29 +366,53 @@ msgid ""
 "message with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 
-#: ../lib/util.php:1136
-msgid "Before »"
+#: ../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 ""
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+msgid "Awaiting confirmation on this phone number."
+msgstr ""
+
+#: ../lib/util.php:1318 lib/util.php:1452 lib/facebookaction.php:259
+#: lib/util.php:1792
+#, fuzzy
+msgid "Before »"
 msgstr "ఇంతక్రితం »"
 
-#: ../actions/profilesettings.php:52
+#: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: actions/profilesettings.php:82 actions/register.php:184
+#: actions/profilesettings.php:84 actions/register.php:211
 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:222 actions/register.php:98
 msgid "Bio is too long (max 140 chars)."
 msgstr "స్వపరిచయం చాలా పెద్దగా ఉంది (140 అక్షరాలు గరిష్ఠం)."
 
-#: ../actions/updateprofile.php:118 ../actions/updateprofile.php:119
-#: actions/updateprofile.php:120
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+msgid "Can't delete this notice."
+msgstr ""
+
+#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr ""
 
-#: ../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/profilesettings.php:433
 msgid "Can't save new password."
 msgstr "కొత్త సంకేతపదాన్ని భద్రపరచలేము."
 
-#: ../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
 msgid "Cancel"
 msgstr "రద్దుచేయి"
 
@@ -216,244 +420,380 @@ msgstr "రద్దుచేయి"
 msgid "Cannot instantiate OpenID consumer object."
 msgstr ""
 
-#: ../actions/imsettings.php:154 ../actions/imsettings.php:163
-#: actions/imsettings.php:171
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
 msgid "Cannot normalize that Jabber ID"
 msgstr ""
 
-#: ../actions/password.php:45
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:204
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/profilesettings.php:189
 msgid "Change"
 msgstr "మార్చు"
 
-#: ../actions/password.php:32
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: actions/deleteprofile.php:245
+msgid "Change email handling"
+msgstr ""
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
 msgid "Change password"
 msgstr "సంకేతపదం మార్చుకోండి"
 
-#: ../actions/password.php:43 ../actions/recoverpassword.php:166
-#: ../actions/register.php:179
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr ""
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#: actions/deleteprofile.php:242
+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/profilesettings.php:187 actions/register.php:196
 msgid "Confirm"
 msgstr "నిర్థారించు"
 
-#: ../actions/confirmaddress.php:84
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
 msgid "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:259
 msgid "Confirmation cancelled."
 msgstr "నిర్ధారణ రద్దయింది."
 
-#: ../actions/confirmaddress.php:38
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+msgid "Confirmation code"
+msgstr ""
+
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
 msgid "Confirmation code not found."
 msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
 
-#: ../actions/finishopenidlogin.php:91
+#: ../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:97
 msgid "Connect"
 msgstr "అనుసంధానించు"
 
-#: ../actions/finishopenidlogin.php:86
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
 msgid "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/util.php:360
 msgid "Contact"
 msgstr "సంప్రదించు"
 
-#: ../lib/openid.php:178
+#: ../lib/openid.php:178 lib/openid.php:178
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "ఓపెన్ఐడీ ఫారమును సృష్టించలేకపోయాం: %s"
 
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:46 actions/twitapifriendships.php:62
+#, 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:39
+msgid "Could not follow user: User not found."
+msgstr ""
+
 #: ../lib/openid.php:160 lib/openid.php:160
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr ""
 
-#: ../actions/updateprofile.php:161
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
 msgid "Could not save avatar info"
 msgstr "అవతారపు సమాచారాన్ని భద్రపరచలేకున్నాం"
 
-#: ../actions/updateprofile.php:154
+#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
 msgid "Could not save new profile info"
 msgstr "కొత్త ప్రొఫైలు సమాచారాన్ని భద్రపరచలేకున్నాం"
 
-#: ../actions/profilesettings.php:146
-msgid "Couldn't confirm email."
-msgstr "ఈమెయిలుని నిర్ధారించలేకున్నాం."
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:70
+msgid "Could not subscribe other to you."
+msgstr ""
+
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:55
+msgid "Could not subscribe."
+msgstr ""
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr ""
 
 #: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101
+#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:112
 msgid "Couldn't convert request tokens to access tokens."
 msgstr ""
 
-#: ../actions/subscribe.php:59
-msgid "Couldn't create subscription."
-msgstr "చందాని సృష్టించలేకపోయాం."
-
-#: ../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/emailsettings.php:255
 msgid "Couldn't delete email confirmation."
 msgstr "ఈమెయిల్ నిర్ధారణని తొలగించలేకున్నాం."
 
-#: ../actions/unsubscribe.php:56
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:129
 msgid "Couldn't delete subscription."
 msgstr "చందాని తొలగించలేకపోయాం."
 
-#: ../actions/remotesubscribe.php:125 ../actions/remotesubscribe.php:127
-#: actions/remotesubscribe.php:136
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+#: actions/twitapistatuses.php:82
+msgid "Couldn't find any statuses."
+msgstr ""
+
+#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
+#: actions/remotesubscribe.php:148
 msgid "Couldn't get a request token."
 msgstr ""
 
-#: ../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:228
 msgid "Couldn't insert confirmation code."
 msgstr "నిర్ధారణ సంకేతాన్ని చేర్చలేకపోయాం."
 
 #: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182
+#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:216
 msgid "Couldn't insert new subscription."
 msgstr ""
 
-#: ../actions/profilesettings.php:175
+#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
+#: actions/profilesettings.php:319 actions/twitapiaccount.php:74
 msgid "Couldn't save profile."
 msgstr "ప్రొఫైలుని భద్రపరచలేకున్నాం."
 
-#: ../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:296
+msgid "Couldn't update user for autosubscribe."
+msgstr ""
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+#: actions/emailsettings.php:301 actions/emailsettings.php:315
+msgid "Couldn't update user record."
+msgstr ""
+
+#: ../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/emailsettings.php:179 actions/emailsettings.php:280
+#: actions/othersettings.php:173 actions/profilesettings.php:276
 msgid "Couldn't update user."
 msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
 
-#: ../actions/finishopenidlogin.php:84
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
 msgid "Create"
 msgstr "సృష్టించు"
 
-#: ../actions/finishopenidlogin.php:70
+#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
 msgid "Create a new user with this nickname."
 msgstr "ఈ పేరుతో కొత్త వాడుకరిని సృష్టించు"
 
-#: ../actions/finishopenidlogin.php:68
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
 msgid "Create new account"
 msgstr "కొత్త ఖాతా సృష్టించుకోండి"
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+#: actions/finishopenidlogin.php:208
 msgid "Creating new account for OpenID that already has a user."
 msgstr ""
 
-#: ../actions/imsettings.php:45
+#: ../actions/imsettings.php:45 actions/imsettings.php:46
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "ప్రస్తుతం నిర్ధారించిన Jabber/GTalk చిరునామా"
 
-#: ../actions/showstream.php:337
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+msgid "Current confirmed email address."
+msgstr ""
+
+#: ../actions/showstream.php:356 actions/showstream.php:367
+#: actions/showstream.php:418
 msgid "Currently"
 msgstr "ప్రస్తుతం"
 
-#: ../lib/util.php:893 ../lib/util.php:1061 lib/util.php:1110
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:87
 #, php-format
-msgid "DB error inserting reply: %s"
+msgid "DB error inserting hashtag: %s"
 msgstr ""
 
-#: ../actions/profilesettings.php:54
-msgid "Describe yourself and your interests in 140 chars"
+#: ../lib/util.php:1061 lib/util.php:1110 lib/util.php:1417
+#, php-format
+msgid "DB error inserting reply: %s"
+msgstr ""
+
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+msgid "Delete notice"
+msgstr ""
+
+#: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: actions/profilesettings.php:84 actions/register.php:186
+#: actions/profilesettings.php:86 actions/register.php:213
+msgid "Describe yourself and your interests in 140 chars"
 msgstr "మీ గురించి మరియు మీ ఆసక్తుల గురించి 140 అక్షరాల్లో చెప్పండి"
 
-#: ../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/deleteprofile.php:244 actions/register.php:199
+#: actions/register.php:202
 msgid "Email"
 msgstr "ఈమెయిల్"
 
-#: ../actions/profilesettings.php:46
-msgid "Email address"
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+msgid "Email Address"
 msgstr "ఈమెయిల్ చిరునామా"
 
-#: ../actions/profilesettings.php:102 ../actions/register.php:63
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+msgid "Email Settings"
+msgstr "ఈమెయిల్ అమరికలు"
+
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:89
 msgid "Email address already exists."
 msgstr "ఈమెయిల్ చిరునామా ఇప్పటికే ఉంది."
 
-#: ../lib/mail.php:82
+#: ../lib/mail.php:90 lib/mail.php:90
 msgid "Email address confirmation"
 msgstr "ఈమెయిల్ చిరునామా నిర్ధారణ"
 
-#: ../actions/recoverpassword.php:176
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+msgid "Email address, like \"UserName@example.org\""
+msgstr "ఈమెయిల్ చిరునామా, \"username@example.org\" వలె"
+
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr ""
+
+#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
 msgid "Enter a nickname or email address."
 msgstr "పేరు లేదా ఈమెయిల్ చిరునామా ఇవ్వండి."
 
-#: ../actions/userauthorization.php:136 ../actions/userauthorization.php:137
-#: actions/userauthorization.php:144
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+msgid "Enter the code you received on your phone."
+msgstr ""
+
+#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
 msgid "Error authorizing token"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:282
+#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
+#: actions/finishopenidlogin.php:274
 msgid "Error connecting user to OpenID."
 msgstr "వాడుకరిని ఓపెన్ఐడీకి అనుసంధానించటంలో పొరపాటు."
 
-#: ../actions/finishaddopenid.php:78
+#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
 msgid "Error connecting user."
 msgstr "వాడుకరిని అనుసంధానించడంలో పొరపాటు."
 
 #: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:164
 #, fuzzy
 msgid "Error inserting avatar"
 msgstr ""
 "#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"అవతారాన్ని పెట్టడంలో "
-"పొరపాటు\n"
+"అవతారాన్ని పెట్టడంలో పొరపాటు\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
 #: ../actions/finishremotesubscribe.php:143
+#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:156
 msgid "Error inserting new profile"
 msgstr "కొత్త ప్రొపైలుని చేర్చటంలో పొరపాటు"
 
-#: ../actions/postnotice.php:88
-msgid "Error inserting notice"
-msgstr "సందేశాన్ని చేర్చటంలో పొరపాటు"
-
 #: ../actions/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:180
 msgid "Error inserting remote profile"
 msgstr "దూరపు ప్రొపైలుని చేర్చటంలో పొరపాటు"
 
-#: ../actions/recoverpassword.php:201
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
 msgid "Error saving address confirmation."
 msgstr "చిరునామా నిర్ధారణని భద్రపరచడంలో పొరపాటు."
 
-#: ../actions/userauthorization.php:139
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
 msgid "Error saving remote profile"
 msgstr "దూరపు ప్రొఫైలుని భద్రపరచడంలో పొరపాటు"
 
-#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
+#: ../lib/openid.php:226 lib/openid.php:226
 msgid "Error saving the profile."
 msgstr "ప్రొఫైలుని భద్రపరచడంలో పొరపాటు."
 
-#: ../lib/openid.php:237
+#: ../lib/openid.php:237 lib/openid.php:237
 msgid "Error saving the user."
 msgstr "వాడుకరిని భద్రపరచడంలో పొరపాటు."
 
-#: ../actions/password.php:80
+#: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/profilesettings.php:428
 msgid "Error saving user; invalid."
 msgstr "వాడుకరిని భద్రపరచడంలో పొరపాటు: సరికాదు."
 
-#: ../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/register.php:108 actions/login.php:54 actions/login.php:80
+#: actions/register.php:117
 msgid "Error setting user."
 msgstr ""
 
-#: ../actions/finishaddopenid.php:83
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
 msgid "Error updating profile"
 msgstr "ప్రొపైలుని తాజాకరించటంలో పొరపాటు"
 
 #: ../actions/finishremotesubscribe.php:161
+#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:174
 msgid "Error updating remote profile"
 msgstr "దూరపు ప్రొపైలుని తాజాకరించటంలో పొరపాటు"
 
-#: ../actions/recoverpassword.php:79
+#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
 msgid "Error with confirmation code."
 msgstr "నిర్ధారణ సంకేతంలో పొరపాటు."
 
-#: ../actions/finishopenidlogin.php:89
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
 msgid "Existing nickname"
 msgstr "ప్రస్తుత పేరు"
 
-#: ../lib/util.php:298 ../lib/util.php:326 lib/util.php:342
+#: ../lib/util.php:326 lib/util.php:342 lib/util.php:354
 #, fuzzy
 msgid "FAQ"
 msgstr ""
@@ -461,41 +801,61 @@ msgstr ""
 "తవసం\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/avatar.php:115
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/profilesettings.php:381
 msgid "Failed updating avatar."
 msgstr "అవతారపు తాజాకరణ విఫలమైంది."
 
-#: ../actions/all.php:61 ../actions/allrss.php:74
+#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
+#: actions/allrss.php:64
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "%s యొక్క మిత్రుల ఫీడు"
 
-#: ../actions/replies.php:61 ../actions/repliesrss.php:80
+#: ../actions/replies.php:65 ../actions/repliesrss.php:80
+#: actions/replies.php:65 actions/repliesrss.php:66
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "%sకి వచ్చిన స్పందనల ఫీడు"
 
-#: ../actions/login.php:118
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:54
+#, php-format
+msgid "Feed for tag %s"
+msgstr ""
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+msgid "Find content of notices"
+msgstr ""
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+msgid "Find people on this site"
+msgstr ""
+
+#: ../actions/login.php:122
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
-"భద్రతా కారణాల దృష్ట్యా, "
-"అమరికలు మార్చే ముందు మీ వాడుకరి పేరుని మరియు సంకేతపదాన్ని మరోసారి ఇవ్వండి."
+"భద్రతా కారణాల దృష్ట్యా, అమరికలు మార్చే ముందు మీ వాడుకరి పేరుని మరియు సంకేతపదాన్ని మరోసారి ఇవ్వండి."
 
-#: ../actions/profilesettings.php:44
+#: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: actions/profilesettings.php:77 actions/register.php:178
+#: actions/profilesettings.php:79 actions/register.php:205
 msgid "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/profilesettings.php:219 actions/register.php:95
 msgid "Full name is too long (max 255 chars)."
 msgstr "పూర్తి పేరు చాలా పెద్దగా ఉంది (గరిష్ఠంగా 255 అక్షరాలు)."
 
-#: ../lib/util.php:279
+#: ../lib/util.php:322 lib/util.php:338 lib/util.php:343 lib/util.php:350
 msgid "Help"
 msgstr "సహాయం"
 
-#: ../lib/util.php:274 ../lib/util.php:298 lib/util.php:314
+#: ../lib/util.php:298 lib/util.php:314 lib/util.php:325
 #, fuzzy
 msgid "Home"
 msgstr ""
@@ -503,9 +863,9 @@ msgstr ""
 "వాకిలి\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/profilesettings.php:49 ../actions/profilesettings.php:46
-#: ../actions/register.php:167 actions/profilesettings.php:79
-#: actions/register.php:181
+#: ../actions/profilesettings.php:46 ../actions/register.php:167
+#: actions/profilesettings.php:79 actions/register.php:181
+#: actions/profilesettings.php:81 actions/register.php:208
 #, fuzzy
 msgid "Homepage"
 msgstr ""
@@ -513,25 +873,37 @@ msgstr ""
 "హోమ్ పేజీ\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/profilesettings.php:87
+#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: actions/profilesettings.php:210 actions/register.php:83
+#: actions/profilesettings.php:216 actions/register.php:92
 msgid "Homepage is not a valid URL."
 msgstr "హోమ్ పేజీ URL సరైనది కాదు."
 
-#: ../actions/imsettings.php:61
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+#: actions/emailsettings.php:101
+msgid "I want to post notices by email."
+msgstr ""
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+#: actions/deleteprofile.php:253
+msgid "IM"
+msgstr ""
+
+#: ../actions/imsettings.php:60 actions/imsettings.php:61
 msgid "IM Address"
 msgstr "IM చిరునామా"
 
-#: ../actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
 msgid "IM Settings"
 msgstr "IM అమరికలు"
 
-#: ../actions/finishopenidlogin.php:88
+#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
 msgstr ""
-"మీకు ఇప్పటికే ఖాతా ఉంటే, మీ "
-"వాడుకరిపేరు మరియు సంకేతపదంతో లోనికి ప్రవేశించి మీ ఓపెన్ఐడీని మీ ఖాతాకి జతచేసుకోండి."
+"మీకు ఇప్పటికే ఖాతా ఉంటే, మీ వాడుకరిపేరు మరియు సంకేతపదంతో లోనికి ప్రవేశించి మీ ఓపెన్ఐడీని మీ ఖాతాకి "
+"జతచేసుకోండి."
 
 #: ../actions/openidsettings.php:45
 msgid ""
@@ -539,189 +911,288 @@ msgid ""
 "click \"Add\"."
 msgstr ""
 
-#: ../actions/recoverpassword.php:122
+#: ../actions/recoverpassword.php:137
 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 ""
-"మీరు మీ సంకేతపదాన్ని "
-"మర్చిపోతే, మీ ఖాతాలో భద్రపరచిన ఈమెయిలుకి కొత్తదాన్ని పంపించుకోవచ్చు."
 
-#: ../actions/password.php:69
+#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
+#: actions/emailsettings.php:68 actions/smssettings.php:76
+msgid "Incoming email"
+msgstr ""
+
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+#: actions/emailsettings.php:304
+msgid "Incoming email address removed."
+msgstr ""
+
+#: ../actions/password.php:69 actions/profilesettings.php:388
+#: actions/profilesettings.php:417
 msgid "Incorrect old password"
 msgstr "పాత సంకేతపదం తప్పు"
 
-#: ../actions/login.php:63
+#: ../actions/login.php:67 actions/login.php:67 actions/login.php:74
 msgid "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."
-msgstr ""
-"మీ సంకేతపదాన్ని తిరిగి "
-"పొందడానికై అవసరమైన సూచనలని మీ ఖాతాతో నమోదైన ఈమెయిల్ చిరునామాకి పంపించాం."
+msgstr "మీ సంకేతపదాన్ని తిరిగి పొందడానికై అవసరమైన సూచనలని మీ ఖాతాతో నమోదైన ఈమెయిల్ చిరునామాకి పంపించాం."
 
-#: ../actions/updateprofile.php:113
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "'%s' అనే అవతారపు URL తప్పు"
 
-#: ../actions/updateprofile.php:97
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "'%s' అనే హోమ్ పేజీ సరైనదికాదు"
 
-#: ../actions/updateprofile.php:81
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "తప్పుడు లైసెన్సు URL '%s'"
 
-#: ../actions/postnotice.php:61
+#: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:63
 msgid "Invalid notice content"
 msgstr "సందేశపు విషయం సరైనది కాదు"
 
-#: ../actions/postnotice.php:67
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:69
 msgid "Invalid notice uri"
 msgstr "సందేశపు URI తప్పు"
 
-#: ../actions/postnotice.php:72
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:74
 msgid "Invalid notice url"
 msgstr "సందేశపు URL తప్పు"
 
-#: ../actions/updateprofile.php:86
+#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "ప్రొపైల్ URL '%s' తప్పు."
 
-#: ../actions/remotesubscribe.php:96
+#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
 msgid "Invalid profile URL (bad format)"
 msgstr "ప్రొపైల్ URL తప్పు (చెడు ఫార్మాట్)"
 
 #: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:78
 msgid "Invalid profile URL returned by server."
 msgstr ""
 
-#: ../actions/avatarbynickname.php:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
 msgid "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:256 actions/register.php:112
+#: actions/register.php:130
 msgid "Invalid username or password."
 msgstr "వాడుకరిపేరు లేదా సంకేతపదం తప్పు."
 
-#: ../lib/util.php:237 ../lib/util.php:261 lib/util.php:277
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr ""
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
+
+#: ../lib/util.php:306 lib/util.php:322 lib/util.php:332
+msgid "Invite"
+msgstr "ఆహ్వానించు"
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr ""
+
+#: ../lib/util.php:261 lib/util.php:277 lib/util.php:288
 #, 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 ""
 
-#: ../actions/imsettings.php:164
+#: ../actions/imsettings.php:173 actions/imsettings.php:181
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID ఇప్పటికే వేరొకరికి ఉంది."
 
-#: ../actions/imsettings.php:63 ../actions/imsettings.php:62
-#: 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 ""
 
-#: ../actions/profilesettings.php:55
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
+msgid "Language"
+msgstr "భాష"
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr ""
+
+#: ../actions/profilesettings.php:52 ../actions/register.php:173
+#: actions/profilesettings.php:85 actions/register.php:187
+#: actions/profilesettings.php:87 actions/register.php:214
 msgid "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/profilesettings.php:225 actions/register.php:101
 msgid "Location is too long (max 255 chars)."
 msgstr "ప్రాంతం పేరు మరీ పెద్దగా ఉంది (255 అక్షరాలు గరిష్ఠం)."
 
-#: ../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/login.php:104 actions/login.php:113 actions/openidlogin.php:88
+#: lib/util.php:336
 msgid "Login"
 msgstr "ప్రవేశించండి"
 
-#: ../actions/openidlogin.php:44
+#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:60
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "[ఓపెన్ఐడీ](%%doc.openid%%) ఖాతాతో ప్రవేశించండి."
 
-#: ../actions/login.php:122 ../actions/login.php:126
+#: ../actions/login.php:126
 #, 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 ""
 
-#: ../lib/util.php:284
+#: ../lib/util.php:308 lib/util.php:324 lib/util.php:334
 msgid "Logout"
 msgstr "నిష్క్రమించు"
 
-#: ../actions/login.php:106
+#: ../actions/register.php:166 actions/register.php:180
+#: actions/register.php:207
+msgid "Longer name, preferably your \"real\" name"
+msgstr ""
+
+#: ../actions/login.php:110 actions/login.php:110 actions/login.php:118
 msgid "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 ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr ""
+
+#: ../actions/showstream.php:300 actions/showstream.php:315
+#: actions/showstream.php:363
 msgid "Member since"
 msgstr "సభ్యులైన తేదీ"
 
 #: ../actions/userrss.php:70 actions/userrss.php:67
-#, php-format
-#, fuzzy
+#, fuzzy, php-format
 msgid "Microblog by %s"
 msgstr ""
 "#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "%s యొక్క మైక్రోబ్లాగు\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
-#: ../actions/register.php:188 actions/finishopenidlogin.php:85
-#: actions/register.php:202
+#: ../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 ""
+
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php:85 actions/register.php:202
+#: actions/register.php:229
 msgid "My text and files are available under "
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:71
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+msgid "New"
+msgstr ""
+
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:138
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+#: actions/emailsettings.php:318
+msgid "New incoming email address added."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
 msgid "New nickname"
 msgstr "కొత్త పేరు"
 
-#: ../actions/newnotice.php:100
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:141
 msgid "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/profilesettings.php:185
 msgid "New password"
 msgstr "కొత్త సంకేతపదం"
 
-#: ../actions/recoverpassword.php:275
+#: ../actions/recoverpassword.php:314
 msgid "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:108 actions/profilesettings.php:76
+#: actions/register.php:192
 msgid "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/finishopenidlogin.php:192 actions/profilesettings.php:231
+#: actions/register.php:85
 msgid "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/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: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:182 actions/profilesettings.php:209
+#: actions/register.php:83
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:170
+#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:187
 msgid "Nickname not allowed."
 msgstr "ఆ పేరుని అనుమతించము."
 
@@ -729,32 +1200,57 @@ msgstr "ఆ పేరుని అనుమతించము."
 msgid "Nickname of the user you want to follow"
 msgstr ""
 
-#: ../actions/recoverpassword.php:147
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
 msgid "Nickname or email"
 msgstr "పేరు లేదా ఈమెయిల్"
 
-#: ../actions/imsettings.php:147
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:104
+msgid "No"
+msgstr ""
+
+#: ../actions/imsettings.php:156 actions/imsettings.php:164
 msgid "No Jabber ID."
 msgstr "Jabber ID లేదు."
 
-#: ../actions/userauthorization.php:128 ../actions/userauthorization.php:129
-#: actions/userauthorization.php:136
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
 msgid "No authorization request!"
 msgstr ""
 
-#: ../actions/confirmaddress.php:33
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+msgid "No carrier selected."
+msgstr ""
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+msgid "No code entered"
+msgstr ""
+
+#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
 msgid "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:52
+#: actions/newnotice.php:53
 msgid "No content!"
 msgstr "విషయం లేదు!"
 
-#: ../actions/userbyid.php:27
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+#: actions/emailsettings.php:197
+msgid "No email address."
+msgstr ""
+
+#: ../actions/userbyid.php:32 actions/userbyid.php:32
 msgid "No id."
 msgstr "ఐడీ లేదు."
 
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+#: actions/emailsettings.php:292
+msgid "No incoming email address."
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:65
+#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:66
 msgid "No nickname provided by remote server."
 msgstr "దూరపు సర్వర్ పేరుని ఇవ్వలేదు."
 
@@ -766,40 +1262,63 @@ msgstr ""
 "పేరు లేదు.\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../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:243
 msgid "No pending confirmation to cancel."
 msgstr "రద్దుచేయడానికి వేచివున్న నిర్ధారణలేమీ లేవు."
 
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+msgid "No phone number."
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74
+#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:73
 msgid "No profile URL returned by server."
 msgstr ""
 
-#: ../actions/recoverpassword.php:189
+#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
 msgid "No registered email address for that user."
 msgstr "ఈ వాడుకరికై నమోదైన ఈమెయిల్ చిరునామాలు ఏమీ లేవు."
 
-#: ../actions/userauthorization.php:48
+#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
 msgid "No request found!"
 msgstr "అభ్యర్థనలేమీ కనబడలేదు!"
 
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
+#: actions/noticesearch.php:69 actions/peoplesearch.php:69
+#: actions/noticesearch.php:68 actions/peoplesearch.php:59
 msgid "No results"
 msgstr "ఫలితాలేమీ లేవు"
 
-#: ../actions/avatarbynickname.php:32
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
 msgid "No size."
 msgstr "పరిమాణం లేదు."
 
-#: ../actions/openidsettings.php:135
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:109
+#: actions/twitapistatuses.php:438
+msgid "No status found with that ID."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:411
+msgid "No status with that ID found."
+msgstr ""
+
+#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
 msgid "No such OpenID."
 msgstr "అటువంటి ఓపెన్ఐడీ లేదు."
 
-#: ../actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29
 msgid "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:38
+#: actions/shownotice.php:114
 msgid "No such notice."
 msgstr "అటువంటి సందేశమేమీ లేదు."
 
@@ -812,16 +1331,31 @@ msgid "No such subscription"
 msgstr ""
 
 #: ../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/showstream.php:157
+#: classes/Command.php:208 classes/Command.php:242 lib/gallery.php:85
+#: lib/subs.php:105
 msgid "No such user."
 msgstr "అటువంటి వాడుకరి లేరు."
 
-#: ../lib/gallery.php:76 ../lib/gallery.php:80 lib/gallery.php:85
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr ""
+
+#: ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
 msgstr ""
 
@@ -829,29 +1363,45 @@ msgstr ""
 msgid "Not a recovery code."
 msgstr ""
 
-#: ../actions/imsettings.php:158
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+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:423 lib/twitterapi.php:450
+#: lib/twitterapi.php:534
+msgid "Not a supported data format."
+msgstr ""
+
+#: ../actions/imsettings.php:167 actions/imsettings.php:175
 msgid "Not a valid Jabber ID"
 msgstr "సరైన Jabber ఐడీ కాదు"
 
-#: ../lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131
 msgid "Not a valid OpenID."
 msgstr "సరైన ఓపెన్ఐడీ కాదు."
 
-#: ../actions/profilesettings.php:75 ../actions/register.php:53
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+#: actions/emailsettings.php:208
+msgid "Not a valid email address"
+msgstr ""
+
+#: ../actions/register.php:63 actions/register.php:70 actions/register.php:79
 msgid "Not a valid email address."
 msgstr "సరైన ఈమెయిల్ చిరునామా కాదు:"
 
-#: ../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/profilesettings.php:212 actions/register.php:87
 msgid "Not a valid nickname."
 msgstr "సరైన పేరు కాదు."
 
-#: ../actions/remotesubscribe.php:118 ../actions/remotesubscribe.php:120
-#: actions/remotesubscribe.php:129
+#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
 msgid "Not a valid profile URL (incorrect services)."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:111 ../actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:122
+#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr ""
 
@@ -859,12 +1409,13 @@ msgstr ""
 msgid "Not a valid profile URL (no YADIS document)."
 msgstr ""
 
-#: ../actions/avatar.php:95
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: actions/profilesettings.php:361
 msgid "Not an image or corrupt file."
 msgstr "బొమ్మ కాదు లేదా పాడైపోయిన ఫైలు."
 
 #: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:52
 msgid "Not authorized."
 msgstr ""
 
@@ -873,34 +1424,61 @@ msgstr ""
 msgid "Not expecting this response!"
 msgstr ""
 
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
-#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+#: actions/twitapistatuses.php:304
+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:31 actions/newnotice.php:30
+#: actions/nudge.php:30 actions/subedit.php:31 actions/unblock.php:31
 msgid "Not logged in."
 msgstr "లోనికి ప్రవేశించలేదు."
 
-#: ../actions/unsubscribe.php:43 ../lib/subs.php:91 lib/subs.php:104
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:117
 msgid "Not subscribed!."
 msgstr ""
 
-#: ../actions/showstream.php:82
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+msgid "Notice Search"
+msgstr ""
+
+#: ../actions/showstream.php:82 actions/showstream.php:82
+#: actions/showstream.php:111 actions/showstream.php:118
+#: actions/showstream.php:123
 #, php-format
 msgid "Notice feed for %s"
 msgstr "%s యొక్క సందేశముల ఫీడు"
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
+#: actions/shownotice.php:45
 msgid "Notice has no profile"
 msgstr ""
 
-#: ../actions/showstream.php:297
+#: ../actions/showstream.php:316 actions/showstream.php:331
+#: actions/showstream.php:379
 msgid "Notices"
 msgstr "సందేశాలు"
 
-#: ../actions/password.php:39
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
+#, php-format
+msgid "Notices tagged with %s"
+msgstr ""
+
+#: ../actions/password.php:39 actions/profilesettings.php:178
+#: actions/profilesettings.php:183
 msgid "Old password"
 msgstr "పాత సంకేతపదం"
 
-#: ../lib/util.php:288
+#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
+#: lib/util.php:330 actions/deleteprofile.php:247 lib/util.php:340
 msgid "OpenID"
 msgstr "ఓపెన్ఐడీ"
 
@@ -917,138 +1495,191 @@ msgid "OpenID Auto-Submit"
 msgstr ""
 
 #: ../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/finishopenidlogin.php:150 actions/openidlogin.php:76
 msgid "OpenID Login"
 msgstr "ఓపెన్ఐడీ ప్రవేశం"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
+#: actions/openidlogin.php:74 actions/openidsettings.php:50
+#: actions/openidlogin.php:82
 msgid "OpenID URL"
 msgstr "ఓపెన్ఐడీ URL"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
+#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 msgid "OpenID authentication cancelled."
 msgstr "ఓపెన్ఐడీ అధీకరణ రద్దు చేయబడింది."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
+#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "ఓపెన్ఐడీ అధీకరణ విఫలమైంది: %s"
 
-#: ../lib/openid.php:133
+#: ../lib/openid.php:133 lib/openid.php:133
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "ఓపెన్ఐడీ వైఫల్యం: %s"
 
-#: ../actions/openidsettings.php:144
+#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
 msgid "OpenID removed."
 msgstr "ఓపెన్ఐడీని తొలగించాం."
 
-#: ../actions/openidsettings.php:37
+#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
 msgid "OpenID settings"
 msgstr "ఓపెన్ఐడీ అమరికలు"
 
-#: ../actions/avatar.php:84
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: actions/profilesettings.php:350
 msgid "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/login.php:109 actions/register.php:194
 msgid "Password"
 msgstr "సంకేతపదం"
 
-#: ../actions/recoverpassword.php:249
+#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
 msgid "Password and confirmation do not match."
 msgstr "సంకేతపదం మరియు నిర్ధారణ సరిపోలేదు."
 
-#: ../actions/recoverpassword.php:245
+#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
 msgid "Password must be 6 chars or more."
 msgstr "సంకేతపదం 6 లేదా అంతకంటే ఎక్కవ అక్షరాలుండాలి."
 
-#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
 #: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
 #: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 msgid "Password recovery requested"
 msgstr ""
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:274
+#: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: actions/profilesettings.php:408 actions/recoverpassword.php:326
+#: actions/profilesettings.php:437
 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/profilesettings.php:409 actions/register.php:107
 msgid "Passwords don't match."
 msgstr "సంకేతపదాలు సరిపోలలేదు."
 
-#: ../actions/peoplesearch.php:33
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+msgid "People"
+msgstr ""
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+msgid "People Search"
+msgstr ""
+
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
 msgid "People search"
 msgstr "వ్యక్తుల అన్వేషణ"
 
-#: ../lib/stream.php:44
+#: ../lib/stream.php:50 lib/personal.php:50
 msgid "Personal"
 msgstr "వ్యక్తిగత"
 
-#: ../actions/userauthorization.php:77 ../actions/userauthorization.php:78
+#: ../actions/invite.php:133 actions/invite.php:141
+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 ""
 
-#: ../actions/imsettings.php:74 ../actions/imsettings.php:73
-#: actions/imsettings.php:74
+#: ../actions/imsettings.php:73 actions/imsettings.php:74
 msgid "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
 msgid "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:185 actions/othersettings.php:179
 msgid "Preferences saved."
 msgstr "అభిరుచులు భద్రమయ్యాయి."
 
-#: ../lib/util.php:300
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
+msgid "Preferred language"
+msgstr ""
+
+#: ../lib/util.php:328 lib/util.php:344 lib/util.php:356
 msgid "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:139 classes/Notice.php:149
 msgid "Problem saving notice."
 msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు."
 
-#: ../lib/stream.php:54
+#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
+#: lib/settingsaction.php:84 actions/deleteprofile.php:241
 msgid "Profile"
 msgstr "ప్రొఫైలు"
 
-#: ../actions/remotesubscribe.php:73
+#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
 msgid "Profile URL"
 msgstr "ప్రొఫైలు URL"
 
-#: ../actions/profilesettings.php:34
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
 msgid "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
 msgid "Profile unknown"
 msgstr "అజ్ఞాత ప్రొఫైలు"
 
-#: ../lib/util.php:276
-msgid "Public"
-msgstr "ప్రజా"
-
-#: ../actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:77
 msgid "Public Stream Feed"
 msgstr "ప్రజా వాహిని ఫీడు"
 
-#: ../actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 lib/stream.php:34
 msgid "Public timeline"
 msgstr "ప్రజా కాలరేఖ"
 
-#: ../actions/recoverpassword.php:151 ../actions/recoverpassword.php:166
-#: actions/recoverpassword.php:171
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:104
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
 msgid "Recover"
 msgstr ""
 
-#: ../actions/recoverpassword.php:141 ../actions/recoverpassword.php:156
-#: actions/recoverpassword.php:161
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
 msgid "Recover password"
 msgstr ""
 
@@ -1056,20 +1687,33 @@ msgstr ""
 msgid "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:181 actions/register.php:234 lib/util.php:338
 msgid "Register"
 msgstr "నమోదు"
 
-#: ../actions/userauthorization.php:119
+#: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:173
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:241
+msgid "Registration successful"
+msgstr ""
+
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
 msgid "Reject"
 msgstr "తిరస్కరించు"
 
-#: ../actions/login.php:99 ../actions/register.php:183
+#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
+#: actions/register.php:190 actions/login.php:110 actions/openidlogin.php:85
+#: actions/register.php:217
 msgid "Remember me"
 msgstr "నన్ను గుర్తుంచుకో"
 
-#: ../actions/updateprofile.php:69 ../actions/updateprofile.php:70
-#: actions/updateprofile.php:71
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
 msgid "Remote profile with no matching profile"
 msgstr ""
 
@@ -1077,11 +1721,17 @@ msgstr ""
 msgid "Remote subscribe"
 msgstr ""
 
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php:48 actions/emailsettings.php:76
+#: actions/imsettings.php:49 actions/openidsettings.php:108
+#: actions/smssettings.php:50 actions/smssettings.php:84
+#: actions/twittersettings.php:59 actions/twittersettings.php:61
 msgid "Remove"
 msgstr "తొలగించు"
 
-#: ../actions/openidsettings.php:68
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
 msgid "Remove OpenID"
 msgstr "ఓపెన్ఐడీని తొలగించండి"
 
@@ -1090,52 +1740,83 @@ msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
 msgstr ""
-"మీకున్న ఒకే ఓపెన్ఐడీని "
-"తొలగిస్తే మీరు లోనికి ప్రవేశించడం అసాధ్యమవవచ్చు. మీరు దాన్ని తొలగించాలనుకుంటే, ముందు వేరే ఓపెన్ఐడీని చేర్చండి."
+"మీకున్న ఒకే ఓపెన్ఐడీని తొలగిస్తే మీరు లోనికి ప్రవేశించడం అసాధ్యమవవచ్చు. మీరు దాన్ని తొలగించాలనుకుంటే, "
+"ముందు వేరే ఓపెన్ఐడీని చేర్చండి."
 
-#: ../lib/stream.php:49
+#: ../lib/stream.php:55 lib/personal.php:55
 msgid "Replies"
 msgstr "స్పందనలు"
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:50
+#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
+#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #, php-format
 msgid "Replies to %s"
 msgstr "%sకి స్పందనలు"
 
-#: ../actions/recoverpassword.php:168 ../actions/recoverpassword.php:183
-#: actions/recoverpassword.php:189
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
 msgid "Reset"
 msgstr ""
 
-#: ../actions/recoverpassword.php:158 ../actions/recoverpassword.php:173
-#: actions/recoverpassword.php:178
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
 msgid "Reset password"
 msgstr ""
 
-#: ../actions/recoverpassword.php:167 ../actions/register.php:180
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/deleteprofile.php:250 actions/subscriptions.php:73
+msgid "SMS"
+msgstr ""
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+msgid "SMS Phone number"
+msgstr ""
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:230
+msgid "SMS confirmation"
+msgstr ""
+
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
 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:197
+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/twittersettings.php:83 actions/emailsettings.php:107
+#: actions/othersettings.php:56 actions/profilesettings.php:106
+#: actions/subscriptions.php:74 actions/tagother.php:100
+#: actions/twittersettings.php:82
 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/util.php:327
 msgid "Search"
 msgstr "వెతుకు"
 
-#: ../actions/noticesearch.php:80
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:84
 msgid "Search Stream Feed"
 msgstr "అన్వేషణ వాహిని ఫీడు"
 
-#: ../actions/noticesearch.php:30
+#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
+#: actions/noticesearch.php:29
 #, 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 ""
-"%%site.name%%లోని సందేశాలను వెతకండి. "
-"అన్వేషణ పదాలను ఖాళీలతో వేరుచేయండి; ఒక్కో పదంలో 3 లేదా అంతకంటే ఎక్కువ అక్షరాలు ఉండాలి."
+"%%site.name%%లోని సందేశాలను వెతకండి. అన్వేషణ పదాలను ఖాళీలతో వేరుచేయండి; ఒక్కో పదంలో 3 లేదా "
+"అంతకంటే ఎక్కువ అక్షరాలు ఉండాలి."
 
 #: ../actions/peoplesearch.php:28
 #, php-format
@@ -1143,131 +1824,229 @@ 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 ""
-"%%site.name%%లో వ్యక్తులను వారి "
-"పేరు, ప్రాంతం, లేదా "
-"ఆసక్తులను బట్టి వెతకండి. అన్వేషించే పదాలను ఖాళీలతో వేరుచేయండి; ఒక్కో పదంలో 3 లేదా అంతకంటే ఎక్కువ అక్షరాలు ఉండాలి."
+"%%site.name%%లో వ్యక్తులను వారి పేరు, ప్రాంతం, లేదా ఆసక్తులను బట్టి వెతకండి. అన్వేషించే పదాలను "
+"ఖాళీలతో వేరుచేయండి; ఒక్కో పదంలో 3 లేదా అంతకంటే ఎక్కువ అక్షరాలు ఉండాలి."
 
-#: ../lib/util.php:982
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+msgid "Select a carrier"
+msgstr ""
+
+#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
+#: lib/util.php:1306 lib/util.php:1731 lib/util.php:1646 lib/util.php:2158
 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
+msgid "Send email to this address to post new notices."
+msgstr ""
+
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+msgid "Send me notices of new subscriptions through email."
+msgstr ""
+
+#: ../actions/imsettings.php:70 actions/imsettings.php:71
 msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 
-#: ../lib/util.php:282
+#: ../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 ""
+
+#: ../lib/util.php:304 lib/util.php:320 lib/util.php:330
 msgid "Settings"
 msgstr "అమరికలు"
 
-#: ../actions/profilesettings.php:183
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:336
 msgid "Settings saved."
 msgstr "అమరికలు భద్రమయ్యాయి."
 
-#: ../actions/finishaddopenid.php:66
+#: ../actions/tag.php:60 actions/tag.php:60 actions/tag.php:59
+msgid "Showing most popular tags from the last week"
+msgstr ""
+
+#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
 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 "Something weird happened."
 msgstr "జరగకూడనిదేదో జరిగింది."
 
-#: ../lib/util.php:302
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr ""
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: ../lib/util.php:330 lib/util.php:346 lib/util.php:358
 msgid "Source"
 msgstr "మూలము"
 
-#: ../actions/showstream.php:277
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:359
 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:199 actions/finishopenidlogin.php:267
 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:254 lib/util.php:2078
 msgid "Subscribe"
 msgstr ""
 
-#: ../actions/showstream.php:294 ../actions/subscribers.php:27
+#: ../actions/showstream.php:313 ../actions/subscribers.php:27
+#: actions/showstream.php:328 actions/subscribers.php:27
+#: actions/showstream.php:376 lib/gallery.php:136 lib/gallery.php:137
 msgid "Subscribers"
 msgstr "చందాదార్లు"
 
-#: ../actions/userauthorization.php:309 ../actions/userauthorization.php:310
-#: actions/userauthorization.php:322
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
 msgid "Subscription authorized"
 msgstr ""
 
-#: ../actions/userauthorization.php:319
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
 msgid "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:288 actions/showstream.php:370 lib/gallery.php:131
+#: lib/gallery.php:132
 msgid "Subscriptions"
 msgstr "చందాలు"
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
+#: actions/profilesettings.php:353
 msgid "System error uploading file."
 msgstr ""
 
-#: ../actions/noticesearch.php:34
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317 actions/profilesettings.php:90 actions/showstream.php:382
+#: actions/tag.php:40 actions/tagother.php:96 actions/tagother.php:162
+#: lib/profilelist.php:126 lib/profilelist.php:128
+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:33
 msgid "Text search"
 msgstr "పాఠ్య అన్వేషణ"
 
-#: ../actions/openidsettings.php:140
+#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
 msgid "That OpenID does not belong to you."
 msgstr "ఆ ఓపెన్ఐడీ మీది కాదు."
 
-#: ../actions/confirmaddress.php:52
+#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
 msgid "That address has already been confirmed."
 msgstr "ఆ చిరునామా ఇప్పటికే నిర్ధారితమైంది."
 
-#: ../actions/confirmaddress.php:43
+#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
 msgid "That confirmation code is not for you!"
 msgstr "ఆ నిర్ధారణా సంకేతం మీది కాదు!"
 
-#: ../actions/avatar.php:80
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:214
+msgid "That email address already belongs to another user."
+msgstr "ఆ ఈమెయిల్ చిరునామా ఇప్పటేకే ఇతర వాడుకరికి సంబంధించినది."
+
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: actions/profilesettings.php:346
 msgid "That file is too big."
 msgstr "ఆ ఫైలు చాలా పెద్దగా ఉంది."
 
-#: ../actions/imsettings.php:161
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
 msgid "That is already your Jabber ID."
 msgstr "ఈ Jabber ID మీకు ఇప్పటికే ఉంది"
 
-#: ../actions/imsettings.php:224
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:211
+msgid "That is already your email address."
+msgstr "అది ఇప్పటికే మీ ఈమెయిల్ చిరునామా."
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+msgid "That is already your phone number."
+msgstr ""
+
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
 msgid "That is not your Jabber ID."
 msgstr "ఇది మీ Jabber ID కాదు"
 
-#: ../actions/imsettings.php:201
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+#: actions/emailsettings.php:270
+msgid "That is not your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+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:247
 msgid "That is the wrong IM address."
 msgstr "ఆ IM చిరునామా సరైనది కాదు."
 
-#: ../actions/newnotice.php:52
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+msgid "That is the wrong confirmation number."
+msgstr ""
+
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+msgid "That phone number already belongs to another user."
+msgstr ""
+
+#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: actions/newnotice.php:49 actions/twitapistatuses.php:330
+#: actions/newnotice.php:61 actions/twitapistatuses.php:271
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "ఇది చాలా పొడవుంది. గరిష్ఠ సందేశ పరిమాణం 140 అక్షరాలు."
 
-#: ../actions/confirmaddress.php:86
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+#: actions/twitapiaccount.php:55
+msgid "That's too long. Max notice size is 255 chars."
+msgstr ""
+
+#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "\"%s\" అనే చిరునామా మీ ఖాతాకి నిర్ధారితమైంది."
 
-#: ../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:285
 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 ""
 
-#: ../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 "
@@ -1292,7 +2071,12 @@ msgstr ""
 msgid "These are the people whose notices you listen to."
 msgstr ""
 
-#: ../actions/recoverpassword.php:87
+#: ../actions/invite.php:89 actions/invite.php:96
+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 "ఈ నిర్ధారణ సంకేతం చాలా పాతది. మళ్ళీ మొదలుపెట్టండి."
 
@@ -1310,20 +2094,52 @@ msgid ""
 "your existing account, if you have one."
 msgstr ""
 
-#: ../lib/util.php:147 ../lib/util.php:164 lib/util.php:246
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:94
+#: actions/twitapifriendships.php:82 actions/twitapistatuses.php:428
+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:46
+#: actions/twitapidirect_messages.php:117 actions/twitapifriendships.php:30
+#: actions/twitapistatuses.php:239
+msgid "This method requires a POST."
+msgstr ""
+
+#: ../lib/util.php:164 lib/util.php:246 lib/util.php:257
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
+msgid "Timezone"
+msgstr ""
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr ""
+
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"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 ""
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: actions/twitapifriendships.php:128
+msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
-#: ../actions/profilesettings.php:51
+#: ../actions/profilesettings.php:48 ../actions/register.php:169
+#: actions/profilesettings.php:81 actions/register.php:183
+#: actions/profilesettings.php:83 actions/register.php:210
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "మీ హోమ్ పేజీ, బ్లాగు, లేదా వేరే సేటులోని మీ ప్రొఫైలు యొక్క చిరునామా"
 
@@ -1331,51 +2147,78 @@ 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/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/emailsettings.php:147
+#: actions/othersettings.php:146 actions/twittersettings.php:199
 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
 msgid "Unexpected password reset."
 msgstr ""
 
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60
+#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:59
 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 lib/util.php:296
 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:48
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr "గుర్తుతెలియని చిరునామా రకం %s"
 
-#: ../actions/showstream.php:193 ../actions/showstream.php:209
-#: actions/showstream.php:219
+#: ../actions/showstream.php:209 actions/showstream.php:219
+#: actions/showstream.php:267 lib/util.php:2094
 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
 msgid "Unsupported OMB version"
 msgstr ""
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: actions/profilesettings.php:371
 msgid "Unsupported image file format."
 msgstr ""
 
-#: ../actions/avatar.php:68
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: actions/deleteprofile.php:251
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: actions/deleteprofile.php:254
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/twitapistatuses.php:126
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:198
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
+
+#: ../actions/avatar.php:68 actions/profilesettings.php:161
+#: actions/profilesettings.php:166
 msgid "Upload"
 msgstr "ఎగుమతించు"
 
@@ -1387,109 +2230,191 @@ msgid ""
 "share."
 msgstr ""
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:182
-msgid "Used only for updates, announcements, and password recovery"
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr ""
+
+#: ../actions/invite.php:114 actions/invite.php:121
+msgid ""
+"Use this form to invite your friends and colleagues to use this service."
 msgstr ""
-"తాజా విశేషాలు, ప్రకటనలు, "
-"మరియు సంకేతపదం పోయినప్పుడు మాత్రమే ఉపయోగిస్తాం."
+
+#: ../actions/register.php:159 ../actions/register.php:162
+#: actions/register.php:173 actions/register.php:176 actions/register.php:200
+#: actions/register.php:203
+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:92
 msgid "User being listened to doesn't exist."
 msgstr ""
 
 #: ../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/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/showstream.php:57
+#: actions/twitapiaccount.php:63 actions/twitapifavorites.php:40
+#: actions/twitapistatuses.php:163 actions/twitapistatuses.php:492
+#: lib/twitterapi.php:590
 msgid "User has no profile."
 msgstr "వాడుకరికి ప్రొఫైలు లేదు."
 
-#: ../actions/remotesubscribe.php:71
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
 msgid "User nickname"
 msgstr "వాడుకరి పేరు"
 
-#: ../lib/util.php:969
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../lib/util.php:1159 lib/util.php:1293 lib/util.php:1630
 #, php-format
 msgid "What's up, %s?"
 msgstr "%s, సంగతులేమిటి?"
 
-#: ../actions/profilesettings.php:57
+#: ../actions/profilesettings.php:54 ../actions/register.php:175
+#: actions/profilesettings.php:87 actions/register.php:189
+#: actions/profilesettings.php:89 actions/register.php:216
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "మీరు ఎక్కడ నుండి, \"నగరం, రాష్ట్రం (లేదా ప్రాంతం), దేశం\""
 
-#: ../actions/updateprofile.php:127
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "'%s' కొరకు తప్పుడు బొమ్మ రకం"
 
-#: ../actions/updateprofile.php:122 ../actions/updateprofile.php:123
-#: actions/updateprofile.php:124
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr ""
 
-#: ../actions/finishaddopenid.php:64
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+#: actions/block.php:105
+msgid "Yes"
+msgstr "అవును"
+
+#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
 msgid "You already have this OpenID!"
 msgstr "ఈ ఓపెన్ఐడీ మీకు ఇప్పటికే ఉంది!"
 
-#: ../actions/recoverpassword.php:31
+#: ../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
 msgid "You are already logged in!"
 msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
 
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:102
+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/register.php:164
+#: ../actions/register.php:135 actions/register.php:145
 msgid "You can create a new account to start posting notices."
 msgstr "సందేశాలు పంపించడానికి మీరు కొత్త ఖాతా సృష్టించుకోవచ్చు."
 
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
 #: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
-msgstr ""
-"\"తొలగించు\" అనే బొత్తంపై "
-"నొక్కడం ద్వారా ఒక ఓపెన్ఐడీని మీ ఖాతా నుండి తొలగించుకోవచ్చు."
+msgstr "\"తొలగించు\" అనే బొత్తంపై నొక్కడం ద్వారా ఒక ఓపెన్ఐడీని మీ ఖాతా నుండి తొలగించుకోవచ్చు."
 
 #: ../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 ""
-"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
+#: actions/finishremotesubscribe.php:83 actions/finishremotesubscribe.php:99
 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/register.php:77
 msgid "You can't register if you don't agree to the license."
 msgstr ""
 
-#: ../actions/updateprofile.php:62 ../actions/updateprofile.php:63
-#: actions/updateprofile.php:64
+#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
 msgid "You did not send us that profile"
 msgstr ""
 
-#: ../actions/recoverpassword.php:134
+#: ../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 ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: actions/twitapistatuses.php:455
+msgid "You may not delete another user's status."
+msgstr ""
+
+#: ../actions/invite.php:31 actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+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!"
+msgstr ""
+
+#: ../actions/recoverpassword.php:149
 msgid "You've been identified. Enter a  new password below. "
 msgstr "మిమ్మల్ని గుర్తించాం. కొత్త సంకేతపదాన్ని క్రింద ఇవ్వండి."
 
-#: ../actions/openidlogin.php:67
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:84
 msgid "Your OpenID URL"
 msgstr "మీ ఓపెన్ఐడీ URL"
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:164
 msgid "Your nickname on this server, or your registered email address."
 msgstr "ఈ సర్వరులో మీ పేరు, లేదా నమౌదైన మీ ఈమెయిల్ చిరునామా."
 
@@ -1499,787 +2424,88 @@ msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
-"ఒకే వాడుకరి ఖాతాతో చాలా "
-"సైట్లలోనికి ప్రవేశించే వీలుని [ఓపెన్ఐడీ](%%doc.openid%%) కల్పిస్తుంది. మీ ఓపెన్ఐడీలను ఇక్కడ సంభాళించుకోండి."
+"ఒకే వాడుకరి ఖాతాతో చాలా సైట్లలోనికి ప్రవేశించే వీలుని [ఓపెన్ఐడీ](%%doc.openid%%) కల్పిస్తుంది. మీ "
+"ఓపెన్ఐడీలను ఇక్కడ సంభాళించుకోండి."
 
-#: ../lib/util.php:814
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:1287
 msgid "a few seconds ago"
 msgstr "కొన్ని క్షణాల క్రితం"
 
-#: ../lib/util.php:826
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:1299
 #, php-format
 msgid "about %d days ago"
 msgstr "%d రోజుల క్రితం"
 
-#: ../lib/util.php:822
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:1295
 #, php-format
 msgid "about %d hours ago"
 msgstr "%d గంటల క్రితం"
 
-#: ../lib/util.php:818
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:1291
 #, php-format
 msgid "about %d minutes ago"
 msgstr "%d నిమిషాల క్రితం"
 
-#: ../lib/util.php:830
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:1303
 #, php-format
 msgid "about %d months ago"
 msgstr "%d నెలల క్రితం"
 
-#: ../lib/util.php:824
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:1297
 msgid "about a day ago"
 msgstr "ఓ రోజు క్రితం"
 
-#: ../lib/util.php:816
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:1289
 msgid "about a minute ago"
 msgstr "ఓ నిమిషం క్రితం"
 
-#: ../lib/util.php:828
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:1301
 msgid "about a month ago"
 msgstr "ఓ నెల క్రితం"
 
-#: ../lib/util.php:832
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:1305
 msgid "about a year ago"
 msgstr "ఒక సంవత్సరం క్రితం"
 
-#: ../lib/util.php:820
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:1293
 msgid "about an hour ago"
 msgstr "ఒక గంట క్రితం"
 
-#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
-#: ../lib/stream.php:101
-msgid "in reply to..."
-msgstr "దీనికి స్పందనగా..."
-
-#: ../actions/noticesearch.php:133 ../actions/showstream.php:390
-#: ../lib/stream.php:108
-msgid "reply"
-msgstr "స్పందించు"
-
-#: ../actions/password.php:44
-msgid "same as password above"
-msgstr "పై సంకేతపదం వలెనే"
-
-#: ../lib/util.php:1127
-msgid "« After"
-msgstr "« తర్వాత"
-
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr ""
-
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
-
-#: ../actions/invite.php:168 actions/invite.php:176
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
-
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
-
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
-#, php-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#, php-format
-msgid "%s public timeline"
-msgstr ""
-
-#: ../lib/mail.php:206 lib/mail.php:212
-#, php-format
-msgid "%s status"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#, php-format
-msgid "%s timeline"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
-msgstr ""
-
-#: ../actions/register.php:213
-msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
-msgstr ""
-
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-
-#: ../actions/register.php:154 actions/register.php:168
-msgid "6 or more characters. Required."
-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 ""
-
-#: ../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/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!"
-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 ""
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-msgid "Add or remove OpenIDs"
-msgstr ""
-
-#: ../actions/invite.php:131 actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
-msgstr ""
-
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-msgid "Are you sure you want to delete this notice?"
-msgstr ""
-
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr ""
-
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
-msgid "Can't delete this notice."
-msgstr ""
-
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-msgid "Cannot normalize that email address"
-msgstr ""
-
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr ""
-
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
-msgstr ""
-
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-msgid "Change your profile settings"
-msgstr ""
-
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-msgid "Confirmation code"
-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/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
-msgstr ""
-
-#: ../lib/subs.php:54 lib/subs.php:61
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: ../lib/subs.php:46 lib/subs.php:46
-msgid "Could not subscribe."
-msgstr ""
-
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-msgid "Could not update user with confirmed email address."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-msgid "Couldn't find any statuses."
-msgstr ""
-
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-msgid "Couldn't update user for autosubscribe."
-msgstr ""
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-msgid "Couldn't update user record."
-msgstr ""
-
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-msgid "Current confirmed email address."
-msgstr ""
-
-#: ../classes/Notice.php:72 classes/Notice.php:86
-#, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr ""
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-msgid "Delete notice"
-msgstr ""
-
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-msgid "Email Address"
-msgstr "ఈమెయిల్ చిరునామా"
-
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-msgid "Email Settings"
-msgstr "ఈమెయిల్ అమరికలు"
-
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-msgid "Email address, like \"UserName@example.org\""
-msgstr "ఈమెయిల్ చిరునామా, \"username@example.org\" వలె"
-
-#: ../actions/invite.php:129 actions/invite.php:137
-msgid "Email addresses"
-msgstr ""
-
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
-msgstr ""
-
-#: ../actions/tag.php:55 actions/tag.php:55
-#, php-format
-msgid "Feed for tag %s"
-msgstr ""
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr ""
-
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr ""
-
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-msgid "I want to post notices by email."
-msgstr ""
-
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
-msgstr ""
-
-#: ../actions/recoverpassword.php:137
-msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
-"email address you have stored  in your account."
-msgstr ""
-
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-msgid "Incoming email"
-msgstr ""
-
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-msgid "Incoming email address removed."
-msgstr ""
-
-#: ../actions/invite.php:55 actions/invite.php:62
-#, php-format
-msgid "Invalid email address: %s"
-msgstr ""
-
-#: ../actions/invite.php:79 actions/invite.php:86
-msgid "Invitation(s) sent"
-msgstr ""
-
-#: ../actions/invite.php:97 actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
-msgstr ""
-
-#: ../lib/util.php:306 lib/util.php:322
-msgid "Invite"
-msgstr "ఆహ్వానించు"
-
-#: ../actions/invite.php:123 actions/invite.php:130
-msgid "Invite new users"
-msgstr ""
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Language"
-msgstr "భాష"
-
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-msgid "Language is too long (max 50 chars)."
-msgstr ""
-
-#: ../actions/register.php:166 actions/register.php:180
-msgid "Longer name, preferably your \"real\" name"
-msgstr ""
-
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-#: actions/emailsettings.php:81 actions/smssettings.php:89
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
-
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-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 ""
-
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-msgid "New"
-msgstr ""
-
-#: ../lib/mail.php:144 lib/mail.php:144
-#, php-format
-msgid "New email address for posting to %s"
-msgstr ""
-
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-msgid "New incoming email address added."
-msgstr ""
-
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-msgid "No"
-msgstr ""
-
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-msgid "No carrier selected."
-msgstr ""
-
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-msgid "No code entered"
-msgstr ""
-
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-msgid "No email address."
-msgstr ""
-
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-msgid "No incoming email address."
-msgstr ""
-
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-msgid "No phone number."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-msgid "No status found with that ID."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-msgid "No status with that ID found."
-msgstr ""
-
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-msgid "No user with that email address or username."
-msgstr ""
-
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-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
-msgid "Not a supported data format."
-msgstr ""
-
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-msgid "Not a valid email address"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-msgid "Not found"
-msgstr ""
-
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-msgid "Notice Search"
-msgstr ""
-
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81
-#, php-format
-msgid "Notices tagged with %s"
-msgstr ""
-
-#: ../actions/invite.php:135 actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-msgid "People"
-msgstr ""
-
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-msgid "People Search"
-msgstr ""
-
-#: ../actions/invite.php:133 actions/invite.php:141
-msgid "Personal message"
-msgstr ""
-
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Preferred language"
-msgstr ""
-
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
-
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-msgid "Publish a MicroID for my email address."
-msgstr ""
-
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr ""
-
-#: ../actions/register.php:28 actions/register.php:28
-msgid "Registration not allowed."
-msgstr ""
-
-#: ../actions/register.php:200 actions/register.php:214
-msgid "Registration successful"
-msgstr ""
-
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
-msgstr ""
-
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-msgid "SMS Phone number"
-msgstr ""
-
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-msgid "SMS Settings"
-msgstr ""
-
-#: ../lib/mail.php:219 lib/mail.php:225
-msgid "SMS confirmation"
-msgstr ""
-
-#: ../actions/register.php:156 actions/register.php:170
-msgid "Same as password above. Required."
-msgstr ""
-
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-msgid "Select a carrier"
-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."
-msgstr ""
-
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-msgid "Send me notices of new subscriptions through email."
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr ""
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
-msgstr ""
-
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317
-msgid "Tags"
-msgstr ""
-
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr "పాఠ్యం"
-
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr "ఆ ఈమెయిల్ చిరునామా ఇప్పటేకే ఇతర వాడుకరికి సంబంధించినది."
-
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-msgid "That is already your email address."
-msgstr "అది ఇప్పటికే మీ ఈమెయిల్ చిరునామా."
-
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-msgid "That is already your phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-msgid "That is not your email address."
-msgstr ""
-
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-msgid "That is not your phone number."
-msgstr ""
-
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-msgid "That is the wrong confirmation number."
-msgstr ""
-
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-msgid "That phone number already belongs to another user."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-msgid "That's too long. Max notice size is 255 chars."
-msgstr ""
-
-#: ../actions/invite.php:89 actions/invite.php:96
-msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
-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."
-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."
-msgstr ""
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "Timezone"
-msgstr ""
-
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-msgid "Timezone not selected."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-msgid "Two user ids or screen_names must be supplied."
-msgstr ""
-
-#: ../index.php:57 index.php:57
-msgid "Unknown action"
-msgstr ""
-
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-msgid "Updates by SMS"
-msgstr ""
-
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr ""
-
-#: ../actions/invite.php:114 actions/invite.php:121
-msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
-msgstr ""
-
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr ""
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "What timezone are you normally in?"
-msgstr ""
-
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-msgid "Yes"
-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/invite.php:81 actions/invite.php:88
-msgid "You are already subscribed to these users:"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
-msgstr ""
-
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-msgid "You may not delete another user's status."
-msgstr ""
-
-#: ../actions/invite.php:31 actions/invite.php:31
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-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!"
-msgstr ""
-
 #: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
+#: actions/showstream.php:441 lib/stream.php:99 lib/noticelist.php:211
 msgid "delete"
 msgstr ""
 
+#: ../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:135
+#: lib/facebookaction.php:202 lib/noticelist.php:189
+msgid "in reply to..."
+msgstr "దీనికి స్పందనగా..."
+
+#: ../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:142
+#: lib/noticelist.php:199
+msgid "reply"
+msgstr "స్పందించు"
+
+#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/profilesettings.php:188
+msgid "same as password above"
+msgstr "పై సంకేతపదం వలెనే"
+
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+#: actions/twitapistatuses.php:543
 msgid "unsupported file type"
 msgstr ""
 
+#: ../lib/util.php:1309 lib/util.php:1443 lib/facebookaction.php:251
+#: lib/util.php:1783
+#, fuzzy
+msgid "« After"
+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
@@ -2289,6 +2515,12 @@ msgstr ""
 #: 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:38 actions/deleteprofile.php:127 actions/disfavor.php:47
+#: actions/emailsettings.php:130 actions/favor.php:49 actions/login.php:45
+#: actions/newmessage.php:44 actions/newnotice.php:36 actions/nudge.php:47
+#: actions/othersettings.php:139 actions/profilesettings.php:49
+#: actions/subedit.php:38 actions/tagother.php:113
+#: actions/twittersettings.php:188 actions/unblock.php:38
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -2312,12 +2544,14 @@ msgstr ""
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142
+#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:54
+#: actions/twitapifavorites.php:115
 msgid "This notice is already a favorite!"
 msgstr ""
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
+#: classes/Command.php:132 actions/favor.php:61
+#: actions/twitapifavorites.php:122
 msgid "Could not create favorite."
 msgstr ""
 
@@ -2326,11 +2560,12 @@ msgid "Disfavor"
 msgstr ""
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:62
 #, php-format
 msgid "%s favorite notices"
 msgstr ""
 
-#: actions/favoritesrss.php:64
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:66
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr ""
@@ -2356,47 +2591,50 @@ msgid ""
 "\n"
 msgstr ""
 
-#: actions/login.php:104
+#: actions/login.php:104 actions/login.php:111 actions/openidlogin.php:86
 msgid "Automatically login in the future; "
 msgstr ""
 
-#: actions/login.php:122
+#: actions/login.php:122 actions/login.php:130
 msgid "For security reasons, please re-enter your "
 msgstr ""
 
-#: actions/login.php:126
+#: actions/login.php:126 actions/login.php:134
 msgid "Login with your username and password. "
 msgstr ""
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+#: actions/newmessage.php:60 actions/twitapidirect_messages.php:136
 msgid "That's too long. Max message size is 140 chars."
 msgstr ""
 
-#: actions/newmessage.php:65
+#: actions/newmessage.php:65 actions/newmessage.php:68
 msgid "No recipient specified."
 msgstr ""
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
+#: classes/Command.php:206 actions/newmessage.php:71
+#: actions/newmessage.php:116 classes/Command.php:211
 msgid "You can't send a message to this user."
 msgstr ""
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
+#: classes/Command.php:209 actions/newmessage.php:74
+#: actions/twitapidirect_messages.php:153 classes/Command.php:214
 msgid ""
-"Don't send a message to yourself; just say it to yourself quietly "
-"instead."
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: actions/newmessage.php:108
+#: actions/newmessage.php:108 actions/microsummary.php:32
+#: actions/newmessage.php:111
 msgid "No such user"
 msgstr ""
 
-#: actions/newmessage.php:117
+#: actions/newmessage.php:117 actions/newmessage.php:120
 msgid "New message"
 msgstr ""
 
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:95 actions/noticesearch.php:94
 msgid "Notice without matching profile"
 msgstr ""
 
@@ -2443,6 +2681,7 @@ msgstr ""
 
 #: actions/profilesettings.php:115 actions/remotesubscribe.php:320
 #: actions/userauthorization.php:159 actions/userrss.php:76
+#: actions/profilesettings.php:120 actions/remotesubscribe.php:333
 msgid "User without matching profile"
 msgstr ""
 
@@ -2470,18 +2709,18 @@ msgstr ""
 msgid "New password successfully saved. "
 msgstr ""
 
-#: actions/register.php:95
+#: actions/register.php:95 actions/register.php:104
 msgid "Password must be 6 or more characters."
 msgstr ""
 
-#: actions/register.php:216
+#: actions/register.php:216 actions/register.php:243
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to..."
 msgstr ""
 
-#: actions/register.php:227
+#: actions/register.php:227 actions/register.php:254
 msgid "(You should receive a message by email momentarily, with "
 msgstr ""
 
@@ -2496,6 +2735,7 @@ msgid "Feed for favorites of %s"
 msgstr ""
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:88 actions/twitapifavorites.php:57
 msgid "Could not retrieve favorite notices."
 msgstr ""
 
@@ -2517,7 +2757,7 @@ msgstr ""
 msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: actions/showstream.php:154
+#: actions/showstream.php:154 lib/util.php:2105
 msgid "Send a message"
 msgstr ""
 
@@ -2526,73 +2766,78 @@ msgstr ""
 msgid "Mobile carrier for your phone. "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:64
 #, php-format
 msgid "Direct messages to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:65
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:69
 msgid "Direct Messages You've Sent"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:70
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:132
 msgid "No message text!"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:145
 msgid "Recipient user not found."
 msgstr ""
 
 #: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:148
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
-#: actions/twitapifavorites.php:92
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:64
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
-#: actions/twitapifavorites.php:95
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:67
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
+#: actions/twitapifavorites.php:158 lib/mail.php:303
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr ""
 
 #: actions/twitapifavorites.php:188 lib/mail.php:276
+#: actions/twitapifavorites.php:159 lib/mail.php:304
 #, php-format
 msgid ""
 "%1$s just added your notice from %2$s as one of their favorites.\n"
 "\n"
 msgstr ""
 
-#: actions/twittersettings.php:27
+#: actions/twittersettings.php:27 actions/twittersettings.php:29
 msgid ""
 "Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 
-#: actions/twittersettings.php:41
+#: actions/twittersettings.php:41 actions/twittersettings.php:43
 msgid "Twitter settings"
 msgstr "ట్విట్టర్ అమరికలు"
 
-#: actions/twittersettings.php:48
+#: actions/twittersettings.php:48 actions/twittersettings.php:50
 msgid "Twitter Account"
 msgstr "ట్విట్టర్ ఖాతా"
 
-#: actions/twittersettings.php:56
+#: actions/twittersettings.php:56 actions/twittersettings.php:58
 msgid "Current verified Twitter account."
 msgstr ""
 
@@ -2620,46 +2865,50 @@ msgstr ""
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:216
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr ""
 
-#: actions/twittersettings.php:128
+#: actions/twittersettings.php:128 actions/twittersettings.php:221
 msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: actions/twittersettings.php:137 actions/twittersettings.php:228
 #, php-format
 msgid "Unable to retrieve account information for \"%s\" from Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:234 actions/twittersettings.php:253
 msgid "Unable to save your Twitter settings!"
 msgstr ""
 
-#: actions/twittersettings.php:174
+#: actions/twittersettings.php:174 actions/twittersettings.php:261
 msgid "Twitter settings saved."
 msgstr ""
 
-#: actions/twittersettings.php:192
+#: actions/twittersettings.php:192 actions/twittersettings.php:272
 msgid "That is not your Twitter account."
 msgstr ""
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:280
 msgid "Couldn't remove Twitter user."
 msgstr ""
 
-#: actions/twittersettings.php:212
+#: actions/twittersettings.php:212 actions/twittersettings.php:284
 msgid "Twitter account removed."
 msgstr ""
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
+#: actions/twittersettings.php:299 actions/twittersettings.php:310
+#: actions/twittersettings.php:322
 msgid "Couldn't save Twitter preferences."
 msgstr ""
 
-#: actions/twittersettings.php:245
+#: actions/twittersettings.php:245 actions/twittersettings.php:330
 msgid "Twitter preferences saved."
 msgstr ""
 
@@ -2675,15 +2924,15 @@ msgstr ""
 msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#: classes/Channel.php:113
+#: classes/Channel.php:113 classes/Channel.php:129
 msgid "Command results"
 msgstr ""
 
-#: classes/Channel.php:148
+#: classes/Channel.php:148 classes/Channel.php:175
 msgid "Command complete"
 msgstr ""
 
-#: classes/Channel.php:158
+#: classes/Channel.php:158 classes/Channel.php:185
 msgid "Command failed"
 msgstr ""
 
@@ -2696,7 +2945,7 @@ msgstr ""
 msgid "Subscriptions: %1$s\n"
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:247
 msgid "User has no last notice"
 msgstr ""
 
@@ -2729,59 +2978,60 @@ msgstr ""
 msgid "About: %s"
 msgstr "గురించి: %s"
 
-#: classes/Command.php:200
+#: classes/Command.php:200 classes/Command.php:202
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: classes/Command.php:214
+#: classes/Command.php:214 classes/Command.php:219
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: classes/Command.php:216
+#: classes/Command.php:216 classes/Command.php:221
 msgid "Error sending direct message."
 msgstr ""
 
-#: classes/Command.php:263
+#: classes/Command.php:263 classes/Command.php:268
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: classes/Command.php:270
+#: classes/Command.php:270 classes/Command.php:275
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: classes/Command.php:288
+#: classes/Command.php:288 classes/Command.php:293
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: classes/Command.php:295
+#: classes/Command.php:295 classes/Command.php:300
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330
+#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:315
+#: classes/Command.php:335
 msgid "Command not yet implemented."
 msgstr ""
 
-#: classes/Command.php:313
+#: classes/Command.php:313 classes/Command.php:318
 msgid "Notification off."
 msgstr ""
 
-#: classes/Command.php:315
+#: classes/Command.php:315 classes/Command.php:320
 msgid "Can't turn off notification."
 msgstr ""
 
-#: classes/Command.php:333
+#: classes/Command.php:333 classes/Command.php:338
 msgid "Notification on."
 msgstr ""
 
-#: classes/Command.php:335
+#: classes/Command.php:335 classes/Command.php:340
 msgid "Can't turn on notification."
 msgstr ""
 
-#: classes/Command.php:344
+#: classes/Command.php:344 classes/Command.php:349
 msgid "Commands:\n"
 msgstr ""
 
@@ -2793,23 +3043,23 @@ msgstr ""
 msgid "Could not update message with new URI."
 msgstr ""
 
-#: lib/gallery.php:46
+#: lib/gallery.php:46 lib/gallery.php:55
 msgid "User without matching profile in system."
 msgstr ""
 
-#: lib/mail.php:147
+#: lib/mail.php:147 lib/mail.php:141
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:249
+#: lib/mail.php:249 lib/mail.php:275
 #, php-format
 msgid "New private message from %s"
 msgstr ""
 
-#: lib/mail.php:253
+#: lib/mail.php:253 lib/mail.php:279
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -2853,18 +3103,458 @@ msgstr ""
 msgid "Your sent messages"
 msgstr "మీరు పంపిన సందేశాలు"
 
-#: lib/settingsaction.php:99
+#: lib/settingsaction.php:99 actions/deleteprofile.php:256
 msgid "Twitter"
 msgstr ""
 
-#: lib/settingsaction.php:100
+#: lib/settingsaction.php:100 actions/deleteprofile.php:257
 msgid "Twitter integration options"
 msgstr ""
 
-#: lib/util.php:1718
+#: lib/util.php:1718 lib/util.php:2145
 msgid "To"
 msgstr ""
 
 #: scripts/maildaemon.php:45
 msgid "Could not parse message."
 msgstr ""
+
+#: actions/block.php:45 actions/subedit.php:45 actions/unblock.php:45
+msgid "No profile specified."
+msgstr ""
+
+#: actions/block.php:52 actions/subedit.php:52 actions/tagother.php:45
+#: actions/unblock.php:52
+msgid "No profile with that ID."
+msgstr ""
+
+#: actions/block.php:78
+#, fuzzy
+msgid "Block user"
+msgstr "అటువంటి వాడుకరి లేరు."
+
+#: actions/block.php:81
+msgid "Are you sure you want to block this user? "
+msgstr ""
+
+#: actions/block.php:117
+#, fuzzy
+msgid "You have already blocked this user."
+msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
+
+#: actions/block.php:124
+msgid "Failed to save block information."
+msgstr ""
+
+#: actions/deleteprofile.php:25
+msgid "Code not yet ready."
+msgstr ""
+
+#: actions/deleteprofile.php:36
+msgid "Export and delete your user information."
+msgstr ""
+
+#: actions/deleteprofile.php:88 actions/deleteprofile.php:119
+#, fuzzy
+msgid "Delete my account"
+msgstr "కొత్త ఖాతా సృష్టించుకోండి"
+
+#: actions/deleteprofile.php:89
+#, fuzzy
+msgid "Delete my account confirmation"
+msgstr "ఈమెయిల్ నిర్ధారణని తొలగించలేకున్నాం."
+
+#: actions/deleteprofile.php:117
+msgid "Check if you are sure you want to delete your account."
+msgstr ""
+
+#: actions/deleteprofile.php:259 lib/settingsaction.php:102
+msgid "Other"
+msgstr ""
+
+#: actions/deleteprofile.php:260 lib/settingsaction.php:103
+msgid "Other options"
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Add to favorites"
+msgstr ""
+
+#: actions/emailsettings.php:98
+msgid "Allow friends to nudge me and send me an email."
+msgstr ""
+
+#: actions/facebookremove.php:54
+#, fuzzy
+msgid "Couldn't remove Facebook user."
+msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
+
+#: actions/favor.php:71
+msgid "Disfavor favorite"
+msgstr ""
+
+#: actions/favorited.php:31 lib/stream.php:45
+#, fuzzy
+msgid "Popular notices"
+msgstr "అటువంటి సందేశమేమీ లేదు."
+
+#: actions/favorited.php:54
+msgid "Showing recently popular notices"
+msgstr ""
+
+#: actions/featured.php:32 actions/featured.php:54 lib/stream.php:41
+msgid "Featured users"
+msgstr ""
+
+#: actions/finishremotesubscribe.php:186
+msgid "That user has blocked you from subscribing."
+msgstr ""
+
+#: actions/microsummary.php:39
+msgid "No current status"
+msgstr ""
+
+#: actions/newnotice.php:93
+#, fuzzy
+msgid "Notice posted"
+msgstr "సందేశాలు"
+
+#: actions/newnotice.php:116 classes/Channel.php:140
+msgid "Ajax Error"
+msgstr ""
+
+#: actions/nudge.php:52
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
+
+#: actions/nudge.php:61
+msgid "Nudge sent"
+msgstr ""
+
+#: actions/othersettings.php:27
+msgid "Manage various other options."
+msgstr ""
+
+#: actions/othersettings.php:33
+#, fuzzy
+msgid "Other Settings"
+msgstr "ట్విట్టర్ అమరికలు"
+
+#: actions/othersettings.php:35
+msgid "URL Auto-shortening"
+msgstr ""
+
+#: actions/othersettings.php:54
+#, fuzzy
+msgid "Service"
+msgstr "వెతుకు"
+
+#: actions/othersettings.php:54
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/othersettings.php:155
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "ప్రాంతం పేరు మరీ పెద్దగా ఉంది (255 అక్షరాలు గరిష్ఠం)."
+
+#: actions/peopletag.php:33
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "సరైన ఈమెయిల్ చిరునామా కాదు:"
+
+#: actions/peopletag.php:45
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr ""
+
+#: actions/peopletag.php:87
+#, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+msgstr ""
+
+#: actions/profilesettings.php:92
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+
+#: actions/profilesettings.php:246 actions/tagother.php:131
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "'%s' అనే హోమ్ పేజీ సరైనదికాదు"
+
+#: actions/profilesettings.php:328
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "ప్రొఫైలుని భద్రపరచలేకున్నాం."
+
+#: actions/public.php:68
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
+msgstr ""
+
+#: actions/public.php:90
+msgid "Could not retrieve public stream."
+msgstr ""
+
+#: actions/register.php:67 actions/register.php:177
+msgid "Sorry, only invited people can register."
+msgstr ""
+
+#: actions/register.php:156
+msgid "With this form you can create a new account. "
+msgstr ""
+
+#: actions/remotesubscribe.php:136 actions/remotesubscribe.php:141
+msgid "That's a local profile! Login to subscribe."
+msgstr ""
+
+#: actions/subedit.php:68
+msgid "You are not subscribed to that profile."
+msgstr ""
+
+#: actions/subedit.php:81
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "చందాని సృష్టించలేకపోయాం."
+
+#: actions/subscribe.php:53
+#, fuzzy
+msgid "Not a local user."
+msgstr "అటువంటి వాడుకరి లేరు."
+
+#: actions/subscribe.php:67
+#, fuzzy
+msgid "Subscribed"
+msgstr "చందాదార్లు"
+
+#: actions/subscriptions.php:72
+#, fuzzy
+msgid "Jabber"
+msgstr "Jabber ID లేదు."
+
+#: actions/tagother.php:31
+#, fuzzy
+msgid "Not logged in"
+msgstr "లోనికి ప్రవేశించలేదు."
+
+#: actions/tagother.php:40
+#, fuzzy
+msgid "No id argument."
+msgstr "అటువంటి పత్రమేమీ లేదు."
+
+#: actions/tagother.php:56
+msgid "Tag a person"
+msgstr ""
+
+#: actions/tagother.php:98
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
+msgstr ""
+
+#: actions/tagother.php:120
+#, fuzzy
+msgid "No such profile."
+msgstr "అటువంటి సందేశమేమీ లేదు."
+
+#: actions/tagother.php:146
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+
+#: actions/tagother.php:153
+#, fuzzy
+msgid "Could not save tags."
+msgstr "అవతారపు సమాచారాన్ని భద్రపరచలేకున్నాం"
+
+#: actions/tagother.php:188
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
+
+#: actions/tagrss.php:33
+#, fuzzy
+msgid "No such tag."
+msgstr "అటువంటి సందేశమేమీ లేదు."
+
+#: actions/tagrss.php:62
+#, fuzzy, php-format
+msgid "Microblog tagged with %s"
+msgstr ""
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"%s యొక్క మైక్రోబ్లాగు\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: actions/twitapiblocks.php:45
+msgid "Block user failed."
+msgstr ""
+
+#: actions/twitapiblocks.php:66
+msgid "Unblock user failed."
+msgstr ""
+
+#: actions/twitapiusers.php:45
+#, fuzzy
+msgid "Not found."
+msgstr "అభ్యర్థనలేమీ కనబడలేదు!"
+
+#: actions/twittersettings.php:63
+#, fuzzy
+msgid "Twitter user name"
+msgstr "ట్విట్టర్ అమరికలు"
+
+#: actions/twittersettings.php:67
+#, fuzzy
+msgid "Twitter password"
+msgstr "కొత్త సంకేతపదం"
+
+#: actions/twittersettings.php:129
+#, fuzzy
+msgid "Twitter Friends"
+msgstr "ట్విట్టర్ అమరికలు"
+
+#: actions/unblock.php:73
+#, fuzzy
+msgid "Error removing the block."
+msgstr "వాడుకరిని భద్రపరచడంలో పొరపాటు."
+
+#: actions/unsubscribe.php:48
+msgid "No profile id in request."
+msgstr ""
+
+#: actions/unsubscribe.php:55
+msgid "No profile with that id."
+msgstr ""
+
+#: actions/unsubscribe.php:69
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "చందాదార్లు"
+
+#: classes/Notice.php:100
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు."
+
+#: classes/Notice.php:105
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+
+#: classes/Notice.php:112
+msgid "You are banned from posting notices on this site."
+msgstr ""
+
+#: lib/gallery.php:98
+msgid "Filter tags"
+msgstr ""
+
+#: lib/gallery.php:104
+msgid "All"
+msgstr ""
+
+#: lib/gallery.php:108
+msgid "Tag"
+msgstr ""
+
+#: lib/gallery.php:109
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/gallery.php:110
+msgid "Go"
+msgstr ""
+
+#: lib/gallery.php:264
+#, fuzzy
+msgid "Subscriptions navigation"
+msgstr "చందాలు"
+
+#: lib/gallery.php:270 lib/gallery.php:292
+msgid "List"
+msgstr ""
+
+#: lib/gallery.php:280 lib/gallery.php:294
+msgid "Icons"
+msgstr ""
+
+#: lib/mail.php:92
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:242
+#, php-format
+msgid "You've been nudged by %s"
+msgstr ""
+
+#: lib/mail.php:246
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+msgstr ""
+
+#: lib/profilelist.php:146
+msgid "(none)"
+msgstr ""
+
+#: lib/stream.php:33
+msgid "Public"
+msgstr "ప్రజా"
+
+#: lib/stream.php:36 lib/stream.php:37
+msgid "Recent tags"
+msgstr ""
+
+#: lib/stream.php:40
+msgid "Featured"
+msgstr ""
+
+#: lib/stream.php:44
+#, fuzzy
+msgid "Popular"
+msgstr "వ్యక్తుల అన్వేషణ"
+
+#: lib/subs.php:51
+#, fuzzy
+msgid "User has blocked you."
+msgstr "వాడుకరికి ప్రొఫైలు లేదు."
+
+#: lib/util.php:2059
+msgid "Send a nudge"
+msgstr ""
+
+#: lib/util.php:2063
+msgid "Nudge sent!"
+msgstr ""
+
+#: lib/util.php:2194
+msgid "Block"
+msgstr ""
+
+#: lib/util.php:2198
+msgid "Unblock"
+msgstr ""
+
+#~ msgid "Couldn't confirm email."
+#~ msgstr "ఈమెయిలుని నిర్ధారించలేకున్నాం."
+
+#~ msgid "Email address"
+#~ msgstr "ఈమెయిల్ చిరునామా"
+
+#~ msgid "Error inserting notice"
+#~ msgstr "సందేశాన్ని చేర్చటంలో పొరపాటు"
+
+#~ msgid ""
+#~ "If you've forgotten or lost your password, you can get a new one sent  "
+#~ "the email address you have stored  in your account."
+#~ msgstr "మీరు మీ సంకేతపదాన్ని మర్చిపోతే, మీ ఖాతాలో భద్రపరచిన ఈమెయిలుకి కొత్తదాన్ని పంపించుకోవచ్చు."
diff --git a/tr_TR/LC_MESSAGES/laconica.po b/tr_TR/LC_MESSAGES/laconica.po
index 275ff72b61..df44dda768 100644
--- a/tr_TR/LC_MESSAGES/laconica.po
+++ b/tr_TR/LC_MESSAGES/laconica.po
@@ -7,48 +7,90 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"#-#-#-#-#  laconica.po (Laconi.ca Türkçe)  #-#-#-#-#\n"
-"Project-Id-Version: Laconi.ca Türkçe\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-14 21:07+1200\n"
-"PO-Revision-Date: 2008-07-29 12:33+0100\n"
-"Last-Translator: Kemal Yaylali <kemal.yaylali@gmail.com>\n"
-"Language-Team: nedurum.com\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Turkish\n"
-"X-Poedit-Country: TURKEY\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"POT-Creation-Date: 2009-01-12 12:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"#-#-#-#-#  laconica.po (Laconi.ca Türkçe)  #-#-#-#-#\n"
+"X-Poedit-Language: Turkish\n"
+"X-Poedit-Country: TURKEY\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/noticesearchrss.php:64
+#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:61
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr " \"%s\" için arama sonuçları"
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: actions/finishopenidlogin.php:88 actions/register.php:205
+#: actions/register.php:232
 msgid ""
-" except this private data: password, email address, IM address, phone "
-"number."
+" except this private data: password, email address, IM address, phone number."
 msgstr ""
 "bu özel veriler haricinde: parola, eposta adresi, IM adresi, telefon "
 "numarası."
 
-#: ../actions/subscribe.php:84
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+#: lib/facebookaction.php:195 lib/noticelist.php:160
+msgid " from "
+msgstr ""
+
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: actions/twitapistatuses.php:341
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr ""
+
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
+
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:115
+#: lib/mail.php:117
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s %2$s'da durumunuzu takip ediyor"
 
-#: ../actions/subscribe.php:86
+#: ../lib/mail.php:126
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -62,519 +104,882 @@ msgstr ""
 "\n"
 "\t%3$s\n"
 "\n"
-"Kendisini durumsuz bırakmayın!,\n%4$s.\n"
+"Kendisini durumsuz bırakmayın!,\n"
+"%4$s.\n"
+
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#: actions/twitapistatuses.php:344
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
 
-#: ../actions/shownotice.php:45
+#: ../actions/shownotice.php:45 actions/shownotice.php:45
+#: actions/shownotice.php:73
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1$s'in %2$s'deki durum mesajları "
 
-#: ../actions/publicrss.php:60
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../actions/publicrss.php:62 actions/publicrss.php:48
 #, php-format
 msgid "%s Public Stream"
 msgstr "%s Genel Durum Mesajları"
 
-#: ../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/twitapistatuses.php:123
 #, php-format
 msgid "%s and friends"
 msgstr "%s ve arkadaşları"
 
-#: ../lib/util.php:233
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:31
+#, php-format
+msgid "%s public timeline"
+msgstr ""
+
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:217
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:195
+#, php-format
+msgid "%s timeline"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:34
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+
+#: ../lib/util.php:257 lib/util.php:273 lib/util.php:284
 #, 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%%** [%%site.broughtby%%](%%site.broughtbyurl%%)\" tarafından "
 "hazırlanan anında mesajlaşma ağıdır. "
 
-#: ../lib/util.php:235
+#: ../lib/util.php:259 lib/util.php:275 lib/util.php:286
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** bir aninda mesajlaşma sosyal ağıdır."
 
-#: ../lib/util.php:250
+#: ../lib/util.php:274 lib/util.php:290 lib/util.php:301
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr "Katkı sunanlar tam ad veya takma ad ile atfedilmelidir."
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: ../actions/register.php:176
+#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
+#: actions/profilesettings.php:78
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 "1-64 küçük harf veya rakam, noktalama işaretlerine ve boşluklara izin "
 "verilmez"
 
-#: ../actions/password.php:42 ../actions/register.php:178
+#: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:193
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/profilesettings.php:186
 msgid "6 or more characters"
 msgstr "6 veya daha fazla karakter"
 
-#: ../actions/recoverpassword.php:165
+#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
 msgid "6 or more characters, and don't forget it!"
 msgstr "Unutmayın, 6 veya daha fazla karakter"
 
-#: ../actions/imsettings.php:188
+#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:195
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, 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 ""
+"Eklemiş olduğunuz IM adresine bir onay kodu gönderildi. %s tarafından size "
+"mesaj yollanabilmesi için onaylamanız gerekmektedir."
+
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:234
+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 ""
+
+#: ../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/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:30
+#: actions/twitapidirect_messages.php:107 actions/twitapifavorites.php:83
+#: actions/twitapifavorites.php:99 actions/twitapifriendships.php:117
+#: actions/twitapihelp.php:42 actions/twitapistatuses.php:77
+#: actions/twitapistatuses.php:144 actions/twitapistatuses.php:224
+#: actions/twitapistatuses.php:234 actions/twitapistatuses.php:386
+#: actions/twitapistatuses.php:395 actions/twitapistatuses.php:421
+#: actions/twitapiusers.php:30
+msgid "API method not found!"
 msgstr ""
-"Eklemiş olduğunuz IM adresine bir onay kodu gönderildi. %s tarafından "
-"size mesaj yollanabilmesi için onaylamanız gerekmektedir."
 
-#: ../lib/util.php:296
+#: ../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:39
+#: actions/twitapiaccount.php:89 actions/twitapiaccount.php:94
+#: actions/twitapidirect_messages.php:178 actions/twitapifavorites.php:139
+#: actions/twitapihelp.php:49 actions/twitapistatuses.php:549
+msgid "API method under construction."
+msgstr ""
+
+#: ../lib/util.php:324 lib/util.php:340 lib/util.php:352
 msgid "About"
 msgstr "Hakkında"
 
-#: ../actions/userauthorization.php:118
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
 msgid "Accept"
 msgstr "Kabul et"
 
-#: ../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/twittersettings.php:84
 msgid "Add"
 msgstr "Ekle"
 
-#: ../actions/openidsettings.php:43
+#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
 msgid "Add OpenID"
 msgstr "OpenID ekle"
 
-#: ../actions/imsettings.php:39
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: actions/deleteprofile.php:248
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
 msgid "Address"
 msgstr "Adres"
 
-#: ../actions/showstream.php:254
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
+
+#: ../actions/showstream.php:273 actions/showstream.php:288
+#: actions/showstream.php:336
 msgid "All subscriptions"
 msgstr "Bütün abonelikler"
 
-#: ../actions/publicrss.php:62
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
 #, php-format
 msgid "All updates for %s"
 msgstr "%s için bütün güncellemeler"
 
-#: ../actions/noticesearchrss.php:66
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:63
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "\"%s\" kelimesinin geçtiği tüm güncellemeler"
 
-#: ../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
 msgid "Already logged in."
 msgstr "Zaten giriş yapılmış."
 
-#: ../actions/subscribe.php:48
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:47
 msgid "Already subscribed!."
 msgstr "Zaten abone olunmuş!."
 
-#: ../actions/userauthorization.php:76
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+msgid "Are you sure you want to delete this notice?"
+msgstr ""
+
+#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
 msgid "Authorize subscription"
 msgstr "Takip isteğini onayla"
 
-#: ../actions/login.php:100 ../actions/register.php:184
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192 actions/register.php:219
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
-"Gelecekte kendiliğinden giriş yap, paylaşılan bilgisayarlar için "
-"değildir!"
+"Gelecekte kendiliğinden giriş yap, paylaşılan bilgisayarlar için değildir!"
+
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:103
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
 
-#: ../actions/avatar.php:32
+#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: actions/profilesettings.php:34
 msgid "Avatar"
 msgstr "Avatar"
 
-#: ../actions/avatar.php:113
+#: ../actions/avatar.php:113 actions/profilesettings.php:350
+#: actions/profilesettings.php:379
 msgid "Avatar updated."
 msgstr "Avatar güncellendi."
 
-#: ../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 ""
-"Bu adresten onay bekleniyor. Jabber/Google Talk hesabınızı ayrıntılı "
-"bilgi içeren mesajı almak için kontrol edin. (%s'u arkadaş listenize "
-"eklediniz mi?)"
+"Bu adresten onay bekleniyor. Jabber/Google Talk hesabınızı ayrıntılı bilgi "
+"içeren mesajı almak için kontrol edin. (%s'u arkadaş listenize eklediniz mi?)"
+
+#: ../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 ""
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+msgid "Awaiting confirmation on this phone number."
+msgstr ""
 
-#: ../lib/util.php:1136
-msgid "Before »"
+#: ../lib/util.php:1318 lib/util.php:1452 lib/facebookaction.php:259
+#: lib/util.php:1792
+#, fuzzy
+msgid "Before »"
 msgstr "Önce »"
 
-#: ../actions/profilesettings.php:52
+#: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: actions/profilesettings.php:82 actions/register.php:184
+#: actions/profilesettings.php:84 actions/register.php:211
 msgid "Bio"
 msgstr "Hakkında"
 
-#: ../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:222 actions/register.php:98
 msgid "Bio is too long (max 140 chars)."
 msgstr "Hakkında bölümü çok uzun (azm 140 karakter)."
 
-#: ../actions/updateprofile.php:118
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+msgid "Can't delete this notice."
+msgstr ""
+
+#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "Avatar URLi '%s' okunamıyor"
 
-#: ../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/profilesettings.php:433
 msgid "Can't save new password."
 msgstr "Yeni parola kaydedilemedi."
 
-#: ../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
 msgid "Cancel"
 msgstr "Ä°ptal et"
 
-#: ../lib/openid.php:121
+#: ../lib/openid.php:121 lib/openid.php:121
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "OpenID işlemlerinde hata oluştu."
 
-#: ../actions/imsettings.php:154
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
 msgid "Cannot normalize that Jabber ID"
 msgstr "Jabber işlemlerinde bir hata oluştu."
 
-#: ../actions/password.php:45
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:204
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/profilesettings.php:189
 msgid "Change"
 msgstr "Değiştir"
 
-#: ../actions/password.php:32
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: actions/deleteprofile.php:245
+msgid "Change email handling"
+msgstr ""
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
 msgid "Change password"
 msgstr "Parolayı değiştir"
 
-#: ../actions/password.php:43 ../actions/recoverpassword.php:166
-#: ../actions/register.php:179
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr ""
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#: actions/deleteprofile.php:242
+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/profilesettings.php:187 actions/register.php:196
 msgid "Confirm"
 msgstr "Onayla"
 
-#: ../actions/confirmaddress.php:84
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
 msgid "Confirm Address"
 msgstr "Adresi Onayla"
 
-#: ../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:259
 msgid "Confirmation cancelled."
 msgstr "Onaylama iptal edildi."
 
-#: ../actions/confirmaddress.php:38
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+msgid "Confirmation code"
+msgstr ""
+
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
 msgid "Confirmation code not found."
 msgstr "Onay kodu bulunamadı."
 
-#: ../actions/finishopenidlogin.php:91
+#: ../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:97
 msgid "Connect"
 msgstr "Bağlan"
 
-#: ../actions/finishopenidlogin.php:86
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
 msgid "Connect existing account"
 msgstr "Varolan hesaba bağlan"
 
-#: ../lib/util.php:304
+#: ../lib/util.php:332 lib/util.php:348 lib/util.php:360
 msgid "Contact"
 msgstr "İletişim"
 
-#: ../lib/openid.php:178
+#: ../lib/openid.php:178 lib/openid.php:178
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "OpenID formu yaratılamadı: %s"
 
-#: ../lib/openid.php:160
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:46 actions/twitapifriendships.php:62
+#, 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:39
+msgid "Could not follow user: User not found."
+msgstr ""
+
+#: ../lib/openid.php:160 lib/openid.php:160
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "Sunucuya yönlendirme yapılamadı: %s"
 
-#: ../actions/updateprofile.php:161
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
 msgid "Could not save avatar info"
 msgstr "Avatar bilgisi kaydedilemedi"
 
-#: ../actions/updateprofile.php:154
+#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
 msgid "Could not save new profile info"
 msgstr "Yeni profil bilgisi kaydedilemedi"
 
-#: ../actions/profilesettings.php:146
-msgid "Couldn't confirm email."
-msgstr "Eposta onaylanamadı."
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:70
+msgid "Could not subscribe other to you."
+msgstr ""
+
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:55
+msgid "Could not subscribe."
+msgstr ""
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr ""
 
 #: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101
+#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:112
 msgid "Couldn't convert request tokens to access tokens."
 msgstr ""
 
-#  Note: Bu federation ozelligi nasilsa simdi kullanilmayacak
-#: ../actions/subscribe.php:59
-msgid "Couldn't create subscription."
-msgstr "Abonelik oluşturulamadı."
-
-#: ../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/emailsettings.php:255
 msgid "Couldn't delete email confirmation."
 msgstr "Eposta onayı silinemedi."
 
-#: ../actions/unsubscribe.php:56
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:129
 msgid "Couldn't delete subscription."
 msgstr "Abonelik silinemedi."
 
-#: ../actions/remotesubscribe.php:125 ../actions/remotesubscribe.php:127
-#: actions/remotesubscribe.php:136
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+#: actions/twitapistatuses.php:82
+msgid "Couldn't find any statuses."
+msgstr ""
+
+#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
+#: actions/remotesubscribe.php:148
 msgid "Couldn't get a request token."
 msgstr ""
 
 #  Note: Bu federation ozelligi nasilsa simdi kullanilmayacak
-#: ../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:228
 msgid "Couldn't insert confirmation code."
 msgstr "Onay kodu eklenemedi."
 
 #: ../actions/finishremotesubscribe.php:180
+#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:216
 msgid "Couldn't insert new subscription."
 msgstr "Yeni abonelik eklenemedi."
 
-#: ../actions/profilesettings.php:175
+#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
+#: actions/profilesettings.php:319 actions/twitapiaccount.php:74
 msgid "Couldn't save profile."
 msgstr "Profil kaydedilemedi."
 
-#: ../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:296
+msgid "Couldn't update user for autosubscribe."
+msgstr ""
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+#: actions/emailsettings.php:301 actions/emailsettings.php:315
+msgid "Couldn't update user record."
+msgstr ""
+
+#: ../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/emailsettings.php:179 actions/emailsettings.php:280
+#: actions/othersettings.php:173 actions/profilesettings.php:276
 msgid "Couldn't update user."
 msgstr "Kullanıcı güncellenemedi."
 
-#: ../actions/finishopenidlogin.php:84
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
 msgid "Create"
 msgstr "Yarat"
 
-#: ../actions/finishopenidlogin.php:70
+#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
 msgid "Create a new user with this nickname."
 msgstr "Bu takma ad ile yeni bir kullanıcı oluştur."
 
-#: ../actions/finishopenidlogin.php:68
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
 msgid "Create new account"
 msgstr "Yeni hesap oluştur"
 
-#: ../actions/finishopenidlogin.php:191
+#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+#: actions/finishopenidlogin.php:208
 msgid "Creating new account for OpenID that already has a user."
 msgstr "OpenID kullanıcısı için hesap oluşturuluyor"
 
-#: ../actions/imsettings.php:45
+#: ../actions/imsettings.php:45 actions/imsettings.php:46
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Onaylanmış Jabber/Gtalk adresi."
 
-#: ../actions/showstream.php:337
-msgid "Currently"
-msgstr "Şu anda"
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
 
-#: ../lib/util.php:893
-#, php-format
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+msgid "Current confirmed email address."
+msgstr ""
+
+#: ../actions/showstream.php:356 actions/showstream.php:367
+#: actions/showstream.php:418
+msgid "Currently"
+msgstr "Şu anda"
+
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:87
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: ../lib/util.php:1061 lib/util.php:1110 lib/util.php:1417
+#, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Cevap eklenirken veritabanı hatası: %s"
 
-#: ../actions/profilesettings.php:54
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+msgid "Delete notice"
+msgstr ""
+
+#: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: actions/profilesettings.php:84 actions/register.php:186
+#: actions/profilesettings.php:86 actions/register.php:213
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
 
-#: ../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/deleteprofile.php:244 actions/register.php:199
+#: actions/register.php:202
 msgid "Email"
 msgstr "Eposta"
 
-#: ../actions/profilesettings.php:46
-msgid "Email address"
-msgstr "Eposta adresi"
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+msgid "Email Address"
+msgstr ""
+
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+msgid "Email Settings"
+msgstr ""
 
-#: ../actions/profilesettings.php:102 ../actions/register.php:63
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:89
 msgid "Email address already exists."
 msgstr "Eposta adresi zaten var."
 
-#: ../lib/mail.php:82
+#: ../lib/mail.php:90 lib/mail.php:90
 msgid "Email address confirmation"
 msgstr "Eposta adresi onayı"
 
-#: ../actions/recoverpassword.php:176
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
+
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr ""
+
+#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
 msgid "Enter a nickname or email address."
 msgstr "Bir takma ad veya eposta adresi girin."
 
-#: ../actions/userauthorization.php:136 ../actions/userauthorization.php:137
-#: actions/userauthorization.php:144
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+msgid "Enter the code you received on your phone."
+msgstr ""
+
+#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
 msgid "Error authorizing token"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:282
+#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
+#: actions/finishopenidlogin.php:274
 msgid "Error connecting user to OpenID."
 msgstr "Kullanıcıyı OpenID'ye bağlarken hata oluştu."
 
-#: ../actions/finishaddopenid.php:78
+#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
 msgid "Error connecting user."
 msgstr "Kullanıcı bağlamada hata oluştu."
 
 #: ../actions/finishremotesubscribe.php:151
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:164
 msgid "Error inserting avatar"
 msgstr "Avatar eklemede hata oluştu"
 
 #: ../actions/finishremotesubscribe.php:143
+#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:156
 msgid "Error inserting new profile"
 msgstr "Yeni profil eklemede hata oluştu"
 
-#: ../actions/postnotice.php:88
-msgid "Error inserting notice"
-msgstr "Durum gönderilirken hata oluştu"
-
 #: ../actions/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:180
 msgid "Error inserting remote profile"
 msgstr "Uzak profil eklemede hata oluştu"
 
-#: ../actions/recoverpassword.php:201
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
 msgid "Error saving address confirmation."
 msgstr "Adres onayını kaydetmede hata."
 
-#: ../actions/userauthorization.php:139
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
 msgid "Error saving remote profile"
 msgstr "Uzaktaki profili kaydetmede hata oluştu"
 
-#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
+#: ../lib/openid.php:226 lib/openid.php:226
 msgid "Error saving the profile."
 msgstr "Profili kaydetmede hata oluştu."
 
-#: ../lib/openid.php:237
+#: ../lib/openid.php:237 lib/openid.php:237
 msgid "Error saving the user."
 msgstr "Kullanıcıyı kaydetmede hata oluştu."
 
-#: ../actions/password.php:80
+#: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/profilesettings.php:428
 msgid "Error saving user; invalid."
 msgstr "Kullanıcıyı kaydetmede hata oluştu; geçersiz."
 
-#: ../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:54 actions/login.php:80
+#: actions/register.php:117
 msgid "Error setting user."
 msgstr "Kullanıcı ayarlamada hata oluştu."
 
-#: ../actions/finishaddopenid.php:83
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
 msgid "Error updating profile"
 msgstr "Profil güncellemede hata oluştu"
 
 #: ../actions/finishremotesubscribe.php:161
+#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:174
 msgid "Error updating remote profile"
 msgstr "Uzaktaki profili güncellemede hata oluştu"
 
-#: ../actions/recoverpassword.php:79
+#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
 msgid "Error with confirmation code."
 msgstr "Onay kodu hatası."
 
-#: ../actions/finishopenidlogin.php:89
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
 msgid "Existing nickname"
 msgstr "Varolan takma ad"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:326 lib/util.php:342 lib/util.php:354
 msgid "FAQ"
 msgstr "SSS"
 
-#: ../actions/avatar.php:115
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/profilesettings.php:381
 msgid "Failed updating avatar."
 msgstr "Avatar güncellemede hata."
 
-#: ../actions/all.php:61 ../actions/allrss.php:74
+#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
+#: actions/allrss.php:64
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "%s için arkadaş güncellemeleri RSS beslemesi"
 
-#: ../actions/replies.php:61 ../actions/repliesrss.php:80
+#: ../actions/replies.php:65 ../actions/repliesrss.php:80
+#: actions/replies.php:65 actions/repliesrss.php:66
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Cevaplar için RSS Beslemesi: %s"
 
-#: ../actions/login.php:118
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:54
+#, php-format
+msgid "Feed for tag %s"
+msgstr ""
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+msgid "Find content of notices"
+msgstr ""
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+msgid "Find people on this site"
+msgstr ""
+
+#: ../actions/login.php:122
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
-"Güvenliğiniz için, ayarlarınızı değiştirmeden önce lütfen "
-"kullanıcı adınızı ve parolanızı tekrar giriniz."
+"Güvenliğiniz için, ayarlarınızı değiştirmeden önce lütfen kullanıcı adınızı "
+"ve parolanızı tekrar giriniz."
 
-#: ../actions/profilesettings.php:44
+#: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: actions/profilesettings.php:77 actions/register.php:178
+#: actions/profilesettings.php:79 actions/register.php:205
 msgid "Full name"
 msgstr "Tam Ä°sim"
 
-#: ../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/profilesettings.php:219 actions/register.php:95
 msgid "Full name is too long (max 255 chars)."
 msgstr "Tam isim çok uzun (azm: 255 karakter)."
 
-#: ../lib/util.php:279
+#: ../lib/util.php:322 lib/util.php:338 lib/util.php:343 lib/util.php:350
 msgid "Help"
 msgstr "Yardım"
 
-#: ../lib/util.php:274
+#: ../lib/util.php:298 lib/util.php:314 lib/util.php:325
 msgid "Home"
 msgstr "Başlangıç"
 
 #  Belki Durum Merkezi falan denebilir mi ki?
-#: ../actions/profilesettings.php:49
+#: ../actions/profilesettings.php:46 ../actions/register.php:167
+#: actions/profilesettings.php:79 actions/register.php:181
+#: actions/profilesettings.php:81 actions/register.php:208
 msgid "Homepage"
 msgstr "Başlangıç Sayfası"
 
-#: ../actions/profilesettings.php:87
+#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: actions/profilesettings.php:210 actions/register.php:83
+#: actions/profilesettings.php:216 actions/register.php:92
 msgid "Homepage is not a valid URL."
 msgstr "Başlangıç sayfası adresi geçerli bir URL değil."
 
-#: ../actions/imsettings.php:61
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+#: actions/emailsettings.php:101
+msgid "I want to post notices by email."
+msgstr ""
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+#: actions/deleteprofile.php:253
+msgid "IM"
+msgstr ""
+
+#: ../actions/imsettings.php:60 actions/imsettings.php:61
 msgid "IM Address"
 msgstr "IM adresi"
 
-#: ../actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
 msgid "IM Settings"
 msgstr "IM Ayarları"
 
-#: ../actions/finishopenidlogin.php:88
+#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
 msgstr ""
-"Eğer zaten bir hesabınız varsa, kullanıcı adınız ve parolanız ile "
-"giriş yapıp hesabınızı OpenID'nize bağlayabilirsiniz."
+"Eğer zaten bir hesabınız varsa, kullanıcı adınız ve parolanız ile giriş "
+"yapıp hesabınızı OpenID'nize bağlayabilirsiniz."
 
 #: ../actions/openidsettings.php:45
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
 msgstr ""
-"Eğer hesabınıza bir OpenID eklemek istiyorsanız, aşağıdaki kutuya "
-"girin ve \"Add\" düğmesine tıklayın."
+"Eğer hesabınıza bir OpenID eklemek istiyorsanız, aşağıdaki kutuya girin ve "
+"\"Add\" düğmesine tıklayın."
 
-#: ../actions/recoverpassword.php:122
+#: ../actions/recoverpassword.php:137
 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 ""
-"Eğer parolanızı unuttuysanız veya kaybettiyseniz, hesabınıza eklemiş "
-"olduğunuz eposta adresine yeni bir tane gönderilmesini sağlayabilirsiniz."
 
-#: ../actions/password.php:69
+#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
+#: actions/emailsettings.php:68 actions/smssettings.php:76
+msgid "Incoming email"
+msgstr ""
+
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+#: actions/emailsettings.php:304
+msgid "Incoming email address removed."
+msgstr ""
+
+#: ../actions/password.php:69 actions/profilesettings.php:388
+#: actions/profilesettings.php:417
 msgid "Incorrect old password"
 msgstr "Eski parola yanlış"
 
-#: ../actions/login.php:63
+#: ../actions/login.php:67 actions/login.php:67 actions/login.php:74
 msgid "Incorrect username or password."
 msgstr "Yanlış kullanıcı adı veya parola."
 
-#: ../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."
 msgstr ""
-"Hesabınıza eklemiş olduğunuz eposta adresine parolanızı geri getirmek "
-"için gerekli olan talimatlar yollanmıştır."
+"Hesabınıza eklemiş olduğunuz eposta adresine parolanızı geri getirmek için "
+"gerekli olan talimatlar yollanmıştır."
 
-#: ../actions/updateprofile.php:113
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "Geçersiz avatar URLi '%s'"
 
-#: ../actions/updateprofile.php:97
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "%s Geçersiz başlangıç sayfası"
 
-#: ../actions/updateprofile.php:81
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "Geçersiz lisans URLi '%s'"
 
-#: ../actions/postnotice.php:61
+#: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:63
 msgid "Invalid notice content"
 msgstr "Geçersiz durum mesajı"
 
-#: ../actions/postnotice.php:67
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:69
 msgid "Invalid notice uri"
 msgstr "Geçersiz durum adresi"
 
-#: ../actions/postnotice.php:72
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:74
 msgid "Invalid notice url"
 msgstr "Geçersiz durum adresi"
 
-#: ../actions/updateprofile.php:86
+#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "'%s' geçersiz profil adresi."
@@ -584,36 +989,54 @@ msgid "Invalid profile URL (bad format)"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:78
 msgid "Invalid profile URL returned by server."
 msgstr ""
 
-#: ../actions/avatarbynickname.php:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
 msgid "Invalid size."
 msgstr "Geçersiz büyüklük."
 
-#: ../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:256 actions/register.php:112
+#: actions/register.php:130
 msgid "Invalid username or password."
 msgstr "Geçersiz kullanıcı adı veya parola."
 
-#: ../lib/util.php:237
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr ""
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
+
+#: ../lib/util.php:306 lib/util.php:322 lib/util.php:332
+msgid "Invite"
+msgstr ""
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr ""
+
+#: ../lib/util.php:261 lib/util.php:277 lib/util.php:288
 #, 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 ""
-"nedurum.com [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html) lisansı ile "
-"korunan [Laconica](http://laconi.ca/) microbloglama yazılımının %s. "
-"versiyonunu kullanmaktadır."
+"nedurum.com [GNU Affero General Public License](http://www.fsf.org/licensing/"
+"licenses/agpl-3.0.html) lisansı ile korunan [Laconica](http://laconi.ca/) "
+"microbloglama yazılımının %s. versiyonunu kullanmaktadır."
 
-#: ../actions/imsettings.php:164
+#: ../actions/imsettings.php:173 actions/imsettings.php:181
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID başka bir kullanıcıya ait."
 
-#: ../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 "
@@ -622,147 +1045,255 @@ msgstr ""
 "Jabber veya Gtalk adresi: \"KullaniciAdi@ornek.org\" gibi. Öncelikle %s, IM "
 "istemcisi veya Gtalk arkadaşlar listenize eklenmiş olmalıdır."
 
-#: ../actions/profilesettings.php:55
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
+msgid "Language"
+msgstr ""
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr ""
+
+#: ../actions/profilesettings.php:52 ../actions/register.php:173
+#: actions/profilesettings.php:85 actions/register.php:187
+#: actions/profilesettings.php:87 actions/register.php:214
 msgid "Location"
 msgstr "Yer"
 
-#: ../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/profilesettings.php:225 actions/register.php:101
 msgid "Location is too long (max 255 chars)."
 msgstr "Yer bilgisi çok uzun (azm: 255 karakter)."
 
-#: ../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/login.php:104 actions/login.php:113 actions/openidlogin.php:88
+#: lib/util.php:336
 msgid "Login"
 msgstr "Giriş"
 
-#: ../actions/openidlogin.php:44
+#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:60
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Bir [OpenID](%%doc.openid%%) hesabı ile giriş yapın."
 
-#: ../actions/login.php:122
+#: ../actions/login.php:126
 #, 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 ""
-"Kullanıcı adı ve parolanızla giriş yapın. Henüz bir hesabınız yok "
-"mu? Ne duruyorsunuz, hemen bir [yeni hesap oluşturun](%%action.register%%) "
-"ya da [OpenID](%%action.openidlogin%%) ile giriş yapın."
+"Kullanıcı adı ve parolanızla giriş yapın. Henüz bir hesabınız yok mu? Ne "
+"duruyorsunuz, hemen bir [yeni hesap oluşturun](%%action.register%%) ya da "
+"[OpenID](%%action.openidlogin%%) ile giriş yapın."
 
-#: ../lib/util.php:284
+#: ../lib/util.php:308 lib/util.php:324 lib/util.php:334
 msgid "Logout"
 msgstr "Çıkış"
 
-#: ../actions/login.php:106
+#: ../actions/register.php:166 actions/register.php:180
+#: actions/register.php:207
+msgid "Longer name, preferably your \"real\" name"
+msgstr ""
+
+#: ../actions/login.php:110 actions/login.php:110 actions/login.php:118
 msgid "Lost or forgotten password?"
 msgstr "Parolamı unuttum veya kaybettim"
 
-#: ../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 ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr ""
+
+#: ../actions/showstream.php:300 actions/showstream.php:315
+#: actions/showstream.php:363
 msgid "Member since"
 msgstr "Üyelik başlangıcı"
 
-#: ../actions/userrss.php:70
+#: ../actions/userrss.php:70 actions/userrss.php:67
 #, php-format
 msgid "Microblog by %s"
 msgstr "%s adli kullanicinin durum mesajlari"
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
+#: ../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 ""
+
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php:85 actions/register.php:202
+#: actions/register.php:229
 msgid "My text and files are available under "
 msgstr "Durum mesajlarim ve dosyalarim şu lisans ile korunmaktadır: "
 
-#: ../actions/finishopenidlogin.php:71
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+msgid "New"
+msgstr ""
+
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:138
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+#: actions/emailsettings.php:318
+msgid "New incoming email address added."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
 msgid "New nickname"
 msgstr "Yeni takma ad"
 
-#: ../actions/newnotice.php:100
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:141
 msgid "New notice"
 msgstr "Yeni durum mesajı"
 
-#: ../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/profilesettings.php:185
 msgid "New password"
 msgstr "Yeni parola"
 
-#: ../actions/recoverpassword.php:275
+#: ../actions/recoverpassword.php:314
 msgid "New password successfully saved. You are now logged in."
 msgstr "Yeni parola başarıyla kaydedildi. Şimdi giriş yaptınız."
 
-#: ../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:108 actions/profilesettings.php:76
+#: actions/register.php:192
 msgid "Nickname"
 msgstr "Takma ad"
 
-#: ../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/finishopenidlogin.php:192 actions/profilesettings.php:231
+#: actions/register.php:85
 msgid "Nickname already in use. Try another one."
 msgstr "Takma ad kullanımda. Başka bir tane deneyin."
 
-#: ../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:182 actions/profilesettings.php:209
+#: actions/register.php:83
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "Takma ad sadece küçük harflerden ve rakamlardan oluşabilir, boşluk "
 "kullanılamaz. "
 
-#: ../actions/finishopenidlogin.php:170
+#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:187
 msgid "Nickname not allowed."
 msgstr "Takma ada izin verilmiyor."
 
-#: ../actions/remotesubscribe.php:72
+#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
 msgid "Nickname of the user you want to follow"
 msgstr "Takip etmek istediğiniz kullanıcının takma adı"
 
-#: ../actions/recoverpassword.php:147
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
 msgid "Nickname or email"
 msgstr "Takma ad veya eposta"
 
-#: ../actions/imsettings.php:147
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:104
+msgid "No"
+msgstr ""
+
+#: ../actions/imsettings.php:156 actions/imsettings.php:164
 msgid "No Jabber ID."
 msgstr "JabberID yok."
 
-#: ../actions/userauthorization.php:128
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
 msgid "No authorization request!"
 msgstr "Yetkilendirme isteği yok!"
 
-#: ../actions/confirmaddress.php:33
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+msgid "No carrier selected."
+msgstr ""
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+msgid "No code entered"
+msgstr ""
+
+#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
 msgid "No confirmation code."
 msgstr "Onay kodu yok."
 
-#: ../actions/newnotice.php:49
+#: ../actions/newnotice.php:44 actions/newmessage.php:53
+#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:52
+#: actions/newnotice.php:53
 msgid "No content!"
 msgstr "İçerik yok!"
 
-#: ../actions/userbyid.php:27
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+#: actions/emailsettings.php:197
+msgid "No email address."
+msgstr ""
+
+#: ../actions/userbyid.php:32 actions/userbyid.php:32
 msgid "No id."
 msgstr "Kullanıcı numarası yok"
 
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+#: actions/emailsettings.php:292
+msgid "No incoming email address."
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:65
+#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:66
 msgid "No nickname provided by remote server."
 msgstr "Uzaktaki sunucu tarafından bir takma ad sağlanmadı."
 
-#: ../actions/avatarbynickname.php:27
+#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 msgid "No nickname."
 msgstr "Takma ad yok"
 
-#: ../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:243
 msgid "No pending confirmation to cancel."
 msgstr "İptal etmek için beklenen onay yok."
 
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+msgid "No phone number."
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74
+#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:73
 msgid "No profile URL returned by server."
 msgstr ""
 
-#: ../actions/recoverpassword.php:189
+#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
 msgid "No registered email address for that user."
 msgstr "Kullanıcı için kaydedilmiş eposta adresi yok."
 
-#: ../actions/userauthorization.php:48
+#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
 msgid "No request found!"
 msgstr "İstek bulunamadı!"
 
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
+#: actions/noticesearch.php:69 actions/peoplesearch.php:69
+#: actions/noticesearch.php:68 actions/peoplesearch.php:59
 msgid "No results"
 msgstr "Sonuç yok"
 
@@ -770,77 +1301,126 @@ msgstr "Sonuç yok"
 msgid "No size."
 msgstr ""
 
-#: ../actions/openidsettings.php:135
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:109
+#: actions/twitapistatuses.php:438
+msgid "No status found with that ID."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:411
+msgid "No status with that ID found."
+msgstr ""
+
+#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
 msgid "No such OpenID."
 msgstr "Böyle bir OpenID yok."
 
-#: ../actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29
 msgid "No such document."
 msgstr "Böyle bir belge yok."
 
-#: ../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:38
+#: actions/shownotice.php:114
 msgid "No such notice."
 msgstr "Böyle bir durum mesajı yok."
 
-#: ../actions/recoverpassword.php:56
+#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
 msgid "No such recovery code."
 msgstr "Böyle bir geri alma kodu yok."
 
-#: ../actions/postnotice.php:56
+#: ../actions/postnotice.php:56 actions/postnotice.php:57
 msgid "No such subscription"
 msgstr "Böyle bir abonelik yok"
 
 #: ../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/showstream.php:157
+#: classes/Command.php:208 classes/Command.php:242 lib/gallery.php:85
+#: lib/subs.php:105
 msgid "No such user."
 msgstr "Böyle bir kullanıcı yok."
 
-#: ../lib/gallery.php:76
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr ""
+
+#: ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
 msgstr "Gösterecek hiç kimse yok!"
 
-#: ../actions/recoverpassword.php:60
+#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
 msgid "Not a recovery code."
 msgstr "Bir geri alma kodu değil."
 
-#: ../actions/imsettings.php:158
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+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:423 lib/twitterapi.php:450
+#: lib/twitterapi.php:534
+msgid "Not a supported data format."
+msgstr ""
+
+#: ../actions/imsettings.php:167 actions/imsettings.php:175
 msgid "Not a valid Jabber ID"
 msgstr "Geçersiz bir Jabber ID"
 
-#: ../lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131
 msgid "Not a valid OpenID."
 msgstr "Geçersiz bir OpenID."
 
-#: ../actions/profilesettings.php:75 ../actions/register.php:53
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+#: actions/emailsettings.php:208
+msgid "Not a valid email address"
+msgstr ""
+
+#: ../actions/register.php:63 actions/register.php:70 actions/register.php:79
 msgid "Not a valid email address."
 msgstr "Geçersiz bir eposta adresi."
 
-#: ../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/profilesettings.php:212 actions/register.php:87
 msgid "Not a valid nickname."
 msgstr "Geçersiz bir takma ad."
 
-#: ../actions/remotesubscribe.php:118
+#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
 msgid "Not a valid profile URL (incorrect services)."
 msgstr "Geçersiz profil adresi (yanlış hizmetler)."
 
-#: ../actions/remotesubscribe.php:111
+#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr "Geçersiz profil adresi (tanımlanmış XRDS yok)."
 
-#: ../actions/remotesubscribe.php:104
+#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
 msgid "Not a valid profile URL (no YADIS document)."
 msgstr "Geçersiz profil adresi (YADIS belgesi yok)."
 
-#: ../actions/avatar.php:95
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: actions/profilesettings.php:361
 msgid "Not an image or corrupt file."
 msgstr "Bu bir resim dosyası değil ya da dosyada hata var"
 
 #: ../actions/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:52
 msgid "Not authorized."
 msgstr "Yetkilendirilmemiş."
 
@@ -849,38 +1429,65 @@ msgstr "Yetkilendirilmemiş."
 msgid "Not expecting this response!"
 msgstr ""
 
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
-#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+#: actions/twitapistatuses.php:304
+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:31 actions/newnotice.php:30
+#: actions/nudge.php:30 actions/subedit.php:31 actions/unblock.php:31
 msgid "Not logged in."
 msgstr "Giriş yapılmadı."
 
-#: ../actions/unsubscribe.php:43
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:117
 msgid "Not subscribed!."
 msgstr "Bu kullanıcıyı zaten takip etmiyorsunuz!"
 
-#: ../actions/showstream.php:82
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+msgid "Notice Search"
+msgstr ""
+
+#: ../actions/showstream.php:82 actions/showstream.php:82
+#: actions/showstream.php:111 actions/showstream.php:118
+#: actions/showstream.php:123
 #, php-format
 msgid "Notice feed for %s"
 msgstr "%s için durum RSS beslemesi"
 
-#: ../actions/shownotice.php:39
+#: ../actions/shownotice.php:39 actions/shownotice.php:39
+#: actions/shownotice.php:45
 msgid "Notice has no profile"
 msgstr "Bu durum mesajının ait oldugu kullanıcı profili yok"
 
-#: ../actions/showstream.php:297
+#: ../actions/showstream.php:316 actions/showstream.php:331
+#: actions/showstream.php:379
 msgid "Notices"
 msgstr "Durum mesajları"
 
-#: ../actions/password.php:39
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
+#, php-format
+msgid "Notices tagged with %s"
+msgstr ""
+
+#: ../actions/password.php:39 actions/profilesettings.php:178
+#: actions/profilesettings.php:183
 msgid "Old password"
 msgstr "Eski parola"
 
-#: ../lib/util.php:288
+#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
+#: lib/util.php:330 actions/deleteprofile.php:247 lib/util.php:340
 msgid "OpenID"
 msgstr "OpenID"
 
-#: ../actions/finishopenidlogin.php:61
+#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
 msgid "OpenID Account Setup"
 msgstr "OpenID Hesabı Kurulumu"
 
@@ -889,171 +1496,247 @@ msgid "OpenID Auto-Submit"
 msgstr ""
 
 #: ../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/finishopenidlogin.php:150 actions/openidlogin.php:76
 msgid "OpenID Login"
 msgstr "OpenID Girişi"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
+#: actions/openidlogin.php:74 actions/openidsettings.php:50
+#: actions/openidlogin.php:82
 msgid "OpenID URL"
 msgstr "OpenID URLi"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
+#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 msgid "OpenID authentication cancelled."
 msgstr "OpenID yetkilendirilmesi iptal edildi."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
+#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "OpenID yetkilendirmesi başarız oldu: %s"
 
-#: ../lib/openid.php:133
+#: ../lib/openid.php:133 lib/openid.php:133
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "OpenID hatası: %s"
 
-#: ../actions/openidsettings.php:144
+#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
 msgid "OpenID removed."
 msgstr "OpenID kaldırıldı."
 
-#: ../actions/openidsettings.php:37
+#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
 msgid "OpenID settings"
 msgstr "OpenID ayarları"
 
-#: ../actions/avatar.php:84
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: actions/profilesettings.php:350
 msgid "Partial upload."
 msgstr "Kısmi yükleme."
 
-#: ../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/login.php:109 actions/register.php:194
 msgid "Password"
 msgstr "Parola"
 
-#: ../actions/recoverpassword.php:249
+#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
 msgid "Password and confirmation do not match."
 msgstr "Parola ve onaylaması birbirini tutmuyor."
 
-#: ../actions/recoverpassword.php:245
+#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
 msgid "Password must be 6 chars or more."
 msgstr "Parola 6 veya daha fazla karakterden oluşmalıdır."
 
-#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
+#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 msgid "Password recovery requested"
 msgstr "Parola geri alma isteği"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:274
+#: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: actions/profilesettings.php:408 actions/recoverpassword.php:326
+#: actions/profilesettings.php:437
 msgid "Password saved."
 msgstr "Parola kaydedildi."
 
-#: ../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/profilesettings.php:409 actions/register.php:107
 msgid "Passwords don't match."
 msgstr "Parolalar birbirini tutmuyor."
 
-#: ../actions/peoplesearch.php:33
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+msgid "People"
+msgstr ""
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+msgid "People Search"
+msgstr ""
+
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
 msgid "People search"
 msgstr "Kişi Arama"
 
-#: ../lib/stream.php:44
+#: ../lib/stream.php:50 lib/personal.php:50
 msgid "Personal"
 msgstr "Kişisel"
 
-#: ../actions/userauthorization.php:77
+#: ../actions/invite.php:133 actions/invite.php:141
+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 ""
-"Lütfen bu kullanıcının durumunu takip etmek istediğinizden emin olmak "
-"için detayları gözden geçirin. Kimsenin durumunu taki etme isteğinde "
+"Lütfen bu kullanıcının durumunu takip etmek istediğinizden emin olmak için "
+"detayları gözden geçirin. Kimsenin durumunu taki etme isteğinde "
 "bulunmadıysanız \"İptal\" tuşuna basın. "
 
-#: ../actions/imsettings.php:74
+#: ../actions/imsettings.php:73 actions/imsettings.php:74
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
-"Jabber/GTalk durum mesajim değiştiğinde nedurum.com'da durumumu "
-"güncelle"
+"Jabber/GTalk durum mesajim değiştiğinde nedurum.com'da durumumu güncelle"
 
-#: ../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
 msgid "Preferences"
 msgstr "Tercihler"
 
-#: ../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:185 actions/othersettings.php:179
 msgid "Preferences saved."
 msgstr "Tercihler kaydedildi."
 
-#: ../lib/util.php:300
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
+msgid "Preferred language"
+msgstr ""
+
+#: ../lib/util.php:328 lib/util.php:344 lib/util.php:356
 msgid "Privacy"
 msgstr "Gizlilik"
 
-#: ../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:139 classes/Notice.php:149
 msgid "Problem saving notice."
 msgstr "Durum mesajını kaydederken hata oluştu."
 
-#: ../lib/stream.php:54
+#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
+#: lib/settingsaction.php:84 actions/deleteprofile.php:241
 msgid "Profile"
 msgstr "Profil"
 
-#: ../actions/remotesubscribe.php:73
+#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
 msgid "Profile URL"
 msgstr "Profil Adresi"
 
-#: ../actions/profilesettings.php:34
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
 msgid "Profile settings"
 msgstr "Profil ayarları"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
+#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
+#: actions/postnotice.php:52 actions/updateprofile.php:53
 msgid "Profile unknown"
 msgstr "Profil bilinmiyor"
 
-#: ../lib/util.php:276
-msgid "Public"
-msgstr "Genel"
-
-#: ../actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:77
 msgid "Public Stream Feed"
 msgstr "Genel Durum Akış RSS Beslemesi"
 
-#: ../actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 lib/stream.php:34
 msgid "Public timeline"
 msgstr "Genel zaman çizgisi"
 
-#: ../actions/recoverpassword.php:151
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:104
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
 msgid "Recover"
 msgstr "Geri al"
 
-#: ../actions/recoverpassword.php:141
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
 msgid "Recover password"
 msgstr "Parolanı geri al"
 
-#: ../actions/recoverpassword.php:67
+#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
 msgid "Recovery code for unknown user."
 msgstr "Bilinmeye kullanıcı için geri alma kodu"
 
-#: ../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:181 actions/register.php:234 lib/util.php:338
 msgid "Register"
 msgstr "Kayıt"
 
-#: ../actions/userauthorization.php:119
+#: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:173
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:241
+msgid "Registration successful"
+msgstr ""
+
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
 msgid "Reject"
 msgstr "Reddet"
 
-#: ../actions/login.php:99 ../actions/register.php:183
+#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
+#: actions/register.php:190 actions/login.php:110 actions/openidlogin.php:85
+#: actions/register.php:217
 msgid "Remember me"
 msgstr "Beni hatırla"
 
-#: ../actions/updateprofile.php:69 ../actions/updateprofile.php:70
-#: actions/updateprofile.php:71
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
 msgid "Remote profile with no matching profile"
 msgstr ""
 
-#: ../actions/remotesubscribe.php:65
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
 msgid "Remote subscribe"
 msgstr "Uzaktan abonelik"
 
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php:48 actions/emailsettings.php:76
+#: actions/imsettings.php:49 actions/openidsettings.php:108
+#: actions/smssettings.php:50 actions/smssettings.php:84
+#: actions/twittersettings.php:59 actions/twittersettings.php:61
 msgid "Remove"
 msgstr "Kaldır"
 
-#: ../actions/openidsettings.php:68
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
 msgid "Remove OpenID"
 msgstr "OpenID'yi kaldır"
 
@@ -1065,48 +1748,80 @@ msgstr ""
 "OpenID'nizi sistemden silerseniz giriş yapamazsınız! Eğer silmek "
 "istiyorsanuz, önce yeni bir OpenID ekleyin"
 
-#: ../lib/stream.php:49
+#: ../lib/stream.php:55 lib/personal.php:55
 msgid "Replies"
 msgstr "Cevaplar"
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:50
+#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
+#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #, php-format
 msgid "Replies to %s"
 msgstr "%s için cevaplar"
 
-#: ../actions/recoverpassword.php:168
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
 msgid "Reset"
 msgstr "Sıfırla"
 
-#: ../actions/recoverpassword.php:158
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
 msgid "Reset password"
 msgstr "Parolayı sıfırla"
 
-#: ../actions/recoverpassword.php:167 ../actions/register.php:180
-msgid "Same as password above"
-msgstr "yukarıdaki parolanın aynısı"
-
-#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
-msgid "Save"
-msgstr "Kaydet"
-
-#: ../lib/searchaction.php:73 ../lib/util.php:277
-msgid "Search"
-msgstr "Ara"
-
-#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
-msgid "Search Stream Feed"
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/deleteprofile.php:250 actions/subscriptions.php:73
+msgid "SMS"
 msgstr ""
 
-#: ../actions/noticesearch.php:30
-#, php-format
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+msgid "SMS Phone number"
+msgstr ""
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:230
+msgid "SMS confirmation"
+msgstr ""
+
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
+msgid "Same as password above"
+msgstr "yukarıdaki parolanın aynısı"
+
+#: ../actions/register.php:156 actions/register.php:170
+#: actions/register.php:197
+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/twittersettings.php:83 actions/emailsettings.php:107
+#: actions/othersettings.php:56 actions/profilesettings.php:106
+#: actions/subscriptions.php:74 actions/tagother.php:100
+#: actions/twittersettings.php:82
+msgid "Save"
+msgstr "Kaydet"
+
+#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
+#: lib/util.php:316 lib/util.php:327
+msgid "Search"
+msgstr "Ara"
+
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:84
+msgid "Search Stream Feed"
+msgstr ""
+
+#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
+#: actions/noticesearch.php:29
+#, 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 ""
-"%%site.name%%'da durum mesajlarının içeriğinde arama yap. Anahtar "
-"kelimeleri boşluk ile ayırın. Anahtar kelime 3 veya daha fazla "
-"karakterden oluşmalı."
+"%%site.name%%'da durum mesajlarının içeriğinde arama yap. Anahtar kelimeleri "
+"boşluk ile ayırın. Anahtar kelime 3 veya daha fazla karakterden oluşmalı."
 
 #: ../actions/peoplesearch.php:28
 #, php-format
@@ -1114,152 +1829,261 @@ 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 ""
-"%%site.name%% üyeleri arasında isim, yer ya da ilgi alanları içinde "
-"arama yap. Anahtar kelimeleri boşluk ile ayırın. Anahtar kelime 3 veya "
-"daha fazla karakterden oluşmalı. "
+"%%site.name%% üyeleri arasında isim, yer ya da ilgi alanları içinde arama "
+"yap. Anahtar kelimeleri boşluk ile ayırın. Anahtar kelime 3 veya daha fazla "
+"karakterden oluşmalı. "
+
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+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 lib/util.php:1646 lib/util.php:2158
 msgid "Send"
 msgstr "Gönder"
 
-#: ../actions/imsettings.php:71
+#: ../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."
+msgstr ""
+
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+msgid "Send me notices of new subscriptions through email."
+msgstr ""
+
+#: ../actions/imsettings.php:70 actions/imsettings.php:71
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Durum mesajlarını Jabber/GTalk üzerinden gönder."
 
-#: ../lib/util.php:282
+#: ../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 ""
+
+#: ../lib/util.php:304 lib/util.php:320 lib/util.php:330
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: ../actions/profilesettings.php:183
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:336
 msgid "Settings saved."
 msgstr "Ayarlar kaydedildi."
 
-#: ../actions/finishaddopenid.php:66
+#: ../actions/tag.php:60 actions/tag.php:60 actions/tag.php:59
+msgid "Showing most popular tags from the last week"
+msgstr ""
+
+#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
 msgid "Someone else already has this OpenID."
 msgstr "Bir başkası zaten bu OpenID'ye sahip."
 
 #: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
+#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
 msgid "Something weird happened."
 msgstr "Garip bir şey oldu."
 
-#: ../lib/util.php:302
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr ""
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: ../lib/util.php:330 lib/util.php:346 lib/util.php:358
 msgid "Source"
 msgstr "Kaynak"
 
-#: ../actions/showstream.php:277
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:359
 msgid "Statistics"
 msgstr "Ä°statistikler"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
+#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
+#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
+#: actions/finishopenidlogin.php:199 actions/finishopenidlogin.php:267
 msgid "Stored OpenID not found."
 msgstr "Kaydedilmiş OpenID bulunamadı."
 
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:172
-#: ../actions/showstream.php:181
+#: ../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:254 lib/util.php:2078
 msgid "Subscribe"
 msgstr "Abone ol"
 
-#: ../actions/showstream.php:294 ../actions/subscribers.php:27
+#: ../actions/showstream.php:313 ../actions/subscribers.php:27
+#: actions/showstream.php:328 actions/subscribers.php:27
+#: actions/showstream.php:376 lib/gallery.php:136 lib/gallery.php:137
 msgid "Subscribers"
 msgstr "Abone olanlar"
 
-#: ../actions/userauthorization.php:309
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
 msgid "Subscription authorized"
 msgstr "Takip talebine izin verildi"
 
-#: ../actions/userauthorization.php:319
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
 msgid "Subscription rejected"
 msgstr "Abonelik reddedildi."
 
-#: ../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:288 actions/showstream.php:370 lib/gallery.php:131
+#: lib/gallery.php:132
 msgid "Subscriptions"
 msgstr "Abonelikler"
 
-#: ../actions/avatar.php:87
+#: ../actions/avatar.php:87 actions/profilesettings.php:324
+#: actions/profilesettings.php:353
 msgid "System error uploading file."
 msgstr "Dosya yüklemede sistem hatası."
 
-#: ../actions/noticesearch.php:34
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317 actions/profilesettings.php:90 actions/showstream.php:382
+#: actions/tag.php:40 actions/tagother.php:96 actions/tagother.php:162
+#: lib/profilelist.php:126 lib/profilelist.php:128
+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:33
 msgid "Text search"
 msgstr "Metin arama"
 
-#: ../actions/openidsettings.php:140
+#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
 msgid "That OpenID does not belong to you."
 msgstr "Bu OpenID size ait değil."
 
-#: ../actions/confirmaddress.php:52
+#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
 msgid "That address has already been confirmed."
 msgstr "O adres daha önce onaylanmış."
 
-#: ../actions/confirmaddress.php:43
+#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
 msgid "That confirmation code is not for you!"
 msgstr "O onay kodu sizin için değil!"
 
-#: ../actions/avatar.php:80
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:214
+msgid "That email address already belongs to another user."
+msgstr ""
+
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: actions/profilesettings.php:346
 msgid "That file is too big."
 msgstr "Dosya çok büyük."
 
-#: ../actions/imsettings.php:161
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
 msgid "That is already your Jabber ID."
 msgstr "Bu zaten sizin Jabber ID'niz."
 
-#: ../actions/imsettings.php:224
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:211
+msgid "That is already your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+msgid "That is already your phone number."
+msgstr ""
+
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
 msgid "That is not your Jabber ID."
 msgstr "Bu sizin Jabber ID'niz değil."
 
-#: ../actions/imsettings.php:201
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+#: actions/emailsettings.php:270
+msgid "That is not your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+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:247
 msgid "That is the wrong IM address."
 msgstr "Yanlış IM adresi."
 
-#: ../actions/newnotice.php:52
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+msgid "That is the wrong confirmation number."
+msgstr ""
+
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+msgid "That phone number already belongs to another user."
+msgstr ""
+
+#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: actions/newnotice.php:49 actions/twitapistatuses.php:330
+#: actions/newnotice.php:61 actions/twitapistatuses.php:271
 msgid "That's too long. Max notice size is 140 chars."
 msgstr ""
-"Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne "
-"dersiniz?"
+"Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?"
+
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+#: actions/twitapiaccount.php:55
+msgid "That's too long. Max notice size is 255 chars."
+msgstr ""
 
-#: ../actions/confirmaddress.php:86
+#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "\"%s\" adresi hesabınız için onaylandı."
 
-#: ../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:285
 msgid "The address was removed."
 msgstr "Bu adres kaldırılmıştı."
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "%s adlı kullanıcının durumunu takip edenler"
 
-#: ../actions/subscribers.php:33
+#: ../actions/subscribers.php:33 actions/subscribers.php:33
 msgid "These are the people who listen to your notices."
 msgstr "Sizin durumunuzu takip edenler"
 
-#: ../actions/subscriptions.php:35
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "%s adlı kullanıcının durumlarını takip ettiği kullanıcılar"
 
-#: ../actions/subscriptions.php:33
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
 msgid "These are the people whose notices you listen to."
 msgstr "Sizin durumlarını takip ettiğiniz kullanıcılar"
 
-#: ../actions/recoverpassword.php:87
+#: ../actions/invite.php:89 actions/invite.php:96
+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 "Onay kodu çok eski. Lütfen tekrar başlayınız."
 
@@ -1271,7 +2095,7 @@ msgstr ""
 "Bu form kendiliğinden gönderilmeli. Eğer yönlendirilmediyseniz, OpenID "
 "servis sağlayıcınıza yönlenmek için düğmeye basın."
 
-#: ../actions/finishopenidlogin.php:56
+#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -1279,45 +2103,86 @@ msgid ""
 "your existing account, if you have one."
 msgstr ""
 "%s'a İlk defa giriş yapıyorsunuz. Bu yüzden OpenID'nizi hesabınıza "
-"bağlamamız gerekli. Bunun için ya yeni bir hesap oluşturabilirsiniz ya "
-"da varolan hesabınızı kullanabilirsiniz. "
+"bağlamamız gerekli. Bunun için ya yeni bir hesap oluşturabilirsiniz ya da "
+"varolan hesabınızı kullanabilirsiniz. "
+
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:94
+#: actions/twitapifriendships.php:82 actions/twitapistatuses.php:428
+msgid "This method requires a POST or DELETE."
+msgstr ""
 
-#: ../lib/util.php:147
+#: ../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:46
+#: actions/twitapidirect_messages.php:117 actions/twitapifriendships.php:30
+#: actions/twitapistatuses.php:239
+msgid "This method requires a POST."
+msgstr ""
+
+#: ../lib/util.php:164 lib/util.php:246 lib/util.php:257
 msgid "This page is not available in a media type you accept"
 msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil"
 
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
+msgid "Timezone"
+msgstr ""
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr ""
+
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"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 ""
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: actions/twitapifriendships.php:128
+msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
-#: ../actions/profilesettings.php:51
+#: ../actions/profilesettings.php:48 ../actions/register.php:169
+#: actions/profilesettings.php:81 actions/register.php:183
+#: actions/profilesettings.php:83 actions/register.php:210
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
-"Web Sitenizin, blogunuzun ya da varsa başka bir sitedeki profilinizin "
-"adresi"
+"Web Sitenizin, blogunuzun ya da varsa başka bir sitedeki profilinizin adresi"
 
 #: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
 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/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/emailsettings.php:147
+#: actions/othersettings.php:146 actions/twittersettings.php:199
 msgid "Unexpected form submission."
 msgstr "Beklenmeğen form girdisi."
 
-#: ../actions/recoverpassword.php:237
+#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
 msgid "Unexpected password reset."
 msgstr "Beklemeğen parola sıfırlaması."
 
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:58
+#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:59
 msgid "Unknown version of OMB protocol."
 msgstr "OMB protokolünün bilinmeğen sürümü."
 
-#: ../lib/util.php:245
+#: ../lib/util.php:269 lib/util.php:285 lib/util.php:296
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
@@ -1325,24 +2190,50 @@ msgstr ""
 "Aksi ifade edilmedikce, bu sitedeki içerik yaratıcılarına aittir ve şu "
 "lisans ile korunmaktadır: "
 
-#: ../actions/confirmaddress.php:48
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr "Tanınmayan adres türü %s"
 
-#: ../actions/showstream.php:193
+#: ../actions/showstream.php:209 actions/showstream.php:219
+#: actions/showstream.php:267 lib/util.php:2094
 msgid "Unsubscribe"
 msgstr "Aboneliği sonlandır"
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
+#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
+#: actions/postnotice.php:45 actions/updateprofile.php:46
 msgid "Unsupported OMB version"
 msgstr "Desteklenmeyen OMB sürümü"
 
-#: ../actions/avatar.php:105
+#: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: actions/profilesettings.php:371
 msgid "Unsupported image file format."
 msgstr "Desteklenmeyen görüntü dosyası biçemi."
 
-#: ../actions/avatar.php:68
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: actions/deleteprofile.php:251
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: actions/deleteprofile.php:254
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/twitapistatuses.php:126
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:198
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
+
+#: ../actions/avatar.php:68 actions/profilesettings.php:161
+#: actions/profilesettings.php:166
 msgid "Upload"
 msgstr "Yükle"
 
@@ -1354,114 +2245,202 @@ msgid ""
 "share."
 msgstr ""
 "Buradan yeni bir \"avatar\" (kullanıcı resmi) yükleyin. Resminizi "
-"yükledikten sonra düzenleyemezsiniz bu sebeple kare biçimine yakın "
-"olmasına özen gösterin. Buna ek olarak, resminiz sitenin lisansına tabi "
-"olmalıdır. Kendinize ait olan ve paylaşmak istediğiniz bir resim kullanın. "
+"yükledikten sonra düzenleyemezsiniz bu sebeple kare biçimine yakın olmasına "
+"özen gösterin. Buna ek olarak, resminiz sitenin lisansına tabi olmalıdır. "
+"Kendinize ait olan ve paylaşmak istediğiniz bir resim kullanın. "
+
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr ""
+
+#: ../actions/invite.php:114 actions/invite.php:121
+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 actions/register.php:200
+#: actions/register.php:203
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
-"Sadece sistem güncellemeleri, duyurular ve parola geri alma için "
-"kullanılır."
+"Sadece sistem güncellemeleri, duyurular ve parola geri alma için kullanılır."
 
 #: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88
+#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:92
 msgid "User being listened to doesn't exist."
 msgstr ""
 
 #: ../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/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/showstream.php:57
+#: actions/twitapiaccount.php:63 actions/twitapifavorites.php:40
+#: actions/twitapistatuses.php:163 actions/twitapistatuses.php:492
+#: lib/twitterapi.php:590
 msgid "User has no profile."
 msgstr "Kullanıcının profili yok."
 
-#: ../actions/remotesubscribe.php:71
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
 msgid "User nickname"
 msgstr "Kullanıcı takma adı"
 
-#: ../lib/util.php:969
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../lib/util.php:1159 lib/util.php:1293 lib/util.php:1630
 #, php-format
 msgid "What's up, %s?"
 msgstr "N'aber %s?"
 
-#: ../actions/profilesettings.php:57
+#: ../actions/profilesettings.php:54 ../actions/register.php:175
+#: actions/profilesettings.php:87 actions/register.php:189
+#: actions/profilesettings.php:89 actions/register.php:216
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Bulunduğunuz yer, \"Şehir, Eyalet (veya Bölge), Ülke\" gibi"
 
-#: ../actions/updateprofile.php:127
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "%s için yanlış resim türü"
 
-#: ../actions/updateprofile.php:122
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "%s'de yanlış resim boyutu"
 
-#: ../actions/finishaddopenid.php:64
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+#: actions/block.php:105
+msgid "Yes"
+msgstr ""
+
+#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
 msgid "You already have this OpenID!"
 msgstr "Zaten bu OpenID'ye sahipsiniz!"
 
-#: ../actions/recoverpassword.php:31
+#: ../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
 msgid "You are already logged in!"
 msgstr "Zaten giriş yapmış durumdasıznız!"
 
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:102
+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 "Parolanızı burada değiştirebilirsiniz. İyi bir tane seçin!"
 
-#: ../actions/register.php:164
+#: ../actions/register.php:135 actions/register.php:145
 msgid "You can create a new account to start posting notices."
 msgstr ""
-"Sizde bir hesap açıp durumunuzdan arkadaşlarınızı haberdar "
-"edebilirsiniz."
+"Sizde bir hesap açıp durumunuzdan arkadaşlarınızı haberdar edebilirsiniz."
+
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
 
 #: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr ""
-"\"Sil\" düğmesine basarak hesabınızdan eklediğiniz OpenID'yi "
-"silebilirsiniz."
+"\"Sil\" düğmesine basarak hesabınızdan eklediğiniz OpenID'yi silebilirsiniz."
 
-#: ../actions/imsettings.php:28
+#: ../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 ""
 "Jabber/GTalk kullanarak durum mesaji gÖnderip alabilirsiniz. IM adres "
 "ayarlarinizi aşağıda yapın."
 
 #: ../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 ""
-"Burada kişisel profilinizi güncelleyebilirsiniz, böylelikle insanlar "
-"sizin hakkınızda daha fazla bilgi sahibi olur."
+"Burada kişisel profilinizi güncelleyebilirsiniz, böylelikle insanlar sizin "
+"hakkınızda daha fazla bilgi sahibi olur."
 
 #: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
+#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
+#: actions/finishremotesubscribe.php:83 actions/finishremotesubscribe.php:99
 msgid "You can use the local subscription!"
 msgstr "Yerel aboneliği kullanabilirsiniz!"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:51
+#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
+#: actions/finishopenidlogin.php:38 actions/register.php:68
+#: actions/register.php:77
 msgid "You can't register if you don't agree to the license."
 msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız."
 
-#: ../actions/updateprofile.php:62
+#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
 msgid "You did not send us that profile"
 msgstr "Bize o profili yollamadınız"
 
-#: ../actions/recoverpassword.php:134
+#: ../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 ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: actions/twitapistatuses.php:455
+msgid "You may not delete another user's status."
+msgstr ""
+
+#: ../actions/invite.php:31 actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+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!"
+msgstr ""
+
+#: ../actions/recoverpassword.php:149
 msgid "You've been identified. Enter a  new password below. "
 msgstr "Harika, sizi tanıdık. Simdi yeni parolanızı girin."
 
-#: ../actions/openidlogin.php:67
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:84
 msgid "Your OpenID URL"
 msgstr "OpenID URLniz"
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:164
 msgid "Your nickname on this server, or your registered email address."
 msgstr "Bu sunucudaki takma adınız  veya kaydedilmiş eposta adresiniz."
 
@@ -1474,784 +2453,85 @@ msgstr ""
 "[OpenID](%%doc.openid%%) tek hesap ile bir çok siteye giriş yapmanızı "
 "sağlar. Hesabınızla bağlantılı OpenID'lerinizi burada yönetebilirsiniz."
 
-#: ../lib/util.php:814
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:1287
 msgid "a few seconds ago"
 msgstr "birkaç saniye önce"
 
-#: ../lib/util.php:826
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:1299
 #, php-format
 msgid "about %d days ago"
 msgstr "yaklaşık %d gün önce"
 
-#: ../lib/util.php:822
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:1295
 #, php-format
 msgid "about %d hours ago"
 msgstr "yaklaşık %d saat önce"
 
-#: ../lib/util.php:818
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:1291
 #, php-format
 msgid "about %d minutes ago"
 msgstr "yaklaşık %d dakika önce"
 
-#: ../lib/util.php:830
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:1303
 #, php-format
 msgid "about %d months ago"
 msgstr "yaklaşık %d ay önce"
 
-#: ../lib/util.php:824
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:1297
 msgid "about a day ago"
 msgstr "yaklaşık bir gün önce"
 
-#: ../lib/util.php:816
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:1289
 msgid "about a minute ago"
 msgstr "yaklaşık bir dakika önce"
 
-#: ../lib/util.php:828
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:1301
 msgid "about a month ago"
 msgstr "yaklaşık bir ay önce"
 
-#: ../lib/util.php:832
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:1305
 msgid "about a year ago"
 msgstr "yaklaşık bir yıl önce"
 
-#: ../lib/util.php:820
-msgid "about an hour ago"
-msgstr "yaklaşık bir saat önce"
-
-#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
-#: ../lib/stream.php:101
-msgid "in reply to..."
-msgstr "...cevap olarak"
-
-#: ../actions/noticesearch.php:133 ../actions/showstream.php:390
-#: ../lib/stream.php:108
-msgid "reply"
-msgstr "cevapla"
-
-#: ../actions/password.php:44
-msgid "same as password above"
-msgstr "yukaridaki parola ile aynı"
-
-#: ../lib/util.php:1127
-msgid "« After"
-msgstr "« Sonra"
-
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr ""
-
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
-
-#: ../actions/invite.php:168 actions/invite.php:176
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
-
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
-
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
-#, php-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#, php-format
-msgid "%s public timeline"
-msgstr ""
-
-#: ../lib/mail.php:206 lib/mail.php:212
-#, php-format
-msgid "%s status"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#, php-format
-msgid "%s timeline"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
-msgstr ""
-
-#: ../actions/register.php:213
-msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
-msgstr ""
-
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-
-#: ../actions/register.php:154 actions/register.php:168
-msgid "6 or more characters. Required."
-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 ""
-
-#: ../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/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!"
-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 ""
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-msgid "Add or remove OpenIDs"
-msgstr ""
-
-#: ../actions/invite.php:131 actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
-msgstr ""
-
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-msgid "Are you sure you want to delete this notice?"
-msgstr ""
-
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr ""
-
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
-msgid "Can't delete this notice."
-msgstr ""
-
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-msgid "Cannot normalize that email address"
-msgstr ""
-
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr ""
-
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
-msgstr ""
-
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-msgid "Change your profile settings"
-msgstr ""
-
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-msgid "Confirmation code"
-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/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
-msgstr ""
-
-#: ../lib/subs.php:54 lib/subs.php:61
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: ../lib/subs.php:46 lib/subs.php:46
-msgid "Could not subscribe."
-msgstr ""
-
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-msgid "Could not update user with confirmed email address."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-msgid "Couldn't find any statuses."
-msgstr ""
-
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-msgid "Couldn't update user for autosubscribe."
-msgstr ""
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-msgid "Couldn't update user record."
-msgstr ""
-
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-msgid "Current confirmed email address."
-msgstr ""
-
-#: ../classes/Notice.php:72 classes/Notice.php:86
-#, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr ""
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-msgid "Delete notice"
-msgstr ""
-
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-msgid "Email Address"
-msgstr ""
-
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-msgid "Email Settings"
-msgstr ""
-
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-msgid "Email address, like \"UserName@example.org\""
-msgstr ""
-
-#: ../actions/invite.php:129 actions/invite.php:137
-msgid "Email addresses"
-msgstr ""
-
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
-msgstr ""
-
-#: ../actions/tag.php:55 actions/tag.php:55
-#, php-format
-msgid "Feed for tag %s"
-msgstr ""
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr ""
-
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr ""
-
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-msgid "I want to post notices by email."
-msgstr ""
-
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
-msgstr ""
-
-#: ../actions/recoverpassword.php:137
-msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
-"email address you have stored  in your account."
-msgstr ""
-
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-msgid "Incoming email"
-msgstr ""
-
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-msgid "Incoming email address removed."
-msgstr ""
-
-#: ../actions/invite.php:55 actions/invite.php:62
-#, php-format
-msgid "Invalid email address: %s"
-msgstr ""
-
-#: ../actions/invite.php:79 actions/invite.php:86
-msgid "Invitation(s) sent"
-msgstr ""
-
-#: ../actions/invite.php:97 actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
-msgstr ""
-
-#: ../lib/util.php:306 lib/util.php:322
-msgid "Invite"
-msgstr ""
-
-#: ../actions/invite.php:123 actions/invite.php:130
-msgid "Invite new users"
-msgstr ""
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Language"
-msgstr ""
-
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-msgid "Language is too long (max 50 chars)."
-msgstr ""
-
-#: ../actions/register.php:166 actions/register.php:180
-msgid "Longer name, preferably your \"real\" name"
-msgstr ""
-
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-#: actions/emailsettings.php:81 actions/smssettings.php:89
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
-
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-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 ""
-
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-msgid "New"
-msgstr ""
-
-#: ../lib/mail.php:144 lib/mail.php:144
-#, php-format
-msgid "New email address for posting to %s"
-msgstr ""
-
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-msgid "New incoming email address added."
-msgstr ""
-
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-msgid "No"
-msgstr ""
-
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-msgid "No carrier selected."
-msgstr ""
-
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-msgid "No code entered"
-msgstr ""
-
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-msgid "No email address."
-msgstr ""
-
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-msgid "No incoming email address."
-msgstr ""
-
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-msgid "No phone number."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-msgid "No status found with that ID."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-msgid "No status with that ID found."
-msgstr ""
-
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-msgid "No user with that email address or username."
-msgstr ""
-
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-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
-msgid "Not a supported data format."
-msgstr ""
-
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-msgid "Not a valid email address"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-msgid "Not found"
-msgstr ""
-
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-msgid "Notice Search"
-msgstr ""
-
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81
-#, php-format
-msgid "Notices tagged with %s"
-msgstr ""
-
-#: ../actions/invite.php:135 actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-msgid "People"
-msgstr ""
-
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-msgid "People Search"
-msgstr ""
-
-#: ../actions/invite.php:133 actions/invite.php:141
-msgid "Personal message"
-msgstr ""
-
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Preferred language"
-msgstr ""
-
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
-
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-msgid "Publish a MicroID for my email address."
-msgstr ""
-
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr ""
-
-#: ../actions/register.php:28 actions/register.php:28
-msgid "Registration not allowed."
-msgstr ""
-
-#: ../actions/register.php:200 actions/register.php:214
-msgid "Registration successful"
-msgstr ""
-
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
-msgstr ""
-
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-msgid "SMS Phone number"
-msgstr ""
-
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-msgid "SMS Settings"
-msgstr ""
-
-#: ../lib/mail.php:219 lib/mail.php:225
-msgid "SMS confirmation"
-msgstr ""
-
-#: ../actions/register.php:156 actions/register.php:170
-msgid "Same as password above. Required."
-msgstr ""
-
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-msgid "Select a carrier"
-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."
-msgstr ""
-
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-msgid "Send me notices of new subscriptions through email."
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr ""
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
-msgstr ""
-
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317
-msgid "Tags"
-msgstr ""
-
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr ""
-
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr ""
-
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-msgid "That is already your email address."
-msgstr ""
-
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-msgid "That is already your phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-msgid "That is not your email address."
-msgstr ""
-
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-msgid "That is not your phone number."
-msgstr ""
-
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-msgid "That is the wrong confirmation number."
-msgstr ""
-
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-msgid "That phone number already belongs to another user."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-msgid "That's too long. Max notice size is 255 chars."
-msgstr ""
-
-#: ../actions/invite.php:89 actions/invite.php:96
-msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
-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."
-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."
-msgstr ""
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "Timezone"
-msgstr ""
-
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-msgid "Timezone not selected."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-msgid "Two user ids or screen_names must be supplied."
-msgstr ""
-
-#: ../index.php:57 index.php:57
-msgid "Unknown action"
-msgstr ""
-
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-msgid "Updates by SMS"
-msgstr ""
-
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr ""
-
-#: ../actions/invite.php:114 actions/invite.php:121
-msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
-msgstr ""
-
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr ""
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "What timezone are you normally in?"
-msgstr ""
-
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-msgid "Yes"
-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/invite.php:81 actions/invite.php:88
-msgid "You are already subscribed to these users:"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
-msgstr ""
-
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-msgid "You may not delete another user's status."
-msgstr ""
-
-#: ../actions/invite.php:31 actions/invite.php:31
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-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!"
-msgstr ""
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:1293
+msgid "about an hour ago"
+msgstr "yaklaşık bir saat önce"
 
 #: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
+#: actions/showstream.php:441 lib/stream.php:99 lib/noticelist.php:211
 msgid "delete"
 msgstr ""
 
+#: ../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:135
+#: lib/facebookaction.php:202 lib/noticelist.php:189
+msgid "in reply to..."
+msgstr "...cevap olarak"
+
+#: ../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:142
+#: lib/noticelist.php:199
+msgid "reply"
+msgstr "cevapla"
+
+#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/profilesettings.php:188
+msgid "same as password above"
+msgstr "yukaridaki parola ile aynı"
+
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+#: actions/twitapistatuses.php:543
 msgid "unsupported file type"
 msgstr ""
 
+#: ../lib/util.php:1309 lib/util.php:1443 lib/facebookaction.php:251
+#: lib/util.php:1783
+#, fuzzy
+msgid "« After"
+msgstr "« Sonra"
+
 #: actions/deletenotice.php:74 actions/disfavor.php:43
 #: actions/emailsettings.php:127 actions/favor.php:45
 #: actions/finishopenidlogin.php:33 actions/imsettings.php:105
@@ -2261,6 +2541,12 @@ msgstr ""
 #: 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:38 actions/deleteprofile.php:127 actions/disfavor.php:47
+#: actions/emailsettings.php:130 actions/favor.php:49 actions/login.php:45
+#: actions/newmessage.php:44 actions/newnotice.php:36 actions/nudge.php:47
+#: actions/othersettings.php:139 actions/profilesettings.php:49
+#: actions/subedit.php:38 actions/tagother.php:113
+#: actions/twittersettings.php:188 actions/unblock.php:38
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -2284,12 +2570,14 @@ msgstr ""
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142
+#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:54
+#: actions/twitapifavorites.php:115
 msgid "This notice is already a favorite!"
 msgstr ""
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
+#: classes/Command.php:132 actions/favor.php:61
+#: actions/twitapifavorites.php:122
 msgid "Could not create favorite."
 msgstr ""
 
@@ -2298,11 +2586,12 @@ msgid "Disfavor"
 msgstr ""
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:62
 #, php-format
 msgid "%s favorite notices"
 msgstr ""
 
-#: actions/favoritesrss.php:64
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:66
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr ""
@@ -2328,47 +2617,50 @@ msgid ""
 "\n"
 msgstr ""
 
-#: actions/login.php:104
+#: actions/login.php:104 actions/login.php:111 actions/openidlogin.php:86
 msgid "Automatically login in the future; "
 msgstr ""
 
-#: actions/login.php:122
+#: actions/login.php:122 actions/login.php:130
 msgid "For security reasons, please re-enter your "
 msgstr ""
 
-#: actions/login.php:126
+#: actions/login.php:126 actions/login.php:134
 msgid "Login with your username and password. "
 msgstr ""
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+#: actions/newmessage.php:60 actions/twitapidirect_messages.php:136
 msgid "That's too long. Max message size is 140 chars."
 msgstr ""
 
-#: actions/newmessage.php:65
+#: actions/newmessage.php:65 actions/newmessage.php:68
 msgid "No recipient specified."
 msgstr ""
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
+#: classes/Command.php:206 actions/newmessage.php:71
+#: actions/newmessage.php:116 classes/Command.php:211
 msgid "You can't send a message to this user."
 msgstr ""
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
+#: classes/Command.php:209 actions/newmessage.php:74
+#: actions/twitapidirect_messages.php:153 classes/Command.php:214
 msgid ""
-"Don't send a message to yourself; just say it to yourself quietly "
-"instead."
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: actions/newmessage.php:108
+#: actions/newmessage.php:108 actions/microsummary.php:32
+#: actions/newmessage.php:111
 msgid "No such user"
 msgstr ""
 
-#: actions/newmessage.php:117
+#: actions/newmessage.php:117 actions/newmessage.php:120
 msgid "New message"
 msgstr ""
 
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:95 actions/noticesearch.php:94
 msgid "Notice without matching profile"
 msgstr ""
 
@@ -2415,6 +2707,7 @@ msgstr ""
 
 #: actions/profilesettings.php:115 actions/remotesubscribe.php:320
 #: actions/userauthorization.php:159 actions/userrss.php:76
+#: actions/profilesettings.php:120 actions/remotesubscribe.php:333
 msgid "User without matching profile"
 msgstr ""
 
@@ -2442,18 +2735,18 @@ msgstr ""
 msgid "New password successfully saved. "
 msgstr ""
 
-#: actions/register.php:95
+#: actions/register.php:95 actions/register.php:104
 msgid "Password must be 6 or more characters."
 msgstr ""
 
-#: actions/register.php:216
+#: actions/register.php:216 actions/register.php:243
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to..."
 msgstr ""
 
-#: actions/register.php:227
+#: actions/register.php:227 actions/register.php:254
 msgid "(You should receive a message by email momentarily, with "
 msgstr ""
 
@@ -2468,6 +2761,7 @@ msgid "Feed for favorites of %s"
 msgstr ""
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:88 actions/twitapifavorites.php:57
 msgid "Could not retrieve favorite notices."
 msgstr ""
 
@@ -2489,7 +2783,7 @@ msgstr ""
 msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: actions/showstream.php:154
+#: actions/showstream.php:154 lib/util.php:2105
 msgid "Send a message"
 msgstr ""
 
@@ -2498,73 +2792,78 @@ msgstr ""
 msgid "Mobile carrier for your phone. "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:64
 #, php-format
 msgid "Direct messages to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:65
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:69
 msgid "Direct Messages You've Sent"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:70
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:132
 msgid "No message text!"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:145
 msgid "Recipient user not found."
 msgstr ""
 
 #: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:148
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
-#: actions/twitapifavorites.php:92
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:64
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
-#: actions/twitapifavorites.php:95
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:67
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
+#: actions/twitapifavorites.php:158 lib/mail.php:303
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr ""
 
 #: actions/twitapifavorites.php:188 lib/mail.php:276
+#: actions/twitapifavorites.php:159 lib/mail.php:304
 #, php-format
 msgid ""
 "%1$s just added your notice from %2$s as one of their favorites.\n"
 "\n"
 msgstr ""
 
-#: actions/twittersettings.php:27
+#: actions/twittersettings.php:27 actions/twittersettings.php:29
 msgid ""
 "Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 
-#: actions/twittersettings.php:41
+#: actions/twittersettings.php:41 actions/twittersettings.php:43
 msgid "Twitter settings"
 msgstr ""
 
-#: actions/twittersettings.php:48
+#: actions/twittersettings.php:48 actions/twittersettings.php:50
 msgid "Twitter Account"
 msgstr ""
 
-#: actions/twittersettings.php:56
+#: actions/twittersettings.php:56 actions/twittersettings.php:58
 msgid "Current verified Twitter account."
 msgstr ""
 
@@ -2592,46 +2891,50 @@ msgstr ""
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:216
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr ""
 
-#: actions/twittersettings.php:128
+#: actions/twittersettings.php:128 actions/twittersettings.php:221
 msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: actions/twittersettings.php:137 actions/twittersettings.php:228
 #, php-format
 msgid "Unable to retrieve account information for \"%s\" from Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:234 actions/twittersettings.php:253
 msgid "Unable to save your Twitter settings!"
 msgstr ""
 
-#: actions/twittersettings.php:174
+#: actions/twittersettings.php:174 actions/twittersettings.php:261
 msgid "Twitter settings saved."
 msgstr ""
 
-#: actions/twittersettings.php:192
+#: actions/twittersettings.php:192 actions/twittersettings.php:272
 msgid "That is not your Twitter account."
 msgstr ""
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:280
 msgid "Couldn't remove Twitter user."
 msgstr ""
 
-#: actions/twittersettings.php:212
+#: actions/twittersettings.php:212 actions/twittersettings.php:284
 msgid "Twitter account removed."
 msgstr ""
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
+#: actions/twittersettings.php:299 actions/twittersettings.php:310
+#: actions/twittersettings.php:322
 msgid "Couldn't save Twitter preferences."
 msgstr ""
 
-#: actions/twittersettings.php:245
+#: actions/twittersettings.php:245 actions/twittersettings.php:330
 msgid "Twitter preferences saved."
 msgstr ""
 
@@ -2647,15 +2950,15 @@ msgstr ""
 msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#: classes/Channel.php:113
+#: classes/Channel.php:113 classes/Channel.php:129
 msgid "Command results"
 msgstr ""
 
-#: classes/Channel.php:148
+#: classes/Channel.php:148 classes/Channel.php:175
 msgid "Command complete"
 msgstr ""
 
-#: classes/Channel.php:158
+#: classes/Channel.php:158 classes/Channel.php:185
 msgid "Command failed"
 msgstr ""
 
@@ -2668,7 +2971,7 @@ msgstr ""
 msgid "Subscriptions: %1$s\n"
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:247
 msgid "User has no last notice"
 msgstr ""
 
@@ -2701,59 +3004,60 @@ msgstr ""
 msgid "About: %s"
 msgstr ""
 
-#: classes/Command.php:200
+#: classes/Command.php:200 classes/Command.php:202
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: classes/Command.php:214
+#: classes/Command.php:214 classes/Command.php:219
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: classes/Command.php:216
+#: classes/Command.php:216 classes/Command.php:221
 msgid "Error sending direct message."
 msgstr ""
 
-#: classes/Command.php:263
+#: classes/Command.php:263 classes/Command.php:268
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: classes/Command.php:270
+#: classes/Command.php:270 classes/Command.php:275
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: classes/Command.php:288
+#: classes/Command.php:288 classes/Command.php:293
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: classes/Command.php:295
+#: classes/Command.php:295 classes/Command.php:300
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330
+#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:315
+#: classes/Command.php:335
 msgid "Command not yet implemented."
 msgstr ""
 
-#: classes/Command.php:313
+#: classes/Command.php:313 classes/Command.php:318
 msgid "Notification off."
 msgstr ""
 
-#: classes/Command.php:315
+#: classes/Command.php:315 classes/Command.php:320
 msgid "Can't turn off notification."
 msgstr ""
 
-#: classes/Command.php:333
+#: classes/Command.php:333 classes/Command.php:338
 msgid "Notification on."
 msgstr ""
 
-#: classes/Command.php:335
+#: classes/Command.php:335 classes/Command.php:340
 msgid "Can't turn on notification."
 msgstr ""
 
-#: classes/Command.php:344
+#: classes/Command.php:344 classes/Command.php:349
 msgid "Commands:\n"
 msgstr ""
 
@@ -2765,23 +3069,23 @@ msgstr ""
 msgid "Could not update message with new URI."
 msgstr ""
 
-#: lib/gallery.php:46
+#: lib/gallery.php:46 lib/gallery.php:55
 msgid "User without matching profile in system."
 msgstr ""
 
-#: lib/mail.php:147
+#: lib/mail.php:147 lib/mail.php:141
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:249
+#: lib/mail.php:249 lib/mail.php:275
 #, php-format
 msgid "New private message from %s"
 msgstr ""
 
-#: lib/mail.php:253
+#: lib/mail.php:253 lib/mail.php:279
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -2825,18 +3129,458 @@ msgstr ""
 msgid "Your sent messages"
 msgstr ""
 
-#: lib/settingsaction.php:99
+#: lib/settingsaction.php:99 actions/deleteprofile.php:256
 msgid "Twitter"
 msgstr ""
 
-#: lib/settingsaction.php:100
+#: lib/settingsaction.php:100 actions/deleteprofile.php:257
 msgid "Twitter integration options"
 msgstr ""
 
-#: lib/util.php:1718
+#: lib/util.php:1718 lib/util.php:2145
 msgid "To"
 msgstr ""
 
 #: scripts/maildaemon.php:45
 msgid "Could not parse message."
 msgstr ""
+
+#: actions/block.php:45 actions/subedit.php:45 actions/unblock.php:45
+msgid "No profile specified."
+msgstr ""
+
+#: actions/block.php:52 actions/subedit.php:52 actions/tagother.php:45
+#: actions/unblock.php:52
+msgid "No profile with that ID."
+msgstr ""
+
+#: actions/block.php:78
+#, fuzzy
+msgid "Block user"
+msgstr "Böyle bir kullanıcı yok."
+
+#: actions/block.php:81
+msgid "Are you sure you want to block this user? "
+msgstr ""
+
+#: actions/block.php:117
+#, fuzzy
+msgid "You have already blocked this user."
+msgstr "Zaten giriş yapmış durumdasıznız!"
+
+#: actions/block.php:124
+msgid "Failed to save block information."
+msgstr ""
+
+#: actions/deleteprofile.php:25
+msgid "Code not yet ready."
+msgstr ""
+
+#: actions/deleteprofile.php:36
+msgid "Export and delete your user information."
+msgstr ""
+
+#: actions/deleteprofile.php:88 actions/deleteprofile.php:119
+#, fuzzy
+msgid "Delete my account"
+msgstr "Yeni hesap oluştur"
+
+#: actions/deleteprofile.php:89
+#, fuzzy
+msgid "Delete my account confirmation"
+msgstr "Eposta onayı silinemedi."
+
+#: actions/deleteprofile.php:117
+msgid "Check if you are sure you want to delete your account."
+msgstr ""
+
+#: actions/deleteprofile.php:259 lib/settingsaction.php:102
+msgid "Other"
+msgstr ""
+
+#: actions/deleteprofile.php:260 lib/settingsaction.php:103
+msgid "Other options"
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Add to favorites"
+msgstr ""
+
+#: actions/emailsettings.php:98
+msgid "Allow friends to nudge me and send me an email."
+msgstr ""
+
+#: actions/facebookremove.php:54
+#, fuzzy
+msgid "Couldn't remove Facebook user."
+msgstr "Kullanıcı güncellenemedi."
+
+#: actions/favor.php:71
+msgid "Disfavor favorite"
+msgstr ""
+
+#: actions/favorited.php:31 lib/stream.php:45
+#, fuzzy
+msgid "Popular notices"
+msgstr "Böyle bir durum mesajı yok."
+
+#: actions/favorited.php:54
+msgid "Showing recently popular notices"
+msgstr ""
+
+#: actions/featured.php:32 actions/featured.php:54 lib/stream.php:41
+msgid "Featured users"
+msgstr ""
+
+#: actions/finishremotesubscribe.php:186
+msgid "That user has blocked you from subscribing."
+msgstr ""
+
+#: actions/microsummary.php:39
+msgid "No current status"
+msgstr ""
+
+#: actions/newnotice.php:93
+#, fuzzy
+msgid "Notice posted"
+msgstr "Durum mesajları"
+
+#: actions/newnotice.php:116 classes/Channel.php:140
+msgid "Ajax Error"
+msgstr ""
+
+#: actions/nudge.php:52
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
+
+#: actions/nudge.php:61
+msgid "Nudge sent"
+msgstr ""
+
+#: actions/othersettings.php:27
+msgid "Manage various other options."
+msgstr ""
+
+#: actions/othersettings.php:33
+#, fuzzy
+msgid "Other Settings"
+msgstr "Ayarlar"
+
+#: actions/othersettings.php:35
+msgid "URL Auto-shortening"
+msgstr ""
+
+#: actions/othersettings.php:54
+#, fuzzy
+msgid "Service"
+msgstr "Ara"
+
+#: actions/othersettings.php:54
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/othersettings.php:155
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Yer bilgisi çok uzun (azm: 255 karakter)."
+
+#: actions/peopletag.php:33
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "Geçersiz bir eposta adresi."
+
+#: actions/peopletag.php:45
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr ""
+
+#: actions/peopletag.php:87
+#, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+msgstr ""
+
+#: actions/profilesettings.php:92
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+
+#: actions/profilesettings.php:246 actions/tagother.php:131
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "%s Geçersiz başlangıç sayfası"
+
+#: actions/profilesettings.php:328
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "Profil kaydedilemedi."
+
+#: actions/public.php:68
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
+msgstr ""
+
+#: actions/public.php:90
+msgid "Could not retrieve public stream."
+msgstr ""
+
+#: actions/register.php:67 actions/register.php:177
+msgid "Sorry, only invited people can register."
+msgstr ""
+
+#: actions/register.php:156
+msgid "With this form you can create a new account. "
+msgstr ""
+
+#: actions/remotesubscribe.php:136 actions/remotesubscribe.php:141
+msgid "That's a local profile! Login to subscribe."
+msgstr ""
+
+#: actions/subedit.php:68
+#, fuzzy
+msgid "You are not subscribed to that profile."
+msgstr "Bize o profili yollamadınız"
+
+#  Note: Bu federation ozelligi nasilsa simdi kullanilmayacak
+#: actions/subedit.php:81
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "Abonelik oluşturulamadı."
+
+#: actions/subscribe.php:53
+#, fuzzy
+msgid "Not a local user."
+msgstr "Böyle bir kullanıcı yok."
+
+#: actions/subscribe.php:67
+#, fuzzy
+msgid "Subscribed"
+msgstr "Abone ol"
+
+#: actions/subscriptions.php:72
+#, fuzzy
+msgid "Jabber"
+msgstr "JabberID yok."
+
+#: actions/tagother.php:31
+#, fuzzy
+msgid "Not logged in"
+msgstr "Giriş yapılmadı."
+
+#: actions/tagother.php:40
+#, fuzzy
+msgid "No id argument."
+msgstr "Böyle bir belge yok."
+
+#: actions/tagother.php:56
+msgid "Tag a person"
+msgstr ""
+
+#: actions/tagother.php:98
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
+msgstr ""
+
+#: actions/tagother.php:120
+#, fuzzy
+msgid "No such profile."
+msgstr "Böyle bir durum mesajı yok."
+
+#: actions/tagother.php:146
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+
+#: actions/tagother.php:153
+#, fuzzy
+msgid "Could not save tags."
+msgstr "Avatar bilgisi kaydedilemedi"
+
+#: actions/tagother.php:188
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
+
+#: actions/tagrss.php:33
+#, fuzzy
+msgid "No such tag."
+msgstr "Böyle bir durum mesajı yok."
+
+#: actions/tagrss.php:62
+#, fuzzy, php-format
+msgid "Microblog tagged with %s"
+msgstr "%s adli kullanicinin durum mesajlari"
+
+#: actions/twitapiblocks.php:45
+msgid "Block user failed."
+msgstr ""
+
+#: actions/twitapiblocks.php:66
+msgid "Unblock user failed."
+msgstr ""
+
+#: actions/twitapiusers.php:45
+#, fuzzy
+msgid "Not found."
+msgstr "İstek bulunamadı!"
+
+#: actions/twittersettings.php:63
+msgid "Twitter user name"
+msgstr ""
+
+#: actions/twittersettings.php:67
+#, fuzzy
+msgid "Twitter password"
+msgstr "Yeni parola"
+
+#: actions/twittersettings.php:129
+msgid "Twitter Friends"
+msgstr ""
+
+#: actions/unblock.php:73
+#, fuzzy
+msgid "Error removing the block."
+msgstr "Kullanıcıyı kaydetmede hata oluştu."
+
+#: actions/unsubscribe.php:48
+#, fuzzy
+msgid "No profile id in request."
+msgstr "Yetkilendirme isteği yok!"
+
+#: actions/unsubscribe.php:55
+msgid "No profile with that id."
+msgstr ""
+
+#: actions/unsubscribe.php:69
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Aboneliği sonlandır"
+
+#: classes/Notice.php:100
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "Durum mesajını kaydederken hata oluştu."
+
+#: classes/Notice.php:105
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+
+#: classes/Notice.php:112
+msgid "You are banned from posting notices on this site."
+msgstr ""
+
+#: lib/gallery.php:98
+msgid "Filter tags"
+msgstr ""
+
+#: lib/gallery.php:104
+msgid "All"
+msgstr ""
+
+#: lib/gallery.php:108
+msgid "Tag"
+msgstr ""
+
+#: lib/gallery.php:109
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/gallery.php:110
+msgid "Go"
+msgstr ""
+
+#: lib/gallery.php:264
+#, fuzzy
+msgid "Subscriptions navigation"
+msgstr "Abonelikler"
+
+#: lib/gallery.php:270 lib/gallery.php:292
+msgid "List"
+msgstr ""
+
+#: lib/gallery.php:280 lib/gallery.php:294
+msgid "Icons"
+msgstr ""
+
+#: lib/mail.php:92
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:242
+#, php-format
+msgid "You've been nudged by %s"
+msgstr ""
+
+#: lib/mail.php:246
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+msgstr ""
+
+#: lib/profilelist.php:146
+msgid "(none)"
+msgstr ""
+
+#: lib/stream.php:33
+msgid "Public"
+msgstr "Genel"
+
+#: lib/stream.php:36 lib/stream.php:37
+msgid "Recent tags"
+msgstr ""
+
+#: lib/stream.php:40
+msgid "Featured"
+msgstr ""
+
+#: lib/stream.php:44
+#, fuzzy
+msgid "Popular"
+msgstr "Kişi Arama"
+
+#: lib/subs.php:51
+#, fuzzy
+msgid "User has blocked you."
+msgstr "Kullanıcının profili yok."
+
+#: lib/util.php:2059
+msgid "Send a nudge"
+msgstr ""
+
+#: lib/util.php:2063
+msgid "Nudge sent!"
+msgstr ""
+
+#: lib/util.php:2194
+msgid "Block"
+msgstr ""
+
+#: lib/util.php:2198
+msgid "Unblock"
+msgstr ""
+
+#~ msgid "Couldn't confirm email."
+#~ msgstr "Eposta onaylanamadı."
+
+#~ msgid "Email address"
+#~ msgstr "Eposta adresi"
+
+#~ msgid "Error inserting notice"
+#~ msgstr "Durum gönderilirken hata oluştu"
+
+#~ 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 ""
+#~ "Eğer parolanızı unuttuysanız veya kaybettiyseniz, hesabınıza eklemiş "
+#~ "olduğunuz eposta adresine yeni bir tane gönderilmesini sağlayabilirsiniz."
diff --git a/uk_UA/LC_MESSAGES/laconica.po b/uk_UA/LC_MESSAGES/laconica.po
index 329397dbbb..a6902dc02a 100644
--- a/uk_UA/LC_MESSAGES/laconica.po
+++ b/uk_UA/LC_MESSAGES/laconica.po
@@ -7,62 +7,90 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"#-#-#-#-#  laconica.po  #-#-#-#-#\n"
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-29 20:02+1200\n"
-"PO-Revision-Date: \n"
-"Last-Translator: Kostyantyn Bakarzhiev <boogie@e-mail.ua>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Ukrainian\n"
-"X-Poedit-Country: UKRAINE\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"POT-Creation-Date: 2009-01-12 12:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"#-#-#-#-#  laconica.po  #-#-#-#-#\n"
+"X-Poedit-Language: Ukrainian\n"
+"X-Poedit-Country: UKRAINE\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/noticesearchrss.php:64
+#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:61
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr "Потік пошуку для \"%s\""
 
-#: ../actions/tag.php:139
-msgid " by "
-msgstr "від"
-
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:255
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: actions/finishopenidlogin.php:88 actions/register.php:205
+#: actions/register.php:232
 msgid ""
-" except this private data: password, email address, IM address, phone "
-"number."
+" except this private data: password, email address, IM address, phone number."
+msgstr ""
+"окрім цих приватних даних: пароль, електронна адреса, адреса IM, телефонний "
+"номер."
+
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+#: lib/facebookaction.php:195 lib/noticelist.php:160
+msgid " from "
 msgstr ""
-"окрім цих приватних даних: пароль, "
-"електронна адреса, адреса IM, телефонний номер."
 
-#: ../actions/twitapistatuses.php:469
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: actions/twitapistatuses.php:341
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
 msgstr "%1$s / Оновленні відповіді %2$s"
 
-#: ../actions/tag.php:127
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
+
+#: ../actions/invite.php:170
 #, php-format
-msgid "%1$s Notices recently tagged with %2$s"
-msgstr "%1$s Повідомлення щойно позначені з %2$s"
+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 ""
 
-#: ../lib/mail.php:120
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:115
+#: lib/mail.php:117
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s тепер слідкує за вашими повідомленями на %2$s."
 
-#: ../lib/mail.php:122
+#: ../lib/mail.php:126
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -72,296 +100,409 @@ msgid ""
 "Faithfully yours,\n"
 "%4$s.\n"
 msgstr ""
-"%1$s тепер слідкує за вашими повідомленями "
-"на %2$s.\n\n\t%3$s\n\nЩиро ваші,\n%4$s.\n"
+"%1$s тепер слідкує за вашими повідомленями на %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Щиро ваші,\n"
+"%4$s.\n"
 
-#: ../actions/twitapistatuses.php:473
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#: actions/twitapistatuses.php:344
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s оновив(ла) цю відповідь на оновлення від %2$s / %3$s."
 
-#: ../actions/shownotice.php:45
+#: ../actions/shownotice.php:45 actions/shownotice.php:45
+#: actions/shownotice.php:73
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1$s має статус на %2$s"
 
-#: ../actions/publicrss.php:60
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../actions/publicrss.php:62 actions/publicrss.php:48
 #, php-format
 msgid "%s Public Stream"
 msgstr "%s Спільний потік"
 
 #: ../actions/all.php:47 ../actions/allrss.php:60
-#: ../actions/twitapistatuses.php:235 ../lib/stream.php:51
+#: ../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/twitapistatuses.php:123
 #, php-format
 msgid "%s and friends"
 msgstr "%s з друзями"
 
-#: ../actions/twitapistatuses.php:49
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:31
 #, php-format
 msgid "%s public timeline"
 msgstr "%s спільний часовий потік"
 
-#: ../lib/mail.php:202
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:217
 #, php-format
 msgid "%s status"
 msgstr "%s статус"
 
-#: ../actions/twitapistatuses.php:335
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:195
 #, php-format
 msgid "%s timeline"
 msgstr "%s часовий потік"
 
-#: ../actions/twitapistatuses.php:52
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:34
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s оновлення від всіх!"
 
-#: ../actions/register.php:277
+#: ../actions/register.php:213
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 msgstr ""
-"(Ви маєте негайно отримати листа "
-"електронною поштою, в якому будуть інструкції, як підтвердити вашу електронну адресу.)"
+"(Ви маєте негайно отримати листа електронною поштою, в якому будуть "
+"інструкції, як підтвердити вашу електронну адресу.)"
 
-#: ../lib/util.php:244
+#: ../lib/util.php:257 lib/util.php:273 lib/util.php:284
 #, 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%%** це сервіс мікроблогів наданий "
-"вам [%%site.broughtby%%](%%site.broughtbyurl%%)."
+"**%%site.name%%** це сервіс мікроблогів наданий вам [%%site.broughtby%%](%%"
+"site.broughtbyurl%%)."
 
-#: ../lib/util.php:246
+#: ../lib/util.php:259 lib/util.php:275 lib/util.php:286
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** це сервіс мікроблогів."
 
-#: ../lib/util.php:261
+#: ../lib/util.php:274 lib/util.php:290 lib/util.php:301
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ""
-". Контрибутори мають бути зазначені "
-"повним ім'ям або ім'ям користувача."
+". Контрибутори мають бути зазначені повним ім'ям або ім'ям користувача."
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
+#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
+#: actions/profilesettings.php:78
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 букви нижнього регістра і цифри, ніякої пунктуації або інтервалів"
 
-#: ../actions/register.php:221
+#: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:193
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
-"1-64 букви нижнього регістра і цифри, "
-"ніякої пунктуації або інтервалів. Неодмінно."
+"1-64 букви нижнього регістра і цифри, ніякої пунктуації або інтервалів. "
+"Неодмінно."
 
-#: ../actions/password.php:42
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/profilesettings.php:186
 msgid "6 or more characters"
 msgstr "6 або більше знаків"
 
-#: ../actions/recoverpassword.php:165
+#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 або більше знаків, і не забудьте їх!"
 
-#: ../actions/register.php:223
+#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:195
 msgid "6 or more characters. Required."
 msgstr "6 або більше знаків. Неодмінно."
 
-#: ../actions/imsettings.php:197
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, 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 ""
-"Код підтвердження був відправлений на "
-"адресу IM, яку ви додали. Ви повинні схвалити %s для відправлення вам повідомлень."
+"Код підтвердження був відправлений на адресу IM, яку ви додали. Ви повинні "
+"схвалити %s для відправлення вам повідомлень."
 
-#: ../actions/emailsettings.php:213
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:234
 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 ""
-"Код підтвердження був відправлений на "
-"електронну адресу, яку ви додали. "
-"Перевірте вхідну пошту (і теку зі спамом також!), там має бути код та подальші інструкції."
+"Код підтвердження був відправлений на електронну адресу, яку ви додали. "
+"Перевірте вхідну пошту (і теку зі спамом також!), там має бути код та "
+"подальші інструкції."
 
-#: ../actions/smssettings.php:216
+#: ../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 ""
-"Код підтвердження був відправлений на "
-"телефонний номер, який ви додали. "
+"Код підтвердження був відправлений на телефонний номер, який ви додали. "
 "Перевірте вхідні повідомлення, там має бути код та подальші інструкції."
 
-#: ../lib/util.php:310
+#: ../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:30
+#: actions/twitapidirect_messages.php:107 actions/twitapifavorites.php:83
+#: actions/twitapifavorites.php:99 actions/twitapifriendships.php:117
+#: actions/twitapihelp.php:42 actions/twitapistatuses.php:77
+#: actions/twitapistatuses.php:144 actions/twitapistatuses.php:224
+#: actions/twitapistatuses.php:234 actions/twitapistatuses.php:386
+#: actions/twitapistatuses.php:395 actions/twitapistatuses.php:421
+#: actions/twitapiusers.php:30
+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:39
+#: actions/twitapiaccount.php:89 actions/twitapiaccount.php:94
+#: actions/twitapidirect_messages.php:178 actions/twitapifavorites.php:139
+#: actions/twitapihelp.php:49 actions/twitapistatuses.php:549
+msgid "API method under construction."
+msgstr ""
+
+#: ../lib/util.php:324 lib/util.php:340 lib/util.php:352
 msgid "About"
 msgstr "Про"
 
-#: ../actions/userauthorization.php:119
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
 msgid "Accept"
 msgstr "Погодитись"
 
 #: ../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/twittersettings.php:84
 msgid "Add"
 msgstr "Додати"
 
-#: ../actions/openidsettings.php:43
+#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
 msgid "Add OpenID"
 msgstr "Додати OpenID"
 
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: actions/deleteprofile.php:248
+msgid "Add or remove OpenIDs"
+msgstr ""
+
 #: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
 msgid "Address"
 msgstr "Адреса"
 
-#: ../actions/showstream.php:273
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
+
+#: ../actions/showstream.php:273 actions/showstream.php:288
+#: actions/showstream.php:336
 msgid "All subscriptions"
 msgstr "Всі підписки"
 
-#: ../actions/publicrss.php:62
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
 #, php-format
 msgid "All updates for %s"
 msgstr "Всі оновлення для %s"
 
-#: ../actions/noticesearchrss.php:66
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:63
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "Всі оновлення за збігом з \"%s\""
 
 #: ../actions/finishopenidlogin.php:29 ../actions/login.php:31
 #: ../actions/openidlogin.php:29 ../actions/register.php:30
+#: actions/finishopenidlogin.php:29 actions/login.php:31
+#: actions/openidlogin.php:29 actions/register.php:30
 msgid "Already logged in."
 msgstr "Тепер ви увійшли."
 
-#: ../actions/subscribe.php:49
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:47
 msgid "Already subscribed!."
 msgstr "Тепер ви підписані!"
 
-#: ../actions/deletenotice.php:54
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
 msgid "Are you sure you want to delete this notice?"
 msgstr "Ви впевненні, що бажаєте видалити це повідомлення?"
 
-#: ../actions/userauthorization.php:77
+#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
 msgid "Authorize subscription"
 msgstr "Авторизувати підписку"
 
-#: ../actions/login.php:104 ../actions/register.php:242
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192 actions/register.php:219
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Автоматично входити у майбутньому; не для "
 
-#: ../actions/profilesettings.php:65
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:103
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
-"Автоматично підписуватись до тих, хто "
-"підписався до мене (якщо ви бот, це саме для вас)"
+"Автоматично підписуватись до тих, хто підписався до мене (якщо ви бот, це "
+"саме для вас)"
 
-#: ../actions/avatar.php:32
+#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: actions/profilesettings.php:34
 msgid "Avatar"
 msgstr "Аватара"
 
-#: ../actions/avatar.php:113
+#: ../actions/avatar.php:113 actions/profilesettings.php:350
+#: actions/profilesettings.php:379
 msgid "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 ""
-"Очікування підтвердження цієї адреси. "
-"Перевірте свій Jabber/GTalk рахунок, там має "
-"бути повідомлення з подальшими інструкціями. (Ви додали %s до вашого списку контактів?)"
+"Очікування підтвердження цієї адреси. Перевірте свій Jabber/GTalk рахунок, "
+"там має бути повідомлення з подальшими інструкціями. (Ви додали %s до вашого "
+"списку контактів?)"
 
-#: ../actions/emailsettings.php:54
+#: ../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 ""
-"Очікування підтвердження цієї адреси. "
-"Перевірте вхідну пошту (і теку зі спамом також!), там має бути повідомлення з подальшими інструкціями."
+"Очікування підтвердження цієї адреси. Перевірте вхідну пошту (і теку зі "
+"спамом також!), там має бути повідомлення з подальшими інструкціями."
 
-#: ../actions/smssettings.php:58
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
 msgid "Awaiting confirmation on this phone number."
 msgstr "Очікування підтвердження телефонного номера."
 
-#: ../lib/util.php:1290
-msgid "Before »"
+#: ../lib/util.php:1318 lib/util.php:1452 lib/facebookaction.php:259
+#: lib/util.php:1792
+#, fuzzy
+msgid "Before »"
 msgstr "Раніше"
 
-#: ../actions/profilesettings.php:49 ../actions/register.php:234
+#: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: actions/profilesettings.php:82 actions/register.php:184
+#: actions/profilesettings.php:84 actions/register.php:211
 msgid "Bio"
 msgstr "Про себе"
 
-#: ../actions/profilesettings.php:101 ../actions/register.php:78
-#: ../actions/updateprofile.php:103
+#: ../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:222 actions/register.php:98
 msgid "Bio is too long (max 140 chars)."
 msgstr "Про себе забагато написано (140 знаків максимум)"
 
-#: ../lib/deleteaction.php:41
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
 msgid "Can't delete this notice."
 msgstr "Не можна видалити це повідомлення."
 
-#: ../actions/updateprofile.php:119
+#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "Не можна прочитати 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/profilesettings.php:433
 msgid "Can't save new password."
 msgstr "Не можна зберегти новий пароль."
 
 #: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62
+#: ../actions/smssettings.php:62 actions/emailsettings.php:58
+#: actions/imsettings.php:59 actions/smssettings.php:62
 msgid "Cancel"
 msgstr "Скасувати"
 
-#: ../lib/openid.php:121
+#: ../lib/openid.php:121 lib/openid.php:121
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Не можна підтвердити споживчий об'єкт OpenID."
 
-#: ../actions/imsettings.php:163
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
 msgid "Cannot normalize that Jabber ID"
 msgstr "Не можна полагодити цей Jabber ID"
 
-#: ../actions/emailsettings.php:181
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:204
 msgid "Cannot normalize that email address"
 msgstr "Не можна полагодити цю поштову адресу"
 
-#: ../actions/password.php:45
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/profilesettings.php:189
 msgid "Change"
 msgstr "Змінити"
 
-#: ../actions/password.php:32
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: actions/deleteprofile.php:245
+msgid "Change email handling"
+msgstr ""
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
 msgid "Change password"
 msgstr "Змінити пароль"
 
-#: ../actions/password.php:43 ../actions/recoverpassword.php:166
-#: ../actions/register.php:224 ../actions/smssettings.php:65
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr ""
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#: actions/deleteprofile.php:242
+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/profilesettings.php:187 actions/register.php:196
 msgid "Confirm"
 msgstr "Підтвердити"
 
-#: ../actions/confirmaddress.php:86
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
 msgid "Confirm Address"
 msgstr "Підтвердити адресу"
 
 #: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245
+#: ../actions/smssettings.php:245 actions/emailsettings.php:256
+#: actions/imsettings.php:230 actions/smssettings.php:253
+#: actions/emailsettings.php:259
 msgid "Confirmation cancelled."
 msgstr "Підтвердження скасовано."
 
-#: ../actions/smssettings.php:63
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
 msgid "Confirmation code"
 msgstr "Код підтвердження"
 
-#: ../actions/confirmaddress.php:38
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
 msgid "Confirmation code not found."
 msgstr "Код підтвердження не знайдено."
 
-#: ../actions/register.php:266
+#: ../actions/register.php:202
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -379,94 +520,127 @@ msgid ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
-"Вітаємо, %s! І ласкаво просимо до %%%%site.name%%%%. "
-"Звідси ви, можливо, схочете...\n"
+"Вітаємо, %s! І ласкаво просимо до %%%%site.name%%%%. Звідси ви, можливо, "
+"схочете...\n"
+"\n"
+"*Подивитись [ваш профіль](%s) та написати своє перше повідомлення.\n"
+"*Додати [адресу Jabber/GTalk](%%%%action.imsettings%%%%), так щоб мати змогу "
+"надсилати повідомлення через службу миттєвих повідомлень.\n"
+"*[Розшукати людей](%%%%action.peoplesearch%%%%), які мають спільні з вами "
+"інтереси. \n"
+"*Прочитати [додаткову інформацію](%%%%doc.help%%%%), аби переконатись, що ви "
+"нічого не пропустили. \n"
 "\n"
-"*Подивитись [ваш профіль](%s) та написати "
-"своє перше повідомлення.\n"
-"*Додати [адресу Jabber/GTalk](%%%%action.imsettings%%%%), так "
-"щоб мати змогу надсилати повідомлення "
-"через службу миттєвих повідомлень.\n"
-"*[Розшукати людей](%%%%action.peoplesearch%%%%), які "
-"мають спільні з вами інтереси. \n*Прочитати [додаткову інформацію](%%%%doc.help%%%%), аби переконатись, що ви нічого не пропустили. \n\nДякуємо, що зареєструвались у нас, і, сподіваємось, вам сподобається наш сервіс."
-
-#: ../actions/finishopenidlogin.php:91
+"Дякуємо, що зареєструвались у нас, і, сподіваємось, вам сподобається наш "
+"сервіс."
+
+#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
 msgid "Connect"
 msgstr "З'єднатись"
 
-#: ../actions/finishopenidlogin.php:86
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
 msgid "Connect existing account"
 msgstr "З'єднатись використовуючи існуючий рахунок"
 
-#: ../lib/util.php:318
+#: ../lib/util.php:332 lib/util.php:348 lib/util.php:360
 msgid "Contact"
 msgstr "Контакт"
 
-#: ../lib/openid.php:178
+#: ../lib/openid.php:178 lib/openid.php:178
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "Не вдалося створити форму OpenID: %s"
 
-#: ../actions/twitapifriendships.php:48
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:46 actions/twitapifriendships.php:62
+#, 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:39
 msgid "Could not follow user: User not found."
 msgstr "Не вдалося слідувати за користувачем: користувача не знайдено."
 
-#: ../lib/openid.php:160
+#: ../lib/openid.php:160 lib/openid.php:160
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "Невдале перенаправлення на сервер: %s"
 
-#: ../actions/updateprofile.php:162
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
 msgid "Could not save avatar info"
 msgstr "Не вдалося зберегти інформацію про аватару"
 
-#: ../actions/updateprofile.php:155
+#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
 msgid "Could not save new profile info"
 msgstr "Не вдалося зберегти інформацію про новий профіль"
 
-#: ../actions/subscribe.php:62
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:70
 msgid "Could not subscribe other to you."
 msgstr "Не вдалося підписати іншого до вас."
 
-#: ../actions/subscribe.php:54
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:55
 msgid "Could not subscribe."
 msgstr "Невдала підписка."
 
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:99
+#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:112
 msgid "Couldn't convert request tokens to access tokens."
 msgstr "Не вдалося перетворити токени запиту на токени звернення."
 
-#: ../actions/confirmaddress.php:80 ../actions/emailsettings.php:234
+#: ../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/emailsettings.php:255
 msgid "Couldn't delete email confirmation."
 msgstr "Не вдалося видалити підтвердження поштової адреси."
 
-#: ../actions/unsubscribe.php:57
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:129
 msgid "Couldn't delete subscription."
 msgstr "Не вдалося видалити підписку."
 
-#: ../actions/remotesubscribe.php:125
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+#: actions/twitapistatuses.php:82
+msgid "Couldn't find any statuses."
+msgstr ""
+
+#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
+#: actions/remotesubscribe.php:148
 msgid "Couldn't get a request token."
 msgstr "Не вдалося отримати токен запиту."
 
 #: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206
+#: ../actions/smssettings.php:206 actions/emailsettings.php:223
+#: actions/imsettings.php:195 actions/smssettings.php:214
+#: actions/emailsettings.php:228
 msgid "Couldn't insert confirmation code."
 msgstr "Не вдалося додати код підтвердження."
 
 #: ../actions/finishremotesubscribe.php:180
+#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:216
 msgid "Couldn't insert new subscription."
 msgstr "Не вдалося додати нову підписку."
 
-#: ../actions/profilesettings.php:181 ../actions/twitapiaccount.php:92
+#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
+#: actions/profilesettings.php:319 actions/twitapiaccount.php:74
 msgid "Couldn't save profile."
 msgstr "Не вдалося зберегти профіль."
 
-#: ../actions/profilesettings.php:158
+#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
+#: actions/profilesettings.php:296
 msgid "Couldn't update user for autosubscribe."
 msgstr "Не вдалося оновити користувача для автопідписки."
 
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+#: actions/emailsettings.php:301 actions/emailsettings.php:315
 msgid "Couldn't update user record."
 msgstr "Не вдалося оновити запис користувача."
 
@@ -474,188 +648,214 @@ msgstr "Не вдалося оновити запис користувача."
 #: ../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/emailsettings.php:179 actions/emailsettings.php:280
+#: actions/othersettings.php:173 actions/profilesettings.php:276
 msgid "Couldn't update user."
 msgstr "Не вдалося оновити користувача."
 
-#: ../actions/finishopenidlogin.php:84
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
 msgid "Create"
 msgstr "Створити"
 
-#: ../actions/finishopenidlogin.php:70
+#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
 msgid "Create a new user with this nickname."
 msgstr "Створити нового користувача з цим ім'ям."
 
-#: ../actions/finishopenidlogin.php:68
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
 msgid "Create new account"
 msgstr "Створити новий рахунок"
 
-#: ../actions/finishopenidlogin.php:191
+#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+#: actions/finishopenidlogin.php:208
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Створити новий рахунок з OpenID, яким ви вже користуєтесь."
 
-#: ../actions/imsettings.php:45
+#: ../actions/imsettings.php:45 actions/imsettings.php:46
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Поточна підтверджена адреса Jabber/GTalk."
 
-#: ../actions/smssettings.php:46
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Поточний підтверджений телефонний номер."
 
-#: ../actions/emailsettings.php:44
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
 msgid "Current confirmed email address."
 msgstr "Поточна підтверджена поштова адреса."
 
-#: ../actions/showstream.php:356
+#: ../actions/showstream.php:356 actions/showstream.php:367
+#: actions/showstream.php:418
 msgid "Currently"
 msgstr "Поточне"
 
-#: ../classes/Notice.php:72
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:87
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr "Помилка бази даних при додаванні мітки: %s"
 
-#: ../lib/util.php:1033
+#: ../lib/util.php:1061 lib/util.php:1110 lib/util.php:1417
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Помилка бази даних при додаванні відповіді: %s"
 
-#: ../actions/deletenotice.php:41
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
 msgid "Delete notice"
 msgstr "Видалити повідомлення"
 
-#: ../actions/profilesettings.php:51 ../actions/register.php:236
+#: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: actions/profilesettings.php:84 actions/register.php:186
+#: actions/profilesettings.php:86 actions/register.php:213
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Опишіть себе та свої інтереси (140 знаків)"
 
-#: ../actions/register.php:226
+#: ../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/deleteprofile.php:244 actions/register.php:199
+#: actions/register.php:202
 msgid "Email"
 msgstr "Пошта"
 
-#: ../actions/emailsettings.php:59
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
 msgid "Email Address"
 msgstr "Електронна адреса"
 
-#: ../actions/emailsettings.php:32
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
 msgid "Email Settings"
 msgstr "Налаштування пошти"
 
-#: ../actions/register.php:69
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:89
 msgid "Email address already exists."
 msgstr "Ця адреса вже використовується."
 
-#: ../lib/mail.php:90
+#: ../lib/mail.php:90 lib/mail.php:90
 msgid "Email address confirmation"
 msgstr "Підтвердження електронної адреси"
 
-#: ../actions/emailsettings.php:61
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Електронна адреса, на зразок \"UserName@example.org\""
 
-#: ../actions/recoverpassword.php:176
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr ""
+
+#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
 msgid "Enter a nickname or email address."
 msgstr "Введіть ім'я або електронну адресу."
 
-#: ../actions/smssettings.php:64
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
 msgid "Enter the code you received on your phone."
 msgstr "Введіть код, який ви отримали телефоном."
 
-#: ../actions/userauthorization.php:137
+#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
 msgid "Error authorizing token"
 msgstr "Помилка токена авторизації"
 
-#: ../actions/finishopenidlogin.php:282
+#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
+#: actions/finishopenidlogin.php:274
 msgid "Error connecting user to OpenID."
 msgstr "Помилка при підключенні користувача до OpenID."
 
-#: ../actions/finishaddopenid.php:78
+#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
 msgid "Error connecting user."
 msgstr "Помилка при підключенні користувача."
 
 #: ../actions/finishremotesubscribe.php:151
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:164
 msgid "Error inserting avatar"
 msgstr "Помилка при додаванні аватари"
 
 #: ../actions/finishremotesubscribe.php:143
+#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:156
 msgid "Error inserting new profile"
 msgstr "Помилка при додаванні нового профілю"
 
-#: ../actions/postnotice.php:89
-msgid "Error inserting notice"
-msgstr "Помилка при додаванні повідомлення"
-
 #: ../actions/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:180
 msgid "Error inserting remote profile"
 msgstr "Помилка при додаванні віддаленого профілю"
 
-#: ../actions/recoverpassword.php:201
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
 msgid "Error saving address confirmation."
 msgstr "Помилка при збереженні підтвердження адреси."
 
-#: ../actions/userauthorization.php:140
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
 msgid "Error saving remote profile"
 msgstr "Помилка при збереженні віддаленого профілю"
 
-#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
+#: ../lib/openid.php:226 lib/openid.php:226
 msgid "Error saving the profile."
 msgstr "Помилка при збереженні профілю."
 
-#: ../lib/openid.php:237
+#: ../lib/openid.php:237 lib/openid.php:237
 msgid "Error saving the user."
 msgstr "Помилка при збереженні користувача."
 
-#: ../actions/password.php:80
+#: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/profilesettings.php:428
 msgid "Error saving user; invalid."
 msgstr "Помилка при збереженні користувача; недійсний."
 
 #: ../actions/login.php:47 ../actions/login.php:73
-#: ../actions/recoverpassword.php:268 ../actions/register.php:92
+#: ../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:54 actions/login.php:80
+#: actions/register.php:117
 msgid "Error setting user."
 msgstr "Помилка в налаштуваннях користувача."
 
-#: ../actions/finishaddopenid.php:83
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
 msgid "Error updating profile"
 msgstr "Помилка при оновленні профілю"
 
 #: ../actions/finishremotesubscribe.php:161
+#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:174
 msgid "Error updating remote profile"
 msgstr "Помилка при оновленні віддаленого профілю"
 
-#: ../actions/recoverpassword.php:79
+#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
 msgid "Error with confirmation code."
 msgstr "Помилка з кодом підтвердження."
 
-#: ../actions/finishopenidlogin.php:89
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
 msgid "Existing nickname"
 msgstr "Існуюче ім'я"
 
-#: ../lib/util.php:312
+#: ../lib/util.php:326 lib/util.php:342 lib/util.php:354
 msgid "FAQ"
 msgstr "Пширені запитання"
 
-#: ../actions/avatar.php:115
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/profilesettings.php:381
 msgid "Failed updating avatar."
 msgstr "Оновлення аватари невдале."
 
-#: ../actions/all.php:61 ../actions/allrss.php:64
+#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
+#: actions/allrss.php:64
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Живлення для друзів %s"
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
+#: actions/replies.php:65 actions/repliesrss.php:66
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Живлення для відповідей %s"
 
-#: ../actions/tag.php:55
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:54
 #, php-format
 msgid "Feed for tag %s"
 msgstr "Живлення для міток %s"
 
-#: ../lib/searchaction.php:105
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
 msgid "Find content of notices"
 msgstr "Знайти зміст повідомлення"
 
-#: ../lib/searchaction.php:101
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
 msgid "Find people on this site"
 msgstr "Знайти людей на цьому сайті"
 
@@ -664,196 +864,244 @@ msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
-"З міркувань безпеки, будь ласка введіть "
-"ще раз ім'я та пароль, перед тим як змінювати налатування."
+"З міркувань безпеки, будь ласка введіть ще раз ім'я та пароль, перед тим як "
+"змінювати налатування."
 
-#: ../actions/profilesettings.php:44 ../actions/register.php:228
+#: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: actions/profilesettings.php:77 actions/register.php:178
+#: actions/profilesettings.php:79 actions/register.php:205
 msgid "Full name"
 msgstr "Повне ім'я"
 
-#: ../actions/profilesettings.php:98 ../actions/register.php:75
-#: ../actions/updateprofile.php:93
+#: ../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/profilesettings.php:219 actions/register.php:95
 msgid "Full name is too long (max 255 chars)."
 msgstr "Повне ім'я задовге (255 знаків максимум)"
 
-#: ../lib/util.php:291
+#: ../lib/util.php:322 lib/util.php:338 lib/util.php:343 lib/util.php:350
 msgid "Help"
 msgstr "Допомога"
 
-#: ../lib/util.php:285
+#: ../lib/util.php:298 lib/util.php:314 lib/util.php:325
 msgid "Home"
 msgstr "Дім"
 
-#: ../actions/profilesettings.php:46 ../actions/register.php:231
+#: ../actions/profilesettings.php:46 ../actions/register.php:167
+#: actions/profilesettings.php:79 actions/register.php:181
+#: actions/profilesettings.php:81 actions/register.php:208
 msgid "Homepage"
 msgstr "Домашня сторінка"
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:72
+#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: actions/profilesettings.php:210 actions/register.php:83
+#: actions/profilesettings.php:216 actions/register.php:92
 msgid "Homepage is not a valid URL."
 msgstr "Домашня сторінка має недійсну URL-адресу."
 
-#: ../actions/emailsettings.php:91
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+#: actions/emailsettings.php:101
 msgid "I want to post notices by email."
 msgstr "Я хочу надсилати повідомлення поштою."
 
-#: ../actions/imsettings.php:60
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+#: actions/deleteprofile.php:253
+msgid "IM"
+msgstr ""
+
+#: ../actions/imsettings.php:60 actions/imsettings.php:61
 msgid "IM Address"
 msgstr "Адреса IM"
 
-#: ../actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
 msgid "IM Settings"
 msgstr "Налаштування IM"
 
-#: ../actions/finishopenidlogin.php:88
+#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
 msgstr ""
-"Якщо ви вже маєте рахунок, увійдіть "
-"використовуючи ім'я та пароль, щоб приєднати їх до вашого OpenID."
+"Якщо ви вже маєте рахунок, увійдіть використовуючи ім'я та пароль, щоб "
+"приєднати їх до вашого OpenID."
 
 #: ../actions/openidsettings.php:45
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
 msgstr ""
-"Якщо ви бажаєте додати OpenID до вашого "
-"рахунку, введіть адресу в поле нижче і натисніть \"Add\"."
+"Якщо ви бажаєте додати OpenID до вашого рахунку, введіть адресу в поле нижче "
+"і натисніть \"Add\"."
 
-#: ../actions/recoverpassword.php:122
+#: ../actions/recoverpassword.php:137
 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 ""
-"Якщо ви забули, або загубили свій пароль, "
-"ви можете отримати новий на електронну адресу, яку ви закріпили за своїм рахунком."
 
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
+#: actions/emailsettings.php:68 actions/smssettings.php:76
 msgid "Incoming email"
 msgstr "Вхідна пошта"
 
-#: ../actions/emailsettings.php:283
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+#: actions/emailsettings.php:304
 msgid "Incoming email address removed."
 msgstr "Адресу вхідної пошти видалено."
 
-#: ../actions/password.php:69
+#: ../actions/password.php:69 actions/profilesettings.php:388
+#: actions/profilesettings.php:417
 msgid "Incorrect old password"
 msgstr "Старий пароль неточний"
 
-#: ../actions/login.php:67
+#: ../actions/login.php:67 actions/login.php:67 actions/login.php:74
 msgid "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."
 msgstr ""
-"Інструкції з відновлення паролю було "
-"надіслано на електронну адресу, яку ви закріпили за своїм ранком."
+"Інструкції з відновлення паролю було надіслано на електронну адресу, яку ви "
+"закріпили за своїм ранком."
 
-#: ../actions/updateprofile.php:114
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "Недійсна URL-адреса аватари '%s'"
 
-#: ../actions/updateprofile.php:98
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "Недейсна домашня сторінка '%s'"
 
-#: ../actions/updateprofile.php:82
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "Недійсна ліцензія URL '%s'"
 
-#: ../actions/postnotice.php:61
+#: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:63
 msgid "Invalid notice content"
 msgstr "Недійсний зміст повідомлення"
 
-#: ../actions/postnotice.php:67
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:69
 msgid "Invalid notice uri"
 msgstr "Недійсне URI повідомлення"
 
-#: ../actions/postnotice.php:72
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:74
 msgid "Invalid notice url"
 msgstr "Недійсна URL-адреса повідомлення"
 
-#: ../actions/updateprofile.php:87
+#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "Недійсна URL-адреса профілю '%s'."
 
-#: ../actions/remotesubscribe.php:96
+#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
 msgid "Invalid profile URL (bad format)"
 msgstr "Недійсна URL-адреса профілю (неправильний формат)"
 
 #: ../actions/finishremotesubscribe.php:77
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:78
 msgid "Invalid profile URL returned by server."
 msgstr "Недійсну URL-адресу профілю було повернуто сервером."
 
-#: ../actions/avatarbynickname.php:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
 msgid "Invalid size."
 msgstr "Недійсний розмір."
 
-#: ../actions/finishopenidlogin.php:264 ../actions/register.php:87
-#: ../actions/register.php:103
+#: ../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:256 actions/register.php:112
+#: actions/register.php:130
 msgid "Invalid username or password."
 msgstr "Недійсне ім'я або пароль."
 
-#: ../lib/util.php:248
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr ""
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
+
+#: ../lib/util.php:306 lib/util.php:322 lib/util.php:332
+msgid "Invite"
+msgstr ""
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr ""
+
+#: ../lib/util.php:261 lib/util.php:277 lib/util.php:288
 #, 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 ""
-"Сервіс працює на [Laconica](http://laconi.ca/) - "
-"програмному забезпеченні для "
-"мікроблогів, версія %s, доступному під [GNU "
-"Affero General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"Сервіс працює на [Laconica](http://laconi.ca/) - програмному забезпеченні "
+"для мікроблогів, версія %s, доступному під [GNU Affero General Public "
+"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
-#: ../actions/imsettings.php:173
+#: ../actions/imsettings.php:173 actions/imsettings.php:181
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID вже належить іншому користувачу."
 
-#: ../actions/imsettings.php:62
+#: ../actions/imsettings.php:62 actions/imsettings.php:63
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
 "add %s to your buddy list in your IM client or on GTalk."
 msgstr ""
-"Jabber або GTalk адреса, на зразок "
-"\"UserName@example.org\". Але спершу переконайтеся, "
-"що додали %s до списку контактів в своєму IM-клієнті або в GTalk."
+"Jabber або GTalk адреса, на зразок \"UserName@example.org\". Але спершу "
+"переконайтеся, що додали %s до списку контактів в своєму IM-клієнті або в "
+"GTalk."
 
-#: ../actions/profilesettings.php:57
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
 msgid "Language"
 msgstr "Мова"
 
-#: ../actions/profilesettings.php:113
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+#: actions/profilesettings.php:234
 msgid "Language is too long (max 50 chars)."
 msgstr "Мова задовга (50 знаків максимум)"
 
-#: ../actions/tag.php:133
-msgid "Last message posted: "
-msgstr "Останнє повідомлення:"
-
-#: ../actions/profilesettings.php:52 ../actions/register.php:237
+#: ../actions/profilesettings.php:52 ../actions/register.php:173
+#: actions/profilesettings.php:85 actions/register.php:187
+#: actions/profilesettings.php:87 actions/register.php:214
 msgid "Location"
 msgstr "Місцезнаходження"
 
-#: ../actions/profilesettings.php:104 ../actions/register.php:81
-#: ../actions/updateprofile.php:108
+#: ../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/profilesettings.php:225 actions/register.php:101
 msgid "Location is too long (max 255 chars)."
 msgstr "Місцезнаходження задовге (255 знаків максимум)"
 
 #: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:298
+#: ../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/login.php:104 actions/login.php:113 actions/openidlogin.php:88
+#: lib/util.php:336
 msgid "Login"
 msgstr "Увійти"
 
-#: ../actions/openidlogin.php:44
+#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:60
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Увійти з [OpenID](%%doc.openid%%)."
@@ -861,40 +1109,43 @@ msgstr "Увійти з [OpenID](%%doc.openid%%)."
 #: ../actions/login.php:126
 #, 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 ""
-"Увійти викристовуючи ім'я та пароль. Ще не "
-"маєте імені користувача? "
-"[Зареєструвати](%%action.register%%) новий акаунт, або спробувати [OpenID](%%action.openidlogin%%)."
+"Увійти викристовуючи ім'я та пароль. Ще не маєте імені користувача? "
+"[Зареєструвати](%%action.register%%) новий акаунт, або спробувати [OpenID](%%"
+"action.openidlogin%%)."
 
-#: ../lib/util.php:296
+#: ../lib/util.php:308 lib/util.php:324 lib/util.php:334
 msgid "Logout"
 msgstr "Вийти"
 
-#: ../actions/register.php:230
+#: ../actions/register.php:166 actions/register.php:180
+#: actions/register.php:207
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Довше ім'я, переважно це ваше \"real\" ім'я"
 
-#: ../actions/login.php:110
+#: ../actions/login.php:110 actions/login.php:110 actions/login.php:118
 msgid "Lost or forgotten password?"
 msgstr "Загубили або забули пароль?"
 
 #: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
+#: actions/emailsettings.php:81 actions/smssettings.php:89
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Створити нову адресу для надсилання повідомлень; видалити стару."
 
-#: ../actions/emailsettings.php:27
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Зазначте, як само ви бажаєте отримувати листи з %%site.name%%."
 
-#: ../actions/showstream.php:300
+#: ../actions/showstream.php:300 actions/showstream.php:315
+#: actions/showstream.php:363
 msgid "Member since"
 msgstr "Разом з нами з"
 
-#: ../actions/userrss.php:70
+#: ../actions/userrss.php:70 actions/userrss.php:67
 #, php-format
 msgid "Microblog by %s"
 msgstr "Мікроблог від %s"
@@ -905,359 +1156,471 @@ 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 ""
-"Оператор мобільного зв'язку. Якщо вам "
-"відомий оператор, що підтримує "
-"надсилання SMS через електронну пошту, але він тут не вказаний, напишіть нам і ми внесемо його до списку."
+"Оператор мобільного зв'язку. Якщо вам відомий оператор, що підтримує "
+"надсилання SMS через електронну пошту, але він тут не вказаний, напишіть нам "
+"і ми внесемо його до списку."
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:252
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php:85 actions/register.php:202
+#: actions/register.php:229
 msgid "My text and files are available under "
 msgstr "Мої повідомлення та файли доступні під"
 
 #: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
 msgid "New"
 msgstr "Нове"
 
-#: ../lib/mail.php:140
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:138
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Нова електронна адреса для надсилання повідомлень на %s"
 
-#: ../actions/emailsettings.php:297
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+#: actions/emailsettings.php:318
 msgid "New incoming email address added."
 msgstr "Нову адресу для вхідних повідомлень додано."
 
-#: ../actions/finishopenidlogin.php:71
+#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
 msgid "New nickname"
 msgstr "Нове ім'я"
 
-#: ../actions/newnotice.php:102
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:141
 msgid "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/profilesettings.php:185
 msgid "New password"
 msgstr "Новий пароль"
 
-#: ../actions/recoverpassword.php:275
+#: ../actions/recoverpassword.php:314
 msgid "New password successfully saved. You are now logged in."
 msgstr "Новий пароль успішно збережено. Тепер ви увійшли."
 
 #: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:220
+#: ../actions/register.php:151 actions/login.php:101
+#: actions/profilesettings.php:74 actions/register.php:165
+#: actions/login.php:108 actions/profilesettings.php:76
+#: actions/register.php:192
 msgid "Nickname"
 msgstr "Ім'я користувача"
 
 #: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:65
+#: ../actions/register.php:69 actions/finishopenidlogin.php:181
+#: actions/profilesettings.php:225 actions/register.php:76
+#: actions/finishopenidlogin.php:192 actions/profilesettings.php:231
+#: actions/register.php:85
 msgid "Nickname already in use. Try another one."
 msgstr "Це ім'я вже використовується. Спробуйте інше."
 
 #: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
-#: ../actions/register.php:63 ../actions/updateprofile.php:77
+#: ../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:182 actions/profilesettings.php:209
+#: actions/register.php:83
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
-"Ім'я користувача повинно складатись з "
-"літер нижнього регістру і цифр, ніяких інтервалів."
+"Ім'я користувача повинно складатись з літер нижнього регістру і цифр, ніяких "
+"інтервалів."
 
-#: ../actions/finishopenidlogin.php:170
+#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:187
 msgid "Nickname not allowed."
 msgstr "Таке ім'я неприпустиме."
 
-#: ../actions/remotesubscribe.php:72
+#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
 msgid "Nickname of the user you want to follow"
 msgstr "Ім'я користувача, за яким ви бажаєте слідувати"
 
-#: ../actions/recoverpassword.php:147
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
 msgid "Nickname or email"
 msgstr "Ім'я або електронна адреса"
 
-#: ../actions/deletenotice.php:59
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:104
 msgid "No"
 msgstr "Ні"
 
-#: ../actions/imsettings.php:156
+#: ../actions/imsettings.php:156 actions/imsettings.php:164
 msgid "No Jabber ID."
 msgstr "Немає Jabber ID."
 
-#: ../actions/userauthorization.php:129
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
 msgid "No authorization request!"
 msgstr "Немає запиту на авторизацію!"
 
-#: ../actions/smssettings.php:181
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
 msgid "No carrier selected."
 msgstr "Оператора не обрано."
 
-#: ../actions/smssettings.php:316
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
 msgid "No code entered"
 msgstr "Код не введено"
 
-#: ../actions/confirmaddress.php:33
+#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
 msgid "No confirmation code."
 msgstr "Немає коду підтвердження."
 
-#: ../actions/newnotice.php:50
+#: ../actions/newnotice.php:44 actions/newmessage.php:53
+#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:52
+#: actions/newnotice.php:53
 msgid "No content!"
 msgstr "Немає змісту!"
 
-#: ../actions/emailsettings.php:174
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+#: actions/emailsettings.php:197
 msgid "No email address."
 msgstr "Немає електронної адреси."
 
-#: ../actions/userbyid.php:32
+#: ../actions/userbyid.php:32 actions/userbyid.php:32
 msgid "No id."
 msgstr "Немає ID."
 
-#: ../actions/emailsettings.php:271
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+#: actions/emailsettings.php:292
 msgid "No incoming email address."
 msgstr "Немає адреси для вхідної пошти."
 
 #: ../actions/finishremotesubscribe.php:65
+#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:66
 msgid "No nickname provided by remote server."
 msgstr "На віддаленому сервері такого імені немає."
 
-#: ../actions/avatarbynickname.php:27
+#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 msgid "No nickname."
 msgstr "Немає імені."
 
 #: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229
+#: ../actions/smssettings.php:229 actions/emailsettings.php:240
+#: actions/imsettings.php:214 actions/smssettings.php:237
+#: actions/emailsettings.php:243
 msgid "No pending confirmation to cancel."
 msgstr "Не очікується підтвердження для скасування."
 
-#: ../actions/smssettings.php:176
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
 msgid "No phone number."
 msgstr "Немає телефонного номера."
 
 #: ../actions/finishremotesubscribe.php:72
+#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:73
 msgid "No profile URL returned by server."
 msgstr "Немає URL-адреси профілю повернітої сервером."
 
-#: ../actions/recoverpassword.php:189
+#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
 msgid "No registered email address for that user."
 msgstr "Для цього користувача немає зареєстрованої електронної адреси."
 
-#: ../actions/userauthorization.php:49
+#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
 msgid "No request found!"
 msgstr "Немає знайденого запиту!"
 
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
+#: actions/noticesearch.php:69 actions/peoplesearch.php:69
+#: actions/noticesearch.php:68 actions/peoplesearch.php:59
 msgid "No results"
 msgstr "Немає результатів"
 
-#: ../actions/avatarbynickname.php:32
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
 msgid "No size."
 msgstr "Немає розміру."
 
-#: ../actions/openidsettings.php:135
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:109
+#: actions/twitapistatuses.php:438
+msgid "No status found with that ID."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:411
+msgid "No status with that ID found."
+msgstr ""
+
+#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
 msgid "No such OpenID."
 msgstr "Такого OpenID немає."
 
-#: ../actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29
 msgid "No such document."
 msgstr "Такого документа немає."
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30
+#: ../lib/deleteaction.php:30 actions/shownotice.php:32
+#: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:38
+#: actions/shownotice.php:114
 msgid "No such notice."
 msgstr "Такого повідомлення немає."
 
-#: ../actions/recoverpassword.php:56
+#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
 msgid "No such recovery code."
 msgstr "Немає такого коду відновлення."
 
-#: ../actions/postnotice.php:56
+#: ../actions/postnotice.php:56 actions/postnotice.php:57
 msgid "No such subscription"
 msgstr "Немає такої підписки"
 
 #: ../actions/all.php:34 ../actions/allrss.php:35
 #: ../actions/avatarbynickname.php:43 ../actions/foaf.php:40
-#: ../actions/recoverpassword.php:185 ../actions/remotesubscribe.php:84
-#: ../actions/remotesubscribe.php:91 ../actions/replies.php:57
-#: ../actions/repliesrss.php:35 ../actions/showstream.php:110
-#: ../actions/subscribe.php:44 ../actions/unsubscribe.php:39
-#: ../actions/userbyid.php:36 ../actions/userrss.php:35 ../actions/xrds.php:35
-#: ../lib/gallery.php:57
+#: ../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/showstream.php:157
+#: classes/Command.php:208 classes/Command.php:242 lib/gallery.php:85
+#: lib/subs.php:105
 msgid "No such user."
 msgstr "Такого користувача немає."
 
-#: ../lib/gallery.php:80
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr ""
+
+#: ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
 msgstr "Об'єктів для показу немає!"
 
-#: ../actions/recoverpassword.php:60
+#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
 msgid "Not a recovery code."
 msgstr "Це не код оновлення."
 
-#: ../actions/imsettings.php:167
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+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:423 lib/twitterapi.php:450
+#: lib/twitterapi.php:534
+msgid "Not a supported data format."
+msgstr ""
+
+#: ../actions/imsettings.php:167 actions/imsettings.php:175
 msgid "Not a valid Jabber ID"
 msgstr "Це не дійсний Jabber ID"
 
-#: ../lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131
 msgid "Not a valid OpenID."
 msgstr "Це не дійсний OpenID."
 
-#: ../actions/emailsettings.php:185
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+#: actions/emailsettings.php:208
 msgid "Not a valid email address"
 msgstr "Це не дійсна електронна адреса"
 
-#: ../actions/register.php:59
+#: ../actions/register.php:63 actions/register.php:70 actions/register.php:79
 msgid "Not a valid email address."
 msgstr "Це не дійсна електронна адреса."
 
-#: ../actions/profilesettings.php:91 ../actions/register.php:67
+#: ../actions/profilesettings.php:91 ../actions/register.php:71
+#: actions/profilesettings.php:206 actions/register.php:78
+#: actions/profilesettings.php:212 actions/register.php:87
 msgid "Not a valid nickname."
 msgstr "Це не дійсне ім'я користувача."
 
-#: ../actions/remotesubscribe.php:118
+#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
 msgid "Not a valid profile URL (incorrect services)."
 msgstr "Це не дійсна URL-адреса профілю (некоректні послуги)."
 
-#: ../actions/remotesubscribe.php:111
+#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr "Це не дійсна URL-адреса профілю (немає певного XRDS)."
 
-#: ../actions/remotesubscribe.php:104
+#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
 msgid "Not a valid profile URL (no YADIS document)."
 msgstr "Це не дійсна URL-адреса профілю (немає документа YADIS)."
 
-#: ../actions/avatar.php:95
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: actions/profilesettings.php:361
 msgid "Not an image or corrupt file."
 msgstr "Це не зображення, або файл зіпсовано."
 
 #: ../actions/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:52
 msgid "Not authorized."
 msgstr "Не авторизовано."
 
 #: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38
 msgid "Not expecting this response!"
 msgstr "Ця відповідь не очікується!"
 
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+#: actions/twitapistatuses.php:304
+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
+#: ../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:31 actions/newnotice.php:30
+#: actions/nudge.php:30 actions/subedit.php:31 actions/unblock.php:31
 msgid "Not logged in."
 msgstr "Не увійшли."
 
-#: ../actions/unsubscribe.php:44
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:117
 msgid "Not subscribed!."
 msgstr "Не підписано!."
 
-#: ../actions/opensearch.php:35
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
 msgid "Notice Search"
 msgstr "Пошук повідомлень"
 
-#: ../actions/showstream.php:82
+#: ../actions/showstream.php:82 actions/showstream.php:82
+#: actions/showstream.php:111 actions/showstream.php:118
+#: actions/showstream.php:123
 #, php-format
 msgid "Notice feed for %s"
 msgstr "Живлення повідомлень для %s"
 
-#: ../actions/shownotice.php:39
+#: ../actions/shownotice.php:39 actions/shownotice.php:39
+#: actions/shownotice.php:45
 msgid "Notice has no profile"
 msgstr "Повідомлення не має профілю"
 
-#: ../actions/showstream.php:316
+#: ../actions/showstream.php:316 actions/showstream.php:331
+#: actions/showstream.php:379
 msgid "Notices"
 msgstr "Повідомлення"
 
-#: ../actions/tag.php:35 ../actions/tag.php:81 ../actions/tag.php:124
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Повідомлення позначені з %s"
 
-#: ../actions/password.php:39
+#: ../actions/password.php:39 actions/profilesettings.php:178
+#: actions/profilesettings.php:183
 msgid "Old password"
 msgstr "Старий пароль"
 
-#: ../lib/util.php:302
+#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
+#: lib/util.php:330 actions/deleteprofile.php:247 lib/util.php:340
 msgid "OpenID"
 msgstr "OpenID"
 
-#: ../actions/finishopenidlogin.php:61
+#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
 msgid "OpenID Account Setup"
 msgstr "Установки рахунку OpenID"
 
-#: ../lib/openid.php:180
+#: ../lib/openid.php:180 lib/openid.php:180
 msgid "OpenID Auto-Submit"
 msgstr "Автопідтвердження OpenID"
 
 #: ../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/finishopenidlogin.php:150 actions/openidlogin.php:76
 msgid "OpenID Login"
 msgstr "Вхід OpenID"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
+#: actions/openidlogin.php:74 actions/openidsettings.php:50
+#: actions/openidlogin.php:82
 msgid "OpenID URL"
 msgstr "URL-адреса OpenID"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
+#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 msgid "OpenID authentication cancelled."
 msgstr "Ідентифікацію OpenID скасовано."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
+#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "Ідентифікація OpenID невдала: %s"
 
-#: ../lib/openid.php:133
+#: ../lib/openid.php:133 lib/openid.php:133
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "Невдача OpenID: %s"
 
-#: ../actions/openidsettings.php:144
+#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
 msgid "OpenID removed."
 msgstr "OpenID видалено."
 
-#: ../actions/openidsettings.php:37
+#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
 msgid "OpenID settings"
 msgstr "Налаштування OpenID"
 
-#: ../actions/avatar.php:84
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: actions/profilesettings.php:350
 msgid "Partial upload."
 msgstr "Часткове завантаження."
 
 #: ../actions/finishopenidlogin.php:90 ../actions/login.php:102
-#: ../actions/register.php:222
+#: ../actions/register.php:153 ../lib/settingsaction.php:93
+#: actions/finishopenidlogin.php:96 actions/login.php:102
+#: actions/register.php:167 actions/login.php:109 actions/register.php:194
 msgid "Password"
 msgstr "Пароль"
 
-#: ../actions/recoverpassword.php:249
+#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
 msgid "Password and confirmation do not match."
 msgstr "Пароль та підтвердження не співпадають."
 
-#: ../actions/recoverpassword.php:245
+#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
 msgid "Password must be 6 chars or more."
 msgstr "Пароль містить 6 або більше знаків."
 
-#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
+#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 msgid "Password recovery requested"
 msgstr "Запит на відновлення паролю відправлено."
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:274
+#: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: actions/profilesettings.php:408 actions/recoverpassword.php:326
+#: actions/profilesettings.php:437
 msgid "Password saved."
 msgstr "Пароль збережено."
 
-#: ../actions/password.php:61 ../actions/register.php:84
+#: ../actions/password.php:61 ../actions/register.php:88
+#: actions/profilesettings.php:380 actions/register.php:98
+#: actions/profilesettings.php:409 actions/register.php:107
 msgid "Passwords don't match."
 msgstr "Паролі не співпадають."
 
-#: ../lib/searchaction.php:100
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
 msgid "People"
 msgstr "Люди"
 
-#: ../actions/opensearch.php:33
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
 msgid "People Search"
 msgstr "Пошук людей"
 
-#: ../actions/peoplesearch.php:33
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
 msgid "People search"
 msgstr "Пошук людей"
 
-#: ../lib/stream.php:50
+#: ../lib/stream.php:50 lib/personal.php:50
 msgid "Personal"
 msgstr "Особисте"
 
-#: ../actions/smssettings.php:69
+#: ../actions/invite.php:133 actions/invite.php:141
+msgid "Personal message"
+msgstr ""
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Телефонний номер та регіональний код, ніякої пунктуації чи інтервалів"
 
@@ -1267,124 +1630,139 @@ msgid ""
 "user's notices. If you didn't just ask to subscribe to someone's notices, "
 "click \"Cancel\"."
 msgstr ""
-"Будь ласка, перевірте всі деталі, щоб "
-"упевнитись, що ви дійсно бажаєте "
-"підписатись на повідомлення даного "
-"користувача. Якщо ви не збирались підписуватись ні на чиї повідомлення, просто натисніть \"Cancel\"."
+"Будь ласка, перевірте всі деталі, щоб упевнитись, що ви дійсно бажаєте "
+"підписатись на повідомлення даного користувача. Якщо ви не збирались "
+"підписуватись ні на чиї повідомлення, просто натисніть \"Cancel\"."
 
-#: ../actions/imsettings.php:73
+#: ../actions/imsettings.php:73 actions/imsettings.php:74
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Друкувати повідомлення, коли мій мій статус Jabber/GTalk змінюється."
 
 #: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94
+#: ../actions/smssettings.php:94 actions/emailsettings.php:86
+#: actions/imsettings.php:68 actions/smssettings.php:94
+#: actions/twittersettings.php:70
 msgid "Preferences"
 msgstr "Переваги"
 
 #: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163
+#: ../actions/smssettings.php:163 actions/emailsettings.php:180
+#: actions/imsettings.php:152 actions/smssettings.php:171
+#: actions/emailsettings.php:185 actions/othersettings.php:179
 msgid "Preferences saved."
 msgstr "Переваги збережно."
 
-#: ../actions/profilesettings.php:57
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
 msgid "Preferred language"
 msgstr "Мова, якій надаєте перевагу"
 
-#: ../lib/util.php:314
+#: ../lib/util.php:328 lib/util.php:344 lib/util.php:356
 msgid "Privacy"
 msgstr "Конфіденційність"
 
-#: ../actions/newnotice.php:62 ../actions/newnotice.php:70
+#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
+#: classes/Notice.php:119 classes/Notice.php:139 classes/Notice.php:149
 msgid "Problem saving notice."
 msgstr "Проблема при збереженні повідомлення."
 
-#: ../lib/stream.php:60
+#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
+#: lib/settingsaction.php:84 actions/deleteprofile.php:241
 msgid "Profile"
 msgstr "Профіль"
 
-#: ../actions/remotesubscribe.php:73
+#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
 msgid "Profile URL"
 msgstr "URL-адреса профілю"
 
-#: ../actions/profilesettings.php:34
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
 msgid "Profile settings"
 msgstr "Налаштування профілю"
 
 #: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
+#: actions/postnotice.php:52 actions/updateprofile.php:53
 msgid "Profile unknown"
 msgstr "Невідомий профіль"
 
-#: ../lib/util.php:287
-msgid "Public"
-msgstr "Загал"
-
-#: ../actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:77
 msgid "Public Stream Feed"
 msgstr "Живлення спільного потоку"
 
-#: ../actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 lib/stream.php:34
 msgid "Public timeline"
 msgstr "Спільний часовий потік"
 
-#: ../actions/imsettings.php:79
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Позначати MicroID мого рахунку Jabber/GTalk"
 
-#: ../actions/emailsettings.php:94
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:104
 msgid "Publish a MicroID for my email address."
 msgstr "Позначати MicroID моєї електронної адреси."
 
-#: ../actions/tag.php:75 ../actions/tag.php:76
+#: ../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
 msgid "Recover"
 msgstr "Відновити"
 
-#: ../actions/recoverpassword.php:141
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
 msgid "Recover password"
 msgstr "Відновити пароль"
 
-#: ../actions/recoverpassword.php:67
+#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
 msgid "Recovery code for unknown user."
 msgstr "Код відновлення невідомого користувача."
 
-#: ../actions/register.php:216 ../actions/register.php:257 ../lib/util.php:300
+#: ../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:181 actions/register.php:234 lib/util.php:338
 msgid "Register"
 msgstr "Зареєструватись"
 
-#: ../actions/register.php:28
+#: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:173
 msgid "Registration not allowed."
 msgstr "Реєстрацію не дозволено."
 
-#: ../actions/register.php:264
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:241
 msgid "Registration successful"
 msgstr "Реєстрація успішна"
 
-#: ../actions/userauthorization.php:120
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
 msgid "Reject"
 msgstr "Забраковано"
 
-#: ../actions/login.php:103 ../actions/register.php:240
+#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
+#: actions/register.php:190 actions/login.php:110 actions/openidlogin.php:85
+#: actions/register.php:217
 msgid "Remember me"
 msgstr "Пам'ятати мене"
 
-#: ../actions/updateprofile.php:70
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
 msgid "Remote profile with no matching profile"
 msgstr "Віддалений профіль без відповідного профілю"
 
-#: ../actions/remotesubscribe.php:65
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
 msgid "Remote subscribe"
 msgstr "Віддалена підписка"
 
 #: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
 #: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php:48 actions/emailsettings.php:76
+#: actions/imsettings.php:49 actions/openidsettings.php:108
+#: actions/smssettings.php:50 actions/smssettings.php:84
+#: actions/twittersettings.php:59 actions/twittersettings.php:61
 msgid "Remove"
 msgstr "Видалити"
 
-#: ../actions/openidsettings.php:68
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
 msgid "Remove OpenID"
 msgstr "Видалити OpenID"
 
@@ -1393,68 +1771,83 @@ msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
 msgstr ""
-"Ви входите лише з OpenID, якщо ви його "
-"видалите, то не зможете увійти знову! Перед тим як видалити його, з початку додайте інший."
+"Ви входите лише з OpenID, якщо ви його видалите, то не зможете увійти знову! "
+"Перед тим як видалити його, з початку додайте інший."
 
-#: ../lib/stream.php:55
+#: ../lib/stream.php:55 lib/personal.php:55
 msgid "Replies"
 msgstr "Відповіді"
 
 #: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
+#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #, php-format
 msgid "Replies to %s"
 msgstr "Відповіді %s"
 
-#: ../actions/recoverpassword.php:168
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
 msgid "Reset"
 msgstr "Скинути"
 
-#: ../actions/recoverpassword.php:158
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
 msgid "Reset password"
 msgstr "Скинути пароль"
 
-#: ../actions/smssettings.php:67
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/deleteprofile.php:250 actions/subscriptions.php:73
+msgid "SMS"
+msgstr ""
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
 msgid "SMS Phone number"
 msgstr "Телефонний номер"
 
-#: ../actions/smssettings.php:33
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
 msgid "SMS Settings"
 msgstr "Налаштування SMS"
 
-#: ../lib/mail.php:215
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:230
 msgid "SMS confirmation"
 msgstr "Підтвердження SMS"
 
-#: ../actions/recoverpassword.php:167
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
 msgid "Same as password above"
 msgstr "Такий же, як пароль вище"
 
-#: ../actions/register.php:225
+#: ../actions/register.php:156 actions/register.php:170
+#: actions/register.php:197
 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/twittersettings.php:83 actions/emailsettings.php:107
+#: actions/othersettings.php:56 actions/profilesettings.php:106
+#: actions/subscriptions.php:74 actions/tagother.php:100
+#: actions/twittersettings.php:82
 msgid "Save"
 msgstr "Зберегти"
 
-#: ../lib/searchaction.php:84 ../lib/util.php:288
+#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
+#: lib/util.php:316 lib/util.php:327
 msgid "Search"
 msgstr "Пошук"
 
-#: ../actions/noticesearch.php:80
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:84
 msgid "Search Stream Feed"
 msgstr "Живлення потоку пошуку"
 
-#: ../actions/noticesearch.php:30
+#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
+#: actions/noticesearch.php:29
 #, 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 ""
-"Пошук повідомлень на %%site.name%% за їх "
-"змістом. Відокремлюйте пошукові умови "
-"інтервалами; вони повинні складатись з 3 знаків або більше."
+"Пошук повідомлень на %%site.name%% за їх змістом. Відокремлюйте пошукові "
+"умови інтервалами; вони повинні складатись з 3 знаків або більше."
 
 #: ../actions/peoplesearch.php:28
 #, php-format
@@ -1462,181 +1855,223 @@ 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 ""
-"Пошук людей на %%site.name%% за їх ім'ям, місцем "
-"знаходження або інтересами. "
-"Відокремлюйте пошукові умови інтервалами; вони повинні складатись з 3 знаків або більше."
+"Пошук людей на %%site.name%% за їх ім'ям, місцем знаходження або інтересами. "
+"Відокремлюйте пошукові умови інтервалами; вони повинні складатись з 3 знаків "
+"або більше."
 
-#: ../actions/smssettings.php:296
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
 msgid "Select a carrier"
 msgstr "Оберіть оператора"
 
-#: ../lib/util.php:1144
+#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
+#: lib/util.php:1306 lib/util.php:1731 lib/util.php:1646 lib/util.php:2158
 msgid "Send"
 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."
 msgstr "Надсилайте листи на цю адресу, щоб друкувати нові повідомлення."
 
-#: ../actions/emailsettings.php:88
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
 msgid "Send me notices of new subscriptions through email."
 msgstr "Поівдомляти мене поштою про нові підписки."
 
-#: ../actions/imsettings.php:70
+#: ../actions/imsettings.php:70 actions/imsettings.php:71
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Повідомляти мене через Jabber/GTalk."
 
-#: ../actions/smssettings.php:97
+#: ../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 ""
-"Повідомляти мене за допомогою SMS; Я "
-"розімію, що, можливо, понесу надмірні витрати від мого мобільного оператора."
+"Повідомляти мене за допомогою SMS; Я розімію, що, можливо, понесу надмірні "
+"витрати від мого мобільного оператора."
 
-#: ../actions/imsettings.php:76
+#: ../actions/imsettings.php:76 actions/imsettings.php:77
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
-"Надсилати також мені відповіді через "
-"Jabber/GTalk від людей, до яких я не підписаний."
+"Надсилати також мені відповіді через Jabber/GTalk від людей, до яких я не "
+"підписаний."
 
-#: ../lib/util.php:294
+#: ../lib/util.php:304 lib/util.php:320 lib/util.php:330
 msgid "Settings"
 msgstr "Налаштування"
 
-#: ../actions/profilesettings.php:189
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:336
 msgid "Settings saved."
 msgstr "Налаштування збережено."
 
-#: ../actions/tag.php:60
+#: ../actions/tag.php:60 actions/tag.php:60 actions/tag.php:59
 msgid "Showing most popular tags from the last week"
 msgstr "Представлено найбільш популярні мітки за минулий тиждень"
 
-#: ../actions/finishaddopenid.php:66
+#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
 msgid "Someone else already has this OpenID."
 msgstr "Хтось вже користується цим OpenID."
 
 #: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
+#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
 msgid "Something weird happened."
 msgstr "Сталося щось погане."
 
-#: ../lib/util.php:316
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr ""
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: ../lib/util.php:330 lib/util.php:346 lib/util.php:358
 msgid "Source"
 msgstr "Джерело"
 
-#: ../actions/showstream.php:296
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:359
 msgid "Statistics"
 msgstr "Статистика"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
+#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
+#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
+#: actions/finishopenidlogin.php:199 actions/finishopenidlogin.php:267
 msgid "Stored OpenID not found."
 msgstr "Збережений OpenID не знайдено."
 
 #: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197
+#: ../actions/showstream.php:197 actions/remotesubscribe.php:84
+#: actions/showstream.php:197 actions/showstream.php:206
+#: actions/showstream.php:254 lib/util.php:2078
 msgid "Subscribe"
 msgstr "Підписки"
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
+#: actions/showstream.php:328 actions/subscribers.php:27
+#: actions/showstream.php:376 lib/gallery.php:136 lib/gallery.php:137
 msgid "Subscribers"
 msgstr "Підписчики"
 
-#: ../actions/userauthorization.php:310
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
 msgid "Subscription authorized"
 msgstr "Підписку авторизовано"
 
-#: ../actions/userauthorization.php:320
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
 msgid "Subscription rejected"
 msgstr "Підписку скинуто"
 
 #: ../actions/showstream.php:230 ../actions/showstream.php:307
-#: ../actions/subscriptions.php:27
+#: ../actions/subscriptions.php:27 actions/showstream.php:240
+#: actions/showstream.php:322 actions/subscriptions.php:27
+#: actions/showstream.php:288 actions/showstream.php:370 lib/gallery.php:131
+#: lib/gallery.php:132
 msgid "Subscriptions"
 msgstr "Підписки"
 
-#: ../actions/avatar.php:87
+#: ../actions/avatar.php:87 actions/profilesettings.php:324
+#: actions/profilesettings.php:353
 msgid "System error uploading file."
 msgstr "Система відповіла помилкою при завантаженні цього файла."
 
-#: ../actions/tag.php:41 ../lib/util.php:289
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317 actions/profilesettings.php:90 actions/showstream.php:382
+#: actions/tag.php:40 actions/tagother.php:96 actions/tagother.php:162
+#: lib/profilelist.php:126 lib/profilelist.php:128
 msgid "Tags"
 msgstr "Мітки"
 
-#: ../lib/searchaction.php:104
+#: ../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:33
 msgid "Text search"
 msgstr "Пошук тескту"
 
-#: ../actions/openidsettings.php:140
+#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
 msgid "That OpenID does not belong to you."
 msgstr "Цей OpenID вам не належить."
 
-#: ../actions/confirmaddress.php:52
+#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
 msgid "That address has already been confirmed."
 msgstr "Цю адресу вже було підтверджено."
 
-#: ../actions/confirmaddress.php:43
+#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
 msgid "That confirmation code is not for you!"
 msgstr "Цей код підтвердження не для вас!"
 
-#: ../actions/emailsettings.php:191
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:214
 msgid "That email address already belongs to another user."
 msgstr "Ця електронна адреса належить іншому користувачу."
 
-#: ../actions/avatar.php:80
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: actions/profilesettings.php:346
 msgid "That file is too big."
 msgstr "Цей файл завеликий."
 
-#: ../actions/imsettings.php:170
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
 msgid "That is already your Jabber ID."
 msgstr "Це і так вже ваш Jabber ID."
 
-#: ../actions/emailsettings.php:188
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:211
 msgid "That is already your email address."
 msgstr "Це і так вже ваша адреса."
 
-#: ../actions/smssettings.php:188
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
 msgid "That is already your phone number."
 msgstr "Це і так вже ваш телефонний номер."
 
-#: ../actions/imsettings.php:233
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
 msgid "That is not your Jabber ID."
 msgstr "Це не ваш Jabber ID."
 
-#: ../actions/emailsettings.php:249
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+#: actions/emailsettings.php:270
 msgid "That is not your email address."
 msgstr "Це не ваша адреса."
 
-#: ../actions/smssettings.php:257
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
 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:247
 msgid "That is the wrong IM address."
 msgstr "Це помилкова адреса IM."
 
-#: ../actions/smssettings.php:233
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
 msgid "That is the wrong confirmation number."
 msgstr "Це помилковий код підтвердження."
 
-#: ../actions/smssettings.php:191
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
 msgid "That phone number already belongs to another user."
 msgstr "Цей телефонний номер належить іншому користувачу."
 
-#: ../actions/newnotice.php:53
+#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: actions/newnotice.php:49 actions/twitapistatuses.php:330
+#: actions/newnotice.php:61 actions/twitapistatuses.php:271
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "Задовге. Максимальний розмір повідомлення - 140 знаків."
 
-#: ../actions/confirmaddress.php:88
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+#: actions/twitapiaccount.php:55
+msgid "That's too long. Max notice size is 255 chars."
+msgstr ""
+
+#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Адресу \"%s\" було підтверджено для вашого рахунку."
 
 #: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
-#: ../actions/smssettings.php:274
+#: ../actions/smssettings.php:274 actions/emailsettings.php:282
+#: actions/imsettings.php:258 actions/smssettings.php:282
+#: actions/emailsettings.php:285
 msgid "The address was removed."
 msgstr "Адресу було видалено."
 
@@ -1646,9 +2081,9 @@ msgid ""
 "with the site's instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
-"Підписку було авторизовано, але URL-адреса "
-"у відповідь не передавалася. Звіртесь з "
-"інструкціями на сайті для більш конкретної інформації про те, як авторизувати підписку. Ваш підписний токен:"
+"Підписку було авторизовано, але URL-адреса у відповідь не передавалася. "
+"Звіртесь з інструкціями на сайті для більш конкретної інформації про те, як "
+"авторизувати підписку. Ваш підписний токен:"
 
 #: ../actions/userauthorization.php:322
 msgid ""
@@ -1656,29 +2091,34 @@ msgid ""
 "with the site's instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
-"Підписку було скинуно, але URL-адреса у "
-"відповідь не передавалася. Звіртесь з "
-"інструкціями на сайті для більш конкретної інформації про те, як скинути підписку."
+"Підписку було скинуно, але URL-адреса у відповідь не передавалася. Звіртесь "
+"з інструкціями на сайті для більш конкретної інформації про те, як скинути "
+"підписку."
 
-#: ../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 "Тут представлені ті, хто слідкує за повідомленнями від %s."
 
-#: ../actions/subscribers.php:33
+#: ../actions/subscribers.php:33 actions/subscribers.php:33
 msgid "These are the people who listen to your notices."
 msgstr "Тут представлені ті, хто слідкує за вашими повідомленнями."
 
-#: ../actions/subscriptions.php:35
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Тут представлені ті, за чиїми повідомленнями слідкує %s."
 
-#: ../actions/subscriptions.php:33
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
 msgid "These are the people whose notices you listen to."
 msgstr "Тут представлені ті, за чиїми повідомленнями ви слідкуєте."
 
-#: ../actions/recoverpassword.php:87
+#: ../actions/invite.php:89 actions/invite.php:96
+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 "Цей код підтвердження застарий. Будь ласка, розпочніть з початку."
 
@@ -1687,111 +2127,151 @@ msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
 msgstr ""
-"Ця форма повинна автоматично себе "
-"представити. Якщо цього не сталося, "
-"натисніть на кнопку представлення і ви будете перенаправлені до вашого OpenID провайдера."
+"Ця форма повинна автоматично себе представити. Якщо цього не сталося, "
+"натисніть на кнопку представлення і ви будете перенаправлені до вашого "
+"OpenID провайдера."
 
-#: ../actions/finishopenidlogin.php:56
+#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
 #, 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 ""
-"Ви вперше увійшли до %s, так що ми повинні "
-"приєднати ваш OpenID до локального рахунку. "
-"Ви можете також створити новий рахунок, або приєднати OpenID до вашого вже існуючого рахунку, якщо ви його маєте."
+"Ви вперше увійшли до %s, так що ми повинні приєднати ваш OpenID до "
+"локального рахунку. Ви можете також створити новий рахунок, або приєднати "
+"OpenID до вашого вже існуючого рахунку, якщо ви його маєте."
+
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:94
+#: actions/twitapifriendships.php:82 actions/twitapistatuses.php:428
+msgid "This method requires a POST or DELETE."
+msgstr ""
 
-#: ../lib/util.php:151
+#: ../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:46
+#: actions/twitapidirect_messages.php:117 actions/twitapifriendships.php:30
+#: actions/twitapistatuses.php:239
+msgid "This method requires a POST."
+msgstr ""
+
+#: ../lib/util.php:164 lib/util.php:246 lib/util.php:257
 msgid "This page is not available in a media type you accept"
 msgstr "Ця сторінка не доступна в медіа-типі, який ви приймаєте"
 
-#: ../actions/profilesettings.php:63
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
 msgid "Timezone"
 msgstr "Часовий пояс"
 
-#: ../actions/profilesettings.php:107
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:228
 msgid "Timezone not selected."
 msgstr "Часовий пояс не обрано."
 
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"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 ""
-"Щоб підписатись, ви можете "
-"[увійти](%%action.login%%), або "
-"[зареєструвати](%%action.register%%) новий рахунок. "
-"Якщо ви вже маєте рахунок на [сумісному сайті](%%doc.openmublog%%), введіть URL-адресу вашого профілю."
+"Щоб підписатись, ви можете [увійти](%%action.login%%), або [зареєструвати](%%"
+"action.register%%) новий рахунок. Якщо ви вже маєте рахунок на [сумісному "
+"сайті](%%doc.openmublog%%), введіть URL-адресу вашого профілю."
 
-#: ../actions/twitapifriendships.php:150
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: actions/twitapifriendships.php:128
 msgid "Two user ids or screen_names must be supplied."
 msgstr "Два ID або імені_у_мережі повинні підтримуватись."
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:233
+#: ../actions/profilesettings.php:48 ../actions/register.php:169
+#: actions/profilesettings.php:81 actions/register.php:183
+#: actions/profilesettings.php:83 actions/register.php:210
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL-адреса вашої домашньої сторінки, блогу, "
 
-#: ../actions/remotesubscribe.php:74
+#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL-адреса вашого профілю на іншому сумісному сайті"
 
 #: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
 #: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
+#: actions/emailsettings.php:144 actions/imsettings.php:118
+#: actions/recoverpassword.php:39 actions/smssettings.php:143
+#: actions/twittersettings.php:108 actions/emailsettings.php:147
+#: actions/othersettings.php:146 actions/twittersettings.php:199
 msgid "Unexpected form submission."
 msgstr "Несподіване представлення форми."
 
-#: ../actions/recoverpassword.php:237
+#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
 msgid "Unexpected password reset."
 msgstr "Несподіване скидання паролю."
 
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:58
+#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:59
 msgid "Unknown version of OMB protocol."
 msgstr "Невідома версія протоколу OMB."
 
-#: ../lib/util.php:256
+#: ../lib/util.php:269 lib/util.php:285 lib/util.php:296
 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:48
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr "Невизнаний тип адреси %s"
 
-#: ../actions/showstream.php:209
+#: ../actions/showstream.php:209 actions/showstream.php:219
+#: actions/showstream.php:267 lib/util.php:2094
 msgid "Unsubscribe"
 msgstr "Відписатись"
 
 #: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
+#: actions/postnotice.php:45 actions/updateprofile.php:46
 msgid "Unsupported OMB version"
 msgstr "Версія OMB не підтримується"
 
-#: ../actions/avatar.php:105
+#: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: actions/profilesettings.php:371
 msgid "Unsupported image file format."
 msgstr "Формат зображення не підтримується."
 
-#: ../lib/twitterapi.php:257 ../lib/twitterapi.php:278
-msgid "Unsupported type"
-msgstr "Тип не підтримується"
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: actions/deleteprofile.php:251
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: actions/deleteprofile.php:254
+msgid "Updates by instant messenger (IM)"
+msgstr ""
 
-#: ../actions/twitapistatuses.php:238
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/twitapistatuses.php:126
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Оновлення від %1$s та друзів на %2$s!"
 
-#: ../actions/twitapistatuses.php:338
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:198
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Оновлення від %1$s на %2$s!"
 
-#: ../actions/avatar.php:68
+#: ../actions/avatar.php:68 actions/profilesettings.php:161
+#: actions/profilesettings.php:166
 msgid "Upload"
 msgstr "Завантажити"
 
@@ -1802,90 +2282,123 @@ msgid ""
 "site license, also. Use a picture that belongs to you and that you want to "
 "share."
 msgstr ""
-"Завантажити нову \"avatar\" (зображення "
-"користувача) можна тут. Ви не зможете "
-"відредагувати свою аватару після "
-"завантаження, так що з початку "
-"переконайтеся, що вона має більш-менш "
-"квадратну форму. Ваше зображення зберігатиметься під ліцензією сайту, також. Використовуйте зображення, які належать вам, і які ви можете вільно демонструвати."
+"Завантажити нову \"avatar\" (зображення користувача) можна тут. Ви не "
+"зможете відредагувати свою аватару після завантаження, так що з початку "
+"переконайтеся, що вона має більш-менш квадратну форму. Ваше зображення "
+"зберігатиметься під ліцензією сайту, також. Використовуйте зображення, які "
+"належать вам, і які ви можете вільно демонструвати."
+
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr ""
+
+#: ../actions/invite.php:114 actions/invite.php:121
+msgid ""
+"Use this form to invite your friends and colleagues to use this service."
+msgstr ""
 
-#: ../actions/register.php:227
+#: ../actions/register.php:159 ../actions/register.php:162
+#: actions/register.php:173 actions/register.php:176 actions/register.php:200
+#: actions/register.php:203
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
-"Використовується лише для оновлень, "
-"оголошень та переустановлення паролю"
+"Використовується лише для оновлень, оголошень та переустановлення паролю"
 
 #: ../actions/finishremotesubscribe.php:86
+#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:92
 msgid "User being listened to doesn't exist."
 msgstr "Користувача, який слідкував за вашими повідомленнями, більше не існує."
 
 #: ../actions/all.php:41 ../actions/avatarbynickname.php:48
 #: ../actions/foaf.php:47 ../actions/replies.php:41
-#: ../actions/showstream.php:44 ../actions/twitapiaccount.php:78
-#: ../actions/twitapistatuses.php:316 ../actions/twitapistatuses.php:621
+#: ../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/showstream.php:57
+#: actions/twitapiaccount.php:63 actions/twitapifavorites.php:40
+#: actions/twitapistatuses.php:163 actions/twitapistatuses.php:492
+#: lib/twitterapi.php:590
 msgid "User has no profile."
 msgstr "Користувач не має профілю."
 
-#: ../actions/remotesubscribe.php:71
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
 msgid "User nickname"
 msgstr "Ім'я користувача"
 
-#: ../actions/profilesettings.php:63
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
 msgid "What timezone are you normally in?"
 msgstr "За яким часовим поясом ви живете?"
 
-#: ../lib/util.php:1131
+#: ../lib/util.php:1159 lib/util.php:1293 lib/util.php:1630
 #, php-format
 msgid "What's up, %s?"
 msgstr "Як ся маєш, %s?"
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:239
+#: ../actions/profilesettings.php:54 ../actions/register.php:175
+#: actions/profilesettings.php:87 actions/register.php:189
+#: actions/profilesettings.php:89 actions/register.php:216
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Де ви живете, на зразок \"City, State (or Region), Country\""
 
-#: ../actions/updateprofile.php:128
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Неправильний тип зображення для '%s'"
 
-#: ../actions/updateprofile.php:123
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Неправильний розмір зображення '%s'"
 
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+#: actions/block.php:105
 msgid "Yes"
 msgstr "Так"
 
-#: ../actions/finishaddopenid.php:64
+#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
 msgid "You already have this OpenID!"
 msgstr "Ви вже маєте цей OpenID!"
 
-#: ../actions/deletenotice.php:37
+#: ../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
 msgid "You are already logged in!"
 msgstr "Ви вже в системі!"
 
-#: ../actions/twitapifriendships.php:115
-msgid "You are not friends with the specified user."
-msgstr "Ви не є друзями із вказаним користувачем."
-
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:102
+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/register.php:209
+#: ../actions/register.php:135 actions/register.php:145
 msgid "You can create a new account to start posting notices."
 msgstr "Ви можете створити новий рахунок, щоб почати писати повідомлення."
 
-#: ../actions/smssettings.php:28
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Ви можете отримувати SMS через електронну пошту від %%site.name%%."
@@ -1895,40 +2408,41 @@ msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr ""
-"Ви можете видалити OpenID із свого рахунку, "
-"якщо натиснете кнопку \"Remove\"."
+"Ви можете видалити OpenID із свого рахунку, якщо натиснете кнопку \"Remove\"."
 
-#: ../actions/imsettings.php:28
+#: ../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 ""
-"Ви можете надсилати на отримувати "
-"повідомлення через Jabber/GTalk [службу "
+"Ви можете надсилати на отримувати повідомлення через Jabber/GTalk [службу "
 "миттевих повідомлень](%%doc.im%%). Вкажить свою адресу і налаштуйте це нижче."
 
 #: ../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
+#: actions/finishremotesubscribe.php:83 actions/finishremotesubscribe.php:99
 msgid "You can use the local subscription!"
 msgstr "Ви можете користуватись локальними підписками!"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:57
+#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
+#: actions/finishopenidlogin.php:38 actions/register.php:68
+#: actions/register.php:77
 msgid "You can't register if you don't agree to the license."
 msgstr "Ви не зможете зареєструватись, якщо не погодитесь з умовами ліцензії."
 
-#: ../actions/updateprofile.php:63
+#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
 msgid "You did not send us that profile"
 msgstr "Ви не надсилали нам цього профілю"
 
-#: ../lib/mail.php:143
+#: ../lib/mail.php:147
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -1942,24 +2456,42 @@ msgid ""
 msgstr ""
 "Ви маєте нову поштову адресу на %1$s.\n"
 "\n"
-"Надсилайте листи на %2$s, щоб друкувати "
-"нові повідомлення.\n"
+"Надсилайте листи на %2$s, щоб друкувати нові повідомлення.\n"
 "\n"
-"Більше інформації про використання електронної пошти на %3$s.\n\nЩиро ваші,\n%4$s"
+"Більше інформації про використання електронної пошти на %3$s.\n"
+"\n"
+"Щиро ваші,\n"
+"%4$s"
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: actions/twitapistatuses.php:455
+msgid "You may not delete another user's status."
+msgstr ""
+
+#: ../actions/invite.php:31 actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr ""
 
-#: ../actions/recoverpassword.php:134
+#: ../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!"
+msgstr ""
+
+#: ../actions/recoverpassword.php:149
 msgid "You've been identified. Enter a  new password below. "
 msgstr "Вас ідентифіковано. Введіть новий пароль нижче."
 
-#: ../actions/openidlogin.php:67
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:84
 msgid "Your OpenID URL"
 msgstr "URL-адреса вашого OpenID"
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:164
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
-"Ваше ім'я користувача на цьому сервері, "
-"або зареєстрована електронна адреса."
+"Ваше ім'я користувача на цьому сервері, або зареєстрована електронна адреса."
 
 #: ../actions/openidsettings.php:28
 #, php-format
@@ -1967,347 +2499,88 @@ 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%%) дає вам можливість "
-"реєструватися на багатьох сайтах, "
-"користуючись єдиним рахунком. Керувати вашими OpenID можна звідси."
+"[OpenID](%%doc.openid%%) дає вам можливість реєструватися на багатьох "
+"сайтах, користуючись єдиним рахунком. Керувати вашими OpenID можна звідси."
 
-#: ../lib/util.php:919
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:1287
 msgid "a few seconds ago"
 msgstr "кілька секунд тому"
 
-#: ../lib/util.php:931
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:1299
 #, php-format
 msgid "about %d days ago"
 msgstr "близько %d днів тому"
 
-#: ../lib/util.php:927
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:1295
 #, php-format
 msgid "about %d hours ago"
 msgstr "близько %d годин тому"
 
-#: ../lib/util.php:923
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:1291
 #, php-format
 msgid "about %d minutes ago"
 msgstr "близько %d хвилин тому"
 
-#: ../lib/util.php:935
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:1303
 #, php-format
 msgid "about %d months ago"
 msgstr "близько %d місяців тому"
 
-#: ../lib/util.php:929
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:1297
 msgid "about a day ago"
 msgstr "день тому"
 
-#: ../lib/util.php:921
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:1289
 msgid "about a minute ago"
 msgstr "хвилину тому"
 
-#: ../lib/util.php:933
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:1301
 msgid "about a month ago"
 msgstr "місяць тому"
 
-#: ../lib/util.php:937
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:1305
 msgid "about a year ago"
 msgstr "рік тому"
 
-#: ../lib/util.php:925
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:1293
 msgid "about an hour ago"
 msgstr "годину тому"
 
-#: ../actions/showstream.php:424 ../lib/stream.php:130
+#: ../actions/showstream.php:423 ../lib/stream.php:132
+#: actions/showstream.php:441 lib/stream.php:99 lib/noticelist.php:211
 msgid "delete"
 msgstr "видалити"
 
-#: ../actions/noticesearch.php:126 ../actions/showstream.php:408
-#: ../lib/stream.php:114
+#: ../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:135
+#: lib/facebookaction.php:202 lib/noticelist.php:189
 msgid "in reply to..."
 msgstr "у відповідь на..."
 
-#: ../lib/twitterapi.php:363
-msgid "not a supported data format"
-msgstr "формат даних не підтримується"
-
-#: ../actions/noticesearch.php:133 ../actions/showstream.php:415
-#: ../lib/stream.php:121
+#: ../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:142
+#: lib/noticelist.php:199
 msgid "reply"
 msgstr "відповісти"
 
-#: ../actions/password.php:44
+#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/profilesettings.php:188
 msgid "same as password above"
 msgstr "такий же, як пароль вище"
 
-#: ../actions/twitapistatuses.php:691
+#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+#: actions/twitapistatuses.php:543
 msgid "unsupported file type"
 msgstr "тип файлу не підтримується"
 
-#: ../lib/util.php:1281
-msgid "« After"
-msgstr "« Вперед"
-
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr ""
-
-#: ../actions/invite.php:168 actions/invite.php:176
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
-
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
-#, php-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../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!"
-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 ""
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-msgid "Add or remove OpenIDs"
-msgstr ""
-
-#: ../actions/invite.php:131 actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
-msgstr ""
-
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr ""
-
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
-msgstr ""
-
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-msgid "Change your profile settings"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-msgid "Could not update user with confirmed email address."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-msgid "Couldn't find any statuses."
-msgstr ""
-
-#: ../actions/invite.php:129 actions/invite.php:137
-msgid "Email addresses"
-msgstr ""
-
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
-msgstr ""
-
-#: ../actions/recoverpassword.php:137
-msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
-"email address you have stored  in your account."
-msgstr ""
-
-#: ../actions/invite.php:55 actions/invite.php:62
-#, php-format
-msgid "Invalid email address: %s"
-msgstr ""
-
-#: ../actions/invite.php:79 actions/invite.php:86
-msgid "Invitation(s) sent"
-msgstr ""
-
-#: ../actions/invite.php:97 actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
-msgstr ""
-
-#: ../lib/util.php:306 lib/util.php:322
-msgid "Invite"
-msgstr ""
-
-#: ../actions/invite.php:123 actions/invite.php:130
-msgid "Invite new users"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-msgid "No status found with that ID."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-msgid "No status with that ID found."
-msgstr ""
-
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-msgid "No user with that email address or username."
-msgstr ""
-
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-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
-msgid "Not a supported data format."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-msgid "Not found"
-msgstr ""
-
-#: ../actions/invite.php:135 actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
-#: ../actions/invite.php:133 actions/invite.php:141
-msgid "Personal message"
-msgstr ""
-
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
-msgstr ""
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-msgid "That's too long. Max notice size is 255 chars."
-msgstr ""
-
-#: ../actions/invite.php:89 actions/invite.php:96
-msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
-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."
-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."
-msgstr ""
-
-#: ../index.php:57 index.php:57
-msgid "Unknown action"
-msgstr ""
-
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-msgid "Updates by SMS"
-msgstr ""
-
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr ""
-
-#: ../actions/invite.php:114 actions/invite.php:121
-msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
-msgstr ""
-
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr ""
-
-#: ../actions/invite.php:81 actions/invite.php:88
-msgid "You are already subscribed to these users:"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-msgid "You may not delete another user's status."
-msgstr ""
-
-#: ../actions/invite.php:31 actions/invite.php:31
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-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!"
-msgstr ""
-
+#: ../lib/util.php:1309 lib/util.php:1443 lib/facebookaction.php:251
+#: lib/util.php:1783
+#, fuzzy
+msgid "« After"
+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
@@ -2317,6 +2590,12 @@ msgstr ""
 #: 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:38 actions/deleteprofile.php:127 actions/disfavor.php:47
+#: actions/emailsettings.php:130 actions/favor.php:49 actions/login.php:45
+#: actions/newmessage.php:44 actions/newnotice.php:36 actions/nudge.php:47
+#: actions/othersettings.php:139 actions/profilesettings.php:49
+#: actions/subedit.php:38 actions/tagother.php:113
+#: actions/twittersettings.php:188 actions/unblock.php:38
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -2340,12 +2619,14 @@ msgstr ""
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142
+#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:54
+#: actions/twitapifavorites.php:115
 msgid "This notice is already a favorite!"
 msgstr ""
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
+#: classes/Command.php:132 actions/favor.php:61
+#: actions/twitapifavorites.php:122
 msgid "Could not create favorite."
 msgstr ""
 
@@ -2354,11 +2635,12 @@ msgid "Disfavor"
 msgstr ""
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:62
 #, php-format
 msgid "%s favorite notices"
 msgstr ""
 
-#: actions/favoritesrss.php:64
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:66
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr ""
@@ -2384,47 +2666,50 @@ msgid ""
 "\n"
 msgstr ""
 
-#: actions/login.php:104
+#: actions/login.php:104 actions/login.php:111 actions/openidlogin.php:86
 msgid "Automatically login in the future; "
 msgstr ""
 
-#: actions/login.php:122
+#: actions/login.php:122 actions/login.php:130
 msgid "For security reasons, please re-enter your "
 msgstr ""
 
-#: actions/login.php:126
+#: actions/login.php:126 actions/login.php:134
 msgid "Login with your username and password. "
 msgstr ""
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+#: actions/newmessage.php:60 actions/twitapidirect_messages.php:136
 msgid "That's too long. Max message size is 140 chars."
 msgstr ""
 
-#: actions/newmessage.php:65
+#: actions/newmessage.php:65 actions/newmessage.php:68
 msgid "No recipient specified."
 msgstr ""
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
+#: classes/Command.php:206 actions/newmessage.php:71
+#: actions/newmessage.php:116 classes/Command.php:211
 msgid "You can't send a message to this user."
 msgstr ""
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
+#: classes/Command.php:209 actions/newmessage.php:74
+#: actions/twitapidirect_messages.php:153 classes/Command.php:214
 msgid ""
-"Don't send a message to yourself; just say it to yourself quietly "
-"instead."
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: actions/newmessage.php:108
+#: actions/newmessage.php:108 actions/microsummary.php:32
+#: actions/newmessage.php:111
 msgid "No such user"
 msgstr ""
 
-#: actions/newmessage.php:117
+#: actions/newmessage.php:117 actions/newmessage.php:120
 msgid "New message"
 msgstr ""
 
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:95 actions/noticesearch.php:94
 msgid "Notice without matching profile"
 msgstr ""
 
@@ -2471,6 +2756,7 @@ msgstr ""
 
 #: actions/profilesettings.php:115 actions/remotesubscribe.php:320
 #: actions/userauthorization.php:159 actions/userrss.php:76
+#: actions/profilesettings.php:120 actions/remotesubscribe.php:333
 msgid "User without matching profile"
 msgstr ""
 
@@ -2498,18 +2784,18 @@ msgstr ""
 msgid "New password successfully saved. "
 msgstr ""
 
-#: actions/register.php:95
+#: actions/register.php:95 actions/register.php:104
 msgid "Password must be 6 or more characters."
 msgstr ""
 
-#: actions/register.php:216
+#: actions/register.php:216 actions/register.php:243
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to..."
 msgstr ""
 
-#: actions/register.php:227
+#: actions/register.php:227 actions/register.php:254
 msgid "(You should receive a message by email momentarily, with "
 msgstr ""
 
@@ -2524,6 +2810,7 @@ msgid "Feed for favorites of %s"
 msgstr ""
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:88 actions/twitapifavorites.php:57
 msgid "Could not retrieve favorite notices."
 msgstr ""
 
@@ -2545,7 +2832,7 @@ msgstr ""
 msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: actions/showstream.php:154
+#: actions/showstream.php:154 lib/util.php:2105
 msgid "Send a message"
 msgstr ""
 
@@ -2554,73 +2841,78 @@ msgstr ""
 msgid "Mobile carrier for your phone. "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:64
 #, php-format
 msgid "Direct messages to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:65
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:69
 msgid "Direct Messages You've Sent"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:70
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:132
 msgid "No message text!"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:145
 msgid "Recipient user not found."
 msgstr ""
 
 #: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:148
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
-#: actions/twitapifavorites.php:92
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:64
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
-#: actions/twitapifavorites.php:95
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:67
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
+#: actions/twitapifavorites.php:158 lib/mail.php:303
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr ""
 
 #: actions/twitapifavorites.php:188 lib/mail.php:276
+#: actions/twitapifavorites.php:159 lib/mail.php:304
 #, php-format
 msgid ""
 "%1$s just added your notice from %2$s as one of their favorites.\n"
 "\n"
 msgstr ""
 
-#: actions/twittersettings.php:27
+#: actions/twittersettings.php:27 actions/twittersettings.php:29
 msgid ""
 "Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 
-#: actions/twittersettings.php:41
+#: actions/twittersettings.php:41 actions/twittersettings.php:43
 msgid "Twitter settings"
 msgstr ""
 
-#: actions/twittersettings.php:48
+#: actions/twittersettings.php:48 actions/twittersettings.php:50
 msgid "Twitter Account"
 msgstr ""
 
-#: actions/twittersettings.php:56
+#: actions/twittersettings.php:56 actions/twittersettings.php:58
 msgid "Current verified Twitter account."
 msgstr ""
 
@@ -2648,46 +2940,50 @@ msgstr ""
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:216
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr ""
 
-#: actions/twittersettings.php:128
+#: actions/twittersettings.php:128 actions/twittersettings.php:221
 msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: actions/twittersettings.php:137 actions/twittersettings.php:228
 #, php-format
 msgid "Unable to retrieve account information for \"%s\" from Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:234 actions/twittersettings.php:253
 msgid "Unable to save your Twitter settings!"
 msgstr ""
 
-#: actions/twittersettings.php:174
+#: actions/twittersettings.php:174 actions/twittersettings.php:261
 msgid "Twitter settings saved."
 msgstr ""
 
-#: actions/twittersettings.php:192
+#: actions/twittersettings.php:192 actions/twittersettings.php:272
 msgid "That is not your Twitter account."
 msgstr ""
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:280
 msgid "Couldn't remove Twitter user."
 msgstr ""
 
-#: actions/twittersettings.php:212
+#: actions/twittersettings.php:212 actions/twittersettings.php:284
 msgid "Twitter account removed."
 msgstr ""
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
+#: actions/twittersettings.php:299 actions/twittersettings.php:310
+#: actions/twittersettings.php:322
 msgid "Couldn't save Twitter preferences."
 msgstr ""
 
-#: actions/twittersettings.php:245
+#: actions/twittersettings.php:245 actions/twittersettings.php:330
 msgid "Twitter preferences saved."
 msgstr ""
 
@@ -2703,15 +2999,15 @@ msgstr ""
 msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#: classes/Channel.php:113
+#: classes/Channel.php:113 classes/Channel.php:129
 msgid "Command results"
 msgstr ""
 
-#: classes/Channel.php:148
+#: classes/Channel.php:148 classes/Channel.php:175
 msgid "Command complete"
 msgstr ""
 
-#: classes/Channel.php:158
+#: classes/Channel.php:158 classes/Channel.php:185
 msgid "Command failed"
 msgstr ""
 
@@ -2724,7 +3020,7 @@ msgstr ""
 msgid "Subscriptions: %1$s\n"
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:247
 msgid "User has no last notice"
 msgstr ""
 
@@ -2757,59 +3053,60 @@ msgstr ""
 msgid "About: %s"
 msgstr ""
 
-#: classes/Command.php:200
+#: classes/Command.php:200 classes/Command.php:202
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: classes/Command.php:214
+#: classes/Command.php:214 classes/Command.php:219
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: classes/Command.php:216
+#: classes/Command.php:216 classes/Command.php:221
 msgid "Error sending direct message."
 msgstr ""
 
-#: classes/Command.php:263
+#: classes/Command.php:263 classes/Command.php:268
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: classes/Command.php:270
+#: classes/Command.php:270 classes/Command.php:275
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: classes/Command.php:288
+#: classes/Command.php:288 classes/Command.php:293
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: classes/Command.php:295
+#: classes/Command.php:295 classes/Command.php:300
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330
+#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:315
+#: classes/Command.php:335
 msgid "Command not yet implemented."
 msgstr ""
 
-#: classes/Command.php:313
+#: classes/Command.php:313 classes/Command.php:318
 msgid "Notification off."
 msgstr ""
 
-#: classes/Command.php:315
+#: classes/Command.php:315 classes/Command.php:320
 msgid "Can't turn off notification."
 msgstr ""
 
-#: classes/Command.php:333
+#: classes/Command.php:333 classes/Command.php:338
 msgid "Notification on."
 msgstr ""
 
-#: classes/Command.php:335
+#: classes/Command.php:335 classes/Command.php:340
 msgid "Can't turn on notification."
 msgstr ""
 
-#: classes/Command.php:344
+#: classes/Command.php:344 classes/Command.php:349
 msgid "Commands:\n"
 msgstr ""
 
@@ -2821,23 +3118,23 @@ msgstr ""
 msgid "Could not update message with new URI."
 msgstr ""
 
-#: lib/gallery.php:46
+#: lib/gallery.php:46 lib/gallery.php:55
 msgid "User without matching profile in system."
 msgstr ""
 
-#: lib/mail.php:147
+#: lib/mail.php:147 lib/mail.php:141
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:249
+#: lib/mail.php:249 lib/mail.php:275
 #, php-format
 msgid "New private message from %s"
 msgstr ""
 
-#: lib/mail.php:253
+#: lib/mail.php:253 lib/mail.php:279
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -2881,18 +3178,475 @@ msgstr ""
 msgid "Your sent messages"
 msgstr ""
 
-#: lib/settingsaction.php:99
+#: lib/settingsaction.php:99 actions/deleteprofile.php:256
 msgid "Twitter"
 msgstr ""
 
-#: lib/settingsaction.php:100
+#: lib/settingsaction.php:100 actions/deleteprofile.php:257
 msgid "Twitter integration options"
 msgstr ""
 
-#: lib/util.php:1718
+#: lib/util.php:1718 lib/util.php:2145
 msgid "To"
 msgstr ""
 
 #: scripts/maildaemon.php:45
 msgid "Could not parse message."
 msgstr ""
+
+#: actions/block.php:45 actions/subedit.php:45 actions/unblock.php:45
+#, fuzzy
+msgid "No profile specified."
+msgstr "Оператора не обрано."
+
+#: actions/block.php:52 actions/subedit.php:52 actions/tagother.php:45
+#: actions/unblock.php:52
+msgid "No profile with that ID."
+msgstr ""
+
+#: actions/block.php:78
+#, fuzzy
+msgid "Block user"
+msgstr "Такого користувача немає."
+
+#: actions/block.php:81
+#, fuzzy
+msgid "Are you sure you want to block this user? "
+msgstr "Ви впевненні, що бажаєте видалити це повідомлення?"
+
+#: actions/block.php:117
+#, fuzzy
+msgid "You have already blocked this user."
+msgstr "Ви вже в системі!"
+
+#: actions/block.php:124
+msgid "Failed to save block information."
+msgstr ""
+
+#: actions/deleteprofile.php:25
+msgid "Code not yet ready."
+msgstr ""
+
+#: actions/deleteprofile.php:36
+msgid "Export and delete your user information."
+msgstr ""
+
+#: actions/deleteprofile.php:88 actions/deleteprofile.php:119
+#, fuzzy
+msgid "Delete my account"
+msgstr "Створити новий рахунок"
+
+#: actions/deleteprofile.php:89
+#, fuzzy
+msgid "Delete my account confirmation"
+msgstr "Не вдалося видалити підтвердження поштової адреси."
+
+#: actions/deleteprofile.php:117
+#, fuzzy
+msgid "Check if you are sure you want to delete your account."
+msgstr "Ви впевненні, що бажаєте видалити це повідомлення?"
+
+#: actions/deleteprofile.php:259 lib/settingsaction.php:102
+msgid "Other"
+msgstr ""
+
+#: actions/deleteprofile.php:260 lib/settingsaction.php:103
+msgid "Other options"
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Add to favorites"
+msgstr ""
+
+#: actions/emailsettings.php:98
+msgid "Allow friends to nudge me and send me an email."
+msgstr ""
+
+#: actions/facebookremove.php:54
+#, fuzzy
+msgid "Couldn't remove Facebook user."
+msgstr "Не вдалося оновити користувача."
+
+#: actions/favor.php:71
+msgid "Disfavor favorite"
+msgstr ""
+
+#: actions/favorited.php:31 lib/stream.php:45
+#, fuzzy
+msgid "Popular notices"
+msgstr "Такого повідомлення немає."
+
+#: actions/favorited.php:54
+#, fuzzy
+msgid "Showing recently popular notices"
+msgstr "Знайти зміст повідомлення"
+
+#: actions/featured.php:32 actions/featured.php:54 lib/stream.php:41
+msgid "Featured users"
+msgstr ""
+
+#: actions/finishremotesubscribe.php:186
+msgid "That user has blocked you from subscribing."
+msgstr ""
+
+#: actions/microsummary.php:39
+msgid "No current status"
+msgstr ""
+
+#: actions/newnotice.php:93
+#, fuzzy
+msgid "Notice posted"
+msgstr "Повідомлення"
+
+#: actions/newnotice.php:116 classes/Channel.php:140
+msgid "Ajax Error"
+msgstr ""
+
+#: actions/nudge.php:52
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
+
+#: actions/nudge.php:61
+msgid "Nudge sent"
+msgstr ""
+
+#: actions/othersettings.php:27
+msgid "Manage various other options."
+msgstr ""
+
+#: actions/othersettings.php:33
+#, fuzzy
+msgid "Other Settings"
+msgstr "Налаштування"
+
+#: actions/othersettings.php:35
+msgid "URL Auto-shortening"
+msgstr ""
+
+#: actions/othersettings.php:54
+#, fuzzy
+msgid "Service"
+msgstr "Пошук"
+
+#: actions/othersettings.php:54
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/othersettings.php:155
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Мова задовга (50 знаків максимум)"
+
+#: actions/peopletag.php:33
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "Це не дійсна електронна адреса"
+
+#: actions/peopletag.php:45
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr ""
+
+#: actions/peopletag.php:87
+#, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+msgstr ""
+
+#: actions/profilesettings.php:92
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+
+#: actions/profilesettings.php:246 actions/tagother.php:131
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Недейсна домашня сторінка '%s'"
+
+#: actions/profilesettings.php:328
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "Не вдалося зберегти профіль."
+
+#: actions/public.php:68
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
+msgstr ""
+
+#: actions/public.php:90
+#, fuzzy
+msgid "Could not retrieve public stream."
+msgstr "Невдала підписка."
+
+#: actions/register.php:67 actions/register.php:177
+msgid "Sorry, only invited people can register."
+msgstr ""
+
+#: actions/register.php:156
+msgid "With this form you can create a new account. "
+msgstr ""
+
+#: actions/remotesubscribe.php:136 actions/remotesubscribe.php:141
+msgid "That's a local profile! Login to subscribe."
+msgstr ""
+
+#: actions/subedit.php:68
+#, fuzzy
+msgid "You are not subscribed to that profile."
+msgstr "Ви не надсилали нам цього профілю"
+
+#: actions/subedit.php:81
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "Не вдалося видалити підписку."
+
+#: actions/subscribe.php:53
+#, fuzzy
+msgid "Not a local user."
+msgstr "Такого користувача немає."
+
+#: actions/subscribe.php:67
+#, fuzzy
+msgid "Subscribed"
+msgstr "Підписки"
+
+#: actions/subscriptions.php:72
+#, fuzzy
+msgid "Jabber"
+msgstr "Немає Jabber ID."
+
+#: actions/tagother.php:31
+#, fuzzy
+msgid "Not logged in"
+msgstr "Не увійшли."
+
+#: actions/tagother.php:40
+#, fuzzy
+msgid "No id argument."
+msgstr "Такого документа немає."
+
+#: actions/tagother.php:56
+msgid "Tag a person"
+msgstr ""
+
+#: actions/tagother.php:98
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
+msgstr ""
+
+#: actions/tagother.php:120
+#, fuzzy
+msgid "No such profile."
+msgstr "Такого повідомлення немає."
+
+#: actions/tagother.php:146
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+
+#: actions/tagother.php:153
+#, fuzzy
+msgid "Could not save tags."
+msgstr "Не вдалося зберегти інформацію про аватару"
+
+#: actions/tagother.php:188
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
+
+#: actions/tagrss.php:33
+#, fuzzy
+msgid "No such tag."
+msgstr "Такого повідомлення немає."
+
+#: actions/tagrss.php:62
+#, fuzzy, php-format
+msgid "Microblog tagged with %s"
+msgstr "Повідомлення позначені з %s"
+
+#: actions/twitapiblocks.php:45
+msgid "Block user failed."
+msgstr ""
+
+#: actions/twitapiblocks.php:66
+msgid "Unblock user failed."
+msgstr ""
+
+#: actions/twitapiusers.php:45
+#, fuzzy
+msgid "Not found."
+msgstr "Немає знайденого запиту!"
+
+#: actions/twittersettings.php:63
+msgid "Twitter user name"
+msgstr ""
+
+#: actions/twittersettings.php:67
+#, fuzzy
+msgid "Twitter password"
+msgstr "Новий пароль"
+
+#: actions/twittersettings.php:129
+msgid "Twitter Friends"
+msgstr ""
+
+#: actions/unblock.php:73
+#, fuzzy
+msgid "Error removing the block."
+msgstr "Помилка при збереженні користувача."
+
+#: actions/unsubscribe.php:48
+#, fuzzy
+msgid "No profile id in request."
+msgstr "Немає URL-адреси профілю повернітої сервером."
+
+#: actions/unsubscribe.php:55
+#, fuzzy
+msgid "No profile with that id."
+msgstr "Віддалений профіль без відповідного профілю"
+
+#: actions/unsubscribe.php:69
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Відписатись"
+
+#: classes/Notice.php:100
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "Проблема при збереженні повідомлення."
+
+#: classes/Notice.php:105
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+
+#: classes/Notice.php:112
+msgid "You are banned from posting notices on this site."
+msgstr ""
+
+#: lib/gallery.php:98
+#, fuzzy
+msgid "Filter tags"
+msgstr "Живлення для міток %s"
+
+#: lib/gallery.php:104
+msgid "All"
+msgstr ""
+
+#: lib/gallery.php:108
+#, fuzzy
+msgid "Tag"
+msgstr "Мітки"
+
+#: lib/gallery.php:109
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/gallery.php:110
+msgid "Go"
+msgstr ""
+
+#: lib/gallery.php:264
+#, fuzzy
+msgid "Subscriptions navigation"
+msgstr "Підписки"
+
+#: lib/gallery.php:270 lib/gallery.php:292
+msgid "List"
+msgstr ""
+
+#: lib/gallery.php:280 lib/gallery.php:294
+msgid "Icons"
+msgstr ""
+
+#: lib/mail.php:92
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:242
+#, php-format
+msgid "You've been nudged by %s"
+msgstr ""
+
+#: lib/mail.php:246
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+msgstr ""
+
+#: lib/profilelist.php:146
+msgid "(none)"
+msgstr ""
+
+#: lib/stream.php:33
+msgid "Public"
+msgstr "Загал"
+
+#: lib/stream.php:36 lib/stream.php:37
+#, fuzzy
+msgid "Recent tags"
+msgstr "Недавні мітки"
+
+#: lib/stream.php:40
+msgid "Featured"
+msgstr ""
+
+#: lib/stream.php:44
+#, fuzzy
+msgid "Popular"
+msgstr "Люди"
+
+#: lib/subs.php:51
+#, fuzzy
+msgid "User has blocked you."
+msgstr "Користувач не має профілю."
+
+#: lib/util.php:2059
+msgid "Send a nudge"
+msgstr ""
+
+#: lib/util.php:2063
+msgid "Nudge sent!"
+msgstr ""
+
+#: lib/util.php:2194
+msgid "Block"
+msgstr ""
+
+#: lib/util.php:2198
+msgid "Unblock"
+msgstr ""
+
+#~ msgid " by "
+#~ msgstr "від"
+
+#~ msgid "%1$s Notices recently tagged with %2$s"
+#~ msgstr "%1$s Повідомлення щойно позначені з %2$s"
+
+#~ msgid "Error inserting notice"
+#~ msgstr "Помилка при додаванні повідомлення"
+
+#~ msgid ""
+#~ "If you've forgotten or lost your password, you can get a new one sent  "
+#~ "the email address you have stored  in your account."
+#~ msgstr ""
+#~ "Якщо ви забули, або загубили свій пароль, ви можете отримати новий на "
+#~ "електронну адресу, яку ви закріпили за своїм рахунком."
+
+#~ msgid "Last message posted: "
+#~ msgstr "Останнє повідомлення:"
+
+#~ msgid "Unsupported type"
+#~ msgstr "Тип не підтримується"
+
+#~ msgid "not a supported data format"
+#~ msgstr "формат даних не підтримується"
diff --git a/vi_VN/LC_MESSAGES/laconica.po b/vi_VN/LC_MESSAGES/laconica.po
index 3ab63f8c44..eef9f6d850 100644
--- a/vi_VN/LC_MESSAGES/laconica.po
+++ b/vi_VN/LC_MESSAGES/laconica.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: laconica\n"
-"Report-Msgid-Bugs-To: mikec@resnet.net.nz\n"
-"POT-Creation-Date: 2008-07-13 17:15+1200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 12:10+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: LienNguyen <lien.nguyen@anhone.vn>\n"
 "Language-Team:  <support@saigonica.com>\n"
@@ -13,24 +13,100 @@ msgstr ""
 "X-Poedit-Language: English\n"
 "X-Poedit-Country: NEW ZEALAND\n"
 
-#: ../actions/noticesearchrss.php:64
+#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:61
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr " Tìm dòng thông tin cho \"%s\""
 
-#: ../actions/finishopenidlogin.php:82
-#: ../actions/register.php:193
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: actions/finishopenidlogin.php:88 actions/register.php:205
+#: actions/register.php:232
 msgid ""
-" except this private data: password, email address, IM address, phone "
-"number."
+" except this private data: password, email address, IM address, phone number."
 msgstr " ngoại trừ thông tin riêng: mật khẩu, email, địa chỉ IM, số điện thoại"
 
-#: ../actions/subscribe.php:84
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+#: lib/facebookaction.php:195 lib/noticelist.php:160
+msgid " from "
+msgstr " từ"
+
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: actions/twitapistatuses.php:341
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr ""
+
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "%1$s moi ban tham gia vao %2$s"
+
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+"%1$s mời bạn tham gia vào %2$s (%3$s).\n"
+"\n"
+"%2$s là dịch vụ tin nhắn nhanh giúp bạn liên kết với người quen và những "
+"người yêu thích bạn.\n"
+"\n"
+"Bạn cũng có thể chia sẻ những suy nghĩ, thông tin về bạn, hoặc đời sống của "
+"bạn lên trên mạng cho những người quen của bạn biết. Dịch vụ này cũng giúp "
+"bạn gặp gỡ những người chưa quen biết nhưng có cùng sở thích.\n"
+"\n"
+"%1$s nói:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Bạn có thể tham khảo trang thông tin cá nhân của  %1$s trên  %2$s tại đây:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Nếu bạn muốn sử dụng dịch vụ này, hãy nhấn chuột vào liên kết dưới đây để "
+"chấp nhận lời mời.\n"
+"\n"
+"%6$s\n"
+"\n"
+"Nếu không thích tham gia, bạn có thể bỏ qua tin nhắn này. Rất cảm ơn sự kiên "
+"nhẫn vì đã làm mất thời gian của bạn.\n"
+"\n"
+"Thân, %2$s\n"
+
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:115
+#: lib/mail.php:117
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s dang theo doi tin nhan cua ban tren %2$s."
 
-#: ../actions/subscribe.php:86
+#: ../lib/mail.php:126
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -44,1064 +120,1682 @@ msgstr ""
 "\n"
 "\t%3$s\n"
 "\n"
-"Người bạn trung thành của bạn,\n%4$s.\n"
+"Người bạn trung thành của bạn,\n"
+"%4$s.\n"
+
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#: actions/twitapistatuses.php:344
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
 
-#: ../actions/shownotice.php:45
+#: ../actions/shownotice.php:45 actions/shownotice.php:45
+#: actions/shownotice.php:73
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "Trạng thái của %1$s vào %2$s"
 
-#: ../actions/publicrss.php:60
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../actions/publicrss.php:62 actions/publicrss.php:48
 #, php-format
 msgid "%s Public Stream"
 msgstr "%s Dòng tin công cộng"
 
-#: ../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/twitapistatuses.php:123
 #, php-format
 msgid "%s and friends"
 msgstr "%s và bạn bè"
 
-#: ../lib/util.php:233
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:31
+#, fuzzy, php-format
+msgid "%s public timeline"
+msgstr "Dòng tin công cộng"
+
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:217
+#, fuzzy, php-format
+msgid "%s status"
+msgstr "Trạng thái của %1$s vào %2$s"
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:195
+#, fuzzy, php-format
+msgid "%s timeline"
+msgstr "Dòng tin nhắn của %s"
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:34
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+"(Bạn sẽ nhận email thông báo, hãy đọc hướng dẫn để xác nhận địa chỉ email "
+"của bạn.)"
+
+#: ../lib/util.php:257 lib/util.php:273 lib/util.php:284
 #, 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%%** là dịch vụ gửi tin nhắn được cung cấp từ "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+"**%%site.name%%** là dịch vụ gửi tin nhắn được cung cấp từ [%%site.broughtby%"
+"%](%%site.broughtbyurl%%). "
 
-#: ../lib/util.php:235
+#: ../lib/util.php:259 lib/util.php:275 lib/util.php:286
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** là dịch vụ gửi tin nhắn. "
 
-#: ../lib/util.php:250
+#: ../lib/util.php:274 lib/util.php:290 lib/util.php:301
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr "Người đăng ký nên được phân theo tên hoặc nickname"
 
-#: ../actions/finishopenidlogin.php:73
-#: ../actions/profilesettings.php:43
-#: ../actions/register.php:176
+#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
+#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
+#: actions/profilesettings.php:78
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1-64 chữ cái thường hoặc là chữ số, không có dấu chấm hay "
+
+#: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:193
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
-"1-64 chữ cái thường hoặc là chữ số, không có dấu chấm hay "
+"1-64 chữ cái thường hoặc là chữ số, không có dấu chấm hay khoảng trắng. Bắt "
+"buộc."
 
-#: ../actions/password.php:42
-#: ../actions/register.php:178
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/profilesettings.php:186
 msgid "6 or more characters"
 msgstr "Nhiều hơn 6 ký tự"
 
-#: ../actions/register.php:178
-msgid " Required."
-msgstr " Bắt buộc."
-
-#: ../actions/register.php:178
-msgid "Longer name, preferably your \"real\" name"
-msgstr "Họ tên đầy đủ của bạn, tốt nhất là tên thật của bạn."
-
-#: ../actions/recoverpassword.php:165
+#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
 msgid "6 or more characters, and don't forget it!"
 msgstr "Nhiều hơn 6 ký tự, đừng quên nó!"
 
-#: ../actions/imsettings.php:188
+#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:195
+msgid "6 or more characters. Required."
+msgstr "Nhiều hơn 6 ký tự. Bắt buộc"
+
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, 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 ""
+"Mã xác nhận đã được gửi đến địa chỉ IM. Bạn phải chấp nhận %s để có thể gửi "
+"tin nhắn đến bạn."
+
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:234
+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 ""
+"Mã xác nhận đã được gửi tới địa chỉ email của bạn. Hãy kiểm tra hộp thư và "
+"làm theo hướng dẫn."
+
+#: ../actions/smssettings.php:216 actions/smssettings.php:224
+#, fuzzy
+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 ""
-"Mã xác nhận đã được gửi đến địa chỉ IM. Bạn phải "
-"chấp nhận %s để có thể gửi tin nhắn đến bạn."
+"Mã xác nhận đã được gửi tới địa chỉ email của bạn. Hãy kiểm tra hộp thư và "
+"làm theo hướng dẫn."
+
+#: ../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:30
+#: actions/twitapidirect_messages.php:107 actions/twitapifavorites.php:83
+#: actions/twitapifavorites.php:99 actions/twitapifriendships.php:117
+#: actions/twitapihelp.php:42 actions/twitapistatuses.php:77
+#: actions/twitapistatuses.php:144 actions/twitapistatuses.php:224
+#: actions/twitapistatuses.php:234 actions/twitapistatuses.php:386
+#: actions/twitapistatuses.php:395 actions/twitapistatuses.php:421
+#: actions/twitapiusers.php:30
+msgid "API method not found!"
+msgstr "Phương thức API không tìm thấy!"
+
+#: ../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:39
+#: actions/twitapiaccount.php:89 actions/twitapiaccount.php:94
+#: actions/twitapidirect_messages.php:178 actions/twitapifavorites.php:139
+#: actions/twitapihelp.php:49 actions/twitapistatuses.php:549
+msgid "API method under construction."
+msgstr "Phương thức API dưới cấu trúc có sẵn."
 
-#: ../lib/util.php:296
+#: ../lib/util.php:324 lib/util.php:340 lib/util.php:352
 msgid "About"
 msgstr "Giới thiệu"
 
-#: ../actions/userauthorization.php:118
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
 msgid "Accept"
 msgstr "Chấp nhận"
 
-#: ../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/twittersettings.php:84
 msgid "Add"
 msgstr "Thêm"
 
-#: ../actions/openidsettings.php:43
+#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
 msgid "Add OpenID"
 msgstr "Thêm OpenID"
 
-#: ../actions/imsettings.php:39
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: actions/deleteprofile.php:248
+msgid "Add or remove OpenIDs"
+msgstr "Thêm mới hoặc xóa OpenIDs"
+
+#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
 msgid "Address"
 msgstr "Địa chỉ"
 
-#: ../actions/showstream.php:254
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
+"Các địa chỉ email của những người bạn muốn mời (mỗi địa chỉ nằm trên 1 dòng)"
+
+#: ../actions/showstream.php:273 actions/showstream.php:288
+#: actions/showstream.php:336
 msgid "All subscriptions"
 msgstr "Tất cả đăng nhận"
 
-#: ../actions/publicrss.php:62
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
 #, php-format
 msgid "All updates for %s"
 msgstr "Tất cả các cập nhật của %s"
 
-#: ../actions/noticesearchrss.php:66
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:63
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "Các thay đổi phù hợp với từ \"%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
 msgid "Already logged in."
 msgstr "Đã đăng nhập."
 
-#: ../actions/subscribe.php:48
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:47
 msgid "Already subscribed!."
 msgstr "Đã đăng nhận rồi!"
 
-#: ../actions/userauthorization.php:76
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+msgid "Are you sure you want to delete this notice?"
+msgstr "Bạn có chắc chắn là muốn xóa tin nhắn này không?"
+
+#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
 msgid "Authorize subscription"
 msgstr "Đăng nhận cho phép"
 
-#: ../actions/login.php:100
-#: ../actions/register.php:184
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192 actions/register.php:219
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Sẽ tự động đăng nhập, không dành cho các máy sử dụng chung!"
 
-#: ../actions/avatar.php:32
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:103
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr "Tự động theo những người nào đăng ký theo tôi"
+
+#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: actions/profilesettings.php:34
 msgid "Avatar"
 msgstr "Hình đại diện"
 
-#: ../actions/avatar.php:113
+#: ../actions/avatar.php:113 actions/profilesettings.php:350
+#: actions/profilesettings.php:379
 msgid "Avatar updated."
 msgstr "Hình đại diện đã được cập nhật."
 
-#: ../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 ""
-"Đang đợi xác nhận đến địa chỉ này. Hãy kiểm tra tài "
-"khoản Jabber/GTalk để nhận tin nhắn và lời hướng dẫn. "
-"(Bạn đã thêm %s vào danh sách bạn thân chưa?)"
+"Đang đợi xác nhận đến địa chỉ này. Hãy kiểm tra tài khoản Jabber/GTalk để "
+"nhận tin nhắn và lời hướng dẫn. (Bạn đã thêm %s vào danh sách bạn thân chưa?)"
 
-#: ../actions/imsettings.php:55
-#, php-format
+#: ../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 ""
-"Đang đợi xác nhận đến địa chỉ này. Hãy kiểm tra hộp "
-"thư đến (hoặc thư rác) để nhận tin nhắn và lời hướng dẫn."
+"Đang đợi xác nhận đến địa chỉ này. Hãy kiểm tra hộp thư đến (hoặc thư rác) "
+"để nhận tin nhắn và lời hướng dẫn."
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+#, fuzzy
+msgid "Awaiting confirmation on this phone number."
+msgstr "Đó không phải là số điện thoại của bạn."
 
-#: ../lib/util.php:1136
-msgid "Before"
+#: ../lib/util.php:1318 lib/util.php:1452 lib/facebookaction.php:259
+#: lib/util.php:1792
+#, fuzzy
+msgid "Before »"
 msgstr "Trước"
 
-#: ../actions/profilesettings.php:52
+#: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: actions/profilesettings.php:82 actions/register.php:184
+#: actions/profilesettings.php:84 actions/register.php:211
 msgid "Bio"
 msgstr "Lý lịch"
 
-#: ../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:222 actions/register.php:98
 msgid "Bio is too long (max 140 chars)."
 msgstr "Lý lịch quá dài (không quá 140 ký tự)"
 
-#: ../actions/updateprofile.php:118
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+msgid "Can't delete this notice."
+msgstr "Không thể xóa tin nhắn này."
+
+#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "Không thể đọc URL cho hình đại diện '%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/profilesettings.php:433
 msgid "Can't save new password."
 msgstr "Không thể lưu mật khẩu mới"
 
-#: ../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
 msgid "Cancel"
 msgstr "Hủy"
 
-#: ../lib/openid.php:121
+#: ../lib/openid.php:121 lib/openid.php:121
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Không thể thiết lập đối tượng OpenID."
 
-#: ../actions/imsettings.php:154
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
 msgid "Cannot normalize that Jabber ID"
 msgstr "Không thể bình thường hóa Jabber ID"
 
-#: ../actions/password.php:45
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:204
+#, fuzzy
+msgid "Cannot normalize that email address"
+msgstr "Không thể bình thường hóa địa chỉ GTalk này"
+
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/profilesettings.php:189
 msgid "Change"
 msgstr "Thay đổi"
 
-#: ../actions/password.php:32
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: actions/deleteprofile.php:245
+msgid "Change email handling"
+msgstr "Đang thực hiện việc thay đổi email"
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
 msgid "Change password"
 msgstr "Đổi mật khẩu"
 
-#: ../actions/password.php:43
-#: ../actions/recoverpassword.php:166
-#: ../actions/register.php:179
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr "Thay đổi mật khẩu của bạn"
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#: actions/deleteprofile.php:242
+msgid "Change your profile settings"
+msgstr "Thay đổi các thiết lập trong hồ sơ cá nhân của bạn"
+
+#: ../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/profilesettings.php:187 actions/register.php:196
 msgid "Confirm"
 msgstr "Xác nhận"
 
-#: ../actions/confirmaddress.php:84
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
 msgid "Confirm Address"
 msgstr "Xác nhận địa chỉ"
 
-#: ../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:259
 msgid "Confirmation cancelled."
 msgstr "Sự xác nhận đã bị hủy bỏ."
 
-#: ../actions/confirmaddress.php:38
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+#, fuzzy
+msgid "Confirmation code"
+msgstr "Không có mã số xác nhận."
+
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
 msgid "Confirmation code not found."
 msgstr "Không tìm thấy mã xác nhận."
 
-#: ../actions/finishopenidlogin.php:91
+#: ../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 ""
+"Chúc mừng, %s! Chào mừng bạn đến với  %%%%site.name%%%%. Bây giờ bạn có "
+"thể...\n"
+"\n"
+"* Vào trang [Hồ sơ cá nhân](%s) của bạn và gửi tin nhắn đầu tiên. \n"
+"* Thêm [địa chỉ Jabber/GTalk](%%%%action.imsettings%%%%) để có thể gửi tin "
+"nhắn nhanh.\n"
+"* [Tìm kiếm người quen](%%%%action.peoplesearch%%%%) mà bạn nghĩ là có thể "
+"chia sẻ niềm vui.\n"
+"* Đọc xuyên suốt [hướng dẫn](%%%%doc.help%%%%) để hiểu thêm về dịch vụ của "
+"chúng tôi.\n"
+"\n"
+"Cảm ơn bạn đã đăng ký để là thành viên và rất mong bạn sẽ thích dịch vụ này."
+
+#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
 msgid "Connect"
 msgstr "Kết nối"
 
-#: ../actions/finishopenidlogin.php:86
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
 msgid "Connect existing account"
 msgstr "Kết nối đến tài khoản hiện hữu"
 
-#: ../lib/util.php:304
+#: ../lib/util.php:332 lib/util.php:348 lib/util.php:360
 msgid "Contact"
 msgstr "Liên hệ"
 
-#: ../lib/openid.php:178
+#: ../lib/openid.php:178 lib/openid.php:178
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "Không thể tạo OpenID mẫu: %s"
 
-#: ../lib/openid.php:160
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:46 actions/twitapifriendships.php:62
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
+
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+#: actions/twitapifriendships.php:39
+#, fuzzy
+msgid "Could not follow user: User not found."
+msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
+
+#: ../lib/openid.php:160 lib/openid.php:160
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "Không thể chuyển đến máy chủ: %s"
 
-#: ../actions/updateprofile.php:161
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
 msgid "Could not save avatar info"
 msgstr "Không thể lưu hình đại diện"
 
-#: ../actions/updateprofile.php:154
+#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
 msgid "Could not save new profile info"
 msgstr "Không thể lưu thông tin về hồ sơ cá nhân"
 
-#: ../actions/profilesettings.php:146
-msgid "Couldn't confirm email."
-msgstr "Không thể xác nhận địa chỉ email."
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:70
+#, fuzzy
+msgid "Could not subscribe other to you."
+msgstr "Không thể tạo favorite."
+
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:55
+#, fuzzy
+msgid "Could not subscribe."
+msgstr "Chưa đăng nhận!"
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr "Không thể cập nhật thông tin user với địa chỉ email đã được xác nhận."
 
 #: ../actions/finishremotesubscribe.php:99
+#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:112
 msgid "Couldn't convert request tokens to access tokens."
 msgstr "Không thể chuyển các token yêu cầu đến token truy cập."
 
-#: ../actions/subscribe.php:59
-msgid "Couldn't create subscription."
-msgstr "Không thể tạo đăng nhận."
-
-#: ../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/emailsettings.php:255
 msgid "Couldn't delete email confirmation."
 msgstr "Không thể xóa email xác nhận."
 
-#: ../actions/unsubscribe.php:56
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:129
 msgid "Couldn't delete subscription."
 msgstr "Không thể xóa đăng nhận."
 
-#: ../actions/remotesubscribe.php:125
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+#: actions/twitapistatuses.php:82
+msgid "Couldn't find any statuses."
+msgstr "Không tìm thấy bất kỳ trạng thái nào."
+
+#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
+#: actions/remotesubscribe.php:148
 msgid "Couldn't get a request token."
 msgstr "Không thể lấy token yêu cầu."
 
-#: ../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:228
 msgid "Couldn't insert confirmation code."
 msgstr "Không thể  chèn mã xác nhận."
 
 #: ../actions/finishremotesubscribe.php:180
+#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:216
 msgid "Couldn't insert new subscription."
 msgstr "Không thể chèn thêm vào đăng nhận."
 
-#: ../actions/profilesettings.php:175
+#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
+#: actions/profilesettings.php:319 actions/twitapiaccount.php:74
 msgid "Couldn't save profile."
 msgstr "Không thể lưu hồ sơ cá nhân."
 
-#: ../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:296
+#, fuzzy
+msgid "Couldn't update user for autosubscribe."
+msgstr "Không thể cập nhật thành viên."
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+#: actions/emailsettings.php:301 actions/emailsettings.php:315
+#, fuzzy
+msgid "Couldn't update user record."
+msgstr "Không thể cập nhật thành viên."
+
+#: ../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/emailsettings.php:179 actions/emailsettings.php:280
+#: actions/othersettings.php:173 actions/profilesettings.php:276
 msgid "Couldn't update user."
 msgstr "Không thể cập nhật thành viên."
 
-#: ../actions/finishopenidlogin.php:84
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
 msgid "Create"
 msgstr "Tạo"
 
-#: ../actions/finishopenidlogin.php:70
+#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
 msgid "Create a new user with this nickname."
 msgstr "Tạo người dùng mới với tên đăng nhập này."
 
-#: ../actions/finishopenidlogin.php:68
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
 msgid "Create new account"
 msgstr "Tạo tài khoản mới"
 
-#: ../actions/finishopenidlogin.php:191
+#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+#: actions/finishopenidlogin.php:208
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Tạo tài khoản mới hoặc dùng OpenID"
 
-#: ../actions/imsettings.php:45
+#: ../actions/imsettings.php:45 actions/imsettings.php:46
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Địa chỉ Jabber/GTalk vừa được xác nhận."
 
-#: ../actions/showstream.php:337
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+msgid "Current confirmed SMS-enabled phone number."
+msgstr "SMS xác nhận ngay - đã cho phép gửi qua điện thoại. "
+
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+msgid "Current confirmed email address."
+msgstr "Đã xác nhận địa chỉ này."
+
+#: ../actions/showstream.php:356 actions/showstream.php:367
+#: actions/showstream.php:418
 msgid "Currently"
 msgstr "Hiện tại"
 
-#: ../lib/util.php:893
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:87
+#, fuzzy, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr "Lỗi cơ sở dữ liệu khi chèn trả lời: %s"
+
+#: ../lib/util.php:1061 lib/util.php:1110 lib/util.php:1417
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Lỗi cơ sở dữ liệu khi chèn trả lời: %s"
 
-#: ../actions/profilesettings.php:54
-msgid "Describe your group's interest in 140 characters"
-msgstr "Nói về những sở thích của nhóm trong vòng 140 ký tự"
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+msgid "Delete notice"
+msgstr "Xóa tin nhắn"
+
+#: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: actions/profilesettings.php:84 actions/register.php:186
+#: actions/profilesettings.php:86 actions/register.php:213
+msgid "Describe yourself and your interests in 140 chars"
+msgstr "Nói về bạn và những sở thích của bạn khoảng 140 ký tự"
 
-#: ../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/deleteprofile.php:244 actions/register.php:199
+#: actions/register.php:202
 msgid "Email"
 msgstr "Email"
 
-#: ../actions/profilesettings.php:46
-msgid "Email address"
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+#, fuzzy
+msgid "Email Address"
 msgstr "Địa chỉ email"
 
-#: ../actions/profilesettings.php:102
-#: ../actions/register.php:63
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+msgid "Email Settings"
+msgstr "Thiết lập địa chỉ email"
+
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:89
 msgid "Email address already exists."
 msgstr "Địa chỉ email đã tồn tại."
 
-#: ../lib/mail.php:82
+#: ../lib/mail.php:90 lib/mail.php:90
 msgid "Email address confirmation"
 msgstr "Xac nhan dia chi email"
 
-#: ../actions/recoverpassword.php:176
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+#, fuzzy
+msgid "Email address, like \"UserName@example.org\""
+msgstr "Địa chỉ email GTalk, Ví dụ: \"UserName@gmail.com\""
+
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr "Địa chỉ email"
+
+#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
 msgid "Enter a nickname or email address."
 msgstr "Nhập biệt hiệu hoặc email."
 
-#: ../actions/userauthorization.php:136
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+msgid "Enter the code you received on your phone."
+msgstr ""
+
+#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
 msgid "Error authorizing token"
 msgstr "Lỗi cho phép token"
 
-#: ../actions/finishopenidlogin.php:282
+#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
+#: actions/finishopenidlogin.php:274
 msgid "Error connecting user to OpenID."
 msgstr "Lỗi xảy ra khi kết nối với OpenId"
 
-#: ../actions/finishaddopenid.php:78
+#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
 msgid "Error connecting user."
 msgstr "Lỗi khi kết nối người dùng."
 
 #: ../actions/finishremotesubscribe.php:151
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:164
 msgid "Error inserting avatar"
 msgstr "Lỗi xảy ra khi thêm mới hình đại diện"
 
 #: ../actions/finishremotesubscribe.php:143
+#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:156
 msgid "Error inserting new profile"
 msgstr "Lỗi xảy ra khi thêm mới hồ sơ cá nhân"
 
-#: ../actions/postnotice.php:88
-msgid "Error inserting notice"
-msgstr "Lỗi xảy ra khi thêm mới tin nhắn"
-
 #: ../actions/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:180
 msgid "Error inserting remote profile"
 msgstr "Lỗi xảy ra khi thêm mới hồ sơ cá nhân"
 
-#: ../actions/recoverpassword.php:201
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
 msgid "Error saving address confirmation."
 msgstr "Lỗi xảy ra khi lưu địa chỉ đã được xác nhận."
 
-#: ../actions/userauthorization.php:139
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
 msgid "Error saving remote profile"
 msgstr "Lỗi xảy ra khi lưu hồ sơ cá nhân"
 
-#: ../actions/finishopenidlogin.php:222
-#: ../lib/openid.php:226
+#: ../lib/openid.php:226 lib/openid.php:226
 msgid "Error saving the profile."
 msgstr "Lỗi xảy ra khi lưu hồ sơ cá nhân."
 
-#: ../lib/openid.php:237
+#: ../lib/openid.php:237 lib/openid.php:237
 msgid "Error saving the user."
 msgstr "Lỗi xảy ra khi lưu thành viên."
 
-#: ../actions/password.php:80
+#: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/profilesettings.php:428
 msgid "Error saving user; invalid."
 msgstr "Lỗi xảy ra khi lưu thành viên;  không hợp lệ."
 
-#: ../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:54 actions/login.php:80
+#: actions/register.php:117
 msgid "Error setting user."
 msgstr "Lỗi xảy ra khi tạo thành viên."
 
-#: ../actions/finishaddopenid.php:83
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
 msgid "Error updating profile"
 msgstr "Lỗi xảy ra khi cập nhật hồ sơ cá nhân"
 
 #: ../actions/finishremotesubscribe.php:161
+#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:174
 msgid "Error updating remote profile"
 msgstr "Lỗi xảy ra khi cập nhật hồ sơ cá nhân"
 
-#: ../actions/recoverpassword.php:79
+#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
 msgid "Error with confirmation code."
 msgstr "Lỗi xảy ra với mã xác nhận."
 
-#: ../actions/finishopenidlogin.php:89
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
 msgid "Existing nickname"
 msgstr "Biệt hiệu này đã tồn tại"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:326 lib/util.php:342 lib/util.php:354
 msgid "FAQ"
 msgstr "FAQ"
 
-msgid "FAQ "
-msgstr "FAQ - Hỏi đáp"
-
-#: ../actions/avatar.php:115
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/profilesettings.php:381
 msgid "Failed updating avatar."
 msgstr "Cập nhật hình đại diện không thành công."
 
-#: ../actions/all.php:61
-#: ../actions/allrss.php:74
+#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
+#: actions/allrss.php:64
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Chọn những người bạn của %s"
 
-#: ../actions/replies.php:61
-#: ../actions/repliesrss.php:80
+#: ../actions/replies.php:65 ../actions/repliesrss.php:80
+#: actions/replies.php:65 actions/repliesrss.php:66
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Chọn các phản hồi đến %s"
 
-#: ../actions/profilesettings.php:44
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:54
+#, fuzzy, php-format
+msgid "Feed for tag %s"
+msgstr "Chọn các phản hồi đến %s"
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+msgid "Find content of notices"
+msgstr "Tìm theo nội dung của tin nhắn"
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+msgid "Find people on this site"
+msgstr "Tìm kiếm mọi người trên trang web này"
+
+#: ../actions/login.php:122
+msgid ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
+msgstr ""
+"Vì lý do bảo mật, bạn hãy nhập lại tên đăng nhập và mật khẩu trước khi thay "
+"đổi trong điều chỉnh."
+
+#: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: actions/profilesettings.php:77 actions/register.php:178
+#: actions/profilesettings.php:79 actions/register.php:205
 msgid "Full name"
 msgstr "Tên đầy đủ"
 
-#: ../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/profilesettings.php:219 actions/register.php:95
 msgid "Full name is too long (max 255 chars)."
 msgstr "Tên đầy đủ quá dài (tối đa là 255 ký tự)."
 
-#: ../lib/util.php:279
+#: ../lib/util.php:322 lib/util.php:338 lib/util.php:343 lib/util.php:350
 msgid "Help"
 msgstr "Hướng dẫn"
 
-#: ../lib/util.php:274
+#: ../lib/util.php:298 lib/util.php:314 lib/util.php:325
 msgid "Home"
 msgstr "Trang chủ"
 
-#: ../actions/profilesettings.php:49
+#: ../actions/profilesettings.php:46 ../actions/register.php:167
+#: actions/profilesettings.php:79 actions/register.php:181
+#: actions/profilesettings.php:81 actions/register.php:208
 msgid "Homepage"
 msgstr "Trang chủ hoặc Blog"
 
-#: ../actions/profilesettings.php:87
+#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: actions/profilesettings.php:210 actions/register.php:83
+#: actions/profilesettings.php:216 actions/register.php:92
 msgid "Homepage is not a valid URL."
 msgstr "Trang chủ không phải là URL"
 
-#: ../actions/imsettings.php:61
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+#: actions/emailsettings.php:101
+msgid "I want to post notices by email."
+msgstr "Tôi muốn đưa tin nhắn lên bằng email."
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+#: actions/deleteprofile.php:253
+msgid "IM"
+msgstr "IM"
+
+#: ../actions/imsettings.php:60 actions/imsettings.php:61
 msgid "IM Address"
 msgstr "IM"
 
-#: ../actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
 msgid "IM Settings"
 msgstr "Cấu hình IM"
 
-#: ../actions/finishopenidlogin.php:88
+#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
 msgstr ""
-"Bạn đã có tài khoản rồi, hãy đăng nhập bằng tên đăng "
-"nhập và mật khẩu để kết nối với OpenId của bạn."
+"Bạn đã có tài khoản rồi, hãy đăng nhập bằng tên đăng nhập và mật khẩu để kết "
+"nối với OpenId của bạn."
 
 #: ../actions/openidsettings.php:45
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
 msgstr ""
-"Bạn muốn thêm một OpenId vào tài khoản của bạn, đánh nó "
-"vào hộp dưới đây và nhấn\" Thêm\"."
+"Bạn muốn thêm một OpenId vào tài khoản của bạn, đánh nó vào hộp dưới đây và "
+"nhấn\" Thêm\"."
 
-#: ../actions/recoverpassword.php:122
+#: ../actions/recoverpassword.php:137
 msgid ""
 "If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
 msgstr ""
-"Nếu bạn đã quên hoặc mất mật khẩu, bạn có thể tạo "
-"mới và được gửi đến địa chỉ email lưu trong tài khoản của bạn."
+"Nếu bạn đã quên hoặc mất mật khẩu, bạn có thể tạo mới và được gửi đến địa "
+"chỉ email lưu trong tài khoản của bạn."
+
+#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
+#: actions/emailsettings.php:68 actions/smssettings.php:76
+msgid "Incoming email"
+msgstr ""
 
-#: ../actions/password.php:69
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+#: actions/emailsettings.php:304
+#, fuzzy
+msgid "Incoming email address removed."
+msgstr "Địa chỉ email hoặc mật khẩu không đúng."
+
+#: ../actions/password.php:69 actions/profilesettings.php:388
+#: actions/profilesettings.php:417
 msgid "Incorrect old password"
 msgstr "Mật khẩu cũ sai"
 
-#: ../actions/login.php:63
+#: ../actions/login.php:67 actions/login.php:67 actions/login.php:74
 msgid "Incorrect username or password."
 msgstr "Sai tên đăng nhập hoặc mật khẩu."
 
-#: ../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."
 msgstr ""
-"Hướng dẫn cách khôi phục mật khẩu đã được gửi đến "
-"địa chỉ email đăng ký trong tài khoản của bạn."
+"Hướng dẫn cách khôi phục mật khẩu đã được gửi đến địa chỉ email đăng ký "
+"trong tài khoản của bạn."
 
-#: ../actions/updateprofile.php:113
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "URL cho hình đại diện '%s'  không hợp lệ "
 
-#: ../actions/updateprofile.php:97
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr "Địa chỉ email không đúng:%s"
+
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "Trang chủ '%s'  không hợp lệ"
 
-#: ../actions/updateprofile.php:81
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "URL cấp phép '%s'  không hợp lệ"
 
-#: ../actions/postnotice.php:61
+#: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:63
 msgid "Invalid notice content"
 msgstr "Nội dung tin nhắn không hợp lệ"
 
-#: ../actions/postnotice.php:67
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:69
 msgid "Invalid notice uri"
 msgstr "URI tin nhắn không hợp lệ"
 
-#: ../actions/postnotice.php:72
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:74
 msgid "Invalid notice url"
 msgstr "URL tin nhắn không hợp lệ"
 
-#: ../actions/updateprofile.php:86
+#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "URL hồ sơ cá nhân của '%s' không hợp lệ"
 
-#: ../actions/remotesubscribe.php:96
+#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
 msgid "Invalid profile URL (bad format)"
 msgstr "URL hồ sơ cá nhân không đúng định dạng."
 
 #: ../actions/finishremotesubscribe.php:77
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:78
 msgid "Invalid profile URL returned by server."
 msgstr "URL hồ sơ cá nhân không hợp lệ."
 
-#: ../actions/avatarbynickname.php:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
 msgid "Invalid size."
 msgstr "Kích thước không hợp lệ."
 
-#: ../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:256 actions/register.php:112
+#: actions/register.php:130
 msgid "Invalid username or password."
 msgstr "Tên đăng nhập hoặc mật khẩu không hợp lệ."
 
-#: ../lib/util.php:237
-#, php-format
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr "Thư mời đã gửi"
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr "Thư mời đã gửi đến:"
+
+#: ../lib/util.php:306 lib/util.php:322 lib/util.php:332
+msgid "Invite"
+msgstr "Thư mời"
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr "Gửi thư mời đến những người chưa có tài khoản"
+
+#: ../lib/util.php:261 lib/util.php:277 lib/util.php:288
+#, fuzzy, 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 ""
-"Microblogging [Laconica](http://laconi.ca/), version %s đã có ở [GNU "
-"Affero General Public License] "
-"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"Saigonica là bản sửa đổi của phiên bản [Laconica 0.6.0](http://laconi.ca/),  "
+"phát hành theo bản quyền [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 
-#: ../actions/imsettings.php:164
+#: ../actions/imsettings.php:173 actions/imsettings.php:181
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID này đã thuộc về người khác rồi."
 
-#: ../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 ""
-"Địa chỉ Jabber hoặc GTalk, giống như \"UserName@example.org\". "
-"Đầu tiên, hãy tạo thêm %s vào danh sách buddy trên IM client hoặc GTalk của bạn."
+"Địa chỉ Jabber hoặc GTalk, giống như \"UserName@example.org\". Đầu tiên, hãy "
+"tạo thêm %s vào danh sách buddy trên IM client hoặc GTalk của bạn."
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
+msgid "Language"
+msgstr "Ngôn ngữ"
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+#: actions/profilesettings.php:234
+#, fuzzy
+msgid "Language is too long (max 50 chars)."
+msgstr "Tên khu vực quá dài (không quá 255 ký tự)."
 
-#: ../actions/profilesettings.php:55
+#: ../actions/profilesettings.php:52 ../actions/register.php:173
+#: actions/profilesettings.php:85 actions/register.php:187
+#: actions/profilesettings.php:87 actions/register.php:214
 msgid "Location"
 msgstr "Thành phố"
 
-#: ../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/profilesettings.php:225 actions/register.php:101
 msgid "Location is too long (max 255 chars)."
 msgstr "Tên khu vực quá dài (không quá 255 ký tự)."
 
-#: ../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/login.php:104 actions/login.php:113 actions/openidlogin.php:88
+#: lib/util.php:336
 msgid "Login"
 msgstr "Đăng nhập"
 
-#: ../actions/openidlogin.php:44
+#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:60
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Đăng nhập bằng tài khoản [OpenID](%%doc.openid%%)."
 
-#: ../actions/login.php:112
+#: ../actions/login.php:126
 #, 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 ""
-"Hãy đăng nhập với tên đăng nhập và mật khẩu của bạn. "
-"Nếu bạn chưa có tài khoản, [hãy đăng ký](%%action.register%%) "
-"tài khoản mới, hoặc thử đăng nhập bằng [OpenID](%%action.openidlogin%%). "
+"Hãy đăng nhập với tên đăng nhập và mật khẩu của bạn. Nếu bạn chưa có tài "
+"khoản, [hãy đăng ký](%%action.register%%) tài khoản mới, hoặc thử đăng nhập "
+"bằng [OpenID](%%action.openidlogin%%). "
 
-msgid ""
-"Login with your username and password. Don't have a username yet? "
-"[Register](%%action.register%%) a new account."
-msgstr ""
-"Hãy đăng nhập với tên đăng nhập và mật khẩu của bạn. "
-"Nếu bạn chưa có tài khoản, [hãy đăng ký](%%action.register%%) tài khoản mới."
-
-#: ../lib/util.php:284
+#: ../lib/util.php:308 lib/util.php:324 lib/util.php:334
 msgid "Logout"
 msgstr "Thoát"
 
-#: ../actions/login.php:106
+#: ../actions/register.php:166 actions/register.php:180
+#: actions/register.php:207
+msgid "Longer name, preferably your \"real\" name"
+msgstr "Họ tên đầy đủ của bạn, tốt nhất là tên thật của bạn."
+
+#: ../actions/login.php:110 actions/login.php:110 actions/login.php:118
 msgid "Lost or forgotten password?"
 msgstr "Mất hoặc quên mật khẩu?"
 
-#: ../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 "Tạo một địa chỉ email mới để đưa tin nhắn lên; và xóa "
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr "Bạn nhận email từ %%site.name%% như thế nào."
+
+#: ../actions/showstream.php:300 actions/showstream.php:315
+#: actions/showstream.php:363
 msgid "Member since"
 msgstr "Gia nhập từ"
 
-#: ../actions/userrss.php:70
+#: ../actions/userrss.php:70 actions/userrss.php:67
 #, php-format
 msgid "Microblog by %s"
 msgstr "Microblog bởi  %s"
 
-#: ../actions/finishopenidlogin.php:79
-#: ../actions/register.php:190
+#: ../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 ""
+"Nhà cung cấp dịch vụ điện thoại di động của bạn. Nếu bạn biết nhà cung cấp "
+"dịch vụ điện thoại nào cho phép nhận SMS qua email  mà chưa có trong danh "
+"sách này, vui lòng gửi mail cho chúng tôi đến địa chỉ %s."
+
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php:85 actions/register.php:202
+#: actions/register.php:229
 msgid "My text and files are available under "
 msgstr "Ghi chú và các file của tôi đã có ở phía dưới"
 
-#: ../actions/finishopenidlogin.php:71
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+msgid "New"
+msgstr ""
+
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:138
+#, php-format
+msgid "New email address for posting to %s"
+msgstr "Dia chi email moi de gui tin nhan den %s"
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+#: actions/emailsettings.php:318
+#, fuzzy
+msgid "New incoming email address added."
+msgstr "Đã xác nhận địa chỉ này."
+
+#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
 msgid "New nickname"
 msgstr "Biệt hiệu mới"
 
-#: ../actions/newnotice.php:100
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:141
 msgid "New notice"
 msgstr "Thông báo mới"
 
-#: ../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/profilesettings.php:185
 msgid "New password"
 msgstr "Mật khẩu mới"
 
-#: ../actions/recoverpassword.php:275
+#: ../actions/recoverpassword.php:314
 msgid "New password successfully saved. You are now logged in."
 msgstr "Mật khẩu mới đã được lưu. Bạn có thể đăng nhập ngay bây giờ."
 
-#: ../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:108 actions/profilesettings.php:76
+#: actions/register.php:192
 msgid "Nickname"
 msgstr "Biệt danh"
 
-#: ../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/finishopenidlogin.php:192 actions/profilesettings.php:231
+#: actions/register.php:85
 msgid "Nickname already in use. Try another one."
 msgstr "Biệt hiệu này đã dùng rồi. Hãy nhập biệt hiệu khác."
 
-#: ../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:182 actions/profilesettings.php:209
+#: actions/register.php:83
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Biệt hiệu phải là chữ viết thường hoặc số và không có khoảng trắng."
 
-#: ../actions/finishopenidlogin.php:170
+#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:187
 msgid "Nickname not allowed."
 msgstr "Biệt hiệu không được cho phép."
 
-#: ../actions/remotesubscribe.php:72
+#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
 msgid "Nickname of the user you want to follow"
 msgstr "Biệt hiệu của thành viên mà bạn muốn theo"
 
-#: ../actions/recoverpassword.php:147
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
 msgid "Nickname or email"
 msgstr "Biệt hiệu hoặc email"
 
-#: ../actions/imsettings.php:147
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:104
+msgid "No"
+msgstr "Không"
+
+#: ../actions/imsettings.php:156 actions/imsettings.php:164
 msgid "No Jabber ID."
 msgstr "Không có Jabber ID."
 
-#: ../actions/userauthorization.php:128
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
 msgid "No authorization request!"
 msgstr "Không có yêu cầu!"
 
-#: ../actions/confirmaddress.php:33
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+#, fuzzy
+msgid "No carrier selected."
+msgstr "Bạn chưa chọn hình để đưa lên."
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+msgid "No code entered"
+msgstr "Không có mã nào được nhập"
+
+#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
 msgid "No confirmation code."
 msgstr "Không có mã số xác nhận."
 
-#: ../actions/newnotice.php:49
+#: ../actions/newnotice.php:44 actions/newmessage.php:53
+#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:52
+#: actions/newnotice.php:53
 msgid "No content!"
 msgstr "Không có nội dung!"
 
-#: ../actions/userbyid.php:27
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+#: actions/emailsettings.php:197
+#, fuzzy
+msgid "No email address."
+msgstr "Địa chỉ email của bạn"
+
+#: ../actions/userbyid.php:32 actions/userbyid.php:32
 msgid "No id."
 msgstr "Không có id."
 
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+#: actions/emailsettings.php:292
+#, fuzzy
+msgid "No incoming email address."
+msgstr "Địa chỉ email không hợp lệ."
+
 #: ../actions/finishremotesubscribe.php:65
+#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:66
 msgid "No nickname provided by remote server."
 msgstr "Không có biệt hiệu được cung cấp."
 
-#: ../actions/avatarbynickname.php:27
+#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 msgid "No nickname."
 msgstr "Không có biệt hiệu."
 
-#: ../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:243
 msgid "No pending confirmation to cancel."
 msgstr "Sự xác nhận chưa được hủy bỏ."
 
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+#, fuzzy
+msgid "No phone number."
+msgstr "Số điện thoại để nhắn SMS "
+
 #: ../actions/finishremotesubscribe.php:72
+#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:73
 msgid "No profile URL returned by server."
 msgstr "Không có URL cho hồ sơ để quay về."
 
-#: ../actions/recoverpassword.php:189
+#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
 msgid "No registered email address for that user."
 msgstr "Thành viên này đã không đăng ký địa chỉ email."
 
-#: ../actions/userauthorization.php:48
+#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
 msgid "No request found!"
 msgstr "Không tìm thấy yêu cầu nào!"
 
-#: ../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/noticesearch.php:68 actions/peoplesearch.php:59
 msgid "No results"
 msgstr "Không có kết quả nào"
 
-#: ../actions/avatarbynickname.php:32
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
 msgid "No size."
 msgstr "Không có kích thước."
 
-#: ../actions/openidsettings.php:135
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:109
+#: actions/twitapistatuses.php:438
+msgid "No status found with that ID."
+msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:411
+msgid "No status with that ID found."
+msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
+
+#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
 msgid "No such OpenID."
 msgstr "Không có OpenID nào."
 
-#: ../actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29
 msgid "No such document."
 msgstr "Không có tài liệu nào."
 
-#: ../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:38
+#: actions/shownotice.php:114
 msgid "No such notice."
 msgstr "Không có tin nhắn nào."
 
-#: ../actions/recoverpassword.php:56
+#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
 msgid "No such recovery code."
 msgstr "Không có mã khôi phục nào."
 
-#: ../actions/postnotice.php:56
+#: ../actions/postnotice.php:56 actions/postnotice.php:57
 msgid "No such subscription"
 msgstr "Không có đăng ký nào."
 
-#: ../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/all.php:34 ../actions/allrss.php:35
+#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:40
+#: ../actions/remotesubscribe.php:84 ../actions/remotesubscribe.php:91
+#: ../actions/replies.php:57 ../actions/repliesrss.php:35
+#: ../actions/showstream.php:110 ../actions/userbyid.php:36
+#: ../actions/userrss.php:35 ../actions/xrds.php:35 ../lib/gallery.php:57
+#: ../lib/subs.php:33 ../lib/subs.php:82 actions/all.php:34
+#: actions/allrss.php:35 actions/avatarbynickname.php:43
+#: actions/favoritesrss.php:35 actions/foaf.php:40 actions/ical.php:31
+#: actions/remotesubscribe.php:93 actions/remotesubscribe.php:100
+#: actions/replies.php:57 actions/repliesrss.php:35
+#: actions/showfavorites.php:34 actions/showstream.php:110
+#: actions/userbyid.php:36 actions/userrss.php:35 actions/xrds.php:35
+#: classes/Command.php:120 classes/Command.php:162 classes/Command.php:203
+#: classes/Command.php:237 lib/gallery.php:62 lib/mailbox.php:36
+#: lib/subs.php:33 lib/subs.php:95 actions/showstream.php:157
+#: classes/Command.php:208 classes/Command.php:242 lib/gallery.php:85
+#: lib/subs.php:105
 msgid "No such user."
 msgstr "Không có user nào."
 
-#: ../lib/gallery.php:76
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr ""
+"Không tìm thấy người dùng nào tương ứng với địa chỉ email hoặc username đó."
+
+#: ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
 msgstr "Không có ai!"
 
-#: ../actions/recoverpassword.php:60
+#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
 msgid "Not a recovery code."
 msgstr "Mã khôi phục không đúng."
 
-#: ../actions/imsettings.php:158
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+msgid "Not a registered user."
+msgstr "Không có người dùng nào đăng ký"
+
+#: ../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:423 lib/twitterapi.php:450
+#: lib/twitterapi.php:534
+msgid "Not a supported data format."
+msgstr "Không hỗ trợ định dạng dữ liệu này."
+
+#: ../actions/imsettings.php:167 actions/imsettings.php:175
 msgid "Not a valid Jabber ID"
 msgstr "Jabber ID không hợp lệ"
 
-#: ../lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131
 msgid "Not a valid OpenID."
 msgstr "OpenID không hợp lệ."
 
-#: ../actions/profilesettings.php:75
-#: ../actions/register.php:53
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+#: actions/emailsettings.php:208
+#, fuzzy
+msgid "Not a valid email address"
+msgstr "Địa chỉ email không hợp lệ."
+
+#: ../actions/register.php:63 actions/register.php:70 actions/register.php:79
 msgid "Not a valid email address."
 msgstr "Địa chỉ email không hợp lệ."
 
-#: ../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/profilesettings.php:212 actions/register.php:87
 msgid "Not a valid nickname."
 msgstr "Biệt hiệu không hợp lệ."
 
-#: ../actions/remotesubscribe.php:118
+#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
 msgid "Not a valid profile URL (incorrect services)."
 msgstr "Không phải là URL về hồ sơ cá nhân hợp lệ (dịch vụ không xác định)."
 
-#: ../actions/remotesubscribe.php:111
+#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr "Không phải là URL về hồ sơ cá nhân hợp lệ (chưa định nghĩa XRDS)."
 
-#: ../actions/remotesubscribe.php:104
+#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
 msgid "Not a valid profile URL (no YADIS document)."
-msgstr ""
-"Không phải là URL về hồ sơ cá nhân hợp lệ (không phải là "
+msgstr "Không phải là URL về hồ sơ cá nhân hợp lệ (không phải là "
 
-#: ../actions/avatar.php:95
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: actions/profilesettings.php:361
 msgid "Not an image or corrupt file."
 msgstr "File hỏng hoặc không phải là file ảnh."
 
 #: ../actions/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:52
 msgid "Not authorized."
 msgstr "Chưa được phép."
 
 #: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38
 msgid "Not expecting this response!"
 msgstr "Không mong đợi trả lời lại!"
 
-#: ../actions/finishaddopenid.php:29
-#: ../actions/logout.php:28
-#: ../actions/newnotice.php:29
-#: ../actions/subscribe.php:27
-#: ../actions/unsubscribe.php:24
-#: ../lib/settingsaction.php:27
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+#: actions/twitapistatuses.php:304
+msgid "Not found"
+msgstr "Không tìm thấy"
+
+#: ../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:31 actions/newnotice.php:30
+#: actions/nudge.php:30 actions/subedit.php:31 actions/unblock.php:31
 msgid "Not logged in."
 msgstr "Chưa đăng nhập."
 
-#: ../actions/unsubscribe.php:43
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:117
 msgid "Not subscribed!."
 msgstr "Chưa đăng nhận!"
 
-#: ../actions/showstream.php:82
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+#, fuzzy
+msgid "Notice Search"
+msgstr "Tin đã gửi"
+
+#: ../actions/showstream.php:82 actions/showstream.php:82
+#: actions/showstream.php:111 actions/showstream.php:118
+#: actions/showstream.php:123
 #, php-format
 msgid "Notice feed for %s"
 msgstr "Dòng tin nhắn cho %s"
 
-#: ../actions/shownotice.php:39
+#: ../actions/shownotice.php:39 actions/shownotice.php:39
+#: actions/shownotice.php:45
 msgid "Notice has no profile"
 msgstr "Tin nhắn không có hồ sơ cá nhân"
 
-#: ../actions/showstream.php:297
+#: ../actions/showstream.php:316 actions/showstream.php:331
+#: actions/showstream.php:379
 msgid "Notices"
 msgstr "Tin nhắn"
 
-#: ../actions/password.php:39
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
+#, fuzzy, php-format
+msgid "Notices tagged with %s"
+msgstr "Dòng tin nhắn cho %s"
+
+#: ../actions/password.php:39 actions/profilesettings.php:178
+#: actions/profilesettings.php:183
 msgid "Old password"
 msgstr "Mật khẩu cũ"
 
-#: ../lib/util.php:288
+#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
+#: lib/util.php:330 actions/deleteprofile.php:247 lib/util.php:340
 msgid "OpenID"
 msgstr "OpenID"
 
-#: ../actions/finishopenidlogin.php:61
+#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
 msgid "OpenID Account Setup"
 msgstr "Tạo tài khoản OpenID"
 
-#: ../lib/openid.php:180
+#: ../lib/openid.php:180 lib/openid.php:180
 msgid "OpenID Auto-Submit"
 msgstr "Tự động nhập OpenID"
 
-#: ../actions/finishaddopenid.php:99
-#: ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60
+#: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
+#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
+#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
+#: actions/finishopenidlogin.php:150 actions/openidlogin.php:76
 msgid "OpenID Login"
 msgstr "Đăng nhập OpenID"
 
-#: ../actions/openidlogin.php:65
-#: ../actions/openidsettings.php:49
+#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
+#: actions/openidlogin.php:74 actions/openidsettings.php:50
+#: actions/openidlogin.php:82
 msgid "OpenID URL"
 msgstr "OpenID URL"
 
-#: ../actions/finishaddopenid.php:42
-#: ../actions/finishopenidlogin.php:103
+#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
+#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 msgid "OpenID authentication cancelled."
 msgstr "Xác thực OpenID bị hủy."
 
-#: ../actions/finishaddopenid.php:46
-#: ../actions/finishopenidlogin.php:107
+#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
+#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "Xác thực OpendID bị lỗi: %s"
 
-#: ../lib/openid.php:133
+#: ../lib/openid.php:133 lib/openid.php:133
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "OpenID lỗi: %s"
 
-#: ../actions/openidsettings.php:144
+#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
 msgid "OpenID removed."
 msgstr "OpenID đã xóa."
 
-#: ../actions/openidsettings.php:37
+#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
 msgid "OpenID settings"
 msgstr "Cấu hình OpenID"
 
-#: ../actions/avatar.php:84
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr "Không bắt buộc phải thêm thông điệp vào thư mời."
+
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: actions/profilesettings.php:350
 msgid "Partial upload."
 msgstr "Upload từng phần."
 
-#: ../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/login.php:109 actions/register.php:194
 msgid "Password"
 msgstr "Mật khẩu"
 
-#: ../actions/recoverpassword.php:249
+#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
 msgid "Password and confirmation do not match."
 msgstr "Mật khẩu và mật khẩu xác nhận không khớp nhau."
 
-#: ../actions/recoverpassword.php:245
+#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
 msgid "Password must be 6 chars or more."
 msgstr "Mật khẩu phải nhiều hơn 6 ký tự."
 
-#: ../actions/recoverpassword.php:222
-#: ../actions/recoverpassword.php:224
+#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 msgid "Password recovery requested"
 msgstr "Yêu cầu khôi phục lại mật khẩu đã được gửi"
 
-msgid "Password recovery requested "
-msgstr "Yeu cau khoi phuc lai mat khau da duoc gui"
-
-#: ../actions/password.php:89
-#: ../actions/recoverpassword.php:274
+#: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: actions/profilesettings.php:408 actions/recoverpassword.php:326
+#: actions/profilesettings.php:437
 msgid "Password saved."
 msgstr "Đã lưu mật khẩu."
 
-#: ../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/profilesettings.php:409 actions/register.php:107
 msgid "Passwords don't match."
 msgstr "Mật khẩu không khớp."
 
-#: ../actions/peoplesearch.php:33
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+msgid "People"
+msgstr "Tên tài khoản"
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+#, fuzzy
+msgid "People Search"
+msgstr "Tìm kiếm nhiều người"
+
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
 msgid "People search"
 msgstr "Tìm kiếm nhiều người"
 
-#: ../lib/stream.php:44
+#: ../lib/stream.php:50 lib/personal.php:50
 msgid "Personal"
 msgstr "Cá nhân"
 
-#: ../actions/userauthorization.php:77
+#: ../actions/invite.php:133 actions/invite.php:141
+msgid "Personal message"
+msgstr "Tin nhắn cá nhân"
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr "Số điện thoại, không cho phép nhập dấu chấm và ký tự "
+
+#: ../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 ""
-"Vui lòng kiểm tra các chi tiết để chắc chắn rằng bạn muốn "
-"đăng nhận xem tin nhắn của các thành viên này. Nếu bạn "
-"không yêu cầu đăng nhận xem tin nhắn của họ, hãy nhấn \"Hủy bỏ\""
+"Vui lòng kiểm tra các chi tiết để chắc chắn rằng bạn muốn đăng nhận xem tin "
+"nhắn của các thành viên này. Nếu bạn không yêu cầu đăng nhận xem tin nhắn "
+"của họ, hãy nhấn \"Hủy bỏ\""
 
-#: ../actions/imsettings.php:74
+#: ../actions/imsettings.php:73 actions/imsettings.php:74
 msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr ""
-"Gửi một tin nhắn khi trạng thái của tôi trên Jabber hay GTalk "
+msgstr "Gửi một tin nhắn khi trạng thái của tôi trên Jabber hay GTalk "
 
-#: ../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
 msgid "Preferences"
 msgstr "Tính năng"
 
-#: ../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:185 actions/othersettings.php:179
 msgid "Preferences saved."
 msgstr "Các tính năng đã được lưu."
 
-#: ../lib/util.php:300
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
+msgid "Preferred language"
+msgstr "Ngôn ngữ bạn thích"
+
+#: ../lib/util.php:328 lib/util.php:344 lib/util.php:356
 msgid "Privacy"
 msgstr "Riêng tư"
 
-#: ../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:139 classes/Notice.php:149
 msgid "Problem saving notice."
 msgstr "Có lỗi xảy ra khi lưu tin nhắn."
 
-#: ../lib/stream.php:54
+#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
+#: lib/settingsaction.php:84 actions/deleteprofile.php:241
 msgid "Profile"
 msgstr "Hồ sơ "
 
-#: ../actions/remotesubscribe.php:73
+#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
 msgid "Profile URL"
 msgstr "URL của Hồ sơ cá nhân"
 
-#: ../actions/profilesettings.php:34
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
 msgid "Profile settings"
 msgstr "Các thiết lập cho Hồ sơ cá nhân"
 
-#: ../actions/postnotice.php:51
-#: ../actions/updateprofile.php:51
+#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
+#: actions/postnotice.php:52 actions/updateprofile.php:53
 msgid "Profile unknown"
 msgstr "Hồ sơ này không biết"
 
-#: ../lib/util.php:276
-msgid "Public"
-msgstr "Công cộng"
-
-#: ../actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:77
 msgid "Public Stream Feed"
 msgstr "Dòng tin công cộng"
 
-#: ../actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 lib/stream.php:34
 msgid "Public timeline"
 msgstr "Dòng tin công cộng"
 
-#: ../actions/recoverpassword.php:151
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr "Gửi MicroID đến địa chỉ Jabber/GTalk của tôi. "
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:104
+msgid "Publish a MicroID for my email address."
+msgstr "Xuất bản một MicroID đến địa chỉ email của tôi."
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr "Các từ khóa hiện tại"
+
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
 msgid "Recover"
 msgstr "Khôi phục"
 
-#: ../actions/recoverpassword.php:141
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
 msgid "Recover password"
 msgstr "Khôi phục mật khẩu"
 
-#: ../actions/recoverpassword.php:67
+#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
 msgid "Recovery code for unknown user."
 msgstr "Khôi phục lại code cho user không đăng ký."
 
-#: ../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:181 actions/register.php:234 lib/util.php:338
 msgid "Register"
 msgstr "Đăng ký"
 
-#: ../actions/userauthorization.php:119
+#: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:173
+#, fuzzy
+msgid "Registration not allowed."
+msgstr "Biệt hiệu không được cho phép."
+
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:241
+msgid "Registration successful"
+msgstr "Đăng ký thành công"
+
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
 msgid "Reject"
 msgstr "Từ chối"
 
-#: ../actions/login.php:99
-#: ../actions/register.php:183
+#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
+#: actions/register.php:190 actions/login.php:110 actions/openidlogin.php:85
+#: actions/register.php:217
 msgid "Remember me"
 msgstr "Nhớ tôi"
 
-#: ../actions/updateprofile.php:69
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
 msgid "Remote profile with no matching profile"
 msgstr "Hồ sơ ở nơi khác không khớp với hồ sơ này của bạn"
 
-#: ../actions/remotesubscribe.php:65
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
 msgid "Remote subscribe"
 msgstr "Đăng nhận từ xa"
 
-#: ../actions/imsettings.php:48
-#: ../actions/openidsettings.php:106
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
+#: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php:48 actions/emailsettings.php:76
+#: actions/imsettings.php:49 actions/openidsettings.php:108
+#: actions/smssettings.php:50 actions/smssettings.php:84
+#: actions/twittersettings.php:59 actions/twittersettings.php:61
 msgid "Remove"
 msgstr "Xóa"
 
-#: ../actions/openidsettings.php:68
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
 msgid "Remove OpenID"
 msgstr "Xóa OpenID"
 
@@ -1110,55 +1804,83 @@ msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
 msgstr ""
-"Việc xóa OpenID của bạn có thể sẽ không đăng nhập được! "
-"Nếu bạn cần xóa nó, hãy tạo một OpenID khác trước đã."
+"Việc xóa OpenID của bạn có thể sẽ không đăng nhập được! Nếu bạn cần xóa nó, "
+"hãy tạo một OpenID khác trước đã."
 
-#: ../lib/stream.php:49
+#: ../lib/stream.php:55 lib/personal.php:55
 msgid "Replies"
 msgstr "Trả lời"
 
-#: ../actions/replies.php:47
-#: ../actions/repliesrss.php:76
-#: ../lib/stream.php:50
+#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
+#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #, php-format
 msgid "Replies to %s"
 msgstr "Trả lời cho %s"
 
-#: ../actions/recoverpassword.php:168
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
 msgid "Reset"
 msgstr "Khởi tạo"
 
-#: ../actions/recoverpassword.php:158
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
 msgid "Reset password"
 msgstr "Khởi tạo lại mật khẩu"
 
-#: ../actions/recoverpassword.php:167
-#: ../actions/register.php:180
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/deleteprofile.php:250 actions/subscriptions.php:73
+msgid "SMS"
+msgstr "SMS"
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+msgid "SMS Phone number"
+msgstr "Số điện thoại để nhắn SMS "
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+msgid "SMS Settings"
+msgstr "Thiết lập SMS"
+
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:230
+msgid "SMS confirmation"
+msgstr "Xác nhận SMS"
+
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
 msgid "Same as password above"
 msgstr "Cùng mật khẩu ở trên"
 
-#: ../actions/imsettings.php:76
-#: ../actions/profilesettings.php:58
+#: ../actions/register.php:156 actions/register.php:170
+#: actions/register.php:197
+msgid "Same as password above. Required."
+msgstr "Cùng mật khẩu ở trên. Bắt buộc."
+
+#: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
+#: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
+#: actions/emailsettings.php:104 actions/imsettings.php:82
+#: actions/profilesettings.php:101 actions/smssettings.php:100
+#: actions/twittersettings.php:83 actions/emailsettings.php:107
+#: actions/othersettings.php:56 actions/profilesettings.php:106
+#: actions/subscriptions.php:74 actions/tagother.php:100
+#: actions/twittersettings.php:82
 msgid "Save"
 msgstr "LÆ°u"
 
-#: ../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/util.php:327
 msgid "Search"
 msgstr "Tìm kiếm"
 
-#: ../actions/noticesearch.php:80
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:84
 msgid "Search Stream Feed"
 msgstr "Tìm kiếm dòng thông tin"
 
-#: ../actions/noticesearch.php:30
+#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
+#: actions/noticesearch.php:29
 #, 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 ""
-"Tìm kiếm những tin nhắn trên %%site.name%% bằng nội dung. Chia "
-"các cụm từ cần tìm bởi khoảng trắng; và phải là 3 ký tự trở lên."
+"Tìm kiếm những tin nhắn trên %%site.name%% bằng nội dung. Chia các cụm từ "
+"cần tìm bởi khoảng trắng; và phải là 3 ký tự trở lên."
 
 #: ../actions/peoplesearch.php:28
 #, php-format
@@ -1166,170 +1888,276 @@ 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 ""
-"Tìm kiếm những người trên %%site.name%% bằng tên, vị trí, "
-"hoặc sở thích của họ. Chia các cụm từ bởi khoảng trắng; và phải là 3 ký tự trở lên."
+"Tìm kiếm những người trên %%site.name%% bằng tên, vị trí, hoặc sở thích của "
+"họ. Chia các cụm từ bởi khoảng trắng; và phải là 3 ký tự trở lên."
 
-#: ../lib/util.php:982
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+msgid "Select a carrier"
+msgstr "Chọn nhà cung cấp Mobile"
+
+#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
+#: lib/util.php:1306 lib/util.php:1731 lib/util.php:1646 lib/util.php:2158
 msgid "Send"
 msgstr "Gá»­i"
 
-#: ../actions/imsettings.php:71
+#: ../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."
+msgstr "Gửi email đến địa chỉ này để đưa tin nhắn mới lên."
+
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+msgid "Send me notices of new subscriptions through email."
+msgstr "Hãy gửi email cho tôi thông báo về các đăng nhận mới."
+
+#: ../actions/imsettings.php:70 actions/imsettings.php:71
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Hãy gửi tin nhắn đến tôi qua Jabber hay GTalk"
 
-#: ../lib/util.php:282
+#: ../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 ""
+"Hãy gửi thông báo đến tôi qua SMS; Tôi  biết là bạn đang phải trả giá cao "
+"cho dịch vụ của chúng tôi. "
+
+#: ../actions/imsettings.php:76 actions/imsettings.php:77
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr ""
+"Gửi những tin nhắn trả lời của tôi từ những người mà tôi không theo qua "
+"Jabber/GTalk."
+
+#: ../lib/util.php:304 lib/util.php:320 lib/util.php:330
 msgid "Settings"
 msgstr "Điều chỉnh"
 
-#: ../actions/profilesettings.php:183
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:336
 msgid "Settings saved."
 msgstr "Đã lưu các điều chỉnh."
 
-#: ../actions/finishaddopenid.php:66
+#: ../actions/tag.php:60 actions/tag.php:60 actions/tag.php:59
+msgid "Showing most popular tags from the last week"
+msgstr "Các từ khóa phổ biến."
+
+#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
 msgid "Someone else already has this OpenID."
 msgstr "Đã có người sử dụng OpenID này rồi."
 
-#: ../actions/finishopenidlogin.php:42
-#: ../actions/openidsettings.php:126
+#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
+#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
 msgid "Something weird happened."
 msgstr "Vài điều bất thường xảy ra."
 
-#: ../lib/util.php:302
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr "Xin lỗi, không có địa chỉ email cho phép."
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr "Xin lỗi, đó không phải là địa chỉ email mà bạn nhập vào."
+
+#: ../lib/util.php:330 lib/util.php:346 lib/util.php:358
 msgid "Source"
 msgstr "Nguồn"
 
-#: ../actions/showstream.php:277
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:359
 msgid "Statistics"
 msgstr "Số liệu thống kê"
 
-#: ../actions/finishopenidlogin.php:182
-#: ../actions/finishopenidlogin.php:275
+#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
+#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
+#: actions/finishopenidlogin.php:199 actions/finishopenidlogin.php:267
 msgid "Stored OpenID not found."
 msgstr "Không tìm thấy OpenID."
 
-#: ../actions/remotesubscribe.php:75
-#: ../actions/showstream.php:172
-#: ../actions/showstream.php:181
+#: ../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:254 lib/util.php:2078
 msgid "Subscribe"
 msgstr "Theo bạn này"
 
-#: ../actions/showstream.php:294
-#: ../actions/subscribers.php:27
+#: ../actions/showstream.php:313 ../actions/subscribers.php:27
+#: actions/showstream.php:328 actions/subscribers.php:27
+#: actions/showstream.php:376 lib/gallery.php:136 lib/gallery.php:137
 msgid "Subscribers"
 msgstr "Bạn này theo tôi"
 
-#: ../actions/showstream.php:294
-#: ../actions/subscribers.php:27
-msgid "Subscribers "
-msgstr "Theo tôi"
-
-#: ../actions/userauthorization.php:309
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
 msgid "Subscription authorized"
 msgstr "Đăng nhận được phép"
 
-#: ../actions/userauthorization.php:319
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
 msgid "Subscription rejected"
 msgstr "Đăng nhận từ chối"
 
-#: ../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:288 actions/showstream.php:370 lib/gallery.php:131
+#: lib/gallery.php:132
 msgid "Subscriptions"
 msgstr "Tôi theo bạn này"
 
-#: ../actions/showstream.php:212
-#: ../actions/showstream.php:288
-#: ../actions/subscriptions.php:27
-msgid "Subscriptions "
-msgstr "Tôi theo"
-
-#: ../actions/avatar.php:87
+#: ../actions/avatar.php:87 actions/profilesettings.php:324
+#: actions/profilesettings.php:353
 msgid "System error uploading file."
 msgstr "Hệ thống xảy ra lỗi trong khi tải file."
 
-#: ../actions/noticesearch.php:34
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317 actions/profilesettings.php:90 actions/showstream.php:382
+#: actions/tag.php:40 actions/tagother.php:96 actions/tagother.php:162
+#: lib/profilelist.php:126 lib/profilelist.php:128
+msgid "Tags"
+msgstr "Từ khóa"
+
+#: ../lib/searchaction.php:104 lib/searchaction.php:104
+msgid "Text"
+msgstr "Chuỗi bất kỳ"
+
+#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
+#: actions/noticesearch.php:33
 msgid "Text search"
 msgstr "Chuỗi cần tìm"
 
-#: ../actions/openidsettings.php:140
+#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
 msgid "That OpenID does not belong to you."
 msgstr "OpenID này không phải của bạn."
 
-#: ../actions/confirmaddress.php:52
+#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
 msgid "That address has already been confirmed."
 msgstr "Địa chỉ đó đã được xác nhận rồi."
 
-#: ../actions/confirmaddress.php:43
+#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
 msgid "That confirmation code is not for you!"
 msgstr "Mã xác nhận này không phải của bạn!"
 
-#: ../actions/avatar.php:80
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:214
+#, fuzzy
+msgid "That email address already belongs to another user."
+msgstr "Địa chỉ email GTalk này đã có người khác sử dụng rồi."
+
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: actions/profilesettings.php:346
 msgid "That file is too big."
 msgstr "File quá lớn."
 
-#: ../actions/imsettings.php:161
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
 msgid "That is already your Jabber ID."
 msgstr "Tài khoản đó đã là tên tài khoản Jabber của bạn rồi."
 
-#: ../actions/imsettings.php:224
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:211
+#, fuzzy
+msgid "That is already your email address."
+msgstr "Bạn đã dùng địa chỉ email này rồi"
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+#, fuzzy
+msgid "That is already your phone number."
+msgstr "Đó không phải là số điện thoại của bạn."
+
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
 msgid "That is not your Jabber ID."
 msgstr "Đây không phải Jabber ID của bạn."
 
-#: ../actions/imsettings.php:201
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+#: actions/emailsettings.php:270
+#, fuzzy
+msgid "That is not your email address."
+msgstr "Xin lỗi, đó không phải là địa chỉ email mà bạn nhập vào."
+
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+msgid "That is not your phone number."
+msgstr "Đó không phải là số điện thoại của bạn."
+
+#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
+#: actions/emailsettings.php:244 actions/imsettings.php:218
+#: actions/emailsettings.php:247
 msgid "That is the wrong IM address."
 msgstr "Sai IM."
 
-#: ../actions/newnotice.php:52
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+#, fuzzy
+msgid "That is the wrong confirmation number."
+msgstr "Đó không phải là số điện thoại của bạn."
+
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+#, fuzzy
+msgid "That phone number already belongs to another user."
+msgstr "Địa chỉ email Yahoo này đã có người khác sử dụng rồi."
+
+#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: actions/newnotice.php:49 actions/twitapistatuses.php:330
+#: actions/newnotice.php:61 actions/twitapistatuses.php:271
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "Quá dài. Tối đa là 140 ký tự."
 
-#: ../actions/confirmaddress.php:86
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+#: actions/twitapiaccount.php:55
+msgid "That's too long. Max notice size is 255 chars."
+msgstr "Tin nhắn quá dài. Chỉ được phép tối đa 255 ký tự."
+
+#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Địa chỉ \"%s\" đã được xác nhận từ tài khoản của bạn."
 
-#: ../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:285
 msgid "The address was removed."
 msgstr "Đã xóa địa chỉ."
 
-#: ../actions/userauthorization.php:311
+#: ../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 ""
-"Đăng nhận được phép, nhưng URL trả lại không được gởi "
-"trả. Hãy kiểm tra các hướng dẫn chi tiết trên site để "
-"biết cách cho phép đăng ký. Đăng nhận token của bạn là:"
+"Đăng nhận được phép, nhưng URL trả lại không được gởi trả. Hãy kiểm tra các "
+"hướng dẫn chi tiết trên site để biết cách cho phép đăng ký. Đăng nhận token "
+"của bạn là:"
 
-#: ../actions/userauthorization.php:321
+#: ../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 ""
-"Đăng nhận này đã bị từ chối, nhưng không có URL nào để "
-"quay về. Hãy kiểm tra các hướng dẫn chi tiết trên site để "
+"Đăng nhận này đã bị từ chối, nhưng không có URL nào để quay về. Hãy kiểm tra "
+"các hướng dẫn chi tiết trên site để "
 
-#: ../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 "Có nhiều người nghe theo lời nhắn của %s."
 
-#: ../actions/subscribers.php:33
+#: ../actions/subscribers.php:33 actions/subscribers.php:33
 msgid "These are the people who listen to your notices."
 msgstr "Có nhiều người nghe theo lời nhắn của bạn."
 
-#: ../actions/subscriptions.php:35
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Có nhiều người gửi lời nhắn để  %s nghe theo."
 
-#: ../actions/subscriptions.php:33
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
 msgid "These are the people whose notices you listen to."
 msgstr "Có nhiều người gửi lời nhắn để bạn nghe theo."
 
-#: ../actions/recoverpassword.php:87
+#: ../actions/invite.php:89 actions/invite.php:96
+msgid ""
+"These people are already users and you were automatically subscribed to them:"
+msgstr ""
+"Những người này đã là thành viên rồi và bạn chỉ cần nhấn nút \"Tôi theo "
+"người này\" để theo họ:"
+
+#: ../actions/recoverpassword.php:88
 msgid "This confirmation code is too old. Please start again."
 msgstr "Mã xác nhận quá cũ. Hãy thử lại cái khác."
 
@@ -1338,87 +2166,151 @@ msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
 msgstr ""
-"Trang này sẽ tự động gửi đi. Nếu không, hãy click lên nút "
-"Gửi để gửi đến nhà cung cấp OpenID của bạn."
+"Trang này sẽ tự động gửi đi. Nếu không, hãy click lên nút Gửi để gửi đến nhà "
+"cung cấp OpenID của bạn."
 
-#: ../actions/finishopenidlogin.php:56
+#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
 #, 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 ""
-"Đây là lần đầu tiên bạn đăng nhập vào %s, vì vậy chúng "
-"tôi phải kết nối tài khoản OpenID của bạn với tài khoản "
-"trên site này. Bạn có thể tạo một tài khoản mới, hoặc "
-"kết nối với tài khoản đã có của bạn, nếu như bạn đã có rồi."
+"Đây là lần đầu tiên bạn đăng nhập vào %s, vì vậy chúng tôi phải kết nối tài "
+"khoản OpenID của bạn với tài khoản trên site này. Bạn có thể tạo một tài "
+"khoản mới, hoặc kết nối với tài khoản đã có của bạn, nếu như bạn đã có rồi."
+
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:94
+#: actions/twitapifriendships.php:82 actions/twitapistatuses.php:428
+msgid "This method requires a POST or DELETE."
+msgstr "Phương thức này yêu cầu là POST hoặc DELETE"
+
+#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
+#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
+#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
+#: actions/twitapistatuses.php:303 actions/twitapiaccount.php:46
+#: actions/twitapidirect_messages.php:117 actions/twitapifriendships.php:30
+#: actions/twitapistatuses.php:239
+msgid "This method requires a POST."
+msgstr "Phương thức này yêu cầu là POST."
 
-#: ../lib/util.php:147
+#: ../lib/util.php:164 lib/util.php:246 lib/util.php:257
 msgid "This page is not available in a media type you accept"
 msgstr "Trang này không phải là phương tiện truyền thông mà bạn chấp nhận."
 
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
+msgid "Timezone"
+msgstr "Khu vá»±c"
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr ""
+
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"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 ""
+"Để đăng ký, bạn cần [Đăng nhập](%%action.login%%), hoặc [Đăng ký](%%action."
+"register%%) tài khoản mới. Nếu bạn đã có một tài khoản khác trên [site "
+"microblogging tương ứng](%%doc.openmublog%%), hãy nhập URL về hồ sơ cá nhân "
+"của bạn dưới đây."
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: actions/twitapifriendships.php:128
+msgid "Two user ids or screen_names must be supplied."
 msgstr ""
-"Để đăng ký, bạn cần [Đăng nhập](%%action.login%%), hoặc "
-"[Đăng ký](%%action.register%%) tài khoản mới. Nếu bạn đã có "
-"một tài khoản khác trên [site microblogging tương "
-"ứng](%%doc.openmublog%%), hãy nhập URL về hồ sơ cá nhân của bạn dưới đây."
 
-#: ../actions/profilesettings.php:51
+#: ../actions/profilesettings.php:48 ../actions/register.php:169
+#: actions/profilesettings.php:81 actions/register.php:183
+#: actions/profilesettings.php:83 actions/register.php:210
 msgid "URL of your homepage, blog, or profile on another site"
-msgstr ""
-"URL về Trang chính, Blog, hoặc hồ sơ cá nhân của bạn trên "
+msgstr "URL về Trang chính, Blog, hoặc hồ sơ cá nhân của bạn trên "
 
-#: ../actions/remotesubscribe.php:74
+#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL trong hồ sơ cá nhân của bạn ở trên các trang microblogging khác"
 
-#: ../actions/imsettings.php:105
-#: ../actions/recoverpassword.php:39
+#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
+#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
+#: actions/emailsettings.php:144 actions/imsettings.php:118
+#: actions/recoverpassword.php:39 actions/smssettings.php:143
+#: actions/twittersettings.php:108 actions/emailsettings.php:147
+#: actions/othersettings.php:146 actions/twittersettings.php:199
 msgid "Unexpected form submission."
 msgstr "Bất ngờ gửi mẫu thông tin. "
 
-#: ../actions/recoverpassword.php:237
+#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
 msgid "Unexpected password reset."
 msgstr "Bất ngờ reset mật khẩu."
 
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr "Không tìm thấy action"
+
 #: ../actions/finishremotesubscribe.php:58
+#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:59
 msgid "Unknown version of OMB protocol."
 msgstr "Không biết phiên bản của giao thức OMB."
 
-#: ../lib/util.php:245
+#: ../lib/util.php:269 lib/util.php:285 lib/util.php:296
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
 msgstr ""
-"Nếu không có các quy định khác, nội dung của trang web này có "
-"bản quyền của người đóng góp và theo bản quyền  "
+"Nếu không có các quy định khác, nội dung của trang web này có bản quyền của "
+"người đóng góp và theo bản quyền  "
 
-#: ../actions/confirmaddress.php:48
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr "Không nhận dạng kiểu địa chỉ %s"
 
-#: ../actions/showstream.php:193
+#: ../actions/showstream.php:209 actions/showstream.php:219
+#: actions/showstream.php:267 lib/util.php:2094
 msgid "Unsubscribe"
 msgstr "Hết theo"
 
-#: ../actions/postnotice.php:44
-#: ../actions/updateprofile.php:44
+#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
+#: actions/postnotice.php:45 actions/updateprofile.php:46
 msgid "Unsupported OMB version"
 msgstr "Không hỗ trợ cho version OMB"
 
-#: ../actions/avatar.php:105
+#: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: actions/profilesettings.php:371
 msgid "Unsupported image file format."
 msgstr "Không hỗ trợ kiểu file ảnh này."
 
-#: ../actions/avatar.php:68
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: actions/deleteprofile.php:251
+msgid "Updates by SMS"
+msgstr "Thay đổi bởi SMS"
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: actions/deleteprofile.php:254
+msgid "Updates by instant messenger (IM)"
+msgstr "Thay đổi bởi tin nhắn nhanh (IM)"
+
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/twitapistatuses.php:126
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:198
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
+
+#: ../actions/avatar.php:68 actions/profilesettings.php:161
+#: actions/profilesettings.php:166
 msgid "Upload"
 msgstr "Tải file"
 
@@ -1429,119 +2321,214 @@ msgid ""
 "site license, also. Use a picture that belongs to you and that you want to "
 "share."
 msgstr ""
-"Tải \"hình đại diện\" mới (hình cá nhân) tại đây. Bạn "
-"không thể chỉnh sửa lại hình sau khi tải nó lên, vì thế "
-"nếu muốn hãy sửa trước khi tải lên. Hình phải phù hợp "
+"Tải \"hình đại diện\" mới (hình cá nhân) tại đây. Bạn không thể chỉnh sửa "
+"lại hình sau khi tải nó lên, vì thế nếu muốn hãy sửa trước khi tải lên. Hình "
+"phải phù hợp "
+
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr "Tải lên một file ảnh mới cho hồ sơ cá nhân"
+
+#: ../actions/invite.php:114 actions/invite.php:121
+msgid ""
+"Use this form to invite your friends and colleagues to use this service."
+msgstr ""
+"Điền địa chỉ email và nội dung tin nhắn để gửi thư mời bạn bè và đồng nghiệp "
+"của bạn tham gia vào dịch vụ này."
 
-#: ../actions/profilesettings.php:48
-#: ../actions/register.php:182
+#: ../actions/register.php:159 ../actions/register.php:162
+#: actions/register.php:173 actions/register.php:176 actions/register.php:200
+#: actions/register.php:203
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Chỉ dùng để cập nhật, thông báo, và hồi phục mật khẩu"
 
 #: ../actions/finishremotesubscribe.php:86
+#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:92
 msgid "User being listened to doesn't exist."
 msgstr "Người dùng đang lắng nghe để không thoát khỏi."
 
-#: ../actions/all.php:41
-#: ../actions/avatarbynickname.php:48
-#: ../actions/foaf.php:43
-#: ../actions/replies.php:41
-#: ../actions/showstream.php:44
+#: ../actions/all.php:41 ../actions/avatarbynickname.php:48
+#: ../actions/foaf.php:47 ../actions/replies.php:41
+#: ../actions/showstream.php:44 ../actions/twitapiaccount.php:82
+#: ../actions/twitapistatuses.php:319 ../actions/twitapistatuses.php:685
+#: ../actions/twitapiusers.php:82 actions/all.php:41
+#: actions/avatarbynickname.php:48 actions/foaf.php:47 actions/replies.php:41
+#: actions/showfavorites.php:41 actions/showstream.php:44
+#: actions/twitapiaccount.php:80 actions/twitapifavorites.php:68
+#: actions/twitapistatuses.php:235 actions/twitapistatuses.php:609
+#: actions/twitapiusers.php:87 lib/mailbox.php:50 actions/showstream.php:57
+#: actions/twitapiaccount.php:63 actions/twitapifavorites.php:40
+#: actions/twitapistatuses.php:163 actions/twitapistatuses.php:492
+#: lib/twitterapi.php:590
 msgid "User has no profile."
 msgstr "Người dùng không có thông tin."
 
-#: ../actions/remotesubscribe.php:71
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
 msgid "User nickname"
 msgstr "Biệt hiệu của người dùng"
 
-#: ../lib/util.php:969
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr "Không tìm thấy user."
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
+msgid "What timezone are you normally in?"
+msgstr "Khu vực nào bạn thường ở?"
+
+#: ../lib/util.php:1159 lib/util.php:1293 lib/util.php:1630
 #, php-format
 msgid "What's up, %s?"
 msgstr "Bạn đang làm gì thế, %s?"
 
-#: ../lib/util.php:969
-#, php-format
-msgid "%s, Tell the world what's on your mind?"
-msgstr "%s, bạn đang làm gì?"
-
-#: ../actions/profilesettings.php:57
-msgid "City, State/Region, Country"
-msgstr "Thành phố, Tỉnh thành, Quốc gia"
+#: ../actions/profilesettings.php:54 ../actions/register.php:175
+#: actions/profilesettings.php:87 actions/register.php:189
+#: actions/profilesettings.php:89 actions/register.php:216
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr "Bạn ở đâu, \"Thành phố, Tỉnh thành, Quốc gia\""
 
-#: ../actions/updateprofile.php:127
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Kiểu file ảnh không phù hợp với  '%s'"
 
-#: ../actions/updateprofile.php:122
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Kích thước file ảnh không phù hợp đối với  '%s'"
 
-#: ../actions/finishaddopenid.php:64
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+#: actions/block.php:105
+msgid "Yes"
+msgstr "Có"
+
+#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
 msgid "You already have this OpenID!"
 msgstr "Bạn đã có được tài khoản OpenID này rồi!"
 
-#: ../actions/recoverpassword.php:31
+#: ../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 "Bạn muốn xóa tin nhắn này? Sau khi xóa, bạn không thể lấy lại được."
+
+#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
 msgid "You are already logged in!"
 msgstr "Bạn đã đăng nhập!"
 
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr "Bạn đã theo những người này:"
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:102
+#, fuzzy
+msgid "You are not friends with the specified user."
+msgstr "Bạn đã theo những người này:"
+
 #: ../actions/password.php:27
 msgid "You can change your password here. Choose a good one!"
 msgstr "Bạn có thể thay đổi mật khẩu tại đây. Hãy chọn mật khẩu mới!"
 
-#: ../actions/register.php:164
+#: ../actions/register.php:135 actions/register.php:145
 msgid "You can create a new account to start posting notices."
 msgstr "Bạn có thể tạo tài khoản mới để có thể gửi ý kiến của mình."
 
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr "Bạn có thể nhận tin nhắn SMS qua email từ %%site.name%%."
+
 #: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr ""
-"Bạn có thể loại bỏ OpenID khỏi tài khoản của bạn bằng "
-"cách nhấn vào nút \"Xóa\"."
+"Bạn có thể loại bỏ OpenID khỏi tài khoản của bạn bằng cách nhấn vào nút \"Xóa"
+"\"."
 
-#: ../actions/imsettings.php:28
+#: ../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 ""
-"Bạn có thể gửi và nhận những tin nhắn qua Jabber hoặc GTalk "
-"[tin nhắn nhanh](%%doc.im%%). Định dạng địa chỉ của bạn và các thiết lập sau."
+"Bạn có thể gửi và nhận những tin nhắn qua Jabber hoặc GTalk [tin nhắn nhanh]"
+"(%%doc.im%%). Định dạng địa chỉ của bạn và các thiết lập sau."
 
 #: ../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 ""
-"Bạn có thể cập nhật hồ sơ cá nhân tại đây để mọi "
-"người có thể biết thông tin về bạn."
+"Bạn có thể cập nhật hồ sơ cá nhân tại đây để mọi người có thể biết thông tin "
+"về bạn."
 
-#: ../actions/finishremotesubscribe.php:31
-#: ../actions/remotesubscribe.php:31
+#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
+#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
+#: actions/finishremotesubscribe.php:83 actions/finishremotesubscribe.php:99
 msgid "You can use the local subscription!"
 msgstr "Bạn có thể đăng ký tại nơi bạn ở!"
 
-#: ../actions/finishopenidlogin.php:33
-#: ../actions/register.php:51
+#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
+#: actions/finishopenidlogin.php:38 actions/register.php:68
+#: actions/register.php:77
 msgid "You can't register if you don't agree to the license."
 msgstr "Bạn không thể đăng ký nếu không đồng ý các điều khoản."
 
-#: ../actions/updateprofile.php:62
+#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
 msgid "You did not send us that profile"
 msgstr "Bạn chưa cập nhật thông tin riêng"
 
-#: ../actions/recoverpassword.php:134
+#: ../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 ""
+"Bạn có địa chỉ mới để gửi tin nhắn trên %1$s.\n"
+"\n"
+"Hãy gửi email đến %2$s để  có thể nhắn tin.\n"
+"\n"
+"Bạn có thể đọc hướng dẫn tại %3$s.\n"
+"\n"
+"Chúc sức khỏe,\n"
+"%4$s"
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: actions/twitapistatuses.php:455
+msgid "You may not delete another user's status."
+msgstr "Bạn đã không xóa trạng thái của những người khác."
+
+#: ../actions/invite.php:31 actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr "Bạn phải đăng nhập vào mới có thể gửi thư mời những "
+
+#: ../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!"
+msgstr ""
+"Bạn sẽ nhận được thông báo khi những người được bạn mời nhận lời mời và đăng "
+"ký vào trang web này. Cảm ơn bạn "
+
+#: ../actions/recoverpassword.php:149
 msgid "You've been identified. Enter a  new password below. "
 msgstr "Bạn đã được xác định. Hãy nhập mật khẩu mới ở dưới."
 
-#: ../actions/openidlogin.php:67
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:84
 msgid "Your OpenID URL"
 msgstr "OpenID URL của bạn"
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:164
 msgid "Your nickname on this server, or your registered email address."
 msgstr "Biệt hiệu của bạn đã tồn tại hoặc bạn đã đăng ký bằng email này rồi."
 
@@ -1551,1607 +2538,1970 @@ 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%%) đăng nhập nhiều website với cùng 1 tài "
-"khoản. Quản lý các OpenID của bạn ở đây."
+"[OpenID](%%doc.openid%%) đăng nhập nhiều website với cùng 1 tài khoản. Quản "
+"lý các OpenID của bạn ở đây."
 
-#: ../lib/util.php:814
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:1287
 msgid "a few seconds ago"
 msgstr "vài giây trước"
 
-#: ../lib/util.php:826
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:1299
 #, php-format
 msgid "about %d days ago"
 msgstr "%d ngày trước"
 
-#: ../lib/util.php:822
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:1295
 #, php-format
 msgid "about %d hours ago"
 msgstr "%d giờ trước"
 
-#: ../lib/util.php:818
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:1291
 #, php-format
 msgid "about %d minutes ago"
 msgstr "%d phút trước"
 
-#: ../lib/util.php:830
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:1303
 #, php-format
 msgid "about %d months ago"
 msgstr "%d tháng trước"
 
-#: ../lib/util.php:824
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:1297
 msgid "about a day ago"
 msgstr "1 ngày trước"
 
-#: ../lib/util.php:816
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:1289
 msgid "about a minute ago"
 msgstr "1 phút trước"
 
-#: ../lib/util.php:828
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:1301
 msgid "about a month ago"
 msgstr "1 tháng trước"
 
-#: ../lib/util.php:832
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:1305
 msgid "about a year ago"
 msgstr "1 năm trước"
 
-#: ../lib/util.php:820
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:1293
 msgid "about an hour ago"
 msgstr "1 giờ trước"
 
-#: ../actions/noticesearch.php:126
-#: ../actions/showstream.php:383
-#: ../lib/stream.php:101
+#: ../actions/showstream.php:423 ../lib/stream.php:132
+#: actions/showstream.php:441 lib/stream.php:99 lib/noticelist.php:211
+msgid "delete"
+msgstr ""
+
+#: ../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:135
+#: lib/facebookaction.php:202 lib/noticelist.php:189
 msgid "in reply to..."
 msgstr "còn nữa..."
 
-#: ../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:142
+#: lib/noticelist.php:199
 msgid "reply"
 msgstr "trả lời"
 
-#: ../actions/password.php:44
+#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/profilesettings.php:188
 msgid "same as password above"
 msgstr "cùng mật khẩu ở trên"
 
-#: ../lib/util.php:1127
-msgid "After"
+#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+#: actions/twitapistatuses.php:543
+#, fuzzy
+msgid "unsupported file type"
+msgstr "Không hỗ trợ kiểu file ảnh này."
+
+#: ../lib/util.php:1309 lib/util.php:1443 lib/facebookaction.php:251
+#: lib/util.php:1783
+#, fuzzy
+msgid "« After"
 msgstr "Sau"
 
-#: ../lib/util.php:
-msgid "Tags"
-msgstr "Từ khóa"
-
-#: ../lib/util.php:
-msgid "Register for a free account!"
-msgstr "Đăng ký tài khoản miễn phí!"
+#: 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:38 actions/deleteprofile.php:127 actions/disfavor.php:47
+#: actions/emailsettings.php:130 actions/favor.php:49 actions/login.php:45
+#: actions/newmessage.php:44 actions/newnotice.php:36 actions/nudge.php:47
+#: actions/othersettings.php:139 actions/profilesettings.php:49
+#: actions/subedit.php:38 actions/tagother.php:113
+#: actions/twittersettings.php:188 actions/unblock.php:38
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Có lỗi xảy ra khi thao tác. Hãy thử lại lần nữa."
 
-#: ../lib/util.php:
-msgid "Everyone"
-msgstr "Tất cả mọi người"
+#: actions/disfavor.php:55
+#, fuzzy
+msgid "This notice is not a favorite!"
+msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của bạn rồi!"
 
-#: ../lib/util.php:
-msgid "Welcome to %s"
-msgstr "%s chào mừng bạn "
+#: actions/disfavor.php:63
+#, fuzzy
+msgid "Could not delete favorite."
+msgstr "Không thể tạo favorite."
 
-#: ../lib/util.php:
-msgid "Blog + Chat = Fun"
-msgstr "Vừa Blog vừa Chat = Vui Lắm"
+#: actions/disfavor.php:72
+#, fuzzy
+msgid "Favor"
+msgstr "Ưa thích"
 
-#: ../lib/util.php:
-msgid ""
-"%s is a new way to send short messages to your friends, family, and "
-"co-workers."
+#: actions/emailsettings.php:92
+msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
-"%s là dịch vụ cho bạn bè, gia đình và đồng nghiệp liên "
-"lạc và kết nối qua những trao đổi ngắn."
+"Gửi email thông báo tôi khi có ai đó lưu tin nhắn của tôi vào danh sách ưa "
+"thích của họ."
 
-#: ../lib/util.php:
-msgid ""
-"Starting a conversation is fast and easy: You can shout messages to your "
-"followers, or whisper to your friends. Just think of something to say, and "
-"get started!"
-msgstr ""
-"Để bắt đầu cuộc đàm luận: Bạn có thể gửi tin nhắn "
-"đến những người mà bạn theo, hoặc gửi những mong ước "
-"của bạn đến bạn bè, những câu trả lời thông thường cho một câu hỏi đơn giản: Bạn đang làm gì vậy? "
+#: actions/emailsettings.php:95
+msgid "Send me email when someone sends me a private message."
+msgstr "Gửi email báo cho tôi biết khi có ai đó gửi tin nhắn riêng cho tôi."
 
-#: ../lib/util.php:
-msgid "Register now!"
-msgstr "Hãy đăng ký ngay!"
+#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:54
+#: actions/twitapifavorites.php:115
+msgid "This notice is already a favorite!"
+msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của bạn rồi!"
 
-#: ../lib/util.php:
-msgid "What's the latest?"
-msgstr "Mọi người đang nói gì?"
+#: actions/favor.php:60 actions/twitapifavorites.php:151
+#: classes/Command.php:132 actions/favor.php:61
+#: actions/twitapifavorites.php:122
+msgid "Could not create favorite."
+msgstr "Không thể tạo favorite."
 
-#: ../lib/util.php:
-msgid "What Everyone Is Talking About"
-msgstr "Mọi người đang nói gì?"
+#: actions/favor.php:70
+msgid "Disfavor"
+msgstr "Không thích"
 
-#: ../lib/searchaction.php:
-msgid "People"
-msgstr "Tên tài khoản"
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:62
+#, php-format
+msgid "%s favorite notices"
+msgstr "%s ưa thích các tin nhắn"
 
-#: ../lib/searchaction.php:
-msgid "Find people on this site"
-msgstr "Tìm kiếm mọi người trên trang web này"
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:66
+#, fuzzy, php-format
+msgid "Feed of favorite notices of %s"
+msgstr "Tìm kiếm các tin nhắn ưa thích của %s"
 
-#: ../lib/searchaction.php:
-msgid "Text"
-msgstr "Chuỗi bất kỳ"
+#: actions/inbox.php:28
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr "Hộp thư đến của %s - trang %d"
 
-#: ../lib/util.php:
-msgid "Find content of notices"
-msgstr "Tìm theo nội dung của tin nhắn"
+#: actions/inbox.php:30
+#, php-format
+msgid "Inbox for %s"
+msgstr "Hộp thư đến của %s"
 
-#: ../actions/tag.php:
-msgid "Showing most popular tags from the last week"
-msgstr "Các từ khóa phổ biến."
+#: actions/inbox.php:53
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr "Đây là hộp thư đến của bạn, bao gồm các tin nhắn gửi đến riêng cho bạn"
 
-#: ../actions/tag.php:
-msgid "Recent Tags"
-msgstr "Các từ khóa hiện tại"
+#: actions/invite.php:178
+#, fuzzy, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+msgstr "%1$s moi ban tham gia vao %2$s"
 
-#: ../actions/profileseting.php:
-msgid "What timezone are you normally in?"
-msgstr "Khu vực nào bạn thường ở?"
+#: actions/login.php:104 actions/login.php:111 actions/openidlogin.php:86
+#, fuzzy
+msgid "Automatically login in the future; "
+msgstr "Sẽ tự động đăng nhập, không dành cho các máy sử dụng chung!"
 
-#: ../actions/profileseting.php:
-msgid "Timezone"
-msgstr "Khu vá»±c"
+#: actions/login.php:122 actions/login.php:130
+#, fuzzy
+msgid "For security reasons, please re-enter your "
+msgstr ""
+"Vì lý do bảo mật, bạn hãy nhập lại tên đăng nhập và mật khẩu trước khi thay "
+"đổi trong điều chỉnh."
 
-#: ../actions/profileseting.php:
-msgid "Language"
-msgstr "Ngôn ngữ"
+#: actions/login.php:126 actions/login.php:134
+#, fuzzy
+msgid "Login with your username and password. "
+msgstr "Sai tên đăng nhập hoặc mật khẩu."
 
-#: ../actions/profileseting.php:
-msgid "Preferred language"
-msgstr "Ngôn ngữ bạn thích"
+#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+#: actions/newmessage.php:60 actions/twitapidirect_messages.php:136
+#, fuzzy
+msgid "That's too long. Max message size is 140 chars."
+msgstr "Quá dài. Tối đa là 140 ký tự."
+
+#: actions/newmessage.php:65 actions/newmessage.php:68
+msgid "No recipient specified."
+msgstr ""
+
+#: actions/newmessage.php:68 actions/newmessage.php:113
+#: classes/Command.php:206 actions/newmessage.php:71
+#: actions/newmessage.php:116 classes/Command.php:211
+#, fuzzy
+msgid "You can't send a message to this user."
+msgstr "Bạn đã theo những người này:"
 
-#: ../actions/profileseting.php:
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209 actions/newmessage.php:74
+#: actions/twitapidirect_messages.php:153 classes/Command.php:214
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
-msgstr "Tự động theo những người nào đăng ký theo tôi"
+"Don't send a message to yourself; just say it to yourself quietly instead."
+msgstr ""
 
-#: ../actions/profileseting.php:
-msgid "Could not save profile."
-msgstr "Không thể lưu hồ sơ cá nhân."
+#: actions/newmessage.php:108 actions/microsummary.php:32
+#: actions/newmessage.php:111
+#, fuzzy
+msgid "No such user"
+msgstr "Không có user nào."
 
-#: ../lib/setingactions.php:
-msgid "Change your profile settings"
-msgstr "Thay đổi các thiết lập trong hồ sơ cá nhân của bạn"
+#: actions/newmessage.php:117 actions/newmessage.php:120
+#, fuzzy
+msgid "New message"
+msgstr "Tin mới nhất"
 
-#: ../lib/setingactions.php:
-msgid "Change email handling"
-msgstr "Đang thực hiện việc thay đổi email"
+#: actions/noticesearch.php:95 actions/noticesearch.php:94
+#, fuzzy
+msgid "Notice without matching profile"
+msgstr "Hồ sơ ở nơi khác không khớp với hồ sơ này của bạn"
 
-#: ../lib/setingactions.php:
-msgid "Upload a new profile image"
-msgstr "Tải lên một file ảnh mới cho hồ sơ cá nhân"
+#: actions/openidsettings.php:28
+#, fuzzy, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgstr ""
+"[OpenID](%%doc.openid%%) đăng nhập nhiều website với cùng 1 tài khoản. Quản "
+"lý các OpenID của bạn ở đây."
 
-#: ../lib/setingactions.php:
-msgid "Change your password"
-msgstr "Thay đổi mật khẩu của bạn"
+#: actions/openidsettings.php:46
+#, fuzzy
+msgid "If you want to add an OpenID to your account, "
+msgstr ""
+"Bạn muốn thêm một OpenId vào tài khoản của bạn, đánh nó vào hộp dưới đây và "
+"nhấn\" Thêm\"."
 
-#: ../lib/setingactions.php:
-msgid "Add or remove OpenIDs"
-msgstr "Thêm mới hoặc xóa OpenIDs"
+#: actions/openidsettings.php:74
+#, fuzzy
+msgid "Removing your only OpenID would make it impossible to log in! "
+msgstr ""
+"Việc xóa OpenID của bạn có thể sẽ không đăng nhập được! Nếu bạn cần xóa nó, "
+"hãy tạo một OpenID khác trước đã."
 
-#: ../lib/setingactions.php:
-msgid "Updates by SMS"
-msgstr "Thay đổi bởi SMS"
+#: actions/openidsettings.php:87
+#, fuzzy
+msgid "You can remove an OpenID from your account "
+msgstr ""
+"Bạn có thể loại bỏ OpenID khỏi tài khoản của bạn bằng cách nhấn vào nút \"Xóa"
+"\"."
 
-#: ../lib/setingactions.php:
-msgid "Updates by instant messenger (IM)"
-msgstr "Thay đổi bởi tin nhắn nhanh (IM)"
+#: actions/outbox.php:28
+#, php-format
+msgid "Outbox for %s - page %d"
+msgstr "Hộp thư gửi đi của %s - trang %d"
 
-#: ../lib/smsseting.php:
-msgid "SMS Phone number"
-msgstr "Số điện thoại để nhắn SMS "
+#: actions/outbox.php:30
+#, php-format
+msgid "Outbox for %s"
+msgstr "Hộp thư đi của %s"
 
-#: ../lib/smsseting.php:
-msgid "Phone number, no punctuation or spaces, with area code"
+#: actions/outbox.php:53
+msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
-"Số điện thoại, không cho phép nhập dấu chấm và ký tự "
+"Hộp thư gửi đi của bạn, bao gồm danh sách các tin nhắn gửi trực tiếp mà bạn "
+"đã gửi."
 
-#: ../lib/smsseting.php:
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr "Bạn có thể nhận tin nhắn SMS qua email từ %%site.name%%."
+#: actions/peoplesearch.php:28
+#, fuzzy, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+msgstr ""
+"Tìm kiếm những người trên %%site.name%% bằng tên, vị trí, hoặc sở thích của "
+"họ. Chia các cụm từ bởi khoảng trắng; và phải là 3 ký tự trở lên."
 
-#: ../lib/smsseting.php:
-msgid "SMS Settings"
-msgstr "Thiết lập SMS"
+#: actions/profilesettings.php:27
+#, fuzzy
+msgid "You can update your personal profile info here "
+msgstr ""
+"Bạn có thể cập nhật hồ sơ cá nhân tại đây để mọi người có thể biết thông tin "
+"về bạn."
+
+#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
+#: actions/userauthorization.php:159 actions/userrss.php:76
+#: actions/profilesettings.php:120 actions/remotesubscribe.php:333
+#, fuzzy
+msgid "User without matching profile"
+msgstr "Hồ sơ ở nơi khác không khớp với hồ sơ này của bạn"
 
-#: ../lib/smsseting.php:
-msgid "Current confirmed SMS-enabled phone number."
-msgstr "SMS xác nhận ngay - đã cho phép gửi qua điện thoại. "
+#: actions/recoverpassword.php:91
+#, fuzzy
+msgid "This confirmation code is too old. "
+msgstr "Mã xác nhận quá cũ. Hãy thử lại cái khác."
 
-#: ../lib/smsseting.php:
-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/recoverpassword.php:141
+msgid "If you've forgotten or lost your"
 msgstr ""
-"Nhà cung cấp dịch vụ điện thoại di động của bạn. Nếu "
-"bạn biết nhà cung cấp dịch vụ điện thoại nào cho phép "
-"nhận SMS qua email  mà chưa có trong danh sách này, vui lòng gửi mail cho chúng tôi đến địa chỉ %s."
 
-#: ../lib/smsseting.php:
-msgid "No code entered"
-msgstr "Không có mã nào được nhập"
+#: actions/recoverpassword.php:154
+#, fuzzy
+msgid "You've been identified. Enter a "
+msgstr "Bạn đã được xác định. Hãy nhập mật khẩu mới ở dưới."
 
-#: ../lib/smsseting.php:
-msgid "Select a carrier"
-msgstr "Chọn nhà cung cấp Mobile"
+#: actions/recoverpassword.php:169
+#, fuzzy
+msgid "Your nickname on this server, "
+msgstr "Biệt hiệu của bạn đã tồn tại hoặc bạn đã đăng ký bằng email này rồi."
 
-#: ../lib/smsseting.php:
-msgid "That is not your phone number."
-msgstr "Đó không phải là số điện thoại của bạn."
+#: actions/recoverpassword.php:271
+#, fuzzy
+msgid "Instructions for recovering your password "
+msgstr "Sai tên đăng nhập hoặc mật khẩu."
+
+#: actions/recoverpassword.php:327
+#, fuzzy
+msgid "New password successfully saved. "
+msgstr "Mật khẩu mới đã được lưu. Bạn có thể đăng nhập ngay bây giờ."
+
+#: actions/register.php:95 actions/register.php:104
+#, fuzzy
+msgid "Password must be 6 or more characters."
+msgstr "Mật khẩu phải nhiều hơn 6 ký tự."
 
-#: ../lib/smsseting.php:
+#: actions/register.php:216 actions/register.php:243
+#, php-format
 msgid ""
-"Send me notices through SMS; I understand I may incur exorbitant charges "
-"from my carrier."
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to..."
 msgstr ""
-"Hãy gửi thông báo đến tôi qua SMS; Tôi  biết là bạn đang "
-"phải trả giá cao cho dịch vụ của chúng tôi. "
 
-#: ../lib/imseting.php:
-msgid "Send me replies through Jabber/GTalk from people I’m not subscribed to."
+#: actions/register.php:227 actions/register.php:254
+#, fuzzy
+msgid "(You should receive a message by email momentarily, with "
 msgstr ""
-"Gửi tin nhắn trả lời những người mà tôi không đăng ký qua "
+"(Bạn sẽ nhận email thông báo, hãy đọc hướng dẫn để xác nhận địa chỉ email "
+"của bạn.)"
 
-#: ../lib/imseting.php:
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Gửi MicroID đến địa chỉ Jabber/GTalk của tôi. "
+#: actions/remotesubscribe.php:51
+#, php-format
+msgid "To subscribe, you can [login](%%action.login%%),"
+msgstr ""
 
-#: ../lib/emailseting.php:
-msgid "Manage how you get email from %%site.name%%."
-msgstr "Bạn nhận email từ %%site.name%% như thế nào."
+#: actions/showfavorites.php:61
+#, php-format
+msgid "Feed for favorites of %s"
+msgstr "Tìm kiếm các tin nhắn ưa thích của %s"
 
-#: ../lib/emailseting.php:
-msgid "Send me notices of new subscriptions through email."
-msgstr "Hãy gửi email cho tôi thông báo về các đăng nhận mới."
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:88 actions/twitapifavorites.php:57
+msgid "Could not retrieve favorite notices."
+msgstr "Không thể lấy lại các tin nhắn ưa thích"
 
-#: ../lib/emailseting.php:
-msgid "I want to post notices by email."
-msgstr "Tôi muốn đưa tin nhắn lên bằng email."
+#: actions/showmessage.php:33
+msgid "No such message."
+msgstr "Không có tin nhắn nào."
 
-#: ../lib/emailseting.php:
-msgid "Publish a MicroID for my email address."
-msgstr "Xuất bản một MicroID đến địa chỉ email của tôi."
+#: actions/showmessage.php:42
+#, fuzzy
+msgid "Only the sender and recipient may read this message."
+msgstr "Chỉ có người gửi hoặc người nhận mới có thể xem tin nhắn này"
 
-#: ../lib/emailseting.php:
-msgid "Make a new email address for posting to; cancels the old one."
+#: actions/showmessage.php:61
+#, php-format
+msgid "Message to %1$s on %2$s"
 msgstr ""
-"Tạo một địa chỉ email mới để đưa tin nhắn lên; và xóa "
-
-#: ../lib/emailseting.php:
-msgid "Send email to this address to post new notices."
-msgstr "Gửi email đến địa chỉ này để đưa tin nhắn mới lên."
 
-#: ../actions/choosetheme.php:
-msgid ""
-"You can change the theme as you want by clicking a thumbnail image and then "
-"click Save button to active new theme."
+#: actions/showmessage.php:66
+#, php-format
+msgid "Message from %1$s on %2$s"
 msgstr ""
-"Bạn có thể thay đổi theme bằng cách chọn vào một hình ảnh "
-"theme bạn thích. Sau đó nhấn nút Lưu để thay đổi theme mới."
 
-#: ../actions/choosetheme.php:
-msgid "Choose a theme"
-msgstr "Chọn theme"
+#: actions/showstream.php:154 lib/util.php:2105
+#, fuzzy
+msgid "Send a message"
+msgstr "Tin nhắn cá nhân"
 
-#: ../actions/choosetheme.php:
-msgid "Theme Error"
-msgstr "Lỗi Theme"
+#: actions/smssettings.php:312
+#, php-format
+msgid "Mobile carrier for your phone. "
+msgstr ""
 
-#: ../actions/choosetheme.php:
-msgid ""
-"Tired of the same old colors on your timeline? Change is good so spice up "
-"your %s page."
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:64
+#, fuzzy, php-format
+msgid "Direct messages to %s"
+msgstr "Tin nhắn riêng"
+
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:65
+#, php-format
+msgid "All the direct messages sent to %s"
 msgstr ""
-"Nếu cảm thấy nhàm chán với màu sắc cũ trên timeline của "
-"bạn, hãy thay đổi màu sắc để trang %s của bạn hấp dẫn hơn."
 
-#: ../actions/choosetheme.php:
-msgid "Preview"
-msgstr "Xem trước"
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:69
+#, fuzzy
+msgid "Direct Messages You've Sent"
+msgstr "Tin nhắn riêng"
 
-#: ../actions/choosetheme.php:
-msgid "Background Theme:"
-msgstr "Background Theme:"
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:70
+#, fuzzy, php-format
+msgid "All the direct messages sent from %s"
+msgstr "Bạn có tin nhắn riêng từ %s"
 
-#: ../actions/choosetheme.php:
-msgid "Customize your theme"
-msgstr "Tùy chỉnh theme "
+#: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:132
+#, fuzzy
+msgid "No message text!"
+msgstr "Không có tin nhắn nào."
 
-#: ../actions/choosetheme.php:
-msgid "Timeline Theme:"
-msgstr "Timeline Theme:"
+#: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:145
+#, fuzzy
+msgid "Recipient user not found."
+msgstr "Không tìm thấy user."
 
-#: ../actions/choosetheme.php:
-msgid "Dashboard Theme:"
-msgstr "Dashboard Theme:"
+#: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:148
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
 
-#: ../actions/choosetheme.php:
-msgid "Theme"
-msgstr "Theme"
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:64
+#, fuzzy, php-format
+msgid "%s / Favorites from %s"
+msgstr "Tìm kiếm các tin nhắn ưa thích của %s"
 
-#: ../actions/public.php:
-msgid "Activity"
-msgstr "Các hoạt động"
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:67
+#, fuzzy, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr "Tất cả các cập nhật của %s"
 
-#: ../actions/public.php:
-msgid "Me & My Friends"
-msgstr "Tôi & bạn"
+#: actions/twitapifavorites.php:187 lib/mail.php:275
+#: actions/twitapifavorites.php:158 lib/mail.php:303
+#, php-format
+msgid "%s added your notice as a favorite"
+msgstr "%s da them tin nhan cua ban vao danh sach tin nhan ua thich"
 
-#: ../actions/public.php:
-msgid "User & Friends"
-msgstr "Nhóm bạn"
+#: actions/twitapifavorites.php:188 lib/mail.php:276
+#: actions/twitapifavorites.php:159 lib/mail.php:304
+#, fuzzy, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+msgstr "%s da them tin nhan cua ban vao danh sach tin nhan ua thich"
 
-#: ../actions/public.php:
-msgid "My Profile"
-msgstr "Cá nhân"
+#: actions/twittersettings.php:27 actions/twittersettings.php:29
+#, fuzzy
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
+msgstr ""
+"Hãy đăng ký tài khoản Twitter của bạn để có thể gửi tin nhắn đến Twitter, "
+"bạn cũng có thể  đăng ký theo các bạn của mình trên Twitter tại đây."
 
-#: ../actions/public.php:
-msgid "User Profile"
-msgstr "Hồ sơ"
+#: actions/twittersettings.php:41 actions/twittersettings.php:43
+msgid "Twitter settings"
+msgstr "Thiết lập tài khoản Twitter"
 
-#: ../actions/css.php:
-msgid "Customize your page even more with CSS"
-msgstr "Tùy chỉnh trang của bạn bằng CSS"
+#: actions/twittersettings.php:48 actions/twittersettings.php:50
+msgid "Twitter Account"
+msgstr "Tài khoản Twitter"
 
-#: ../actions/css.php:
-msgid "Save Changes"
-msgstr "LÆ°u"
+#: actions/twittersettings.php:56 actions/twittersettings.php:58
+msgid "Current verified Twitter account."
+msgstr "Tài khoản Twitter đã được xác nhận."
 
-#: ../actions/css.php:
-msgid "Change css code"
-msgstr "Thay đổi code css"
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
+msgstr "Tên tài khoản Twitter"
 
-#: ../actions/css.php:
-msgid "You can change your css code here."
-msgstr "Bạn có thể thay đổi code css"
+#: actions/twittersettings.php:65
+msgid "No spaces, please."
+msgstr "Không nhập ký tự trắng."
 
-#: ../actions/css.php:
-msgid "New css code saved."
-msgstr "CSS đã được lưu."
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
+msgstr "Mật khẩu Twitter"
 
-#: ../lib/util.php:
-msgid "Reply"
-msgstr "Trả lời"
+#: actions/twittersettings.php:72
+msgid "Automatically send my notices to Twitter."
+msgstr "Tự động gửi tin nhắn của tôi đến Twitter."
 
-#: ../actions/avatar.php:
-msgid "Upload from your computer"
-msgstr "Tải từ máy tính cá nhân  "
+#: actions/twittersettings.php:75
+msgid "Send local \"@\" replies to Twitter."
+msgstr ""
 
-#: ../actions/avatar.php:
-msgid "Get from library"
-msgstr "Lấy từ tập ảnh có sẵn"
+#: actions/twittersettings.php:78
+msgid "Subscribe to my Twitter friends here."
+msgstr "Đăng ký theo những bạn trên Twitter tại đây."
 
-#: ../actions/avatar.php:
-msgid "Male"
-msgstr "Nam"
+#: actions/twittersettings.php:122 actions/twittersettings.php:216
+#, fuzzy
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
+msgstr ""
+"Tên tài khoản phải là các chữ số, chữ cái thường hoặc viết hoa, hoặc là dấu "
+"gạch dưới (_)."
 
-#: ../actions/avatar.php:
-msgid "Female"
-msgstr "Nữ"
+#: actions/twittersettings.php:128 actions/twittersettings.php:221
+msgid "Could not verify your Twitter credentials!"
+msgstr "Không thể xác nhận tài khoản Twitter của bạn!"
 
-#: ../dasboard.php:
-msgid "Last message"
-msgstr "Tin mới nhất"
+#: actions/twittersettings.php:137 actions/twittersettings.php:228
+#, fuzzy, php-format
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgstr "Không thể lấy thông tin tài khoản của '%s' từ Twitter."
 
-#: ../stream.php:
-msgid "No reply yet"
-msgstr "chưa có trả lời"
+#: actions/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:234 actions/twittersettings.php:253
+msgid "Unable to save your Twitter settings!"
+msgstr "Không thể lưu thông tin Twitter của bạn!"
 
-msgid "replies"
-msgstr "trả lời"
+#: actions/twittersettings.php:174 actions/twittersettings.php:261
+#, fuzzy
+msgid "Twitter settings saved."
+msgstr "Thiết lập tài khoản Twitter"
 
-#: ../actions/showstream.php:400
-#: ../lib/stream.php:109
-msgid " from "
-msgstr " từ"
+#: actions/twittersettings.php:192 actions/twittersettings.php:272
+msgid "That is not your Twitter account."
+msgstr "Không phải là tài khoản Twitter của bạn."
 
-#: ../actions/invite.php:168
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s moi ban tham gia vao %2$s"
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:280
+msgid "Couldn't remove Twitter user."
+msgstr "Không thể xóa tài khoản Twitter."
 
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-"%1$s mời bạn tham gia vào %2$s (%3$s).\n"
-"\n"
-"%2$s là dịch vụ tin nhắn nhanh giúp bạn liên kết với người "
-"quen và những người yêu thích bạn.\n"
-"\n"
-"Bạn cũng có thể chia sẻ những suy nghĩ, thông tin về bạn, "
-"hoặc đời sống của bạn lên trên mạng cho những người quen "
-"của bạn biết. Dịch vụ này cũng giúp bạn gặp gỡ những "
-"người chưa quen biết nhưng có cùng sở thích.\n"
-"\n"
-"%1$s nói:\n"
-"\n"
-"%4$s\n"
-"\n"
-"Bạn có thể tham khảo trang thông tin cá nhân của  %1$s trên  "
-"%2$s tại đây:\n"
-"\n"
-"%5$s\n"
-"\n"
-"Nếu bạn muốn sử dụng dịch vụ này, hãy nhấn chuột vào "
-"liên kết dưới đây để chấp nhận lời mời.\n\n%6$s\n\nNếu không thích tham gia, bạn có thể bỏ qua tin nhắn này. Rất cảm ơn sự kiên nhẫn vì đã làm mất thời gian của bạn.\n\nThân, %2$s\n"
+#: actions/twittersettings.php:212 actions/twittersettings.php:284
+msgid "Twitter account removed."
+msgstr "Tài khoản Twitter đã xóa."
+
+#: actions/twittersettings.php:225 actions/twittersettings.php:239
+#: actions/twittersettings.php:299 actions/twittersettings.php:310
+#: actions/twittersettings.php:322
+msgid "Couldn't save Twitter preferences."
+msgstr "Không thể lưu các yêu cầu cho tài khoản Twitter. "
 
-#: ../actions/invite.php:84
-#: ../actions/invite.php:92
-#, php-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: actions/twittersettings.php:245 actions/twittersettings.php:330
+msgid "Twitter preferences saved."
+msgstr "Các yêu cầu cho tài khoản Twitter đã lưu"
 
-#: ../actions/invite.php:131
-msgid "Addresses of friends to invite (one per line)"
+#: actions/userauthorization.php:84
+msgid "Please check these details to make sure "
 msgstr ""
-"Các địa chỉ email của những người bạn muốn mời (mỗi "
-"địa chỉ nằm trên 1 dòng)"
-
-#: ../actions/twitapifriendships.php:60
-#: ../actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
 
-#: ../actions/recoverpassword.php:102
-msgid "Could not update user with confirmed email address."
-msgstr "Không thể cập nhật thông tin user với địa chỉ email đã được xác nhận."
+#: actions/userauthorization.php:324
+#, fuzzy
+msgid "The subscription has been authorized, but no "
+msgstr "Đăng nhận được phép"
 
-#: ../actions/twitapistatuses.php:93
-msgid "Couldn't find any statuses."
-msgstr "Không tìm thấy bất kỳ trạng thái nào."
+#: actions/userauthorization.php:334
+#, fuzzy
+msgid "The subscription has been rejected, but no "
+msgstr "Đăng nhận từ chối"
 
-#: ../actions/invite.php:129
-msgid "Email addresses"
-msgstr "Địa chỉ email"
+#: classes/Channel.php:113 classes/Channel.php:129
+#, fuzzy
+msgid "Command results"
+msgstr "Không có kết quả nào"
 
-#: ../lib/settingsaction.php:102
-msgid "IM"
-msgstr "IM"
+#: classes/Channel.php:148 classes/Channel.php:175
+msgid "Command complete"
+msgstr ""
 
-#: ../actions/invite.php:55
-#, php-format
-msgid "Invalid email address: %s"
-msgstr "Địa chỉ email không đúng:%s"
+#: classes/Channel.php:158 classes/Channel.php:185
+#, fuzzy
+msgid "Command failed"
+msgstr " và bạn bè"
 
-#: ../actions/invite.php:79
-msgid "Invitation(s) sent"
-msgstr "Thư mời đã gửi"
+#: classes/Command.php:39
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
 
-#: ../actions/invite.php:97
-msgid "Invitation(s) sent to the following people:"
-msgstr "Thư mời đã gửi đến:"
+#: classes/Command.php:96
+#, fuzzy, php-format
+msgid "Subscriptions: %1$s\n"
+msgstr "Tôi theo"
 
-#: ../lib/util.php:306
-msgid "Invite"
-msgstr "Thư mời"
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:247
+#, fuzzy
+msgid "User has no last notice"
+msgstr "Người dùng không có thông tin."
 
-#: ../actions/invite.php:123
-msgid "Invite new users"
-msgstr "Gửi thư mời đến những người chưa có tài khoản"
+#: classes/Command.php:146
+#, fuzzy
+msgid "Notice marked as fave."
+msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của bạn rồi!"
 
-#: ../actions/twitapistatuses.php:595
-msgid "No status found with that ID."
-msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
+#: classes/Command.php:166
+#, fuzzy, php-format
+msgid "%1$s (%2$s)"
+msgstr "%s (%s)"
 
-#: ../actions/twitapistatuses.php:555
-msgid "No status with that ID found."
-msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
+#: classes/Command.php:169
+#, fuzzy, php-format
+msgid "Fullname: %s"
+msgstr "Tên đầy đủ"
 
-#: ../actions/recoverpassword.php:211
-msgid "No user with that email address or username."
-msgstr ""
-"Không tìm thấy người dùng nào tương ứng với địa chỉ "
-"email hoặc username đó."
+#: classes/Command.php:172
+#, fuzzy, php-format
+msgid "Location: %s"
+msgstr "Thành phố"
 
-#: ../scripts/maildaemon.php:50
-msgid "Not a registered user."
-msgstr "Không có người dùng nào đăng ký"
+#: classes/Command.php:175
+#, fuzzy, php-format
+msgid "Homepage: %s"
+msgstr "Trang chủ hoặc Blog"
 
-#: ../lib/twitterapi.php:226
-#: ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332
-msgid "Not a supported data format."
-msgstr "Không hỗ trợ định dạng dữ liệu này."
+#: classes/Command.php:178
+#, fuzzy, php-format
+msgid "About: %s"
+msgstr "Giới thiệu"
 
-#: ../actions/twitapistatuses.php:422
-msgid "Not found"
-msgstr "Không tìm thấy"
+#: classes/Command.php:200 classes/Command.php:202
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
+msgstr ""
 
-#: ../actions/invite.php:135
-msgid "Optionally add a personal message to the invitation."
-msgstr "Không bắt buộc phải thêm thông điệp vào thư mời."
+#: classes/Command.php:214 classes/Command.php:219
+#, fuzzy, php-format
+msgid "Direct message to %s sent"
+msgstr "Tin nhắn riêng"
 
-#: ../actions/invite.php:133
-msgid "Personal message"
-msgstr "Tin nhắn cá nhân"
+#: classes/Command.php:216 classes/Command.php:221
+#, fuzzy
+msgid "Error sending direct message."
+msgstr "Thư bạn đã gửi"
 
-#: ../lib/settingsaction.php:99
-msgid "SMS"
-msgstr "SMS"
+#: classes/Command.php:263 classes/Command.php:268
+msgid "Specify the name of the user to subscribe to"
+msgstr ""
 
-#: ../scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr "Xin lỗi, không có địa chỉ email cho phép."
+#: classes/Command.php:270 classes/Command.php:275
+#, fuzzy, php-format
+msgid "Subscribed to %s"
+msgstr "Theo nhóm này"
 
-#: ../scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
-msgstr "Xin lỗi, đó không phải là địa chỉ email mà bạn nhập vào."
+#: classes/Command.php:288 classes/Command.php:293
+msgid "Specify the name of the user to unsubscribe from"
+msgstr ""
 
-#: ../actions/twitapiaccount.php:74
-msgid "That's too long. Max notice size is 255 chars."
-msgstr "Tin nhắn quá dài. Chỉ được phép tối đa 255 ký tự."
+#: classes/Command.php:295 classes/Command.php:300
+#, fuzzy, php-format
+msgid "Unsubscribed from %s"
+msgstr "Hết theo"
 
-#: ../actions/invite.php:89
-msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
+#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:315
+#: classes/Command.php:335
+msgid "Command not yet implemented."
 msgstr ""
-"Những người này đã là thành viên rồi và bạn chỉ cần "
-"nhấn nút \"Tôi theo người này\" để theo họ:"
 
-#: ../actions/twitapifriendships.php:108
-#: ../actions/twitapistatuses.php:586
-msgid "This method requires a POST or DELETE."
-msgstr "Phương thức này yêu cầu là POST hoặc DELETE"
+#: classes/Command.php:313 classes/Command.php:318
+#, fuzzy
+msgid "Notification off."
+msgstr "Không có mã số xác nhận."
 
-#: ../actions/twitapiaccount.php:65
-#: ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381
-msgid "This method requires a POST."
-msgstr "Phương thức này yêu cầu là POST."
+#: classes/Command.php:315 classes/Command.php:320
+msgid "Can't turn off notification."
+msgstr ""
 
-#: ../index.php:57
-msgid "Unknown action"
-msgstr "Không tìm thấy action"
+#: classes/Command.php:333 classes/Command.php:338
+#, fuzzy
+msgid "Notification on."
+msgstr "Không có mã số xác nhận."
 
-#: ../actions/invite.php:114
-msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
+#: classes/Command.php:335 classes/Command.php:340
+msgid "Can't turn on notification."
 msgstr ""
-"Điền địa chỉ email và nội dung tin nhắn để gửi thư mời "
-"bạn bè và đồng nghiệp của bạn tham gia vào dịch vụ này."
 
-#: ../actions/twitapiusers.php:75
-msgid "User not found."
-msgstr "Không tìm thấy user."
+#: classes/Command.php:344 classes/Command.php:349
+msgid "Commands:\n"
+msgstr ""
 
-#: ../actions/invite.php:81
-msgid "You are already subscribed to these users:"
-msgstr "Bạn đã theo những người này:"
+#: classes/Message.php:53
+#, fuzzy
+msgid "Could not insert message."
+msgstr "Không thể chèn thêm vào đăng nhận."
 
-#: ../actions/twitapistatuses.php:612
-msgid "You may not delete another user's status."
-msgstr "Bạn đã không xóa trạng thái của những người khác."
+#: classes/Message.php:63
+#, fuzzy
+msgid "Could not update message with new URI."
+msgstr "Không thể cập nhật thông tin user với địa chỉ email đã được xác nhận."
+
+#: lib/gallery.php:46 lib/gallery.php:55
+#, fuzzy
+msgid "User without matching profile in system."
+msgstr "Hồ sơ ở nơi khác không khớp với hồ sơ này của bạn"
 
-#: ../actions/invite.php:31
+#: lib/mail.php:147 lib/mail.php:141
 #, php-format
-msgid "You must be logged in to invite other users to use %s"
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
 msgstr ""
-"Bạn phải đăng nhập vào mới có thể gửi thư mời những "
 
-#: ../actions/invite.php:103
+#: lib/mail.php:249 lib/mail.php:275
+#, php-format
+msgid "New private message from %s"
+msgstr "Bạn có tin nhắn riêng từ %s"
+
+#: lib/mail.php:253 lib/mail.php:279
+#, php-format
 msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+msgstr ""
+
+#: lib/mailbox.php:43
+msgid "Only the user can read their own mailboxes."
 msgstr ""
-"Bạn sẽ nhận được thông báo khi những người được bạn "
-"mời nhận lời mời và đăng ký vào trang web này. Cảm ơn bạn "
 
-#: ..lib/personal.php:
+#: lib/openid.php:195
+msgid "This form should automatically submit itself. "
+msgstr ""
+
+#: lib/personal.php:65
 msgid "Favorites"
 msgstr "Ưa thích"
 
-#: ..lib/personal.php:
+#: lib/personal.php:66
+#, php-format
 msgid "%s's favorite notices"
 msgstr "Những tin nhắn ưa thích của %s"
 
-#: ..lib/personal.php:
+#: lib/personal.php:66
+msgid "User"
+msgstr ""
+
+#: lib/personal.php:75
 msgid "Inbox"
 msgstr "Hộp thư đến"
 
-#: ..lib/personal.php:
+#: lib/personal.php:76
 msgid "Your incoming messages"
 msgstr "Thư đến của bạn"
 
-#: ..lib/personal.php:
+#: lib/personal.php:80
 msgid "Outbox"
 msgstr "Hộp thư đi"
 
-#: ..lib/personal.php:
+#: lib/personal.php:81
 msgid "Your sent messages"
 msgstr "Thư bạn đã gửi"
 
-#: ..actions/inbox.php:
-msgid "Inbox for %s - page %d"
-msgstr "Hộp thư đến của %s - trang %d"
-
-#: ..actions/inbox.php:
-msgid "Inbox for %s"
-msgstr "Hộp thư đến của %s"
-
-#: ..actions/inbox.php:
-msgid "This is your inbox, which lists your incoming private messages."
-msgstr "Đây là hộp thư đến của bạn, bao gồm các tin nhắn gửi đến riêng cho bạn"
-
-#: ..actions/outbox.php:
-msgid "Outbox for %s - page %d"
-msgstr "Hộp thư gửi đi của %s - trang %d"
+#: lib/settingsaction.php:99 actions/deleteprofile.php:256
+#, fuzzy
+msgid "Twitter"
+msgstr "Tài khoản Twitter"
 
-#: ..actions/outbox.php:
-msgid "Outbox for %s"
-msgstr "Hộp thư đi của %s"
+#: lib/settingsaction.php:100 actions/deleteprofile.php:257
+msgid "Twitter integration options"
+msgstr "Các lựa chọn để tích hợp với Twitter "
 
-#: ..actions/outbox.php:
-msgid "This is your outbox, which lists private messages you have sent."
+#: lib/util.php:1718 lib/util.php:2145
+msgid "To"
 msgstr ""
-"Hộp thư gửi đi của bạn, bao gồm danh sách các tin nhắn gửi "
-"trực tiếp mà bạn đã gửi."
-
-#: ..actions/showfavorites.php:
-msgid "%s favorite notices"
-msgstr "%s ưa thích các tin nhắn"
-
-#: ..actions/showfavorites.php:
-msgid "Feed for favorites of %s"
-msgstr "Tìm kiếm các tin nhắn ưa thích của %s"
 
-#: ..actions/showfavorites.php:
-msgid "Could not retrieve favorite notices."
-msgstr "Không thể lấy lại các tin nhắn ưa thích"
+#: scripts/maildaemon.php:45
+#, fuzzy
+msgid "Could not parse message."
+msgstr "Không thể cập nhật thành viên."
 
-#: ..actions/favor.php:
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Có lỗi xảy ra khi thao tác. Hãy thử lại lần nữa."
+#: actions/block.php:45 actions/subedit.php:45 actions/unblock.php:45
+msgid "No profile specified."
+msgstr ""
 
-#: ..actions/favor.php:
-msgid "Could not create favorite."
-msgstr "Không thể tạo favorite."
+#: actions/block.php:52 actions/subedit.php:52 actions/tagother.php:45
+#: actions/unblock.php:52
+#, fuzzy
+msgid "No profile with that ID."
+msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
 
-#: ..actions/favor.php:
-msgid "Disfavor"
-msgstr "Không thích"
+#: actions/block.php:78
+#, fuzzy
+msgid "Block user"
+msgstr "Ban user"
 
-#: ..actions/favor.php:
-msgid "This notice is already a favorite!"
-msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của bạn rồi!"
+#: actions/block.php:81
+#, fuzzy
+msgid "Are you sure you want to block this user? "
+msgstr "Bạn có chắc chắn là muốn xóa tin nhắn này không?"
 
-#: ..actions/inbox.php:
-msgid "%s added your notice as a favorite"
-msgstr "%s da them tin nhan cua ban vao danh sach tin nhan ua thich"
+#: actions/block.php:117
+#, fuzzy
+msgid "You have already blocked this user."
+msgstr "Bạn đã theo những người này:"
 
-#: ..actions/inbox.php:
-msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
-"In case you forgot, you can see the text of your notice here:\n"
-"\n"
-"%3$s\n"
-"\n"
-"You can see the list of %1$s's favorites here:\n"
-"\n"
-"%4$s\n"
-"\n"
-"Faithfully yours,\n"
-"%5$s\n"
+#: actions/block.php:124
+msgid "Failed to save block information."
 msgstr ""
-"%1$s vừa thêm tin nhắn của bạn trên %2$s vào danh sách tin "
-"nhắn ưa thích của mình.\n"
-"\n"
-"Bạn có thể xem lại nội dung tin nhắn của bạn tại "
-"đây:\n"
-"\n"
-"%3$s\n"
-"\n"
-"Bạn có thể xem danh sách tin nhắn ưa thích của %1$s tại đây: \n\n%4$s\n\nChúc sức khỏe,\n%5$s\n"
-
-#: ../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
-msgid "API method not found!"
-msgstr "Phương thức API không tìm thấy!"
 
-#: ../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
-msgid "API method under construction."
-msgstr "Phương thức API dưới cấu trúc có sẵn."
+#: actions/deleteprofile.php:25
+#, fuzzy
+msgid "Code not yet ready."
+msgstr "Không thể tạo favorite."
 
-#: ../actions/register.php:176
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#: actions/deleteprofile.php:36
+msgid "Export and delete your user information."
 msgstr ""
-"1-64 chữ cái thường hoặc là chữ số, không có dấu chấm hay "
-"khoảng trắng. Bắt buộc."
-
-#: ../lib/Mailbox.php
-msgid "Direct Messages"
-msgstr "Tin nhắn riêng"
 
-#: ../.php
-msgid "Notices sent"
-msgstr "Tin đã gửi"
+#: actions/deleteprofile.php:88 actions/deleteprofile.php:119
+#, fuzzy
+msgid "Delete my account"
+msgstr "Tạo tài khoản mới"
 
-#: ../action/deletenotice.php
-msgid "Delete notice"
-msgstr "Xóa tin nhắn"
+#: actions/deleteprofile.php:89
+#, fuzzy
+msgid "Delete my account confirmation"
+msgstr "Không thể xóa email xác nhận."
 
-#: ../action/deletenotice.php
-msgid ""
-"You are about to permanently delete a notice.  Once this is done, it cannot "
-"be undone."
-msgstr "Bạn muốn xóa tin nhắn này? Sau khi xóa, bạn không thể lấy lại được."
+#: actions/deleteprofile.php:117
+#, fuzzy
+msgid "Check if you are sure you want to delete your account."
+msgstr "Bạn có chắc chắn là muốn xóa tin nhắn này không?"
 
-#: ../action/deletenotice.php
-msgid "No"
-msgstr "Không"
+#: actions/deleteprofile.php:259 lib/settingsaction.php:102
+#, fuzzy
+msgid "Other"
+msgstr "Sau"
 
-#: ../action/deletenotice.php
-msgid "Yes"
-msgstr "Có"
+#: actions/deleteprofile.php:260 lib/settingsaction.php:103
+msgid "Other options"
+msgstr ""
 
-#: ../action/deletenotice.php
-msgid "Are you sure you want to delete this notice?"
-msgstr "Bạn có chắc chắn là muốn xóa tin nhắn này không?"
+#: actions/disfavor.php:72
+#, fuzzy
+msgid "Add to favorites"
+msgstr "Tìm kiếm các tin nhắn ưa thích của %s"
 
-#: ..//.php
-msgid "Flagged notices"
-msgstr "Các tin nhắn bị cảnh báo"
+#: actions/emailsettings.php:98
+msgid "Allow friends to nudge me and send me an email."
+msgstr ""
 
-#: ..//.php
-msgid "flag this notice"
-msgstr "cảnh báo tin nhắn"
+#: actions/facebookremove.php:54
+#, fuzzy
+msgid "Couldn't remove Facebook user."
+msgstr "Không thể xóa tài khoản Twitter."
 
-#: ..//.php
-msgid "Flag a notice"
-msgstr "Cảnh báo tin nhắn"
+#: actions/favor.php:71
+#, fuzzy
+msgid "Disfavor favorite"
+msgstr "Không thích"
 
-#: ..//.php
-msgid "Flag this notice?"
-msgstr "Bạn muốn cảnh báo tin nhắn này?"
+#: actions/favorited.php:31 lib/stream.php:45
+#, fuzzy
+msgid "Popular notices"
+msgstr "Các tin nhắn bị cảnh báo"
 
-#: ..//.php
-msgid ""
-"If you think this notice is an offensive message, please notify to the "
-"administrator. Thank you."
-msgstr ""
-"Nếu bạn nghĩ tin nhắn này có nội dung xấu không chấp nhận "
-"được, hãy báo cho ban quản trị web site. Cảm ơn rất nhiều."
+#: actions/favorited.php:54
+#, fuzzy
+msgid "Showing recently popular notices"
+msgstr "Tìm theo nội dung của tin nhắn"
 
-#. ./lib/util.php
-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)."
+#: actions/featured.php:32 actions/featured.php:54 lib/stream.php:41
+msgid "Featured users"
 msgstr ""
-"Saigonica là bản sửa đổi của phiên bản [Laconica "
-"0.6.0](http://laconi.ca/),  phát hành theo bản quyền [GNU Affero "
-"General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
-msgid ""
-"To use this [Saigonica version](%%doc.source%%), you must write the license "
-"is of Laconica and has contributions from Saigonica."
+#: actions/finishremotesubscribe.php:186
+msgid "That user has blocked you from subscribing."
 msgstr ""
-"Để sử dụng [phiên bản Saigonica](%%doc.source%%) này, cần ghi "
-"rõ bản quyền của Laconia cộng thêm sự đóng góp của Saigonica."
 
-#. ./.php
-msgid "Send me email when someone adds my notice as a favorite."
+#: actions/microsummary.php:39
+msgid "No current status"
 msgstr ""
-"Gửi email thông báo tôi khi có ai đó lưu tin nhắn của tôi vào "
-"danh sách ưa thích của họ."
-
-#. ./.php
-msgid "Send me email when someone sends me a private message."
-msgstr "Gửi email báo cho tôi biết khi có ai đó gửi tin nhắn riêng cho tôi."
-
-#. ./.php
-msgid "Current verified Twitter account."
-msgstr "Tài khoản Twitter đã được xác nhận."
-
-#. ./.php
-msgid "Subscribe to my Twitter friends here."
-msgstr "Đăng ký theo những bạn trên Twitter tại đây."
 
-#. ./.php
-msgid "Twitter Account"
-msgstr "Tài khoản Twitter"
+#: actions/newnotice.php:93
+#, fuzzy
+msgid "Notice posted"
+msgstr "Tin đã gửi"
 
-#. ./.php
-msgid "Twitter settings"
-msgstr "Thiết lập tài khoản Twitter"
+#: actions/newnotice.php:116 classes/Channel.php:140
+#, fuzzy
+msgid "Ajax Error"
+msgstr "Lỗi"
 
-#. ./.php
+#: actions/nudge.php:52
 msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, and "
-"subscribe to Twitter friends already here."
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
-"Hãy đăng ký tài khoản Twitter của bạn để có thể gửi tin "
-"nhắn đến Twitter, bạn cũng có thể  đăng ký theo các bạn của mình trên Twitter tại đây."
-
-#. ./.php
-msgid "No spaces, please."
-msgstr "Không nhập ký tự trắng."
 
-#. ./.php
-msgid "Twitter Password"
-msgstr "Mật khẩu Twitter"
+#: actions/nudge.php:61
+#, fuzzy
+msgid "Nudge sent"
+msgstr "Tin đã gửi"
 
-#. ./.php
-msgid "That is not your Twitter account."
-msgstr "Không phải là tài khoản Twitter của bạn."
+#: actions/othersettings.php:27
+msgid "Manage various other options."
+msgstr ""
 
-#. ./.php
-msgid "Couldn't remove Twitter user."
-msgstr "Không thể xóa tài khoản Twitter."
+#: actions/othersettings.php:33
+#, fuzzy
+msgid "Other Settings"
+msgstr "Thiết lập tài khoản Twitter"
 
-#. ./.php
-msgid "Twitter account removed."
-msgstr "Tài khoản Twitter đã xóa."
+#: actions/othersettings.php:35
+msgid "URL Auto-shortening"
+msgstr ""
 
-#. ./.php
-msgid "Couldn't save Twitter preferences."
-msgstr "Không thể lưu các yêu cầu cho tài khoản Twitter. "
+#: actions/othersettings.php:54
+#, fuzzy
+msgid "Service"
+msgstr "Tìm kiếm"
 
-#. ./.php
-msgid "Twitter preferences saved."
-msgstr "Các yêu cầu cho tài khoản Twitter đã lưu"
+#: actions/othersettings.php:54
+msgid "Automatic shortening service to use."
+msgstr ""
 
-#. ./.php
-msgid "Twitter Username"
-msgstr "Tên tài khoản Twitter"
+#: actions/othersettings.php:155
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Tên khu vực quá dài (không quá 255 ký tự)."
 
-#. ./.php
-msgid "Could not verify your Twitter credentials!"
-msgstr "Không thể xác nhận tài khoản Twitter của bạn!"
+#: actions/peopletag.php:33
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "Địa chỉ email không hợp lệ."
 
-#. ./.php
-msgid "Unable to retrieve account information for '%s' from Twitter."
-msgstr "Không thể lấy thông tin tài khoản của '%s' từ Twitter."
+#: actions/peopletag.php:45
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr ""
 
-#. ./.php
-msgid "Unable to save your Twitter settings!"
-msgstr "Không thể lưu thông tin Twitter của bạn!"
+#: actions/peopletag.php:87
+#, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+msgstr ""
 
-#. ./.php
+#: actions/profilesettings.php:92
 msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_)."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
-"Tên tài khoản phải là các chữ số, chữ cái thường hoặc "
-"viết hoa, hoặc là dấu gạch dưới (_)."
 
-msgid "Automatically send my notices to Twitter."
-msgstr "Tự động gửi tin nhắn của tôi đến Twitter."
+#: actions/profilesettings.php:246 actions/tagother.php:131
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Trang chủ '%s'  không hợp lệ"
 
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#: actions/profilesettings.php:328
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "Không thể lưu hồ sơ cá nhân."
+
+#: actions/public.php:68
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
 msgstr ""
-"Gửi những tin nhắn trả lời của tôi từ những người mà "
-"tôi không theo qua Jabber/GTalk."
 
-msgid "New email address for posting to %s"
-msgstr "Dia chi email moi de gui tin nhan den %s"
+#: actions/public.php:90
+#, fuzzy
+msgid "Could not retrieve public stream."
+msgstr "Không thể lấy lại các tin nhắn ưa thích"
 
-msgid "Registration successful"
-msgstr "Đăng ký thành công"
+#: actions/register.php:67 actions/register.php:177
+msgid "Sorry, only invited people can register."
+msgstr ""
 
-msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to...\n"
-"\n"
-"* Go to [your profile](%s) and post your first message.\n"
-"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
-"notices through instant messages.\n"
-"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
-"share your interests. \n"
-"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
-"others more about you. \n"
-"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
-"missed. \n"
-"\n"
-"Thanks for signing up and we hope you enjoy using this service."
+#: actions/register.php:156
+msgid "With this form you can create a new account. "
 msgstr ""
-"Chúc mừng, %s! Chào mừng bạn đến với  %%%%site.name%%%%. Bây "
-"giờ bạn có thể...\n"
-"\n"
-"* Vào trang [Hồ sơ cá nhân](%s) của bạn và gửi tin nhắn "
-"đầu tiên. \n"
-"* Thêm [địa chỉ Jabber/GTalk](%%%%action.imsettings%%%%) để có "
-"thể gửi tin nhắn nhanh.\n"
-"* [Tìm kiếm người quen](%%%%action.peoplesearch%%%%) mà bạn nghĩ "
-"là có thể chia sẻ niềm vui.\n"
-"* Đọc xuyên suốt [hướng dẫn](%%%%doc.help%%%%) để hiểu thêm "
-"về dịch vụ của chúng tôi.\n\nCảm ơn bạn đã đăng ký để là thành viên và rất mong bạn sẽ thích dịch vụ này."
 
-msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+#: actions/remotesubscribe.php:136 actions/remotesubscribe.php:141
+msgid "That's a local profile! Login to subscribe."
 msgstr ""
-"(Bạn sẽ nhận email thông báo, hãy đọc hướng dẫn để xác "
-"nhận địa chỉ email của bạn.)"
 
-msgid "6 or more characters. Required."
-msgstr "Nhiều hơn 6 ký tự. Bắt buộc"
+#: actions/subedit.php:68
+#, fuzzy
+msgid "You are not subscribed to that profile."
+msgstr "Bạn chưa cập nhật thông tin riêng"
 
-msgid "Same as password above. Required."
-msgstr "Cùng mật khẩu ở trên. Bắt buộc."
+#: actions/subedit.php:81
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "Không thể tạo đăng nhận."
 
-msgid "Email Settings"
-msgstr "Thiết lập địa chỉ email"
+#: actions/subscribe.php:53
+#, fuzzy
+msgid "Not a local user."
+msgstr "Không có user nào."
+
+#: actions/subscribe.php:67
+#, fuzzy
+msgid "Subscribed"
+msgstr "Theo bạn này"
 
-msgid "Change theme"
-msgstr "Đổi theme"
+#: actions/subscriptions.php:72
+#, fuzzy
+msgid "Jabber"
+msgstr "Không có Jabber ID."
 
-msgid "Customize theme"
-msgstr "Tùy chỉnh theme"
+#: actions/tagother.php:31
+#, fuzzy
+msgid "Not logged in"
+msgstr "Chưa đăng nhập."
 
-msgid ""
-"You can change the theme as you want by choosing a thumbnail and then click "
-"Save button to active new theme."
+#: actions/tagother.php:40
+#, fuzzy
+msgid "No id argument."
+msgstr "Không có tài liệu nào."
+
+#: actions/tagother.php:56
+msgid "Tag a person"
 msgstr ""
-"Bạn có thể thay đổi theme bằng cách chọn một hình mẫu "
-"của các theme rồi nhấn nút \"Lưu\" để đổi theme. "
 
+#: actions/tagother.php:98
 msgid ""
-"Hey, %1$s .\n"
-"\n"
-"Someone just entered this email address on %2$s.\n"
-"\n"
-"If it was you, and you want to confirm your entry, use the URL below: \n"
-"\n"
-"\t%3$s\n"
-"\n"
-"If not, just ignore this message.\n"
-"\n"
-"Thanks for your time,\n"
-"\n"
-"%4$s\n"
-"\n"
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
 msgstr ""
-"Chào, %1$s .\n"
-"\n"
-"Không biết có phải bạn là người vừa nhập địa chỉ email "
-"này trên %2$s.\n"
-"\n"
-"Nếu bạn là người nhập, và bạn muốn xác nhận lại, hãy "
-"nhấn chuột vào đường dẫn dưới đây: \n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Nếu không phải bạn, hãy bỏ qua tin nhắn này.\n\nCảm ơn bạn đã bỏ thời gian để đọc thư,\n\n%4$s\n\n"
 
+#: actions/tagother.php:120
+#, fuzzy
+msgid "No such profile."
+msgstr "Không có tin nhắn nào."
+
+#: actions/tagother.php:146
 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"
+"You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
-"Bạn có địa chỉ mới để gửi tin nhắn trên %1$s.\n"
-"\n"
-"Hãy gửi email đến %2$s để  có thể nhắn tin.\n"
-"\n"
-"Bạn có thể đọc hướng dẫn tại %3$s.\n\nChúc sức khỏe,\n%4$s"
 
-msgid "SMS confirmation"
-msgstr "Xác nhận SMS"
+#: actions/tagother.php:153
+#, fuzzy
+msgid "Could not save tags."
+msgstr "Không thể lưu hồ sơ cá nhân."
 
-msgid ""
-"%1$s: confirm you own this phone number with this code:\n"
-"\n"
-"%2$s\n"
-"\n"
-msgstr "%1$s: Hãy xác nhận bạn là chủ nhân số điện thoại :\n\n%2$s\n\n"
+#: actions/tagother.php:188
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
 
-msgid "New private message from %s"
-msgstr "Bạn có tin nhắn riêng từ %s"
+#: actions/tagrss.php:33
+#, fuzzy
+msgid "No such tag."
+msgstr "Không có tin nhắn nào."
 
-msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
-"------------------------------------------------------\n"
-"%3$s\n"
-"------------------------------------------------------\n"
-"\n"
-"You can reply to their message here:\n"
-"\n"
-"%4$s\n"
-"\n"
-"Don't reply to this email; it won't get to them.\n"
-"\n"
-"With kind regards,\n"
-"%5$s\n"
+#: actions/tagrss.php:62
+#, fuzzy, php-format
+msgid "Microblog tagged with %s"
+msgstr "Microblog bởi  %s"
+
+#: actions/twitapiblocks.php:45
+msgid "Block user failed."
 msgstr ""
-"%1$s (%2$s) đã gửi đến bạn tin nhắn riêng:\n"
-"\n"
-"------------------------------------------------------\n"
-"%3$s\n"
-"------------------------------------------------------\n"
-"\n"
-"Bạn có thể trả lời tại:\n"
-"\n"
-"%4$s\n"
-"\n"
-"Đừng trả lời lại thư này; sẽ không có ai nhận thư.\n\nChúc sức khỏe,\n%5$s\n"
 
-msgid "Terms of use"
-msgstr "TTSD"
+#: actions/twitapiblocks.php:66
+msgid "Unblock user failed."
+msgstr ""
+
+#: actions/twitapiusers.php:45
+#, fuzzy
+msgid "Not found."
+msgstr "Không tìm thấy"
+
+#: actions/twittersettings.php:63
+#, fuzzy
+msgid "Twitter user name"
+msgstr "Tên tài khoản Twitter"
 
-msgid " Terms of use"
-msgstr "Thỏa thuận sử dụng"
+#: actions/twittersettings.php:67
+#, fuzzy
+msgid "Twitter password"
+msgstr "Mật khẩu Twitter"
 
-msgid "Termsofuse"
-msgstr "Thỏa thuận sử dụng"
+#: actions/twittersettings.php:129
+#, fuzzy
+msgid "Twitter Friends"
+msgstr "Thiết lập tài khoản Twitter"
 
-msgid "Click here to view emotion icon"
-msgstr "Nhấn chuột vào đây để chọn biểu tượng cảm xúc"
+#: actions/unblock.php:73
+#, fuzzy
+msgid "Error removing the block."
+msgstr "Lỗi xảy ra khi lưu thành viên."
 
-msgid "Import from Web Address Book"
-msgstr "Nhập địa chỉ từ Yahoo hoặc Gmail"
+#: actions/unsubscribe.php:48
+#, fuzzy
+msgid "No profile id in request."
+msgstr "Không có URL cho hồ sơ để quay về."
 
-msgid "Incorrect email address or password."
-msgstr "Địa chỉ email hoặc mật khẩu không đúng."
+#: actions/unsubscribe.php:55
+#, fuzzy
+msgid "No profile with that id."
+msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
 
-msgid "Select All/None"
-msgstr "Chọn tất cả/Không chọn"
+#: actions/unsubscribe.php:69
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Hết theo"
 
-msgid "Contacts not found."
-msgstr "Không tìm thấy kết nối."
+#: classes/Notice.php:100
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "Có lỗi xảy ra khi lưu tin nhắn."
 
+#: classes/Notice.php:105
 msgid ""
-"Please input your yahoo or gmail account. List of contacts will be loaded "
-"from your address book.\n"
-"\n"
-"Don't worry, we won't save your password and you'll get a chance to choose "
-"which friends to invite."
+"Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
-"Hãy nhập tài khoản yahoo hoặc tài khoản gmail của bạn. Danh "
-"sách bạn bè, người thân sẽ được lấy từ sổ địa chỉ "
-"của bạn.\n"
-"\n"
-"Đừng lo, chúng tôi sẽ không lưu password của bạn và bạn sẽ có danh sách những người bạn để mời."
 
-msgid "Import Address Book"
-msgstr "Thêm vào danh sách địa chỉ"
+#: classes/Notice.php:112
+msgid "You are banned from posting notices on this site."
+msgstr ""
 
-msgid "Import Contacts Address Book from Yahoo, Gmail"
-msgstr "Nhập sổ địa chỉ liên lạc từ Yahoo, Gmail"
+#: lib/gallery.php:98
+msgid "Filter tags"
+msgstr ""
 
-msgid "Your email address"
-msgstr "Địa chỉ email của bạn"
+#: lib/gallery.php:104
+msgid "All"
+msgstr ""
 
-msgid "Import Web Address Book from"
-msgstr "Nhập sổ địa chỉ web từ"
+#: lib/gallery.php:108
+#, fuzzy
+msgid "Tag"
+msgstr "Từ khóa"
 
-msgid ""
-"%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"
+#: lib/gallery.php:109
+msgid "Choose a tag to narrow list"
 msgstr ""
-"%2$s là một dịch vụ gửi tin nhắn mà nó cho phép bạn giữ "
-"liên lạc, cập nhật thông tin với bạn bè, người thân và "
-"những người quan tâm đến bạn.\n"
-"\n"
-"Ban cũng có thể chia sẻ thông tin về bản thân, những suy "
-"nghĩ, cuộc sống của bạn với những người biết bạn. Là "
-"một công cụ hữu hiệu cho việc gặp gỡ người mới, những người có cùng sở thích với bạn.\n\n"
 
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
+#: lib/gallery.php:110
+msgid "Go"
 msgstr ""
-"%1$s đã mời bạn tham gia vào %2$s (%3$s).\n"
-"\n"
-"%1$s đã nói:\n"
-"\n"
-"%4$s\n"
-"\n"
-"Bạn có thể thấy trang hồ sơ của %1$s trên %2$s ở đây:\n"
-"\n"
-"%5$s\n"
-"\n"
-"Nếu bạn muốn thử dịch vụ này, hãy bấm vào đường liên "
-"kết bên dưới để chấp nhận lời mời.\n"
-"\n"
-"%6$s\n"
-"\n"
-"Nếu không, bạn có thể bỏ qua tin nhắn này. Cảm ơn sự kiên nhẫn và thời gian của bạn dành cho chúng tôi.\n\nXin chân thành cảm ơn, %2$s\n"
 
-msgid ""
-"Hi, I recently created an account at %1$s and want to share it with "
-"you.\n"
-"\n"
-"%1$s is a free, micro-blogging service, which combines the best of blog and "
-"chat. You can use it to write short notices (less than 140 characters) about "
-"your daily life: where you are, what you are doing, and how you are "
-"feeling.\n"
-"\n"
-"It is a tool that allows you to communicate, share, and stay in touch with "
-"friends and to follow other people that interest you through the exchange of "
-"short frequent messages (micro-blogging).\n"
-"\n"
+#: lib/gallery.php:264
+#, fuzzy
+msgid "Subscriptions navigation"
+msgstr "Tôi theo"
+
+#: lib/gallery.php:270 lib/gallery.php:292
+msgid "List"
 msgstr ""
-"Chào bạn, mình đã tạo tài khoản trên %1$s và muốn giới "
-"thiệu cho bạn cùng biết về dịch vụ này.\n"
-"\n"
-"%1$s là dịch vụ gửi tin nhắn ngắn miễn phí, một sự kết "
-"hợp tuyệt vời giữa blog và chat. Bạn có thể viết tin nhắn "
-"khoảng 140 kí tự về đời sống thường nhật của bạn như: "
-"bạn ở đâu, bạn đang làm gì, và bạn cảm thấy thế "
-"nào.\n"
-"\n"
-"Đây là công cụ để bạn giao tiếp, chia sẻ, kết nối với bạn bè và theo những người có cùng sở thích với bạn bằng cách gửi cho nhau những tin nhắn ngắn.\n\n"
 
-msgid "Copy and paste the embed code to your website or blog"
-msgstr "Copy và dán mã trên vào website hay blog của bạn"
+#: lib/gallery.php:280 lib/gallery.php:294
+msgid "Icons"
+msgstr ""
 
+#: lib/mail.php:92
+#, php-format
 msgid ""
-"For security reasons, please re-enter your user name and password before "
-"changing your settings."
+"Hey, %s.\n"
+"\n"
+"Someone just entered this email address on %s.\n"
+"\n"
 msgstr ""
-"Vì lý do bảo mật, bạn hãy nhập lại tên đăng nhập và mật "
-"khẩu trước khi thay đổi trong điều chỉnh."
 
-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."
+#: lib/mail.php:242
+#, php-format
+msgid "You've been nudged by %s"
 msgstr ""
-"Mã xác nhận đã được gửi tới địa chỉ email của bạn. "
-"Hãy kiểm tra hộp thư và làm theo hướng dẫn."
 
+#: lib/mail.php:246
+#, php-format
 msgid ""
-"Hey, %1$s\n"
-"\n"
-"Someone just asked for a new password for this account on %2$s.\n"
-"\n"
-"If it was you, and you want to confirm, use the URL below:\n"
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
 "\n"
-"\t%3$s\n"
-"\n"
-"If not, just ignore this message.\n"
-"\n"
-"Thanks for your time, \n"
-"%1$s\n"
 msgstr ""
-"Xin chào, %1$s\n"
-"\n"
-"Không biết có phải bạn là người yêu cầu mật khẩu mới "
-"cho tài khoản này trên %2$s.\n"
-"\n"
-"Nếu chính là bạn và nếu bạn muốn xác nhận, hãy nhấn "
-"chuột vào đường dẫn dưới đây:\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Nếu không phải bạn, hãy bỏ qua tin nhắn này.\n\nCảm ơn bạn đã bỏ thời gian để đọc thư, \n%1$s\n"
 
-msgid "Create a group"
-msgstr "Tạo nhóm"
-
-msgid "No such message."
-msgstr "Không có tin nhắn nào."
+#: lib/profilelist.php:146
+msgid "(none)"
+msgstr ""
 
-msgid "Only the sender and recipient may read this message"
-msgstr "Chỉ có người gửi hoặc người nhận mới có thể xem tin nhắn này"
+#: lib/stream.php:33
+msgid "Public"
+msgstr "Công cộng"
 
-msgid "Are you sure you want to delete this message?"
-msgstr "Bạn có chắc chắn là muốn xóa tin nhắn này không?"
+#: lib/stream.php:36 lib/stream.php:37
+#, fuzzy
+msgid "Recent tags"
+msgstr "Các từ khóa hiện tại"
 
-msgid ""
-"You are about to permanently delete a message.  Once this is done, it cannot "
-"be undone."
-msgstr "Bạn muốn xóa tin nhắn này? Sau khi xóa, bạn không thể lấy lại được."
+#: lib/stream.php:40
+msgid "Featured"
+msgstr ""
 
-msgid "Can't delete this message."
-msgstr "Không thể xóa tin nhắn này."
+#: lib/stream.php:44
+#, fuzzy
+msgid "Popular"
+msgstr "Tên tài khoản"
 
-msgid "Can't delete this notice."
-msgstr "Không thể xóa tin nhắn này."
+#: lib/subs.php:51
+#, fuzzy
+msgid "User has blocked you."
+msgstr "Người dùng không có thông tin."
 
-msgid "%s and group"
-msgstr "%s và nhóm"
+#: lib/util.php:2059
+msgid "Send a nudge"
+msgstr ""
 
-msgid "My Groups"
-msgstr "Nhóm"
+#: lib/util.php:2063
+#, fuzzy
+msgid "Nudge sent!"
+msgstr "Tin đã gửi"
 
-msgid "Group Profile"
-msgstr "Thông tin nhóm"
+#: lib/util.php:2194
+msgid "Block"
+msgstr ""
 
-msgid "Timeline"
-msgstr "Dòng tin"
+#: lib/util.php:2198
+msgid "Unblock"
+msgstr ""
 
-msgid "%s's timeline"
-msgstr "Dòng tin nhắn của %s"
+#~ msgid " Required."
+#~ msgstr " Bắt buộc."
+
+#~ msgid "Couldn't confirm email."
+#~ msgstr "Không thể xác nhận địa chỉ email."
 
-msgid "Share a thought? Vas-y, ton tour..."
-msgstr "Muốn chia sẽ ý nghĩ của bạn?"
+#~ msgid "Describe your group's interest in 140 characters"
+#~ msgstr "Nói về những sở thích của nhóm trong vòng 140 ký tự"
 
-msgid "Group Members"
-msgstr "Thành viên"
+#~ msgid "Error inserting notice"
+#~ msgstr "Lỗi xảy ra khi thêm mới tin nhắn"
 
-msgid "Group name"
-msgstr "Tên nhóm"
+#~ msgid "FAQ "
+#~ msgstr "FAQ - Hỏi đáp"
 
-msgid "Create date"
-msgstr "Ngày thành lập"
+#~ 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)."
+#~ msgstr ""
+#~ "Microblogging [Laconica](http://laconi.ca/), version %s đã có ở [GNU "
+#~ "Affero General Public License] (http://www.fsf.org/licensing/licenses/"
+#~ "agpl-3.0.html)."
 
-msgid "Member count"
-msgstr "Số thành viên"
+#~ msgid ""
+#~ "Login with your username and password. Don't have a username yet? "
+#~ "[Register](%%action.register%%) a new account."
+#~ msgstr ""
+#~ "Hãy đăng nhập với tên đăng nhập và mật khẩu của bạn. Nếu bạn chưa có tài "
+#~ "khoản, [hãy đăng ký](%%action.register%%) tài khoản mới."
 
-msgid ""
-"By clicking on 'I accept' above, you confirm that you are over 13 years of "
-"age and accept the Terms of Service"
-msgstr ""
-"Nhấn vào 'Tôi đồng ý' ở trên để xác nhận là bạn trên 13 "
-"tuổi và chấp nhận những điều khoản của dịch vụ"
+#~ msgid "Password recovery requested "
+#~ msgstr "Yeu cau khoi phuc lai mat khau da duoc gui"
 
-msgid "I accept"
-msgstr "Tôi đồng ý"
+#~ msgid "Subscribers "
+#~ msgstr "Theo tôi"
 
-msgid "Group code invalid."
-msgstr "Mã số của nhóm không đúng."
+#~ msgid "%s, Tell the world what's on your mind?"
+#~ msgstr "%s, bạn đang làm gì?"
 
-msgid "Register a Group"
-msgstr "Đăng ký nhóm"
+#~ msgid "City, State/Region, Country"
+#~ msgstr "Thành phố, Tỉnh thành, Quốc gia"
 
-msgid "Group code"
-msgstr "Mã nhóm"
+#~ msgid "Register for a free account!"
+#~ msgstr "Đăng ký tài khoản miễn phí!"
 
-msgid "Only people who know this code can join the group. Required."
-msgstr "Chỉ những ai biết mã này mới có thể gia nhập nhóm. Bắt buộc."
+#~ msgid "Everyone"
+#~ msgstr "Tất cả mọi người"
 
-msgid "Enter the code if you want to join this group"
-msgstr "Nhập vào mã của nhóm nếu bạn muốn tham gia."
+#~ msgid "Welcome to %s"
+#~ msgstr "%s chào mừng bạn "
 
-msgid "Manage"
-msgstr "Quản lý"
+#~ msgid "Blog + Chat = Fun"
+#~ msgstr "Vừa Blog vừa Chat = Vui Lắm"
 
-msgid "You have no authentication to access this page."
-msgstr "Bạn không có quyền truy cập trang này."
+#~ msgid ""
+#~ "%s is a new way to send short messages to your friends, family, and co-"
+#~ "workers."
+#~ msgstr ""
+#~ "%s là dịch vụ cho bạn bè, gia đình và đồng nghiệp liên lạc và kết nối qua "
+#~ "những trao đổi ngắn."
 
-msgid "Check the flagged notice and then delete or ignore it."
-msgstr ""
-"Kiểm tra lại tin bị cảnh báo, sau đó bạn hãy quyết định "
-"xóa tin đó hoặc xác nhận nó là hợp lệ."
+#~ msgid ""
+#~ "Starting a conversation is fast and easy: You can shout messages to your "
+#~ "followers, or whisper to your friends. Just think of something to say, "
+#~ "and get started!"
+#~ msgstr ""
+#~ "Để bắt đầu cuộc đàm luận: Bạn có thể gửi tin nhắn đến những người mà bạn "
+#~ "theo, hoặc gửi những mong ước của bạn đến bạn bè, những câu trả lời thông "
+#~ "thường cho một câu hỏi đơn giản: Bạn đang làm gì vậy? "
 
-msgid "Flagged"
-msgstr "Kiểm tin"
+#~ msgid "Register now!"
+#~ msgstr "Hãy đăng ký ngay!"
 
-msgid "Description"
-msgstr "Mô tả"
+#~ msgid "What's the latest?"
+#~ msgstr "Mọi người đang nói gì?"
 
-msgid "Short description of the group"
-msgstr "Mô tả ngắn gọn về nhóm"
+#~ msgid "What Everyone Is Talking About"
+#~ msgstr "Mọi người đang nói gì?"
 
-msgid "Group"
-msgstr "Nhóm"
+#~ msgid ""
+#~ "Send me replies through Jabber/GTalk from people I’m not subscribed to."
+#~ msgstr "Gửi tin nhắn trả lời những người mà tôi không đăng ký qua "
 
-msgid "Check notice flagged by user"
-msgstr "Kiểm tra các tin nhắn do người dùng cảnh báo"
+#~ msgid ""
+#~ "You can change the theme as you want by clicking a thumbnail image and "
+#~ "then click Save button to active new theme."
+#~ msgstr ""
+#~ "Bạn có thể thay đổi theme bằng cách chọn vào một hình ảnh theme bạn "
+#~ "thích. Sau đó nhấn nút Lưu để thay đổi theme mới."
 
-msgid "is more fun with friends."
-msgstr "vui hơn với bạn bè"
+#~ msgid "Choose a theme"
+#~ msgstr "Chọn theme"
 
-msgid "Invite your friends"
-msgstr "Mời bạn bè"
+#~ msgid "Theme Error"
+#~ msgstr "Lỗi Theme"
 
-msgid "Hide recommendations"
-msgstr "Tắt"
+#~ msgid ""
+#~ "Tired of the same old colors on your timeline? Change is good so spice up "
+#~ "your %s page."
+#~ msgstr ""
+#~ "Nếu cảm thấy nhàm chán với màu sắc cũ trên timeline của bạn, hãy thay đổi "
+#~ "màu sắc để trang %s của bạn hấp dẫn hơn."
+
+#~ msgid "Preview"
+#~ msgstr "Xem trước"
+
+#~ msgid "Background Theme:"
+#~ msgstr "Background Theme:"
+
+#~ msgid "Customize your theme"
+#~ msgstr "Tùy chỉnh theme "
+
+#~ msgid "Timeline Theme:"
+#~ msgstr "Timeline Theme:"
+
+#~ msgid "Dashboard Theme:"
+#~ msgstr "Dashboard Theme:"
+
+#~ msgid "Theme"
+#~ msgstr "Theme"
+
+#~ msgid "Activity"
+#~ msgstr "Các hoạt động"
+
+#~ msgid "Me & My Friends"
+#~ msgstr "Tôi & bạn"
+
+#~ msgid "User & Friends"
+#~ msgstr "Nhóm bạn"
 
-msgid ""
-"Sorry, but you need to activate your account first. We sent the activation "
-"email, so please check your email for details. Don't forget to look in your "
-"spam folder as well."
-msgstr ""
-"Xin lỗi, bạn cần phải kích hoạt tài khoản của bạn "
-"trước. Chúng tôi đã gửi email tới bạn, vì vậy hãy mở "
-"hộp mail để xem hướng dẫn chi tiết. Đừng quên tìm cả trong spam."
+#~ msgid "My Profile"
+#~ msgstr "Cá nhân"
+
+#~ msgid "User Profile"
+#~ msgstr "Hồ sơ"
+
+#~ msgid "Customize your page even more with CSS"
+#~ msgstr "Tùy chỉnh trang của bạn bằng CSS"
+
+#~ msgid "Save Changes"
+#~ msgstr "LÆ°u"
+
+#~ msgid "Change css code"
+#~ msgstr "Thay đổi code css"
+
+#~ msgid "You can change your css code here."
+#~ msgstr "Bạn có thể thay đổi code css"
+
+#~ msgid "New css code saved."
+#~ msgstr "CSS đã được lưu."
+
+#~ msgid "Reply"
+#~ msgstr "Trả lời"
+
+#~ msgid "Upload from your computer"
+#~ msgstr "Tải từ máy tính cá nhân  "
+
+#~ msgid "Get from library"
+#~ msgstr "Lấy từ tập ảnh có sẵn"
+
+#~ msgid "Male"
+#~ msgstr "Nam"
+
+#~ msgid "Female"
+#~ msgstr "Nữ"
+
+#~ msgid "No reply yet"
+#~ msgstr "chưa có trả lời"
+
+#~ msgid "replies"
+#~ msgstr "trả lời"
+
+#~ msgid ""
+#~ "%1$s just added your notice from %2$s as one of their favorites.\n"
+#~ "\n"
+#~ "In case you forgot, you can see the text of your notice here:\n"
+#~ "\n"
+#~ "%3$s\n"
+#~ "\n"
+#~ "You can see the list of %1$s's favorites here:\n"
+#~ "\n"
+#~ "%4$s\n"
+#~ "\n"
+#~ "Faithfully yours,\n"
+#~ "%5$s\n"
+#~ msgstr ""
+#~ "%1$s vừa thêm tin nhắn của bạn trên %2$s vào danh sách tin nhắn ưa thích "
+#~ "của mình.\n"
+#~ "\n"
+#~ "Bạn có thể xem lại nội dung tin nhắn của bạn tại đây:\n"
+#~ "\n"
+#~ "%3$s\n"
+#~ "\n"
+#~ "Bạn có thể xem danh sách tin nhắn ưa thích của %1$s tại đây: \n"
+#~ "\n"
+#~ "%4$s\n"
+#~ "\n"
+#~ "Chúc sức khỏe,\n"
+#~ "%5$s\n"
+
+#~ msgid "flag this notice"
+#~ msgstr "cảnh báo tin nhắn"
+
+#~ msgid "Flag a notice"
+#~ msgstr "Cảnh báo tin nhắn"
+
+#~ msgid "Flag this notice?"
+#~ msgstr "Bạn muốn cảnh báo tin nhắn này?"
+
+#~ msgid ""
+#~ "If you think this notice is an offensive message, please notify to the "
+#~ "administrator. Thank you."
+#~ msgstr ""
+#~ "Nếu bạn nghĩ tin nhắn này có nội dung xấu không chấp nhận được, hãy báo "
+#~ "cho ban quản trị web site. Cảm ơn rất nhiều."
+
+#~ msgid ""
+#~ "To use this [Saigonica version](%%doc.source%%), you must write the "
+#~ "license is of Laconica and has contributions from Saigonica."
+#~ msgstr ""
+#~ "Để sử dụng [phiên bản Saigonica](%%doc.source%%) này, cần ghi rõ bản "
+#~ "quyền của Laconia cộng thêm sự đóng góp của Saigonica."
+
+#~ msgid "Change theme"
+#~ msgstr "Đổi theme"
+
+#~ msgid "Customize theme"
+#~ msgstr "Tùy chỉnh theme"
+
+#~ msgid ""
+#~ "You can change the theme as you want by choosing a thumbnail and then "
+#~ "click Save button to active new theme."
+#~ msgstr ""
+#~ "Bạn có thể thay đổi theme bằng cách chọn một hình mẫu của các theme rồi "
+#~ "nhấn nút \"Lưu\" để đổi theme. "
+
+#~ msgid ""
+#~ "Hey, %1$s .\n"
+#~ "\n"
+#~ "Someone just entered this email address on %2$s.\n"
+#~ "\n"
+#~ "If it was you, and you want to confirm your entry, use the URL below: \n"
+#~ "\n"
+#~ "\t%3$s\n"
+#~ "\n"
+#~ "If not, just ignore this message.\n"
+#~ "\n"
+#~ "Thanks for your time,\n"
+#~ "\n"
+#~ "%4$s\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Chào, %1$s .\n"
+#~ "\n"
+#~ "Không biết có phải bạn là người vừa nhập địa chỉ email này trên %2$s.\n"
+#~ "\n"
+#~ "Nếu bạn là người nhập, và bạn muốn xác nhận lại, hãy nhấn chuột vào đường "
+#~ "dẫn dưới đây: \n"
+#~ "\n"
+#~ "\t%3$s\n"
+#~ "\n"
+#~ "Nếu không phải bạn, hãy bỏ qua tin nhắn này.\n"
+#~ "\n"
+#~ "Cảm ơn bạn đã bỏ thời gian để đọc thư,\n"
+#~ "\n"
+#~ "%4$s\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "%1$s: confirm you own this phone number with this code:\n"
+#~ "\n"
+#~ "%2$s\n"
+#~ "\n"
+#~ msgstr ""
+#~ "%1$s: Hãy xác nhận bạn là chủ nhân số điện thoại :\n"
+#~ "\n"
+#~ "%2$s\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "%1$s (%2$s) sent you a private message:\n"
+#~ "\n"
+#~ "------------------------------------------------------\n"
+#~ "%3$s\n"
+#~ "------------------------------------------------------\n"
+#~ "\n"
+#~ "You can reply to their message here:\n"
+#~ "\n"
+#~ "%4$s\n"
+#~ "\n"
+#~ "Don't reply to this email; it won't get to them.\n"
+#~ "\n"
+#~ "With kind regards,\n"
+#~ "%5$s\n"
+#~ msgstr ""
+#~ "%1$s (%2$s) đã gửi đến bạn tin nhắn riêng:\n"
+#~ "\n"
+#~ "------------------------------------------------------\n"
+#~ "%3$s\n"
+#~ "------------------------------------------------------\n"
+#~ "\n"
+#~ "Bạn có thể trả lời tại:\n"
+#~ "\n"
+#~ "%4$s\n"
+#~ "\n"
+#~ "Đừng trả lời lại thư này; sẽ không có ai nhận thư.\n"
+#~ "\n"
+#~ "Chúc sức khỏe,\n"
+#~ "%5$s\n"
+
+#~ msgid "Terms of use"
+#~ msgstr "TTSD"
+
+#~ msgid " Terms of use"
+#~ msgstr "Thỏa thuận sử dụng"
+
+#~ msgid "Termsofuse"
+#~ msgstr "Thỏa thuận sử dụng"
+
+#~ msgid "Click here to view emotion icon"
+#~ msgstr "Nhấn chuột vào đây để chọn biểu tượng cảm xúc"
+
+#~ msgid "Import from Web Address Book"
+#~ msgstr "Nhập địa chỉ từ Yahoo hoặc Gmail"
+
+#~ msgid "Select All/None"
+#~ msgstr "Chọn tất cả/Không chọn"
+
+#~ msgid "Contacts not found."
+#~ msgstr "Không tìm thấy kết nối."
+
+#~ msgid ""
+#~ "Please input your yahoo or gmail account. List of contacts will be loaded "
+#~ "from your address book.\n"
+#~ "\n"
+#~ "Don't worry, we won't save your password and you'll get a chance to "
+#~ "choose which friends to invite."
+#~ msgstr ""
+#~ "Hãy nhập tài khoản yahoo hoặc tài khoản gmail của bạn. Danh sách bạn bè, "
+#~ "người thân sẽ được lấy từ sổ địa chỉ của bạn.\n"
+#~ "\n"
+#~ "Đừng lo, chúng tôi sẽ không lưu password của bạn và bạn sẽ có danh sách "
+#~ "những người bạn để mời."
+
+#~ msgid "Import Address Book"
+#~ msgstr "Thêm vào danh sách địa chỉ"
+
+#~ msgid "Import Contacts Address Book from Yahoo, Gmail"
+#~ msgstr "Nhập sổ địa chỉ liên lạc từ Yahoo, Gmail"
+
+#~ msgid "Import Web Address Book from"
+#~ msgstr "Nhập sổ địa chỉ web từ"
+
+#~ msgid ""
+#~ "%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"
+#~ msgstr ""
+#~ "%2$s là một dịch vụ gửi tin nhắn mà nó cho phép bạn giữ liên lạc, cập "
+#~ "nhật thông tin với bạn bè, người thân và những người quan tâm đến bạn.\n"
+#~ "\n"
+#~ "Ban cũng có thể chia sẻ thông tin về bản thân, những suy nghĩ, cuộc sống "
+#~ "của bạn với những người biết bạn. Là một công cụ hữu hiệu cho việc gặp gỡ "
+#~ "người mới, những người có cùng sở thích với bạn.\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "%1$s has invited you to join them on %2$s (%3$s).\n"
+#~ "\n"
+#~ "%1$s said:\n"
+#~ "\n"
+#~ "%4$s\n"
+#~ "\n"
+#~ "You can see %1$s's profile page on %2$s here:\n"
+#~ "\n"
+#~ "%5$s\n"
+#~ "\n"
+#~ "If you'd like to try the service, click on the link below to accept the "
+#~ "invitation.\n"
+#~ "\n"
+#~ "%6$s\n"
+#~ "\n"
+#~ "If not, you can ignore this message. Thanks for your patience and your "
+#~ "time.\n"
+#~ "\n"
+#~ "Sincerely, %2$s\n"
+#~ msgstr ""
+#~ "%1$s đã mời bạn tham gia vào %2$s (%3$s).\n"
+#~ "\n"
+#~ "%1$s đã nói:\n"
+#~ "\n"
+#~ "%4$s\n"
+#~ "\n"
+#~ "Bạn có thể thấy trang hồ sơ của %1$s trên %2$s ở đây:\n"
+#~ "\n"
+#~ "%5$s\n"
+#~ "\n"
+#~ "Nếu bạn muốn thử dịch vụ này, hãy bấm vào đường liên kết bên dưới để chấp "
+#~ "nhận lời mời.\n"
+#~ "\n"
+#~ "%6$s\n"
+#~ "\n"
+#~ "Nếu không, bạn có thể bỏ qua tin nhắn này. Cảm ơn sự kiên nhẫn và thời "
+#~ "gian của bạn dành cho chúng tôi.\n"
+#~ "\n"
+#~ "Xin chân thành cảm ơn, %2$s\n"
+
+#~ msgid ""
+#~ "Hi, I recently created an account at %1$s and want to share it with you.\n"
+#~ "\n"
+#~ "%1$s is a free, micro-blogging service, which combines the best of blog "
+#~ "and chat. You can use it to write short notices (less than 140 "
+#~ "characters) about your daily life: where you are, what you are doing, and "
+#~ "how you are feeling.\n"
+#~ "\n"
+#~ "It is a tool that allows you to communicate, share, and stay in touch "
+#~ "with friends and to follow other people that interest you through the "
+#~ "exchange of short frequent messages (micro-blogging).\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Chào bạn, mình đã tạo tài khoản trên %1$s và muốn giới thiệu cho bạn cùng "
+#~ "biết về dịch vụ này.\n"
+#~ "\n"
+#~ "%1$s là dịch vụ gửi tin nhắn ngắn miễn phí, một sự kết hợp tuyệt vời giữa "
+#~ "blog và chat. Bạn có thể viết tin nhắn khoảng 140 kí tự về đời sống "
+#~ "thường nhật của bạn như: bạn ở đâu, bạn đang làm gì, và bạn cảm thấy thế "
+#~ "nào.\n"
+#~ "\n"
+#~ "Đây là công cụ để bạn giao tiếp, chia sẻ, kết nối với bạn bè và theo "
+#~ "những người có cùng sở thích với bạn bằng cách gửi cho nhau những tin "
+#~ "nhắn ngắn.\n"
+#~ "\n"
+
+#~ msgid "Copy and paste the embed code to your website or blog"
+#~ msgstr "Copy và dán mã trên vào website hay blog của bạn"
+
+#~ msgid ""
+#~ "Hey, %1$s\n"
+#~ "\n"
+#~ "Someone just asked for a new password for this account on %2$s.\n"
+#~ "\n"
+#~ "If it was you, and you want to confirm, use the URL below:\n"
+#~ "\n"
+#~ "\t%3$s\n"
+#~ "\n"
+#~ "If not, just ignore this message.\n"
+#~ "\n"
+#~ "Thanks for your time, \n"
+#~ "%1$s\n"
+#~ msgstr ""
+#~ "Xin chào, %1$s\n"
+#~ "\n"
+#~ "Không biết có phải bạn là người yêu cầu mật khẩu mới cho tài khoản này "
+#~ "trên %2$s.\n"
+#~ "\n"
+#~ "Nếu chính là bạn và nếu bạn muốn xác nhận, hãy nhấn chuột vào đường dẫn "
+#~ "dưới đây:\n"
+#~ "\n"
+#~ "\t%3$s\n"
+#~ "\n"
+#~ "Nếu không phải bạn, hãy bỏ qua tin nhắn này.\n"
+#~ "\n"
+#~ "Cảm ơn bạn đã bỏ thời gian để đọc thư, \n"
+#~ "%1$s\n"
+
+#~ msgid "Create a group"
+#~ msgstr "Tạo nhóm"
+
+#~ msgid ""
+#~ "You are about to permanently delete a message.  Once this is done, it "
+#~ "cannot be undone."
+#~ msgstr "Bạn muốn xóa tin nhắn này? Sau khi xóa, bạn không thể lấy lại được."
+
+#~ msgid "Can't delete this message."
+#~ msgstr "Không thể xóa tin nhắn này."
+
+#~ msgid "%s and group"
+#~ msgstr "%s và nhóm"
+
+#~ msgid "My Groups"
+#~ msgstr "Nhóm"
+
+#~ msgid "Group Profile"
+#~ msgstr "Thông tin nhóm"
+
+#~ msgid "Timeline"
+#~ msgstr "Dòng tin"
+
+#~ msgid "Share a thought? Vas-y, ton tour..."
+#~ msgstr "Muốn chia sẽ ý nghĩ của bạn?"
+
+#~ msgid "Group Members"
+#~ msgstr "Thành viên"
+
+#~ msgid "Group name"
+#~ msgstr "Tên nhóm"
+
+#~ msgid "Create date"
+#~ msgstr "Ngày thành lập"
+
+#~ msgid "Member count"
+#~ msgstr "Số thành viên"
+
+#~ msgid ""
+#~ "By clicking on 'I accept' above, you confirm that you are over 13 years "
+#~ "of age and accept the Terms of Service"
+#~ msgstr ""
+#~ "Nhấn vào 'Tôi đồng ý' ở trên để xác nhận là bạn trên 13 tuổi và chấp nhận "
+#~ "những điều khoản của dịch vụ"
+
+#~ msgid "I accept"
+#~ msgstr "Tôi đồng ý"
+
+#~ msgid "Group code invalid."
+#~ msgstr "Mã số của nhóm không đúng."
+
+#~ msgid "Register a Group"
+#~ msgstr "Đăng ký nhóm"
+
+#~ msgid "Group code"
+#~ msgstr "Mã nhóm"
 
-msgid "Current confirmed email address."
-msgstr "Đã xác nhận địa chỉ này."
+#~ msgid "Only people who know this code can join the group. Required."
+#~ msgstr "Chỉ những ai biết mã này mới có thể gia nhập nhóm. Bắt buộc."
 
-msgid "Chat vs T8M"
-msgstr "Chat và T8M"
+#~ msgid "Enter the code if you want to join this group"
+#~ msgstr "Nhập vào mã của nhóm nếu bạn muốn tham gia."
 
-msgid "Prev"
-msgstr "Trước"
+#~ msgid "Manage"
+#~ msgstr "Quản lý"
 
-msgid "Next"
-msgstr "Kế"
+#~ msgid "You have no authentication to access this page."
+#~ msgstr "Bạn không có quyền truy cập trang này."
 
-#: ../actions/profilesettings.php:54
-msgid "Describe yourself and your interests in 140 chars"
-msgstr "Nói về bạn và những sở thích của bạn khoảng 140 ký tự"
+#~ msgid "Check the flagged notice and then delete or ignore it."
+#~ msgstr ""
+#~ "Kiểm tra lại tin bị cảnh báo, sau đó bạn hãy quyết định xóa tin đó hoặc "
+#~ "xác nhận nó là hợp lệ."
 
-#: ../actions/profilesettings.php:57
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "Bạn ở đâu, \"Thành phố, Tỉnh thành, Quốc gia\""
+#~ msgid "Flagged"
+#~ msgstr "Kiểm tin"
 
-msgid "Members"
-msgstr "Thành viên"
+#~ msgid "Description"
+#~ msgstr "Mô tả"
 
-msgid "Subscribe "
-msgstr "Theo nhóm này"
+#~ msgid "Short description of the group"
+#~ msgstr "Mô tả ngắn gọn về nhóm"
 
-msgid "Group View"
-msgstr "Xem theo nhóm"
+#~ msgid "Group"
+#~ msgstr "Nhóm"
 
-msgid "Linear View"
-msgstr "Xem tuần tự"
+#~ msgid "Check notice flagged by user"
+#~ msgstr "Kiểm tra các tin nhắn do người dùng cảnh báo"
 
-msgid " and friends"
-msgstr " và bạn bè"
+#~ msgid "is more fun with friends."
+#~ msgstr "vui hơn với bạn bè"
 
-msgid "Channels"
-msgstr "Kênh"
+#~ msgid "Invite your friends"
+#~ msgstr "Mời bạn bè"
 
-msgid "Channel already exist. Try another one."
-msgstr "Kênh này đã có rồi. Hãy chọn tên khác."
+#~ msgid "Hide recommendations"
+#~ msgstr "Tắt"
 
-msgid "Can't save this chanel"
-msgstr "Lỗi khi lưu kênh"
+#~ msgid ""
+#~ "Sorry, but you need to activate your account first. We sent the "
+#~ "activation email, so please check your email for details. Don't forget to "
+#~ "look in your spam folder as well."
+#~ msgstr ""
+#~ "Xin lỗi, bạn cần phải kích hoạt tài khoản của bạn trước. Chúng tôi đã gửi "
+#~ "email tới bạn, vì vậy hãy mở hộp mail để xem hướng dẫn chi tiết. Đừng "
+#~ "quên tìm cả trong spam."
 
-msgid "You can create a new channel here."
-msgstr "Bạn có thể tạo kênh tại đây."
+#~ msgid "Chat vs T8M"
+#~ msgstr "Chat và T8M"
 
-msgid "Create Channel"
-msgstr "Tạo Kênh"
+#~ msgid "Prev"
+#~ msgstr "Trước"
 
-msgid "Channel name"
-msgstr "Tên kênh"
+#~ msgid "Next"
+#~ msgstr "Kế"
 
-msgid "Name of channel. Required."
-msgstr "Tên kênh. Bắt buộc"
+#~ msgid "Members"
+#~ msgstr "Thành viên"
 
-msgid "Channel saved successfully"
-msgstr "Tạo kênh thành công."
+#~ msgid "Group View"
+#~ msgstr "Xem theo nhóm"
 
-msgid " You have just created channel %s successfuly."
-msgstr "Bạn vừa tạo thành công kênh %s."
+#~ msgid "Linear View"
+#~ msgstr "Xem tuần tự"
 
-msgid "Channel"
-msgstr "Kênh"
+#~ msgid "Channels"
+#~ msgstr "Kênh"
 
-msgid "No such chanel."
-msgstr "Không tìm thấy kênh nào."
+#~ msgid "Channel already exist. Try another one."
+#~ msgstr "Kênh này đã có rồi. Hãy chọn tên khác."
 
-msgid "Channels View"
-msgstr "Hệ thống các  kênh"
+#~ msgid "Can't save this chanel"
+#~ msgstr "Lỗi khi lưu kênh"
 
-msgid "Create a channel"
-msgstr "Tạo kênh"
+#~ msgid "You can create a new channel here."
+#~ msgstr "Bạn có thể tạo kênh tại đây."
 
-msgid "Register user by channel"
-msgstr "Đăng ký theo kênh"
+#~ msgid "Create Channel"
+#~ msgstr "Tạo Kênh"
 
-msgid "The channel this user in"
-msgstr "Kênh mà bạn tham gia"
+#~ msgid "Channel name"
+#~ msgstr "Tên kênh"
 
-msgid " Subscribe"
-msgstr "Theo kênh này"
+#~ msgid "Name of channel. Required."
+#~ msgstr "Tên kênh. Bắt buộc"
 
-msgid "Your incoming and sent messages"
-msgstr "Hộp thư của bạn"
+#~ msgid "Channel saved successfully"
+#~ msgstr "Tạo kênh thành công."
 
-msgid "Send me all replies through Yahoo Messenger."
-msgstr "Hãy gửi tin nhắn đến tôi qua Yahoo Messenger"
+#~ msgid " You have just created channel %s successfuly."
+#~ msgstr "Bạn vừa tạo thành công kênh %s."
 
-msgid "Yahoo Messenger Settings"
-msgstr "Thiết lập địa chỉ Yahoo"
+#~ msgid "Channel"
+#~ msgstr "Kênh"
 
-msgid ""
-"You can send and receive notices through Yahoo Messenger [instant "
-"messages](%%doc.im%%). Configure your yahoo address and settings below."
-msgstr ""
-"Bạn có thể gửi và nhận những tin nhắn qua Yahoo Messenger [tin "
-"nhắn nhanh](%%doc.im%%). Hãy định dạng địa chỉ của bạn và các thiết lập sau."
+#~ msgid "No such chanel."
+#~ msgstr "Không tìm thấy kênh nào."
 
-msgid ""
-"Awaiting confirmation on this address. Check your Yahoo inbox (and spam "
-"box!) for a message with further instructions."
-msgstr ""
-"Đang đợi xác nhận đến địa chỉ này. Hãy kiểm tra hộp "
-"thư đến(và thư rác) để nhận tin nhắn và lời hướng dẫn. "
+#~ msgid "Channels View"
+#~ msgstr "Hệ thống các  kênh"
 
-msgid "Yahoo Address"
-msgstr "Địa chỉ email Yahoo"
+#~ msgid "Create a channel"
+#~ msgstr "Tạo kênh"
 
-msgid "Yahoo address, like \"UserName@yahoo.com\""
-msgstr "Địa chỉ email Yahoo, Ví dụ: \"UserName@yahoo.com\""
+#~ msgid "Register user by channel"
+#~ msgstr "Đăng ký theo kênh"
 
-msgid "That yahoo address already belongs to another user."
-msgstr "Địa chỉ email Yahoo này đã có người khác sử dụng rồi."
+#~ msgid "The channel this user in"
+#~ msgstr "Kênh mà bạn tham gia"
 
-msgid "That is already your yahoo address."
-msgstr "Bạn đã dùng địa chỉ email này rồi"
+#~ msgid " Subscribe"
+#~ msgstr "Theo kênh này"
 
-msgid "Cannot normalize that Yahoo address"
-msgstr "Không thể bình thường hóa địa chỉ Yahoo này"
+#~ msgid "Your incoming and sent messages"
+#~ msgstr "Hộp thư của bạn"
 
-msgid "No yahoo address."
-msgstr "Chưa nhập địa chỉ email Yahoo"
+#~ msgid "Send me all replies through Yahoo Messenger."
+#~ msgstr "Hãy gửi tin nhắn đến tôi qua Yahoo Messenger"
 
-msgid ""
-"A confirmation code was sent to the yahoo email address you added. Check "
-"your inbox (and spam box!) for the code and instructions on how to use "
-"it."
-msgstr ""
-"Mã xác nhận đã được gửi đến địa chỉ email Yahoo của "
-"bạn. Hãy kiểm tra hộp thư đến (và thư rác) và làm theo hướng dẫn trong thư."
+#~ msgid "Yahoo Messenger Settings"
+#~ msgstr "Thiết lập địa chỉ Yahoo"
 
-msgid "says"
-msgstr "nói"
+#~ msgid ""
+#~ "You can send and receive notices through Yahoo Messenger [instant "
+#~ "messages](%%doc.im%%). Configure your yahoo address and settings below."
+#~ msgstr ""
+#~ "Bạn có thể gửi và nhận những tin nhắn qua Yahoo Messenger [tin nhắn nhanh]"
+#~ "(%%doc.im%%). Hãy định dạng địa chỉ của bạn và các thiết lập sau."
 
-msgid "Your message is posted successful."
-msgstr "Tin nhắn đã gửi đi"
+#~ msgid ""
+#~ "Awaiting confirmation on this address. Check your Yahoo inbox (and spam "
+#~ "box!) for a message with further instructions."
+#~ msgstr ""
+#~ "Đang đợi xác nhận đến địa chỉ này. Hãy kiểm tra hộp thư đến(và thư rác) "
+#~ "để nhận tin nhắn và lời hướng dẫn. "
 
-msgid "To use this service, You must register your YM with Saigonica."
-msgstr "Để được sử dụng dịch vụ này, bạn phải đăng ký YM trên Saigonica"
+#~ msgid "Yahoo Address"
+#~ msgstr "Địa chỉ email Yahoo"
 
-msgid "To use this service, You must register your Gtalk with Saigonica."
-msgstr "Để được sử dụng dịch vụ này, bạn phải đăng ký GTalk trên Saigonica"
+#~ msgid "Yahoo address, like \"UserName@yahoo.com\""
+#~ msgstr "Địa chỉ email Yahoo, Ví dụ: \"UserName@yahoo.com\""
 
-msgid "Send me all replies through Jabber/GTalk."
-msgstr "Hãy gửi tin nhắn đến tôi qua Jabber/GTalk."
+#~ msgid "That is already your yahoo address."
+#~ msgstr "Bạn đã dùng địa chỉ email này rồi"
 
-msgid "GTalk Settings"
-msgstr "Thiết lập địa chỉ GTalk"
+#~ msgid "Cannot normalize that Yahoo address"
+#~ msgstr "Không thể bình thường hóa địa chỉ Yahoo này"
 
-msgid ""
-"You can send and receive notices through Jabber/GTalk [instant "
-"messages](%%doc.im%%). Configure your yahoo address and settings below."
-msgstr ""
-"Bạn có thể gửi và nhận những tin nhắn qua Jabber/GTalk [tin "
-"nhắn nhanh](%%doc.im%%). Hãy định dạng địa chỉ của bạn và các thiết lập sau."
+#~ msgid "No yahoo address."
+#~ msgstr "Chưa nhập địa chỉ email Yahoo"
 
-msgid ""
-"Awaiting confirmation on this address. Check your GTalk inbox (and spam "
-"box!) for a message with further instructions."
-msgstr ""
-"Đang đợi xác nhận đến địa chỉ này. Hãy kiểm tra hộp "
-"thư đến(và thư rác) để nhận tin nhắn và lời hướng dẫn. "
+#~ msgid ""
+#~ "A confirmation code was sent to the yahoo email address you added. Check "
+#~ "your inbox (and spam box!) for the code and instructions on how to use it."
+#~ msgstr ""
+#~ "Mã xác nhận đã được gửi đến địa chỉ email Yahoo của bạn. Hãy kiểm tra hộp "
+#~ "thư đến (và thư rác) và làm theo hướng dẫn trong thư."
 
-msgid "GTalk Address"
-msgstr "Địa chỉ email GTalk"
+#~ msgid "says"
+#~ msgstr "nói"
 
-msgid "GTalk address, like \"UserName@gmail.com\""
-msgstr "Địa chỉ email GTalk, Ví dụ: \"UserName@gmail.com\""
+#~ msgid "Your message is posted successful."
+#~ msgstr "Tin nhắn đã gửi đi"
 
-msgid "That GTalk address already belongs to another user."
-msgstr "Địa chỉ email GTalk này đã có người khác sử dụng rồi."
+#~ msgid "To use this service, You must register your YM with Saigonica."
+#~ msgstr "Để được sử dụng dịch vụ này, bạn phải đăng ký YM trên Saigonica"
 
-msgid "That is already your GTalk address."
-msgstr "Bạn đã dùng địa chỉ email này rồi"
+#~ msgid "To use this service, You must register your Gtalk with Saigonica."
+#~ msgstr "Để được sử dụng dịch vụ này, bạn phải đăng ký GTalk trên Saigonica"
 
-msgid "Cannot normalize that GTalk address"
-msgstr "Không thể bình thường hóa địa chỉ GTalk này"
+#~ msgid "Send me all replies through Jabber/GTalk."
+#~ msgstr "Hãy gửi tin nhắn đến tôi qua Jabber/GTalk."
 
-msgid "No GTalk address."
-msgstr "Chưa nhập địa chỉ email GTalk"
+#~ msgid "GTalk Settings"
+#~ msgstr "Thiết lập địa chỉ GTalk"
 
-msgid ""
-"A confirmation code was sent to the GTalk email address you added. Check "
-"your inbox (and spam box!) for the code and instructions on how to use "
-"it."
-msgstr ""
-"Mã xác nhận đã được gửi đến địa chỉ email GTalk của "
-"bạn. Hãy kiểm tra hộp thư đến (và thư rác) và làm theo hướng dẫn trong thư."
+#~ msgid ""
+#~ "You can send and receive notices through Jabber/GTalk [instant messages](%"
+#~ "%doc.im%%). Configure your yahoo address and settings below."
+#~ msgstr ""
+#~ "Bạn có thể gửi và nhận những tin nhắn qua Jabber/GTalk [tin nhắn nhanh](%%"
+#~ "doc.im%%). Hãy định dạng địa chỉ của bạn và các thiết lập sau."
 
-msgid "Check virus"
-msgstr "Kiểm tra virus"
+#~ msgid ""
+#~ "Awaiting confirmation on this address. Check your GTalk inbox (and spam "
+#~ "box!) for a message with further instructions."
+#~ msgstr ""
+#~ "Đang đợi xác nhận đến địa chỉ này. Hãy kiểm tra hộp thư đến(và thư rác) "
+#~ "để nhận tin nhắn và lời hướng dẫn. "
 
-msgid "Error"
-msgstr "Lỗi"
+#~ msgid "GTalk Address"
+#~ msgstr "Địa chỉ email GTalk"
 
-msgid "Avatar "
-msgstr "Hình"
+#~ msgid "No GTalk address."
+#~ msgstr "Chưa nhập địa chỉ email GTalk"
 
-msgid "Avatar settings"
-msgstr "Thay đổi hình đại diện"
+#~ msgid ""
+#~ "A confirmation code was sent to the GTalk email address you added. Check "
+#~ "your inbox (and spam box!) for the code and instructions on how to use it."
+#~ msgstr ""
+#~ "Mã xác nhận đã được gửi đến địa chỉ email GTalk của bạn. Hãy kiểm tra hộp "
+#~ "thư đến (và thư rác) và làm theo hướng dẫn trong thư."
 
-msgid "No avatar is selected."
-msgstr "Bạn chưa chọn hình để đưa lên."
+#~ msgid "Check virus"
+#~ msgstr "Kiểm tra virus"
 
-msgid "Change your avatar"
-msgstr "Thay đổi hình đại diện của bạn"
+#~ msgid "Avatar "
+#~ msgstr "Hình"
 
-msgid "Updates by Yahoo Messenger (YM)"
-msgstr "Cập nhật địa chỉ Yahoo để gửi tin qua Yahoo Mesenger(YM)"
+#~ msgid "Avatar settings"
+#~ msgstr "Thay đổi hình đại diện"
 
-msgid "Twitter integration options"
-msgstr "Các lựa chọn để tích hợp với Twitter "
+#~ msgid "Change your avatar"
+#~ msgstr "Thay đổi hình đại diện của bạn"
 
-msgid "Ban from network"
-msgstr "Ban user ra khỏi mạng"
+#~ msgid "Updates by Yahoo Messenger (YM)"
+#~ msgstr "Cập nhật địa chỉ Yahoo để gửi tin qua Yahoo Mesenger(YM)"
 
-msgid "Ban users violate rules of saigonica"
-msgstr "Ban user vi phạm nội quy của saigonica"
+#~ msgid "Ban from network"
+#~ msgstr "Ban user ra khỏi mạng"
 
-msgid "Ban user"
-msgstr "Ban user"
+#~ msgid "Ban users violate rules of saigonica"
+#~ msgstr "Ban user vi phạm nội quy của saigonica"
 
-msgid "Are you sure to ban this user?"
-msgstr "Bạn có chắc muốn ban người này không?"
+#~ msgid "Are you sure to ban this user?"
+#~ msgstr "Bạn có chắc muốn ban người này không?"
 
-msgid "Your account was banned."
-msgstr "Tài khoản của bạn đã bị ban."
+#~ msgid "Your account was banned."
+#~ msgstr "Tài khoản của bạn đã bị ban."
 
-msgid "User has been baned."
-msgstr "User đã bị ban."
+#~ msgid "User has been baned."
+#~ msgstr "User đã bị ban."
diff --git a/zh_CN/LC_MESSAGES/laconica.po b/zh_CN/LC_MESSAGES/laconica.po
index b5fb3b72f8..122ebb0a19 100644
--- a/zh_CN/LC_MESSAGES/laconica.po
+++ b/zh_CN/LC_MESSAGES/laconica.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: identi.ca\n"
-"Report-Msgid-Bugs-To: gouki@goukihq.org\n"
-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 12:10+0000\n"
 "PO-Revision-Date: 2008-12-16 21:31+0800\n"
 "Last-Translator: Yuan Yijun <bbbush.yuan@gmail.com>\n"
 "Language-Team: i18n-zh <i18n-zh@googlegroups.com>\n"
@@ -16,23 +16,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:61
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr "搜索有关\"%s\"的聚合"
 
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
 #: actions/finishopenidlogin.php:88 actions/register.php:205
+#: actions/register.php:232
 msgid ""
-" except this private data: password, email address, IM address, phone "
-"number."
+" except this private data: password, email address, IM address, phone number."
 msgstr "除了隐私内容：密码，电子邮件，即时通讯帐号，电话号码。"
 
 #: ../actions/showstream.php:400 ../lib/stream.php:109
 #: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+#: lib/facebookaction.php:195 lib/noticelist.php:160
 msgid " from "
 msgstr " 从 "
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: actions/twitapistatuses.php:341
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
 msgstr "%1$s / 回复 %2$s 的消息"
@@ -73,7 +76,8 @@ msgid ""
 "Sincerely, %2$s\n"
 msgstr ""
 
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:115
+#: lib/mail.php:117
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s 开始关注您的 %2$s 信息。"
@@ -90,14 +94,18 @@ msgid ""
 msgstr ""
 "%1$s 开始关注您的 %2$s 信息。\n"
 "\n"
-"\t%3$s\n\n为您效力的 %4$s\n"
+"\t%3$s\n"
+"\n"
+"为您效力的 %4$s\n"
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#: actions/twitapistatuses.php:344
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "回复 %2$s / %3$s 的 %1$s 更新。"
 
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
+#: actions/shownotice.php:73
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1$s 的 %2$s 状态"
@@ -116,26 +124,30 @@ msgstr "%s 公开聚合"
 #: ../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/twitapistatuses.php:123
 #, php-format
 msgid "%s and friends"
 msgstr "%s 及好友"
 
 #: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:31
 #, php-format
 msgid "%s public timeline"
 msgstr "%s 公众时间表"
 
-#: ../lib/mail.php:206 lib/mail.php:212
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:217
 #, php-format
 msgid "%s status"
 msgstr "%s 状态"
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:195
 #, php-format
 msgid "%s timeline"
 msgstr "%s 时间表"
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:34
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "来自所有人的 %s 消息！"
@@ -146,34 +158,37 @@ msgid ""
 "to confirm your email address.)"
 msgstr "(您将收到一封邮件，包含了如何确认邮件地址的说明。)"
 
-#: ../lib/util.php:257 lib/util.php:273
+#: ../lib/util.php:257 lib/util.php:273 lib/util.php:284
 #, 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%%** 是一个微博客服务，提供者为 "
-"[%%site.broughtby%%](%%site.broughtbyurl%%)。"
+"**%%site.name%%** 是一个微博客服务，提供者为 [%%site.broughtby%%](%%site."
+"broughtbyurl%%)。"
 
-#: ../lib/util.php:259 lib/util.php:275
+#: ../lib/util.php:259 lib/util.php:275 lib/util.php:286
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** 是一个微博客服务。"
 
-#: ../lib/util.php:274 lib/util.php:290
+#: ../lib/util.php:274 lib/util.php:290 lib/util.php:301
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr "。贡献者应当有全名或昵称。"
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 #: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
+#: actions/profilesettings.php:78
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1 到 64 个小写字母或数字，不包含标点及空白"
 
 #: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:193
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr "1 到 64 个小写字母或数字，不包含标点及空白。此项必填。"
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/profilesettings.php:186
 msgid "6 or more characters"
 msgstr "6 个或更多字符"
 
@@ -182,27 +197,33 @@ msgid "6 or more characters, and don't forget it!"
 msgstr "6 个或更多字符，不能忘记！"
 
 #: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:195
 msgid "6 or more characters. Required."
 msgstr "6 个或更多字符。此项必填。"
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, 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 "验证码已被发送到您新增的即时通讯帐号。您必须允许 %s 向您发送信息。"
 
 #: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:234
 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 "验证码已被发送到您新增的电子邮件。请检查收件箱(和垃圾箱)，找到验证码并按要求使用它。"
+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 "验证码已被发送到您新增的电话号码。请检查收件箱(和垃圾箱)，找到验证码并按要求使用它。"
+msgstr ""
+"验证码已被发送到您新增的电话号码。请检查收件箱(和垃圾箱)，找到验证码并按要求"
+"使用它。"
 
 #: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
 #: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
@@ -214,7 +235,14 @@ msgstr "验证码已被发送到您新增的电话号码。请检查收件箱(
 #: 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/twitapiusers.php:55 actions/twitapiaccount.php:30
+#: actions/twitapidirect_messages.php:107 actions/twitapifavorites.php:83
+#: actions/twitapifavorites.php:99 actions/twitapifriendships.php:117
+#: actions/twitapihelp.php:42 actions/twitapistatuses.php:77
+#: actions/twitapistatuses.php:144 actions/twitapistatuses.php:224
+#: actions/twitapistatuses.php:234 actions/twitapistatuses.php:386
+#: actions/twitapistatuses.php:395 actions/twitapistatuses.php:421
+#: actions/twitapiusers.php:30
 msgid "API method not found!"
 msgstr "API 方法未实现！"
 
@@ -232,11 +260,14 @@ msgstr "API 方法未实现！"
 #: 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/twitapistatuses.php:690 actions/twitapiaccount.php:39
+#: actions/twitapiaccount.php:89 actions/twitapiaccount.php:94
+#: actions/twitapidirect_messages.php:178 actions/twitapifavorites.php:139
+#: actions/twitapihelp.php:49 actions/twitapistatuses.php:549
 msgid "API method under construction."
 msgstr "API 方法尚未实现。"
 
-#: ../lib/util.php:324 lib/util.php:340
+#: ../lib/util.php:324 lib/util.php:340 lib/util.php:352
 msgid "About"
 msgstr "关于"
 
@@ -248,7 +279,7 @@ msgstr "接受"
 #: ../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/twittersettings.php:85 actions/twittersettings.php:84
 msgid "Add"
 msgstr "添加"
 
@@ -257,6 +288,7 @@ msgid "Add OpenID"
 msgstr "添加 OpenID"
 
 #: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: actions/deleteprofile.php:248
 msgid "Add or remove OpenIDs"
 msgstr "添加或移除 OpenID"
 
@@ -271,6 +303,7 @@ msgid "Addresses of friends to invite (one per line)"
 msgstr "要邀请的好友地址(每行一个)"
 
 #: ../actions/showstream.php:273 actions/showstream.php:288
+#: actions/showstream.php:336
 msgid "All subscriptions"
 msgstr "所有订阅"
 
@@ -280,6 +313,7 @@ msgid "All updates for %s"
 msgstr "所有 %s 消息"
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:63
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "所有匹配搜索条件\"%s\"的消息"
@@ -291,7 +325,7 @@ msgstr "所有匹配搜索条件\"%s\"的消息"
 msgid "Already logged in."
 msgstr "已登录。"
 
-#: ../lib/subs.php:42 lib/subs.php:42
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:47
 msgid "Already subscribed!."
 msgstr "已订阅！"
 
@@ -304,14 +338,14 @@ msgid "Authorize subscription"
 msgstr "确认订阅"
 
 #: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
+#: actions/register.php:192 actions/register.php:219
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "保持这台机器上的登录状态。不要在共用的机器上保持登录！"
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:103
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "自动订阅任何订阅我的更新的人(这个选项最适合机器人)"
 
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
@@ -320,6 +354,7 @@ msgid "Avatar"
 msgstr "头像"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
+#: actions/profilesettings.php:379
 msgid "Avatar updated."
 msgstr "头像已更新。"
 
@@ -334,24 +369,30 @@ msgstr ""
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
-msgstr "等待确认此地址。请查看您的收件箱(和垃圾箱)是否收到了邮件，其中包含了进一步的指示。"
+msgstr ""
+"等待确认此地址。请查看您的收件箱(和垃圾箱)是否收到了邮件，其中包含了进一步的"
+"指示。"
 
 #: ../actions/smssettings.php:58 actions/smssettings.php:58
 msgid "Awaiting confirmation on this phone number."
 msgstr "等待确认此电话号码。"
 
-#: ../lib/util.php:1318 lib/util.php:1452
-msgid "Before »"
+#: ../lib/util.php:1318 lib/util.php:1452 lib/facebookaction.php:259
+#: lib/util.php:1792
+#, fuzzy
+msgid "Before »"
 msgstr "之前 »"
 
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
 #: actions/profilesettings.php:82 actions/register.php:184
+#: actions/profilesettings.php:84 actions/register.php:211
 msgid "Bio"
 msgstr "个人小传"
 
 #: ../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:222 actions/register.php:98
 msgid "Bio is too long (max 140 chars)."
 msgstr "个人小传过长(不能超过140字符)。"
 
@@ -366,6 +407,7 @@ msgstr "无法访问头像URL '%s'"
 
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
+#: actions/profilesettings.php:433
 msgid "Can't save new password."
 msgstr "无法保存新密码。"
 
@@ -384,14 +426,17 @@ msgid "Cannot normalize that Jabber ID"
 msgstr "无法识别此Jabber ID"
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:204
 msgid "Cannot normalize that email address"
 msgstr "无法识别此电子邮件"
 
 #: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/profilesettings.php:189
 msgid "Change"
 msgstr "修改"
 
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: actions/deleteprofile.php:245
 msgid "Change email handling"
 msgstr "修改电子邮件"
 
@@ -404,6 +449,7 @@ msgid "Change your password"
 msgstr "修改密码"
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#: actions/deleteprofile.php:242
 msgid "Change your profile settings"
 msgstr "修改您的个人信息"
 
@@ -411,6 +457,7 @@ msgstr "修改您的个人信息"
 #: ../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/profilesettings.php:187 actions/register.php:196
 msgid "Confirm"
 msgstr "确认"
 
@@ -421,6 +468,7 @@ msgstr "确认地址"
 #: ../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:259
 msgid "Confirmation cancelled."
 msgstr "已取消确认。"
 
@@ -459,7 +507,7 @@ msgstr "连接"
 msgid "Connect existing account"
 msgstr "连接现有帐号"
 
-#: ../lib/util.php:332 lib/util.php:348
+#: ../lib/util.php:332 lib/util.php:348 lib/util.php:360
 msgid "Contact"
 msgstr "联系人"
 
@@ -470,11 +518,13 @@ msgstr "无法创建 OpenID 表单：%s"
 
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:46 actions/twitapifriendships.php:62
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "无法订阅用户：%s 已在订阅列表中。"
 
 #: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+#: actions/twitapifriendships.php:39
 msgid "Could not follow user: User not found."
 msgstr "无法订阅用户：未找到。"
 
@@ -491,11 +541,11 @@ msgstr "无法保存头像"
 msgid "Could not save new profile info"
 msgstr "无法保存个人信息"
 
-#: ../lib/subs.php:54 lib/subs.php:61
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:70
 msgid "Could not subscribe other to you."
 msgstr "无法订阅他人更新。"
 
-#: ../lib/subs.php:46 lib/subs.php:46
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:55
 msgid "Could not subscribe."
 msgstr "无法订阅。"
 
@@ -504,7 +554,7 @@ msgid "Could not update user with confirmed email address."
 msgstr "无法更新已确认的电子邮件。"
 
 #: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101
+#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:112
 msgid "Couldn't convert request tokens to access tokens."
 msgstr "无法将请求标记转换为访问令牌。"
 
@@ -512,43 +562,50 @@ msgstr "无法将请求标记转换为访问令牌。"
 #: ../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/emailsettings.php:255
 msgid "Couldn't delete email confirmation."
 msgstr "无法删除电子邮件确认。"
 
-#: ../lib/subs.php:103 lib/subs.php:116
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:129
 msgid "Couldn't delete subscription."
 msgstr "无法删除订阅。"
 
 #: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+#: actions/twitapistatuses.php:82
 msgid "Couldn't find any statuses."
 msgstr "找不到任何信息。"
 
 #: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
+#: actions/remotesubscribe.php:148
 msgid "Couldn't get a request token."
 msgstr "无法获得一份请求标记。"
 
 #: ../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:228
 msgid "Couldn't insert confirmation code."
 msgstr "无法插入验证码。"
 
 #: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182
+#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:216
 msgid "Couldn't insert new subscription."
 msgstr "无法添加新的订阅。"
 
 #: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
 #: actions/profilesettings.php:299 actions/twitapiaccount.php:94
+#: actions/profilesettings.php:319 actions/twitapiaccount.php:74
 msgid "Couldn't save profile."
 msgstr "无法保存个人信息。"
 
 #: ../actions/profilesettings.php:161 actions/profilesettings.php:276
+#: actions/profilesettings.php:296
 msgid "Couldn't update user for autosubscribe."
 msgstr "无法更新用户的自动订阅选项。"
 
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
 #: actions/emailsettings.php:298 actions/emailsettings.php:312
+#: actions/emailsettings.php:301 actions/emailsettings.php:315
 msgid "Couldn't update user record."
 msgstr "无法更新用户记录。"
 
@@ -560,6 +617,8 @@ msgstr "无法更新用户记录。"
 #: 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/emailsettings.php:179 actions/emailsettings.php:280
+#: actions/othersettings.php:173 actions/profilesettings.php:276
 msgid "Couldn't update user."
 msgstr "无法更新用户。"
 
@@ -576,6 +635,7 @@ msgid "Create new account"
 msgstr "创建新帐号"
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+#: actions/finishopenidlogin.php:208
 msgid "Creating new account for OpenID that already has a user."
 msgstr "为 OpenID 用户产生新的帐号。"
 
@@ -592,15 +652,16 @@ msgid "Current confirmed email address."
 msgstr "已确认的电子邮件。"
 
 #: ../actions/showstream.php:356 actions/showstream.php:367
+#: actions/showstream.php:418
 msgid "Currently"
 msgstr "目前"
 
-#: ../classes/Notice.php:72 classes/Notice.php:86
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:87
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr "添加标签时数据库出错：%s"
 
-#: ../lib/util.php:1061 lib/util.php:1110
+#: ../lib/util.php:1061 lib/util.php:1110 lib/util.php:1417
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "添加回复时数据库出错：%s"
@@ -611,12 +672,15 @@ msgstr "删除通告"
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
+#: actions/profilesettings.php:86 actions/register.php:213
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "用不超过140个字符描述您自己和您的爱好"
 
 #: ../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/deleteprofile.php:244 actions/register.php:199
+#: actions/register.php:202
 msgid "Email"
 msgstr "电子邮件"
 
@@ -628,7 +692,7 @@ msgstr "电子邮件地址"
 msgid "Email Settings"
 msgstr "电子邮件设置"
 
-#: ../actions/register.php:73 actions/register.php:80
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:89
 msgid "Email address already exists."
 msgstr "电子邮件地址已存在。"
 
@@ -657,6 +721,7 @@ msgid "Error authorizing token"
 msgstr "无法认证令牌"
 
 #: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
+#: actions/finishopenidlogin.php:274
 msgid "Error connecting user to OpenID."
 msgstr "无法将用户与 OpenID 连接。"
 
@@ -665,17 +730,17 @@ msgid "Error connecting user."
 msgstr "无法连接用户。"
 
 #: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:164
 msgid "Error inserting avatar"
 msgstr "添加头像出错"
 
 #: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145
+#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:156
 msgid "Error inserting new profile"
 msgstr "添加个人信息出错"
 
 #: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:180
 msgid "Error inserting remote profile"
 msgstr "添加远程的个人信息出错"
 
@@ -696,13 +761,15 @@ msgid "Error saving the user."
 msgstr "保存用户时出错。"
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/profilesettings.php:428
 msgid "Error saving user; invalid."
 msgstr "保存用户时出错；不正确。"
 
 #: ../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/register.php:108 actions/login.php:54 actions/login.php:80
+#: actions/register.php:117
 msgid "Error setting user."
 msgstr "保存用户设置时出错。"
 
@@ -711,7 +778,7 @@ msgid "Error updating profile"
 msgstr "更新个人信息时出错"
 
 #: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163
+#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:174
 msgid "Error updating remote profile"
 msgstr "更新远程的个人信息时出错"
 
@@ -723,11 +790,12 @@ msgstr "验证码出错。"
 msgid "Existing nickname"
 msgstr "昵称已被使用"
 
-#: ../lib/util.php:326 lib/util.php:342
+#: ../lib/util.php:326 lib/util.php:342 lib/util.php:354
 msgid "FAQ"
 msgstr "常见问题FAQ"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/profilesettings.php:381
 msgid "Failed updating avatar."
 msgstr "更新头像失败。"
 
@@ -743,7 +811,7 @@ msgstr "%s 好友的聚合"
 msgid "Feed for replies to %s"
 msgstr "%s 回复的聚合"
 
-#: ../actions/tag.php:55 actions/tag.php:55
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:54
 #, php-format
 msgid "Feed for tag %s"
 msgstr "%s 标签的聚合"
@@ -764,38 +832,44 @@ msgstr "由于安全原因，修改设置前需要输入用户名和密码。"
 
 #: ../actions/profilesettings.php:44 ../actions/register.php:164
 #: actions/profilesettings.php:77 actions/register.php:178
+#: actions/profilesettings.php:79 actions/register.php:205
 msgid "Full name"
 msgstr "全名"
 
 #: ../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/profilesettings.php:219 actions/register.php:95
 msgid "Full name is too long (max 255 chars)."
 msgstr "全名过长(不能超过 255 个字符)。"
 
-#: ../lib/util.php:322 lib/util.php:338
+#: ../lib/util.php:322 lib/util.php:338 lib/util.php:343 lib/util.php:350
 msgid "Help"
 msgstr "帮助"
 
-#: ../lib/util.php:298 lib/util.php:314
+#: ../lib/util.php:298 lib/util.php:314 lib/util.php:325
 msgid "Home"
 msgstr "主页"
 
 #: ../actions/profilesettings.php:46 ../actions/register.php:167
 #: actions/profilesettings.php:79 actions/register.php:181
+#: actions/profilesettings.php:81 actions/register.php:208
 msgid "Homepage"
 msgstr "主页"
 
 #: ../actions/profilesettings.php:95 ../actions/register.php:76
 #: actions/profilesettings.php:210 actions/register.php:83
+#: actions/profilesettings.php:216 actions/register.php:92
 msgid "Homepage is not a valid URL."
 msgstr "主页的URL不正确。"
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+#: actions/emailsettings.php:101
 msgid "I want to post notices by email."
 msgstr "我希望通过邮件发布信息。"
 
 #: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+#: actions/deleteprofile.php:253
 msgid "IM"
 msgstr "即时通讯IM"
 
@@ -831,14 +905,16 @@ msgid "Incoming email"
 msgstr "发布用的电子邮件"
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+#: actions/emailsettings.php:304
 msgid "Incoming email address removed."
 msgstr "发布用的电子邮件被移除。"
 
 #: ../actions/password.php:69 actions/profilesettings.php:388
+#: actions/profilesettings.php:417
 msgid "Incorrect old password"
 msgstr "旧密码不正确"
 
-#: ../actions/login.php:67 actions/login.php:67
+#: ../actions/login.php:67 actions/login.php:67 actions/login.php:74
 msgid "Incorrect username or password."
 msgstr "用户名或密码不正确。"
 
@@ -869,14 +945,17 @@ msgid "Invalid license URL '%s'"
 msgstr "授权方式URL '%s'不正确"
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:63
 msgid "Invalid notice content"
 msgstr "通告内容不正确"
 
 #: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:69
 msgid "Invalid notice uri"
 msgstr "通告URI不正确"
 
 #: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:74
 msgid "Invalid notice url"
 msgstr "通告URL不正确"
 
@@ -890,7 +969,7 @@ msgid "Invalid profile URL (bad format)"
 msgstr "个人信息URL不正确(格式错误)"
 
 #: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:78
 msgid "Invalid profile URL returned by server."
 msgstr "服务器返回的个人信息URL不正确。"
 
@@ -901,6 +980,8 @@ msgstr "大小不正确。"
 #: ../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:256 actions/register.php:112
+#: actions/register.php:130
 msgid "Invalid username or password."
 msgstr "用户名或密码不正确。"
 
@@ -912,7 +993,7 @@ msgstr "已发送邀请"
 msgid "Invitation(s) sent to the following people:"
 msgstr "已发送邀请给这些人："
 
-#: ../lib/util.php:306 lib/util.php:322
+#: ../lib/util.php:306 lib/util.php:322 lib/util.php:332
 msgid "Invite"
 msgstr "邀请"
 
@@ -920,16 +1001,16 @@ msgstr "邀请"
 msgid "Invite new users"
 msgstr "邀请新用户"
 
-#: ../lib/util.php:261 lib/util.php:277
+#: ../lib/util.php:261 lib/util.php:277 lib/util.php:288
 #, 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 ""
-"它运行[Laconica](http://laconi.ca/)微博客服务，版本 "
-"%s，采用[GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)授权。"
+"它运行[Laconica](http://laconi.ca/)微博客服务，版本 %s，采用[GNU Affero "
+"General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)"
+"授权。"
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
 msgid "Jabber ID already belongs to another user."
@@ -941,35 +1022,42 @@ 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 或 GTalk "
-"帐号，类似\"UserName@example.org\"。首先，必须在即时聊天工具或GTalk中将 %s 加为好友。"
+"Jabber 或 GTalk 帐号，类似\"UserName@example.org\"。首先，必须在即时聊天工具"
+"或GTalk中将 %s 加为好友。"
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
 msgid "Language"
 msgstr "语言"
 
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+#: actions/profilesettings.php:234
 msgid "Language is too long (max 50 chars)."
 msgstr "语言过长(不能超过50个字符)。"
 
 #: ../actions/profilesettings.php:52 ../actions/register.php:173
 #: actions/profilesettings.php:85 actions/register.php:187
+#: actions/profilesettings.php:87 actions/register.php:214
 msgid "Location"
 msgstr "位置"
 
 #: ../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/profilesettings.php:225 actions/register.php:101
 msgid "Location is too long (max 255 chars)."
 msgstr "位置过长(不能超过255个字符)。"
 
 #: ../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/login.php:104 actions/login.php:113 actions/openidlogin.php:88
+#: lib/util.php:336
 msgid "Login"
 msgstr "登录"
 
 #: ../actions/openidlogin.php:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:60
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "使用[OpenID](%%doc.openid%%)帐号登录。"
@@ -977,20 +1065,21 @@ msgstr "使用[OpenID](%%doc.openid%%)帐号登录。"
 #: ../actions/login.php:126
 #, 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 ""
 
-#: ../lib/util.php:308 lib/util.php:324
+#: ../lib/util.php:308 lib/util.php:324 lib/util.php:334
 msgid "Logout"
 msgstr "登出"
 
 #: ../actions/register.php:166 actions/register.php:180
+#: actions/register.php:207
 msgid "Longer name, preferably your \"real\" name"
 msgstr "长名字，最好是“实名”"
 
-#: ../actions/login.php:110 actions/login.php:110
+#: ../actions/login.php:110 actions/login.php:110 actions/login.php:118
 msgid "Lost or forgotten password?"
 msgstr "忘记了密码？"
 
@@ -1005,6 +1094,7 @@ msgid "Manage how you get email from %%site.name%%."
 msgstr "设置 %%site.name%% 发送的邮件。"
 
 #: ../actions/showstream.php:300 actions/showstream.php:315
+#: actions/showstream.php:363
 msgid "Member since"
 msgstr "注册于"
 
@@ -1018,10 +1108,13 @@ msgstr "%s 的微博客服务"
 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 "电话的服务商。如果您的服务商支持通过电子邮件发送SMS短信，而这里尚未列出，请联系 %s 以告知。"
+msgstr ""
+"电话的服务商。如果您的服务商支持通过电子邮件发送SMS短信，而这里尚未列出，请联"
+"系 %s 以告知。"
 
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
 #: actions/finishopenidlogin.php:85 actions/register.php:202
+#: actions/register.php:229
 msgid "My text and files are available under "
 msgstr "我的文字和文件采用的授权方式为"
 
@@ -1030,12 +1123,13 @@ msgstr "我的文字和文件采用的授权方式为"
 msgid "New"
 msgstr "新建"
 
-#: ../lib/mail.php:144 lib/mail.php:144
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:138
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "新的电子邮件地址，用于发布 %s 信息"
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+#: actions/emailsettings.php:318
 msgid "New incoming email address added."
 msgstr "已添加新的发布用的电子邮件地址。"
 
@@ -1044,11 +1138,13 @@ msgid "New nickname"
 msgstr "新昵称"
 
 #: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:141
 msgid "New notice"
 msgstr "新通告"
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
 #: actions/profilesettings.php:180 actions/recoverpassword.php:185
+#: actions/profilesettings.php:185
 msgid "New password"
 msgstr "新密码"
 
@@ -1059,12 +1155,16 @@ msgstr "新密码已保存，您现在已登录。"
 #: ../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:108 actions/profilesettings.php:76
+#: actions/register.php:192
 msgid "Nickname"
 msgstr "昵称"
 
 #: ../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/finishopenidlogin.php:192 actions/profilesettings.php:231
+#: actions/register.php:85
 msgid "Nickname already in use. Try another one."
 msgstr "昵称已被使用，换一个吧。"
 
@@ -1072,10 +1172,13 @@ msgstr "昵称已被使用，换一个吧。"
 #: ../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:182 actions/profilesettings.php:209
+#: actions/register.php:83
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "昵称只能使用小写字母和数字，不包含空格。"
 
 #: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:187
 msgid "Nickname not allowed."
 msgstr "不允许的昵称。"
 
@@ -1088,6 +1191,7 @@ msgid "Nickname or email"
 msgstr "昵称或电子邮件"
 
 #: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:104
 msgid "No"
 msgstr "否"
 
@@ -1112,11 +1216,13 @@ msgid "No confirmation code."
 msgstr "没有验证码"
 
 #: ../actions/newnotice.php:44 actions/newmessage.php:53
-#: actions/newnotice.php:44 classes/Command.php:197
+#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:52
+#: actions/newnotice.php:53
 msgid "No content!"
 msgstr "没有内容！"
 
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+#: actions/emailsettings.php:197
 msgid "No email address."
 msgstr "没有电子邮件地址。"
 
@@ -1125,11 +1231,12 @@ msgid "No id."
 msgstr "没有 id。"
 
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+#: actions/emailsettings.php:292
 msgid "No incoming email address."
 msgstr "没有发布用的电子邮件地址。"
 
 #: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67
+#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:66
 msgid "No nickname provided by remote server."
 msgstr "远程服务器没有昵称。"
 
@@ -1140,6 +1247,7 @@ msgstr "没有昵称。"
 #: ../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:243
 msgid "No pending confirmation to cancel."
 msgstr "没有可以取消的确认。"
 
@@ -1148,7 +1256,7 @@ msgid "No phone number."
 msgstr "没有电话号码。"
 
 #: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74
+#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:73
 msgid "No profile URL returned by server."
 msgstr "服务器没有返回个人信息URL。"
 
@@ -1162,6 +1270,7 @@ msgstr "没有找到请求！"
 
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
 #: actions/noticesearch.php:69 actions/peoplesearch.php:69
+#: actions/noticesearch.php:68 actions/peoplesearch.php:59
 msgid "No results"
 msgstr "没有结果"
 
@@ -1170,11 +1279,13 @@ msgid "No size."
 msgstr "没有大小。"
 
 #: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
+#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:109
+#: actions/twitapistatuses.php:438
 msgid "No status found with that ID."
 msgstr "没有找到此ID的信息。"
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:411
 msgid "No status with that ID found."
 msgstr "没有找到此ID的信息。"
 
@@ -1188,7 +1299,8 @@ msgstr "没有这份文档。"
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
 #: ../lib/deleteaction.php:30 actions/shownotice.php:32
-#: actions/shownotice.php:83 lib/deleteaction.php:30
+#: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:38
+#: actions/shownotice.php:114
 msgid "No such notice."
 msgstr "没有这份通告。"
 
@@ -1215,7 +1327,9 @@ msgstr "没有这个订阅"
 #: 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
+#: lib/subs.php:33 lib/subs.php:95 actions/showstream.php:157
+#: classes/Command.php:208 classes/Command.php:242 lib/gallery.php:85
+#: lib/subs.php:105
 msgid "No such user."
 msgstr "没有这个用户。"
 
@@ -1237,7 +1351,8 @@ 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:502 lib/twitterapi.php:423 lib/twitterapi.php:450
+#: lib/twitterapi.php:534
 msgid "Not a supported data format."
 msgstr "不支持的数据格式。"
 
@@ -1250,15 +1365,17 @@ msgid "Not a valid OpenID."
 msgstr "不是有效的 OpenID。"
 
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+#: actions/emailsettings.php:208
 msgid "Not a valid email address"
 msgstr "不是有效的电子邮件"
 
-#: ../actions/register.php:63 actions/register.php:70
+#: ../actions/register.php:63 actions/register.php:70 actions/register.php:79
 msgid "Not a valid email address."
 msgstr "不是有效的电子邮件。"
 
 #: ../actions/profilesettings.php:91 ../actions/register.php:71
 #: actions/profilesettings.php:206 actions/register.php:78
+#: actions/profilesettings.php:212 actions/register.php:87
 msgid "Not a valid nickname."
 msgstr "不是有效的昵称。"
 
@@ -1275,11 +1392,12 @@ msgid "Not a valid profile URL (no YADIS document)."
 msgstr "不是有效的个人信息URL(没有YADIS数据)。"
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: actions/profilesettings.php:361
 msgid "Not an image or corrupt file."
 msgstr "不是图片文件或文件已损坏。"
 
 #: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:52
 msgid "Not authorized."
 msgstr "未认证。"
 
@@ -1289,6 +1407,7 @@ msgid "Not expecting this response!"
 msgstr "未预料的响应！"
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+#: actions/twitapistatuses.php:304
 msgid "Not found"
 msgstr "未找到"
 
@@ -1299,11 +1418,12 @@ msgstr "未找到"
 #: 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
+#: lib/settingsaction.php:27 actions/block.php:31 actions/newnotice.php:30
+#: actions/nudge.php:30 actions/subedit.php:31 actions/unblock.php:31
 msgid "Not logged in."
 msgstr "未登录。"
 
-#: ../lib/subs.php:91 lib/subs.php:104
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:117
 msgid "Not subscribed!."
 msgstr "未订阅！"
 
@@ -1312,15 +1432,19 @@ msgid "Notice Search"
 msgstr "搜索通告"
 
 #: ../actions/showstream.php:82 actions/showstream.php:82
+#: actions/showstream.php:111 actions/showstream.php:118
+#: actions/showstream.php:123
 #, php-format
 msgid "Notice feed for %s"
 msgstr "%s 的通告聚合"
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
+#: actions/shownotice.php:45
 msgid "Notice has no profile"
 msgstr "通告没有关联个人信息"
 
 #: ../actions/showstream.php:316 actions/showstream.php:331
+#: actions/showstream.php:379
 msgid "Notices"
 msgstr "通告"
 
@@ -1331,11 +1455,12 @@ msgid "Notices tagged with %s"
 msgstr "带 %s 标签的通告"
 
 #: ../actions/password.php:39 actions/profilesettings.php:178
+#: actions/profilesettings.php:183
 msgid "Old password"
 msgstr "旧密码"
 
 #: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
-#: lib/util.php:330
+#: lib/util.php:330 actions/deleteprofile.php:247 lib/util.php:340
 msgid "OpenID"
 msgstr "OpenID"
 
@@ -1350,11 +1475,13 @@ msgstr "OpenID 自动提交"
 #: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
 #: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
+#: actions/finishopenidlogin.php:150 actions/openidlogin.php:76
 msgid "OpenID Login"
 msgstr "OpenID 登录"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 #: actions/openidlogin.php:74 actions/openidsettings.php:50
+#: actions/openidlogin.php:82
 msgid "OpenID URL"
 msgstr "OpenID URL"
 
@@ -1387,13 +1514,14 @@ msgid "Optionally add a personal message to the invitation."
 msgstr "在邀请中加几句话(可选)。"
 
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: actions/profilesettings.php:350
 msgid "Partial upload."
 msgstr "部分上传。"
 
 #: ../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/register.php:167 actions/login.php:109 actions/register.php:194
 msgid "Password"
 msgstr "密码"
 
@@ -1412,11 +1540,13 @@ msgstr "请求恢复密码"
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
 #: actions/profilesettings.php:408 actions/recoverpassword.php:326
+#: actions/profilesettings.php:437
 msgid "Password saved."
 msgstr "密码已保存。"
 
 #: ../actions/password.php:61 ../actions/register.php:88
 #: actions/profilesettings.php:380 actions/register.php:98
+#: actions/profilesettings.php:409 actions/register.php:107
 msgid "Passwords don't match."
 msgstr "密码不匹配。"
 
@@ -1449,7 +1579,9 @@ 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 "请检查详细信息，确认希望订阅此用户的通告。如果您刚才没有要求订阅任何人的通告，请点击\"取消\"。"
+msgstr ""
+"请检查详细信息，确认希望订阅此用户的通告。如果您刚才没有要求订阅任何人的通"
+"告，请点击\"取消\"。"
 
 #: ../actions/imsettings.php:73 actions/imsettings.php:74
 msgid "Post a notice when my Jabber/GTalk status changes."
@@ -1465,24 +1597,26 @@ msgstr "首选项"
 #: ../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:185 actions/othersettings.php:179
 msgid "Preferences saved."
 msgstr "首选项已保存。"
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
 msgid "Preferred language"
 msgstr "首选语言"
 
-#: ../lib/util.php:328 lib/util.php:344
+#: ../lib/util.php:328 lib/util.php:344 lib/util.php:356
 msgid "Privacy"
 msgstr "隐私"
 
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119
+#: classes/Notice.php:119 classes/Notice.php:139 classes/Notice.php:149
 msgid "Problem saving notice."
 msgstr "保存通告时出错。"
 
 #: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
-#: lib/settingsaction.php:84
+#: lib/settingsaction.php:84 actions/deleteprofile.php:241
 msgid "Profile"
 msgstr "个人信息"
 
@@ -1499,11 +1633,11 @@ msgstr "个人设置"
 msgid "Profile unknown"
 msgstr "未知的帐号"
 
-#: ../actions/public.php:54 actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:77
 msgid "Public Stream Feed"
 msgstr "公开的聚合"
 
-#: ../actions/public.php:33 actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 lib/stream.php:34
 msgid "Public timeline"
 msgstr "公开的时间表"
 
@@ -1512,6 +1646,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "公开Jabber/GTalk帐号的 MicroID。"
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:104
 msgid "Publish a MicroID for my email address."
 msgstr "公开电子邮件的 MicroID。"
 
@@ -1534,14 +1669,17 @@ msgstr "恢复码未知"
 
 #: ../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:181 actions/register.php:234 lib/util.php:338
 msgid "Register"
 msgstr "注册"
 
 #: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:173
 msgid "Registration not allowed."
 msgstr "不允许注册。"
 
 #: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:241
 msgid "Registration successful"
 msgstr "注册成功。"
 
@@ -1550,7 +1688,8 @@ msgid "Reject"
 msgstr "拒绝"
 
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
-#: actions/register.php:190
+#: actions/register.php:190 actions/login.php:110 actions/openidlogin.php:85
+#: actions/register.php:217
 msgid "Remember me"
 msgstr "记住登录状态"
 
@@ -1568,7 +1707,7 @@ msgstr "远程订阅"
 #: 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/twittersettings.php:61
 msgid "Remove"
 msgstr "移除"
 
@@ -1601,6 +1740,7 @@ msgid "Reset password"
 msgstr "重置密码"
 
 #: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/deleteprofile.php:250 actions/subscriptions.php:73
 msgid "SMS"
 msgstr "SMS短信"
 
@@ -1612,7 +1752,7 @@ msgstr "SMS短信电话号码"
 msgid "SMS Settings"
 msgstr "SMS短信设置"
 
-#: ../lib/mail.php:219 lib/mail.php:225
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:230
 msgid "SMS confirmation"
 msgstr "SMS短信确认"
 
@@ -1621,6 +1761,7 @@ msgid "Same as password above"
 msgstr "相同的密码"
 
 #: ../actions/register.php:156 actions/register.php:170
+#: actions/register.php:197
 msgid "Same as password above. Required."
 msgstr "相同的密码。此项必填。"
 
@@ -1628,39 +1769,48 @@ msgstr "相同的密码。此项必填。"
 #: ../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:107
+#: actions/othersettings.php:56 actions/profilesettings.php:106
+#: actions/subscriptions.php:74 actions/tagother.php:100
+#: actions/twittersettings.php:82
 msgid "Save"
 msgstr "保存"
 
 #: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316
+#: lib/util.php:316 lib/util.php:327
 msgid "Search"
 msgstr "搜索"
 
 #: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:84
 msgid "Search Stream Feed"
 msgstr "搜索聚合"
 
 #: ../actions/noticesearch.php:30 actions/noticesearch.php:30
+#: actions/noticesearch.php:29
 #, 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 "在 %%site.name%% 的通告内容中搜索。搜索条件至少包含 3 个字符，多个搜索条件用空格分隔。"
+msgstr ""
+"在 %%site.name%% 的通告内容中搜索。搜索条件至少包含 3 个字符，多个搜索条件用"
+"空格分隔。"
 
 #: ../actions/peoplesearch.php:28
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
 "Separate the terms by spaces; they must be 3 characters or more."
-msgstr "在 %%site.name%% 的用户信息中搜索，可以搜索姓名、未知和爱好。搜索条件至少包含 3 个字符，多个搜索条件用空格分隔。"
+msgstr ""
+"在 %%site.name%% 的用户信息中搜索，可以搜索姓名、未知和爱好。搜索条件至少包"
+"含 3 个字符，多个搜索条件用空格分隔。"
 
 #: ../actions/smssettings.php:296 actions/smssettings.php:304
 msgid "Select a carrier"
 msgstr "选择运营商"
 
 #: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
-#: lib/util.php:1306 lib/util.php:1731
+#: lib/util.php:1306 lib/util.php:1731 lib/util.php:1646 lib/util.php:2158
 msgid "Send"
 msgstr "发送"
 
@@ -1687,15 +1837,16 @@ msgstr "通过SMS短信将通告发给我；我了解这样也许会给我带来
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr "如果我尚未订阅的用户回我消息，使用Jabber/GTalk通知我。"
 
-#: ../lib/util.php:304 lib/util.php:320
+#: ../lib/util.php:304 lib/util.php:320 lib/util.php:330
 msgid "Settings"
 msgstr "设置"
 
 #: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:336
 msgid "Settings saved."
 msgstr "设置已保存。"
 
-#: ../actions/tag.php:60 actions/tag.php:60
+#: ../actions/tag.php:60 actions/tag.php:60 actions/tag.php:59
 msgid "Showing most popular tags from the last week"
 msgstr "显示上周以来最流行的标签"
 
@@ -1716,27 +1867,31 @@ msgstr "对不起，发布用的电子邮件无法使用。"
 msgid "Sorry, that is not your incoming email address."
 msgstr "对不起，这个发布用的电子邮件属于其他用户。"
 
-#: ../lib/util.php:330 lib/util.php:346
+#: ../lib/util.php:330 lib/util.php:346 lib/util.php:358
 msgid "Source"
 msgstr "来源"
 
 #: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:359
 msgid "Statistics"
 msgstr "统计"
 
 #: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
 #: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
+#: actions/finishopenidlogin.php:199 actions/finishopenidlogin.php:267
 msgid "Stored OpenID not found."
 msgstr "未找到已有的OpenID。"
 
 #: ../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:254 lib/util.php:2078
 msgid "Subscribe"
 msgstr "订阅"
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
 #: actions/showstream.php:328 actions/subscribers.php:27
+#: actions/showstream.php:376 lib/gallery.php:136 lib/gallery.php:137
 msgid "Subscribers"
 msgstr "订阅者"
 
@@ -1751,15 +1906,20 @@ msgstr "订阅被拒绝"
 #: ../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:288 actions/showstream.php:370 lib/gallery.php:131
+#: lib/gallery.php:132
 msgid "Subscriptions"
 msgstr "订阅"
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
+#: actions/profilesettings.php:353
 msgid "System error uploading file."
 msgstr "上传文件时出错。"
 
 #: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317
+#: lib/util.php:317 actions/profilesettings.php:90 actions/showstream.php:382
+#: actions/tag.php:40 actions/tagother.php:96 actions/tagother.php:162
+#: lib/profilelist.php:126 lib/profilelist.php:128
 msgid "Tags"
 msgstr "标签"
 
@@ -1768,6 +1928,7 @@ msgid "Text"
 msgstr "文本"
 
 #: ../actions/noticesearch.php:34 actions/noticesearch.php:34
+#: actions/noticesearch.php:33
 msgid "Text search"
 msgstr "搜索文本"
 
@@ -1784,10 +1945,12 @@ msgid "That confirmation code is not for you!"
 msgstr "此确认码不适用！"
 
 #: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:214
 msgid "That email address already belongs to another user."
 msgstr "此电子邮件属于其他用户。"
 
 #: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: actions/profilesettings.php:346
 msgid "That file is too big."
 msgstr "文件超出大小限制。"
 
@@ -1796,6 +1959,7 @@ msgid "That is already your Jabber ID."
 msgstr "您已登记此Jabber帐号。"
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:211
 msgid "That is already your email address."
 msgstr "您已登记此电子邮件。"
 
@@ -1808,6 +1972,7 @@ msgid "That is not your Jabber ID."
 msgstr "这不是您的Jabber帐号。"
 
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+#: actions/emailsettings.php:270
 msgid "That is not your email address."
 msgstr "这是他人的电子邮件。"
 
@@ -1817,6 +1982,7 @@ msgstr "这是他人的电话号码。"
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
 #: actions/emailsettings.php:244 actions/imsettings.php:218
+#: actions/emailsettings.php:247
 msgid "That is the wrong IM address."
 msgstr "即时通讯帐号错误。"
 
@@ -1830,10 +1996,12 @@ msgstr "这个电话号码属于另一个用户。"
 
 #: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
 #: actions/newnotice.php:49 actions/twitapistatuses.php:330
+#: actions/newnotice.php:61 actions/twitapistatuses.php:271
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "超出长度限制。不能超过 140 个字符。"
 
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+#: actions/twitapiaccount.php:55
 msgid "That's too long. Max notice size is 255 chars."
 msgstr "超出长度限制。不能超过 255 个字符。"
 
@@ -1845,6 +2013,7 @@ msgstr "地址 \"%s\" 已确认。"
 #: ../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:285
 msgid "The address was removed."
 msgstr "地址被移除。"
 
@@ -1853,7 +2022,8 @@ 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 "订阅已确认，但是没有回传URL。请到此网站查看如何确认订阅。您的订阅标识是："
+msgstr ""
+"订阅已确认，但是没有回传URL。请到此网站查看如何确认订阅。您的订阅标识是："
 
 #: ../actions/userauthorization.php:322
 msgid ""
@@ -1882,8 +2052,7 @@ msgstr "这是您订阅的用户。"
 
 #: ../actions/invite.php:89 actions/invite.php:96
 msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
+"These people are already users and you were automatically subscribed to them:"
 msgstr "这些好友已注册，您已自动订阅这些用户。"
 
 #: ../actions/recoverpassword.php:88
@@ -1902,48 +2071,56 @@ 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 "这是您第一次登陆 %s，我们需要将 OpenID 连接到这里的帐号。您可以创建新帐号，或者连接到已有的帐号。"
+msgstr ""
+"这是您第一次登陆 %s，我们需要将 OpenID 连接到这里的帐号。您可以创建新帐号，或"
+"者连接到已有的帐号。"
 
 #: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511
+#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:94
+#: actions/twitapifriendships.php:82 actions/twitapistatuses.php:428
 msgid "This method requires a POST or DELETE."
 msgstr "此方法接受POST或DELETE请求。"
 
 #: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
 #: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
 #: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303
+#: actions/twitapistatuses.php:303 actions/twitapiaccount.php:46
+#: actions/twitapidirect_messages.php:117 actions/twitapifriendships.php:30
+#: actions/twitapistatuses.php:239
 msgid "This method requires a POST."
 msgstr "此方法接受POST请求。"
 
-#: ../lib/util.php:164 lib/util.php:246
+#: ../lib/util.php:164 lib/util.php:246 lib/util.php:257
 msgid "This page is not available in a media type you accept"
 msgstr "这个页面不提供您想要的媒体类型"
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
 msgid "Timezone"
 msgstr "时区"
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:228
 msgid "Timezone not selected."
 msgstr "未选择时区。"
 
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"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 ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: actions/twitapifriendships.php:128
 msgid "Two user ids or screen_names must be supplied."
 msgstr "必须提供两个用户帐号或昵称。"
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 #: actions/profilesettings.php:81 actions/register.php:183
+#: actions/profilesettings.php:83 actions/register.php:210
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "您的主页、博客或在其他站点的URL"
 
@@ -1955,7 +2132,8 @@ msgstr "您在其他兼容的微博客服务的个人信息URL"
 #: ../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/twittersettings.php:108 actions/emailsettings.php:147
+#: actions/othersettings.php:146 actions/twittersettings.php:199
 msgid "Unexpected form submission."
 msgstr "未预料的表单提交。"
 
@@ -1968,11 +2146,11 @@ msgid "Unknown action"
 msgstr "未知动作"
 
 #: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60
+#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:59
 msgid "Unknown version of OMB protocol."
 msgstr "此OMB协议版本无效。"
 
-#: ../lib/util.php:269 lib/util.php:285
+#: ../lib/util.php:269 lib/util.php:285 lib/util.php:296
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
@@ -1984,6 +2162,7 @@ msgid "Unrecognized address type %s"
 msgstr "不可识别的地址类型 %s"
 
 #: ../actions/showstream.php:209 actions/showstream.php:219
+#: actions/showstream.php:267 lib/util.php:2094
 msgid "Unsubscribe"
 msgstr "退订"
 
@@ -1993,28 +2172,34 @@ msgid "Unsupported OMB version"
 msgstr "不支持此OMB版本"
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: actions/profilesettings.php:371
 msgid "Unsupported image file format."
 msgstr "不支持这种图像格式。"
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: actions/deleteprofile.php:251
 msgid "Updates by SMS"
 msgstr "使用SMS短信更新"
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: actions/deleteprofile.php:254
 msgid "Updates by instant messenger (IM)"
 msgstr "使用即时通讯工具(IM)更新"
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/twitapistatuses.php:126
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "%2$s 上 %1$s 和好友的更新！"
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:198
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "%2$s 上 %1$s 的更新！"
 
 #: ../actions/avatar.php:68 actions/profilesettings.php:161
+#: actions/profilesettings.php:166
 msgid "Upload"
 msgstr "上传"
 
@@ -2024,7 +2209,9 @@ msgid ""
 "you upload it, so make sure it's more or less square. It must be under the "
 "site license, also. Use a picture that belongs to you and that you want to "
 "share."
-msgstr "在这里上传新的头像。上传后无法修改，请尽量使用正方形图片。图片必须使用与站点相同的授权。请使用您希望分享的属于您的图片。"
+msgstr ""
+"在这里上传新的头像。上传后无法修改，请尽量使用正方形图片。图片必须使用与站点"
+"相同的授权。请使用您希望分享的属于您的图片。"
 
 #: ../lib/settingsaction.php:91
 msgid "Upload a new profile image"
@@ -2032,17 +2219,17 @@ msgstr "上传个人信息头像"
 
 #: ../actions/invite.php:114 actions/invite.php:121
 msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
+"Use this form to invite your friends and colleagues to use this service."
 msgstr "使用这个表单来邀请好友和同事加入。"
 
 #: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176
+#: actions/register.php:173 actions/register.php:176 actions/register.php:200
+#: actions/register.php:203
 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:92
 msgid "User being listened to doesn't exist."
 msgstr "要查看的用户不存在。"
 
@@ -2055,7 +2242,10 @@ msgstr "要查看的用户不存在。"
 #: 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/twitapiusers.php:87 lib/mailbox.php:50 actions/showstream.php:57
+#: actions/twitapiaccount.php:63 actions/twitapifavorites.php:40
+#: actions/twitapistatuses.php:163 actions/twitapistatuses.php:492
+#: lib/twitterapi.php:590
 msgid "User has no profile."
 msgstr "用户没有个人信息。"
 
@@ -2068,16 +2258,18 @@ msgid "User not found."
 msgstr "未找到用户。"
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
 msgid "What timezone are you normally in?"
 msgstr "您一般处于哪个时区？"
 
-#: ../lib/util.php:1159 lib/util.php:1293
+#: ../lib/util.php:1159 lib/util.php:1293 lib/util.php:1630
 #, php-format
 msgid "What's up, %s?"
 msgstr "怎么样，%s？"
 
 #: ../actions/profilesettings.php:54 ../actions/register.php:175
 #: actions/profilesettings.php:87 actions/register.php:189
+#: actions/profilesettings.php:89 actions/register.php:216
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "你的位置，格式类似\"城市，省份，国家\""
 
@@ -2093,6 +2285,7 @@ msgstr "图像大小 '%s' 错误"
 
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
 #: actions/deletenotice.php:64 actions/deletenotice.php:79
+#: actions/block.php:105
 msgid "Yes"
 msgstr "是"
 
@@ -2115,6 +2308,7 @@ msgid "You are already subscribed to these users:"
 msgstr "您已订阅这些用户："
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:102
 msgid "You are not friends with the specified user."
 msgstr "您与此用户并非好友。"
 
@@ -2140,23 +2334,26 @@ msgstr "您可以点击\"移除\"按钮，移除帐号的 OpenID。"
 #: ../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."
-msgstr "您可以通过Jabber/GTalk [即时通讯工具](%%doc.im%%)发送和接受通告。在这里配置它们。"
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
+msgstr ""
+"您可以通过Jabber/GTalk [即时通讯工具](%%doc.im%%)发送和接受通告。在这里配置它"
+"们。"
 
 #: ../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
+#: actions/finishremotesubscribe.php:83 actions/finishremotesubscribe.php:99
 msgid "You can use the local subscription!"
 msgstr "您可以在这里订阅！"
 
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
 #: actions/finishopenidlogin.php:38 actions/register.php:68
+#: actions/register.php:77
 msgid "You can't register if you don't agree to the license."
 msgstr "您必须同意此授权方可注册。"
 
@@ -2178,9 +2375,14 @@ msgid ""
 msgstr ""
 "您的 %1$s 发布用地址已更新。\n"
 "\n"
-"发送邮件到 %2$s 来发布新消息。\n\n更多电子邮件的帮助请见 %3$s。\n\n为您效力的 %4$s"
+"发送邮件到 %2$s 来发布新消息。\n"
+"\n"
+"更多电子邮件的帮助请见 %3$s。\n"
+"\n"
+"为您效力的 %4$s"
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: actions/twitapistatuses.php:455
 msgid "You may not delete another user's status."
 msgstr "您不能删除其他用户的状态。"
 
@@ -2200,6 +2402,7 @@ msgid "You've been identified. Enter a  new password below. "
 msgstr "您已得到确认。请输入新密码。"
 
 #: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:84
 msgid "Your OpenID URL"
 msgstr "您的OpenID URL"
 
@@ -2212,79 +2415,87 @@ msgstr "您在此服务器的昵称，或注册邮箱。"
 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%%)允许您使用相同的帐号登录许多不同的站点。在这里管理已关联的 OpenID。"
+msgstr ""
+"[OpenID](%%doc.openid%%)允许您使用相同的帐号登录许多不同的站点。在这里管理已"
+"关联的 OpenID。"
 
-#: ../lib/util.php:943 lib/util.php:992
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:1287
 msgid "a few seconds ago"
 msgstr "几秒前"
 
-#: ../lib/util.php:955 lib/util.php:1004
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:1299
 #, php-format
 msgid "about %d days ago"
 msgstr "%d 天前"
 
-#: ../lib/util.php:951 lib/util.php:1000
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:1295
 #, php-format
 msgid "about %d hours ago"
 msgstr "%d 小时前"
 
-#: ../lib/util.php:947 lib/util.php:996
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:1291
 #, php-format
 msgid "about %d minutes ago"
 msgstr "%d 分钟前"
 
-#: ../lib/util.php:959 lib/util.php:1008
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:1303
 #, php-format
 msgid "about %d months ago"
 msgstr "%d 个月前"
 
-#: ../lib/util.php:953 lib/util.php:1002
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:1297
 msgid "about a day ago"
 msgstr "一天前"
 
-#: ../lib/util.php:945 lib/util.php:994
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:1289
 msgid "about a minute ago"
 msgstr "一分钟前"
 
-#: ../lib/util.php:957 lib/util.php:1006
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:1301
 msgid "about a month ago"
 msgstr "一个月前"
 
-#: ../lib/util.php:961 lib/util.php:1010
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:1305
 msgid "about a year ago"
 msgstr "一年前"
 
-#: ../lib/util.php:949 lib/util.php:998
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:1293
 msgid "about an hour ago"
 msgstr "一小时前"
 
 #: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
+#: actions/showstream.php:441 lib/stream.php:99 lib/noticelist.php:211
 msgid "delete"
 msgstr "删除"
 
 #: ../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/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:135
+#: lib/facebookaction.php:202 lib/noticelist.php:189
 msgid "in reply to..."
 msgstr "先前……"
 
 #: ../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/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:142
+#: lib/noticelist.php:199
 msgid "reply"
 msgstr "回复"
 
 #: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/profilesettings.php:188
 msgid "same as password above"
 msgstr "相同的密码"
 
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+#: actions/twitapistatuses.php:543
 msgid "unsupported file type"
 msgstr "不支持这种类型的文件"
 
-#: ../lib/util.php:1309 lib/util.php:1443
-msgid "« After"
+#: ../lib/util.php:1309 lib/util.php:1443 lib/facebookaction.php:251
+#: lib/util.php:1783
+#, fuzzy
+msgid "« After"
 msgstr "« 之后"
 
 #: actions/deletenotice.php:74 actions/disfavor.php:43
@@ -2296,6 +2507,12 @@ msgstr "« 之后"
 #: 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:38 actions/deleteprofile.php:127 actions/disfavor.php:47
+#: actions/emailsettings.php:130 actions/favor.php:49 actions/login.php:45
+#: actions/newmessage.php:44 actions/newnotice.php:36 actions/nudge.php:47
+#: actions/othersettings.php:139 actions/profilesettings.php:49
+#: actions/subedit.php:38 actions/tagother.php:113
+#: actions/twittersettings.php:188 actions/unblock.php:38
 msgid "There was a problem with your session token. Try again, please."
 msgstr "会话标识有问题，请重试。"
 
@@ -2319,12 +2536,14 @@ msgstr "如果有人收藏我的通告，发邮件通知我。"
 msgid "Send me email when someone sends me a private message."
 msgstr "如果收到私人信息，发邮件通知我。"
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142
+#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:54
+#: actions/twitapifavorites.php:115
 msgid "This notice is already a favorite!"
 msgstr "已收藏此通告！"
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
+#: classes/Command.php:132 actions/favor.php:61
+#: actions/twitapifavorites.php:122
 msgid "Could not create favorite."
 msgstr "无法创建收藏。"
 
@@ -2333,11 +2552,12 @@ msgid "Disfavor"
 msgstr "取消收藏"
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:62
 #, php-format
 msgid "%s favorite notices"
 msgstr "%s 收藏的通告"
 
-#: actions/favoritesrss.php:64
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:66
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr "%s 的收藏的聚合"
@@ -2361,49 +2581,54 @@ msgstr "这是您的收件箱，包含发给您的私人消息。"
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
 "\n"
-msgstr "%1$s 邀请您加入 %2$s (%3$s)。\n\n"
+msgstr ""
+"%1$s 邀请您加入 %2$s (%3$s)。\n"
+"\n"
 
-#: actions/login.php:104
+#: actions/login.php:104 actions/login.php:111 actions/openidlogin.php:86
 msgid "Automatically login in the future; "
 msgstr "保持登录状态；"
 
-#: actions/login.php:122
+#: actions/login.php:122 actions/login.php:130
 msgid "For security reasons, please re-enter your "
 msgstr "由于安全原因，请重新输入"
 
-#: actions/login.php:126
+#: actions/login.php:126 actions/login.php:134
 msgid "Login with your username and password. "
 msgstr "输入用户名和密码以登录。"
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+#: actions/newmessage.php:60 actions/twitapidirect_messages.php:136
 msgid "That's too long. Max message size is 140 chars."
 msgstr "超出长度限制。不能超过 140 个字符。"
 
-#: actions/newmessage.php:65
+#: actions/newmessage.php:65 actions/newmessage.php:68
 msgid "No recipient specified."
 msgstr "没有收件人。"
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
+#: classes/Command.php:206 actions/newmessage.php:71
+#: actions/newmessage.php:116 classes/Command.php:211
 msgid "You can't send a message to this user."
 msgstr "无法向此用户发送消息。"
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
+#: classes/Command.php:209 actions/newmessage.php:74
+#: actions/twitapidirect_messages.php:153 classes/Command.php:214
 msgid ""
-"Don't send a message to yourself; just say it to yourself quietly "
-"instead."
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "不要向自己发送消息；跟自己悄悄说就得了。"
 
-#: actions/newmessage.php:108
+#: actions/newmessage.php:108 actions/microsummary.php:32
+#: actions/newmessage.php:111
 msgid "No such user"
 msgstr "未找到用户"
 
-#: actions/newmessage.php:117
+#: actions/newmessage.php:117 actions/newmessage.php:120
 msgid "New message"
 msgstr "新消息"
 
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:95 actions/noticesearch.php:94
 msgid "Notice without matching profile"
 msgstr "找不到匹配的通告"
 
@@ -2450,6 +2675,7 @@ msgstr "您可以在这里更新个人信息。"
 
 #: actions/profilesettings.php:115 actions/remotesubscribe.php:320
 #: actions/userauthorization.php:159 actions/userrss.php:76
+#: actions/profilesettings.php:120 actions/remotesubscribe.php:333
 msgid "User without matching profile"
 msgstr "找不到匹配的用户。"
 
@@ -2477,18 +2703,18 @@ msgstr "恢复密码的步骤"
 msgid "New password successfully saved. "
 msgstr "新密码已保存。"
 
-#: actions/register.php:95
+#: actions/register.php:95 actions/register.php:104
 msgid "Password must be 6 or more characters."
 msgstr "密码必须包含 6 个或更多字符。"
 
-#: actions/register.php:216
+#: actions/register.php:216 actions/register.php:243
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to..."
 msgstr "祝贺你，%s！欢迎来到 %%%%site.name%%%%。在这里，您可以……"
 
-#: actions/register.php:227
+#: actions/register.php:227 actions/register.php:254
 msgid "(You should receive a message by email momentarily, with "
 msgstr "(您将立即收到一封电子邮件，含有"
 
@@ -2503,6 +2729,7 @@ msgid "Feed for favorites of %s"
 msgstr "%s 的收藏的聚合"
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:88 actions/twitapifavorites.php:57
 msgid "Could not retrieve favorite notices."
 msgstr "无法获取收藏的通告。"
 
@@ -2524,7 +2751,7 @@ msgstr "发送给 %1$s 的 %2$s 消息"
 msgid "Message from %1$s on %2$s"
 msgstr "来自 %1$s 的 %2$s 消息"
 
-#: actions/showstream.php:154
+#: actions/showstream.php:154 lib/util.php:2105
 msgid "Send a message"
 msgstr "发送消息"
 
@@ -2533,73 +2760,80 @@ msgstr "发送消息"
 msgid "Mobile carrier for your phone. "
 msgstr "手机的运营商。"
 
-#: actions/twitapidirect_messages.php:76
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:64
 #, php-format
 msgid "Direct messages to %s"
 msgstr "发给 %s 的直接消息"
 
-#: actions/twitapidirect_messages.php:77
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:65
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "发给 %s 的直接消息"
 
-#: actions/twitapidirect_messages.php:81
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:69
 msgid "Direct Messages You've Sent"
 msgstr "您已发送的直接消息"
 
-#: actions/twitapidirect_messages.php:82
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:70
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "%s 发送的直接消息"
 
 #: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:132
 msgid "No message text!"
 msgstr "消息没有正文！"
 
 #: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:145
 msgid "Recipient user not found."
 msgstr "未找到收件人。"
 
 #: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:148
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr "无法向并非好友的用户发送直接消息。"
 
-#: actions/twitapifavorites.php:92
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:64
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s 的收藏 / %s"
 
-#: actions/twitapifavorites.php:95
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:67
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "%s 收藏了 %s 的 %s 通告。"
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
+#: actions/twitapifavorites.php:158 lib/mail.php:303
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr "%s 收藏了您的通告"
 
 #: actions/twitapifavorites.php:188 lib/mail.php:276
+#: actions/twitapifavorites.php:159 lib/mail.php:304
 #, php-format
 msgid ""
 "%1$s just added your notice from %2$s as one of their favorites.\n"
 "\n"
-msgstr "%1$s 收藏了您的 %2$s 通告。\n\n"
+msgstr ""
+"%1$s 收藏了您的 %2$s 通告。\n"
+"\n"
 
-#: actions/twittersettings.php:27
+#: actions/twittersettings.php:27 actions/twittersettings.php:29
 msgid ""
 "Add your Twitter account to automatically send your notices to Twitter, "
 msgstr "添加 Twitter 帐号，自动向 Twitter 发送更新。"
 
-#: actions/twittersettings.php:41
+#: actions/twittersettings.php:41 actions/twittersettings.php:43
 msgid "Twitter settings"
 msgstr "Twitter 设置"
 
-#: actions/twittersettings.php:48
+#: actions/twittersettings.php:48 actions/twittersettings.php:50
 msgid "Twitter Account"
 msgstr "Twitter 帐号"
 
-#: actions/twittersettings.php:56
+#: actions/twittersettings.php:56 actions/twittersettings.php:58
 msgid "Current verified Twitter account."
 msgstr "已验证的 Twitter 帐号。"
 
@@ -2627,46 +2861,50 @@ msgstr "将这里的 \"@\" 回复发送到 Twitter。"
 msgid "Subscribe to my Twitter friends here."
 msgstr "在这里订阅 Twitter 好友。"
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:216
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr "用户名只能包含数字，大写和小写字母和下划线。不能超过 15 个字符。"
 
-#: actions/twittersettings.php:128
+#: actions/twittersettings.php:128 actions/twittersettings.php:221
 msgid "Could not verify your Twitter credentials!"
 msgstr "不能验证 Twitter 帐号！"
 
-#: actions/twittersettings.php:137
+#: actions/twittersettings.php:137 actions/twittersettings.php:228
 #, php-format
 msgid "Unable to retrieve account information for \"%s\" from Twitter."
 msgstr "无法从 Twitter 获取\"%s\"的帐号信息。"
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:234 actions/twittersettings.php:253
 msgid "Unable to save your Twitter settings!"
 msgstr "无法保存 Twitter 设置！"
 
-#: actions/twittersettings.php:174
+#: actions/twittersettings.php:174 actions/twittersettings.php:261
 msgid "Twitter settings saved."
 msgstr "Twitter 设置已保存。"
 
-#: actions/twittersettings.php:192
+#: actions/twittersettings.php:192 actions/twittersettings.php:272
 msgid "That is not your Twitter account."
 msgstr "此 Twitter 帐号属于他人。"
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:280
 msgid "Couldn't remove Twitter user."
 msgstr "无法移除 Twitter 用户。"
 
-#: actions/twittersettings.php:212
+#: actions/twittersettings.php:212 actions/twittersettings.php:284
 msgid "Twitter account removed."
 msgstr "Twitter 帐号已移除。"
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
+#: actions/twittersettings.php:299 actions/twittersettings.php:310
+#: actions/twittersettings.php:322
 msgid "Couldn't save Twitter preferences."
 msgstr "无法保存 Twitter 首选项。"
 
-#: actions/twittersettings.php:245
+#: actions/twittersettings.php:245 actions/twittersettings.php:330
 msgid "Twitter preferences saved."
 msgstr "Twitter 首选项已保存。"
 
@@ -2682,15 +2920,15 @@ msgstr "订阅已确认，但是"
 msgid "The subscription has been rejected, but no "
 msgstr "订阅已拒绝，但是"
 
-#: classes/Channel.php:113
+#: classes/Channel.php:113 classes/Channel.php:129
 msgid "Command results"
 msgstr "执行结果"
 
-#: classes/Channel.php:148
+#: classes/Channel.php:148 classes/Channel.php:175
 msgid "Command complete"
 msgstr "执行完毕"
 
-#: classes/Channel.php:158
+#: classes/Channel.php:158 classes/Channel.php:185
 msgid "Command failed"
 msgstr "执行失败"
 
@@ -2703,7 +2941,7 @@ msgstr "对不起，这个命令还没有实现。"
 msgid "Subscriptions: %1$s\n"
 msgstr "订阅：%1$s\n"
 
-#: classes/Command.php:125 classes/Command.php:242
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:247
 msgid "User has no last notice"
 msgstr "用户没有通告。"
 
@@ -2736,59 +2974,60 @@ msgstr "主页：%s"
 msgid "About: %s"
 msgstr "关于：%s"
 
-#: classes/Command.php:200
+#: classes/Command.php:200 classes/Command.php:202
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr "您的消息包含 %d 个字符，超出长度限制 - 不能超过 140 个字符。"
 
-#: classes/Command.php:214
+#: classes/Command.php:214 classes/Command.php:219
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "已向 %s 发送消息"
 
-#: classes/Command.php:216
+#: classes/Command.php:216 classes/Command.php:221
 msgid "Error sending direct message."
 msgstr "发送消息出错。"
 
-#: classes/Command.php:263
+#: classes/Command.php:263 classes/Command.php:268
 msgid "Specify the name of the user to subscribe to"
 msgstr "指定要订阅的用户名"
 
-#: classes/Command.php:270
+#: classes/Command.php:270 classes/Command.php:275
 #, php-format
 msgid "Subscribed to %s"
 msgstr "订阅 %s"
 
-#: classes/Command.php:288
+#: classes/Command.php:288 classes/Command.php:293
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "指定要取消订阅的用户名"
 
-#: classes/Command.php:295
+#: classes/Command.php:295 classes/Command.php:300
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "取消订阅 %s"
 
-#: classes/Command.php:310 classes/Command.php:330
+#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:315
+#: classes/Command.php:335
 msgid "Command not yet implemented."
 msgstr "命令尚未实现。"
 
-#: classes/Command.php:313
+#: classes/Command.php:313 classes/Command.php:318
 msgid "Notification off."
 msgstr "通告关闭。"
 
-#: classes/Command.php:315
+#: classes/Command.php:315 classes/Command.php:320
 msgid "Can't turn off notification."
 msgstr "无法关闭通告。"
 
-#: classes/Command.php:333
+#: classes/Command.php:333 classes/Command.php:338
 msgid "Notification on."
 msgstr "通告开启。"
 
-#: classes/Command.php:335
+#: classes/Command.php:335 classes/Command.php:340
 msgid "Can't turn on notification."
 msgstr "无法开启通告。"
 
-#: classes/Command.php:344
+#: classes/Command.php:344 classes/Command.php:349
 msgid "Commands:\n"
 msgstr "命令：\n"
 
@@ -2800,28 +3039,32 @@ msgstr "无法添加信息。"
 msgid "Could not update message with new URI."
 msgstr "无法添加新URI的信息。"
 
-#: lib/gallery.php:46
+#: lib/gallery.php:46 lib/gallery.php:55
 msgid "User without matching profile in system."
 msgstr "系统中没有相应用户的信息。"
 
-#: lib/mail.php:147
+#: lib/mail.php:147 lib/mail.php:141
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
-msgstr "您的新的发布用的地址是 %1$s。\n\n"
+msgstr ""
+"您的新的发布用的地址是 %1$s。\n"
+"\n"
 
-#: lib/mail.php:249
+#: lib/mail.php:249 lib/mail.php:275
 #, php-format
 msgid "New private message from %s"
 msgstr "%s 发送了新的私人信息"
 
-#: lib/mail.php:253
+#: lib/mail.php:253 lib/mail.php:279
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
 "\n"
-msgstr "%1$s (%2$s) 发送了新的私人信息：\n\n"
+msgstr ""
+"%1$s (%2$s) 发送了新的私人信息：\n"
+"\n"
 
 #: lib/mailbox.php:43
 msgid "Only the user can read their own mailboxes."
@@ -2860,18 +3103,460 @@ msgstr "发件箱"
 msgid "Your sent messages"
 msgstr "您发送的消息"
 
-#: lib/settingsaction.php:99
+#: lib/settingsaction.php:99 actions/deleteprofile.php:256
 msgid "Twitter"
 msgstr "Twitter"
 
-#: lib/settingsaction.php:100
+#: lib/settingsaction.php:100 actions/deleteprofile.php:257
 msgid "Twitter integration options"
 msgstr "Twitter 整合选项"
 
-#: lib/util.php:1718
+#: lib/util.php:1718 lib/util.php:2145
 msgid "To"
 msgstr "到"
 
 #: scripts/maildaemon.php:45
 msgid "Could not parse message."
 msgstr "无法解析消息。"
+
+#: actions/block.php:45 actions/subedit.php:45 actions/unblock.php:45
+#, fuzzy
+msgid "No profile specified."
+msgstr "没有收件人。"
+
+#: actions/block.php:52 actions/subedit.php:52 actions/tagother.php:45
+#: actions/unblock.php:52
+#, fuzzy
+msgid "No profile with that ID."
+msgstr "没有找到此ID的信息。"
+
+#: actions/block.php:78
+#, fuzzy
+msgid "Block user"
+msgstr "未找到用户"
+
+#: actions/block.php:81
+#, fuzzy
+msgid "Are you sure you want to block this user? "
+msgstr "确定要删除这条通告吗？"
+
+#: actions/block.php:117
+#, fuzzy
+msgid "You have already blocked this user."
+msgstr "您已订阅这些用户："
+
+#: actions/block.php:124
+msgid "Failed to save block information."
+msgstr ""
+
+#: actions/deleteprofile.php:25
+#, fuzzy
+msgid "Code not yet ready."
+msgstr "命令尚未实现。"
+
+#: actions/deleteprofile.php:36
+msgid "Export and delete your user information."
+msgstr ""
+
+#: actions/deleteprofile.php:88 actions/deleteprofile.php:119
+#, fuzzy
+msgid "Delete my account"
+msgstr "创建新帐号"
+
+#: actions/deleteprofile.php:89
+#, fuzzy
+msgid "Delete my account confirmation"
+msgstr "无法删除电子邮件确认。"
+
+#: actions/deleteprofile.php:117
+#, fuzzy
+msgid "Check if you are sure you want to delete your account."
+msgstr "确定要删除这条通告吗？"
+
+#: actions/deleteprofile.php:259 lib/settingsaction.php:102
+msgid "Other"
+msgstr ""
+
+#: actions/deleteprofile.php:260 lib/settingsaction.php:103
+msgid "Other options"
+msgstr ""
+
+#: actions/disfavor.php:72
+#, fuzzy
+msgid "Add to favorites"
+msgstr "%s 的收藏的聚合"
+
+#: actions/emailsettings.php:98
+msgid "Allow friends to nudge me and send me an email."
+msgstr ""
+
+#: actions/facebookremove.php:54
+#, fuzzy
+msgid "Couldn't remove Facebook user."
+msgstr "无法移除 Twitter 用户。"
+
+#: actions/favor.php:71
+#, fuzzy
+msgid "Disfavor favorite"
+msgstr "取消收藏"
+
+#: actions/favorited.php:31 lib/stream.php:45
+#, fuzzy
+msgid "Popular notices"
+msgstr "没有这份通告。"
+
+#: actions/favorited.php:54
+#, fuzzy
+msgid "Showing recently popular notices"
+msgstr "搜索通告内容"
+
+#: actions/featured.php:32 actions/featured.php:54 lib/stream.php:41
+msgid "Featured users"
+msgstr ""
+
+#: actions/finishremotesubscribe.php:186
+msgid "That user has blocked you from subscribing."
+msgstr ""
+
+#: actions/microsummary.php:39
+msgid "No current status"
+msgstr ""
+
+#: actions/newnotice.php:93
+#, fuzzy
+msgid "Notice posted"
+msgstr "通告"
+
+#: actions/newnotice.php:116 classes/Channel.php:140
+msgid "Ajax Error"
+msgstr ""
+
+#: actions/nudge.php:52
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
+
+#: actions/nudge.php:61
+msgid "Nudge sent"
+msgstr ""
+
+#: actions/othersettings.php:27
+msgid "Manage various other options."
+msgstr ""
+
+#: actions/othersettings.php:33
+#, fuzzy
+msgid "Other Settings"
+msgstr "Twitter 设置"
+
+#: actions/othersettings.php:35
+msgid "URL Auto-shortening"
+msgstr ""
+
+#: actions/othersettings.php:54
+#, fuzzy
+msgid "Service"
+msgstr "搜索"
+
+#: actions/othersettings.php:54
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/othersettings.php:155
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "语言过长(不能超过50个字符)。"
+
+#: actions/peopletag.php:33
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "不是有效的电子邮件"
+
+#: actions/peopletag.php:45
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr ""
+
+#: actions/peopletag.php:87
+#, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+msgstr ""
+
+#: actions/profilesettings.php:92
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+
+#: actions/profilesettings.php:246 actions/tagother.php:131
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "主页'%s'不正确"
+
+#: actions/profilesettings.php:328
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "无法保存个人信息。"
+
+#: actions/public.php:68
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
+msgstr ""
+
+#: actions/public.php:90
+#, fuzzy
+msgid "Could not retrieve public stream."
+msgstr "无法获取收藏的通告。"
+
+#: actions/register.php:67 actions/register.php:177
+msgid "Sorry, only invited people can register."
+msgstr ""
+
+#: actions/register.php:156
+msgid "With this form you can create a new account. "
+msgstr ""
+
+#: actions/remotesubscribe.php:136 actions/remotesubscribe.php:141
+msgid "That's a local profile! Login to subscribe."
+msgstr ""
+
+#: actions/subedit.php:68
+#, fuzzy
+msgid "You are not subscribed to that profile."
+msgstr "您未告知此个人信息"
+
+#: actions/subedit.php:81
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "无法删除订阅。"
+
+#: actions/subscribe.php:53
+#, fuzzy
+msgid "Not a local user."
+msgstr "没有这个用户。"
+
+#: actions/subscribe.php:67
+#, fuzzy
+msgid "Subscribed"
+msgstr "订阅"
+
+#: actions/subscriptions.php:72
+#, fuzzy
+msgid "Jabber"
+msgstr "没有 Jabber ID。"
+
+#: actions/tagother.php:31
+#, fuzzy
+msgid "Not logged in"
+msgstr "未登录。"
+
+#: actions/tagother.php:40
+#, fuzzy
+msgid "No id argument."
+msgstr "没有这份文档。"
+
+#: actions/tagother.php:56
+msgid "Tag a person"
+msgstr ""
+
+#: actions/tagother.php:98
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
+msgstr ""
+
+#: actions/tagother.php:120
+#, fuzzy
+msgid "No such profile."
+msgstr "没有这份通告。"
+
+#: actions/tagother.php:146
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+
+#: actions/tagother.php:153
+#, fuzzy
+msgid "Could not save tags."
+msgstr "无法保存头像"
+
+#: actions/tagother.php:188
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
+
+#: actions/tagrss.php:33
+#, fuzzy
+msgid "No such tag."
+msgstr "未找到此消息。"
+
+#: actions/tagrss.php:62
+#, fuzzy, php-format
+msgid "Microblog tagged with %s"
+msgstr "带 %s 标签的通告"
+
+#: actions/twitapiblocks.php:45
+msgid "Block user failed."
+msgstr ""
+
+#: actions/twitapiblocks.php:66
+msgid "Unblock user failed."
+msgstr ""
+
+#: actions/twitapiusers.php:45
+#, fuzzy
+msgid "Not found."
+msgstr "未找到"
+
+#: actions/twittersettings.php:63
+#, fuzzy
+msgid "Twitter user name"
+msgstr "Twitter 用户名"
+
+#: actions/twittersettings.php:67
+#, fuzzy
+msgid "Twitter password"
+msgstr "Twitter 密码"
+
+#: actions/twittersettings.php:129
+#, fuzzy
+msgid "Twitter Friends"
+msgstr "Twitter 设置"
+
+#: actions/unblock.php:73
+#, fuzzy
+msgid "Error removing the block."
+msgstr "保存用户时出错。"
+
+#: actions/unsubscribe.php:48
+#, fuzzy
+msgid "No profile id in request."
+msgstr "服务器没有返回个人信息URL。"
+
+#: actions/unsubscribe.php:55
+#, fuzzy
+msgid "No profile with that id."
+msgstr "没有找到此ID的信息。"
+
+#: actions/unsubscribe.php:69
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "退订"
+
+#: classes/Notice.php:100
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "保存通告时出错。"
+
+#: classes/Notice.php:105
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+
+#: classes/Notice.php:112
+#, fuzzy
+msgid "You are banned from posting notices on this site."
+msgstr ""
+"您的新的发布用的地址是 %1$s。\n"
+"\n"
+
+#: lib/gallery.php:98
+#, fuzzy
+msgid "Filter tags"
+msgstr "%s 标签的聚合"
+
+#: lib/gallery.php:104
+msgid "All"
+msgstr ""
+
+#: lib/gallery.php:108
+#, fuzzy
+msgid "Tag"
+msgstr "标签"
+
+#: lib/gallery.php:109
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/gallery.php:110
+msgid "Go"
+msgstr ""
+
+#: lib/gallery.php:264
+#, fuzzy
+msgid "Subscriptions navigation"
+msgstr "订阅"
+
+#: lib/gallery.php:270 lib/gallery.php:292
+msgid "List"
+msgstr ""
+
+#: lib/gallery.php:280 lib/gallery.php:294
+msgid "Icons"
+msgstr ""
+
+#: lib/mail.php:92
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:242
+#, fuzzy, php-format
+msgid "You've been nudged by %s"
+msgstr "您已得到确认。输入"
+
+#: lib/mail.php:246
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+msgstr ""
+
+#: lib/profilelist.php:146
+msgid "(none)"
+msgstr ""
+
+#: lib/stream.php:33
+msgid "Public"
+msgstr ""
+
+#: lib/stream.php:36 lib/stream.php:37
+#, fuzzy
+msgid "Recent tags"
+msgstr "最近的标签"
+
+#: lib/stream.php:40
+msgid "Featured"
+msgstr ""
+
+#: lib/stream.php:44
+#, fuzzy
+msgid "Popular"
+msgstr "用户"
+
+#: lib/subs.php:51
+#, fuzzy
+msgid "User has blocked you."
+msgstr "用户没有个人信息。"
+
+#: lib/util.php:2059
+#, fuzzy
+msgid "Send a nudge"
+msgstr "发送消息"
+
+#: lib/util.php:2063
+msgid "Nudge sent!"
+msgstr ""
+
+#: lib/util.php:2194
+msgid "Block"
+msgstr ""
+
+#: lib/util.php:2198
+msgid "Unblock"
+msgstr ""
diff --git a/zh_TW/LC_MESSAGES/laconica.po b/zh_TW/LC_MESSAGES/laconica.po
index d8e4507252..b90b6ab882 100644
--- a/zh_TW/LC_MESSAGES/laconica.po
+++ b/zh_TW/LC_MESSAGES/laconica.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"POT-Creation-Date: 2009-01-12 12:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,23 +16,74 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../actions/noticesearchrss.php:64
+#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:61
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr "搜尋 \"%s\"相關資料"
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: actions/finishopenidlogin.php:88 actions/register.php:205
+#: actions/register.php:232
 msgid ""
-" except this private data: password, email address, IM address, phone "
-"number."
+" except this private data: password, email address, IM address, phone number."
 msgstr "不包含這些個人資料：密碼、電子信箱、線上即時通信箱、電話號碼"
 
-#: ../actions/subscribe.php:84
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+#: lib/facebookaction.php:195 lib/noticelist.php:160
+msgid " from "
+msgstr ""
+
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: actions/twitapistatuses.php:341
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr ""
+
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
+
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:115
+#: lib/mail.php:117
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "現在%1$s在%2$s成為你的粉絲囉"
 
-#: ../actions/subscribe.php:86
+#: ../lib/mail.php:126
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -43,151 +94,325 @@ msgid ""
 "%4$s.\n"
 msgstr ""
 "現在%1$s在%2$s成為你的粉絲囉。\n"
-"\n\t%3$s\n\n\n%4$s.\n敬上。"
+"\n"
+"\t%3$s\n"
+"\n"
+"\n"
+"%4$s.\n"
+"敬上。"
+
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#: actions/twitapistatuses.php:344
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
 
-#: ../actions/shownotice.php:45
+#: ../actions/shownotice.php:45 actions/shownotice.php:45
+#: actions/shownotice.php:73
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1$s的狀態是%2$s"
 
-#: ../actions/publicrss.php:60
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../actions/publicrss.php:62 actions/publicrss.php:48
 #, php-format
 msgid "%s Public Stream"
 msgstr "%s的公開內容"
 
-#: ../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/twitapistatuses.php:123
 #, php-format
 msgid "%s and friends"
 msgstr "%s與好友"
 
-#: ../lib/util.php:233
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:31
+#, php-format
+msgid "%s public timeline"
+msgstr ""
+
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:217
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:195
+#, php-format
+msgid "%s timeline"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:34
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+
+#: ../lib/util.php:257 lib/util.php:273 lib/util.php:284
 #, 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%%**是由[%%site.broughtby%%](%%site.broughtbyurl%%)所提供的微型部落格服務"
+"**%%site.name%%**是由[%%site.broughtby%%](%%site.broughtbyurl%%)所提供的微型"
+"部落格服務"
 
-#: ../lib/util.php:235
+#: ../lib/util.php:259 lib/util.php:275 lib/util.php:286
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%**是個微型部落格"
 
-#: ../lib/util.php:250 ../lib/util.php:274 lib/util.php:290
+#: ../lib/util.php:274 lib/util.php:290 lib/util.php:301
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr "必須注明作者姓名或昵稱."
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: ../actions/register.php:176
+#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
+#: actions/profilesettings.php:78
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64個小寫英文字母或數字，勿加標點符號或空格"
 
-#: ../actions/password.php:42 ../actions/register.php:178
+#: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:193
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/profilesettings.php:186
 msgid "6 or more characters"
 msgstr "6個以上字元"
 
-#: ../actions/recoverpassword.php:165
+#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
 msgid "6 or more characters, and don't forget it!"
 msgstr "6個或6個以上字元，別忘了自己密碼喔"
 
-#: ../actions/imsettings.php:188
+#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:195
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, 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 "確認信已寄到你的線上即時通信箱。%s送給你得訊息要先經過你的認可。"
 
-#: ../lib/util.php:296
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:234
+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 ""
+
+#: ../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/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:30
+#: actions/twitapidirect_messages.php:107 actions/twitapifavorites.php:83
+#: actions/twitapifavorites.php:99 actions/twitapifriendships.php:117
+#: actions/twitapihelp.php:42 actions/twitapistatuses.php:77
+#: actions/twitapistatuses.php:144 actions/twitapistatuses.php:224
+#: actions/twitapistatuses.php:234 actions/twitapistatuses.php:386
+#: actions/twitapistatuses.php:395 actions/twitapistatuses.php:421
+#: actions/twitapiusers.php:30
+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:39
+#: actions/twitapiaccount.php:89 actions/twitapiaccount.php:94
+#: actions/twitapidirect_messages.php:178 actions/twitapifavorites.php:139
+#: actions/twitapihelp.php:49 actions/twitapistatuses.php:549
+msgid "API method under construction."
+msgstr ""
+
+#: ../lib/util.php:324 lib/util.php:340 lib/util.php:352
 msgid "About"
 msgstr "關於"
 
-#: ../actions/userauthorization.php:118
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
 msgid "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/twittersettings.php:84
 msgid "Add"
 msgstr "新增"
 
-#: ../actions/openidsettings.php:43
+#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
 msgid "Add OpenID"
 msgstr "新增OpenID"
 
-#: ../actions/imsettings.php:39
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: actions/deleteprofile.php:248
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
 msgid "Address"
 msgstr "ä¿¡ç®±"
 
-#: ../actions/showstream.php:254
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
+
+#: ../actions/showstream.php:273 actions/showstream.php:288
+#: actions/showstream.php:336
 msgid "All subscriptions"
 msgstr "所有訂閱"
 
-#: ../actions/publicrss.php:62
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
 #, php-format
 msgid "All updates for %s"
 msgstr "%s的所有新增內容"
 
-#: ../actions/noticesearchrss.php:66
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:63
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "所有符合 \"%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
 msgid "Already logged in."
 msgstr "已登入"
 
-#: ../actions/subscribe.php:48
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:47
 msgid "Already subscribed!."
 msgstr "此帳號已註冊"
 
-#: ../actions/userauthorization.php:76
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+msgid "Are you sure you want to delete this notice?"
+msgstr ""
+
+#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
 msgid "Authorize subscription"
 msgstr "註冊確認"
 
-#: ../actions/login.php:100 ../actions/register.php:184
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192 actions/register.php:219
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "未來在同一部電腦自動登入"
 
-#: ../actions/avatar.php:32
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:103
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
+
+#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: actions/profilesettings.php:34
 msgid "Avatar"
 msgstr "個人圖像"
 
-#: ../actions/avatar.php:113
+#: ../actions/avatar.php:113 actions/profilesettings.php:350
+#: actions/profilesettings.php:379
 msgid "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 "等待確認此信箱。看看你的Jabber/GTalk是否有訊息指示下一步動作。(你加入%s到你的好友清單了嗎？)"
+msgstr ""
+"等待確認此信箱。看看你的Jabber/GTalk是否有訊息指示下一步動作。(你加入%s到你的"
+"好友清單了嗎？)"
+
+#: ../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 ""
 
-#: ../lib/util.php:1136
-msgid "Before »"
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+msgid "Awaiting confirmation on this phone number."
+msgstr ""
+
+#: ../lib/util.php:1318 lib/util.php:1452 lib/facebookaction.php:259
+#: lib/util.php:1792
+#, fuzzy
+msgid "Before »"
 msgstr "之前的內容»"
 
-#: ../actions/profilesettings.php:52
+#: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: actions/profilesettings.php:82 actions/register.php:184
+#: actions/profilesettings.php:84 actions/register.php:211
 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:222 actions/register.php:98
 msgid "Bio is too long (max 140 chars)."
 msgstr "自我介紹過長(共140個字元)"
 
-#: ../actions/updateprofile.php:118
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+msgid "Can't delete this notice."
+msgstr ""
+
+#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "無法讀取此%sURL的圖像"
 
-#: ../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/profilesettings.php:433
 msgid "Can't save new password."
 msgstr "無法存取新密碼"
 
-#: ../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
 msgid "Cancel"
 msgstr "取消"
 
@@ -195,44 +420,93 @@ msgstr "取消"
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "無法初始化OpenID用戶對象(consumer object)"
 
-#: ../actions/imsettings.php:154
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
 msgid "Cannot normalize that Jabber ID"
 msgstr "此JabberID錯誤"
 
-#: ../actions/password.php:45
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:204
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/profilesettings.php:189
 msgid "Change"
 msgstr "更改"
 
-#: ../actions/password.php:32
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: actions/deleteprofile.php:245
+msgid "Change email handling"
+msgstr ""
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
 msgid "Change password"
 msgstr "更改密碼"
 
-#: ../actions/password.php:43 ../actions/recoverpassword.php:166
-#: ../actions/register.php:179
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr ""
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#: actions/deleteprofile.php:242
+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/profilesettings.php:187 actions/register.php:196
 msgid "Confirm"
 msgstr "確認"
 
-#: ../actions/confirmaddress.php:84
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
 msgid "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:259
 msgid "Confirmation cancelled."
 msgstr "確認取消"
 
-#: ../actions/confirmaddress.php:38
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+msgid "Confirmation code"
+msgstr ""
+
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
 msgid "Confirmation code not found."
 msgstr "確認碼遺失"
 
-#: ../actions/finishopenidlogin.php:91
+#: ../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:97
 msgid "Connect"
 msgstr "連結"
 
-#: ../actions/finishopenidlogin.php:86
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
 msgid "Connect existing account"
 msgstr "與現有帳號連結"
 
-#: ../lib/util.php:304
+#: ../lib/util.php:332 lib/util.php:348 lib/util.php:360
 msgid "Contact"
 msgstr "好友名單"
 
@@ -241,76 +515,126 @@ msgstr "好友名單"
 msgid "Could not create OpenID form: %s"
 msgstr "無法從 %s 建立OpenID"
 
-#: ../lib/openid.php:160
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:46 actions/twitapifriendships.php:62
+#, 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:39
+msgid "Could not follow user: User not found."
+msgstr ""
+
+#: ../lib/openid.php:160 lib/openid.php:160
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "無法連結到伺服器:%s"
 
-#: ../actions/updateprofile.php:161
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
 msgid "Could not save avatar info"
 msgstr "無法存取個人圖像資料"
 
-#: ../actions/updateprofile.php:154
+#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
 msgid "Could not save new profile info"
 msgstr "無法存取新的個人資料"
 
-#: ../actions/profilesettings.php:146
-msgid "Couldn't confirm email."
-msgstr "無法確認信箱"
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:70
+msgid "Could not subscribe other to you."
+msgstr ""
+
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:55
+msgid "Could not subscribe."
+msgstr ""
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr ""
 
 #: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101
+#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:112
 msgid "Couldn't convert request tokens to access tokens."
 msgstr "無法轉換請求標記以致無法存取標記"
 
-#: ../actions/subscribe.php:59
-msgid "Couldn't create subscription."
-msgstr "註冊失敗"
-
-#: ../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/emailsettings.php:255
 msgid "Couldn't delete email confirmation."
 msgstr "無法取消信箱確認"
 
-#: ../actions/unsubscribe.php:56
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:129
 msgid "Couldn't delete subscription."
 msgstr "無法刪除帳號"
 
-#: ../actions/remotesubscribe.php:125 ../actions/remotesubscribe.php:127
-#: actions/remotesubscribe.php:136
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+#: actions/twitapistatuses.php:82
+msgid "Couldn't find any statuses."
+msgstr ""
+
+#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
+#: actions/remotesubscribe.php:148
 msgid "Couldn't get a request token."
 msgstr "無法取得轉換標記"
 
-#: ../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:228
 msgid "Couldn't insert confirmation code."
 msgstr "無法輸入確認碼"
 
 #: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182
+#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:216
 msgid "Couldn't insert new subscription."
 msgstr "無法新增訂閱"
 
-#: ../actions/profilesettings.php:175
+#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
+#: actions/profilesettings.php:319 actions/twitapiaccount.php:74
 msgid "Couldn't save profile."
 msgstr "無法儲存個人資料"
 
-#: ../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:296
+msgid "Couldn't update user for autosubscribe."
+msgstr ""
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+#: actions/emailsettings.php:301 actions/emailsettings.php:315
+msgid "Couldn't update user record."
+msgstr ""
+
+#: ../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/emailsettings.php:179 actions/emailsettings.php:280
+#: actions/othersettings.php:173 actions/profilesettings.php:276
 msgid "Couldn't update user."
 msgstr "無法更新使用者"
 
-#: ../actions/finishopenidlogin.php:84
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
 msgid "Create"
 msgstr "新增"
 
-#: ../actions/finishopenidlogin.php:70
+#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
 msgid "Create a new user with this nickname."
 msgstr "以此暱稱新增使用者"
 
-#: ../actions/finishopenidlogin.php:68
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
 msgid "Create new account"
 msgstr "新增帳號"
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+#: actions/finishopenidlogin.php:208
 msgid "Creating new account for OpenID that already has a user."
 msgstr "該OpenID已經注冊"
 
@@ -318,52 +642,85 @@ msgstr "該OpenID已經注冊"
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "目前已確認的Jabber/Gtalk地址"
 
-#: ../actions/showstream.php:337
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+msgid "Current confirmed email address."
+msgstr ""
+
+#: ../actions/showstream.php:356 actions/showstream.php:367
+#: actions/showstream.php:418
 msgid "Currently"
 msgstr "目前"
 
-#: ../lib/util.php:893 ../lib/util.php:1061 lib/util.php:1110
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:87
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: ../lib/util.php:1061 lib/util.php:1110 lib/util.php:1417
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "增加回覆時,資料庫發生錯誤: %s"
 
-#: ../actions/profilesettings.php:54 ../actions/profilesettings.php:51
-#: ../actions/register.php:172 actions/profilesettings.php:84
-#: actions/register.php:186
-msgid "Describe yourself and your interests in 140 chars"
-msgstr "請在140個字以內描述你自己與你的興趣"
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+msgid "Delete notice"
+msgstr ""
+
+#: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: actions/profilesettings.php:84 actions/register.php:186
+#: actions/profilesettings.php:86 actions/register.php:213
+msgid "Describe yourself and your interests in 140 chars"
+msgstr "請在140個字以內描述你自己與你的興趣"
 
-#: ../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/deleteprofile.php:244 actions/register.php:199
+#: actions/register.php:202
 msgid "Email"
 msgstr "電子信箱"
 
-#: ../actions/profilesettings.php:46
-msgid "Email address"
-msgstr "電子信箱"
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+msgid "Email Address"
+msgstr ""
+
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+msgid "Email Settings"
+msgstr ""
 
-#: ../actions/profilesettings.php:102 ../actions/register.php:63
-#: ../actions/register.php:73 actions/register.php:80
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:89
 msgid "Email address already exists."
 msgstr "此電子信箱已註冊過了"
 
-#: ../lib/mail.php:82 ../lib/mail.php:90 lib/mail.php:90
+#: ../lib/mail.php:90 lib/mail.php:90
 msgid "Email address confirmation"
 msgstr "確認信箱"
 
-#: ../actions/recoverpassword.php:176 ../actions/recoverpassword.php:191
-#: actions/recoverpassword.php:197
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
+
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr ""
+
+#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
 msgid "Enter a nickname or email address."
 msgstr "請輸入暱稱或電子信箱"
 
-#: ../actions/userauthorization.php:136 ../actions/userauthorization.php:137
-#: actions/userauthorization.php:144
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+msgid "Enter the code you received on your phone."
+msgstr ""
+
+#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
 msgid "Error authorizing token"
 msgstr "授權錯誤(Error authorizing token)"
 
-#: ../actions/finishopenidlogin.php:282 ../actions/finishopenidlogin.php:253
-#: actions/finishopenidlogin.php:259
+#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
+#: actions/finishopenidlogin.php:274
 msgid "Error connecting user to OpenID."
 msgstr "連接OpenID時發生錯誤"
 
@@ -372,36 +729,29 @@ msgid "Error connecting user."
 msgstr "連接用戶時發生錯誤(Error connecting user.)"
 
 #: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:164
 msgid "Error inserting avatar"
 msgstr "個人圖像插入錯誤"
 
 #: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145
+#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:156
 msgid "Error inserting new profile"
 msgstr "新的更人資料輸入錯誤"
 
-#: ../actions/postnotice.php:88
-msgid "Error inserting notice"
-msgstr "新增訊息時發生錯誤"
-
 #: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:180
 msgid "Error inserting remote profile"
 msgstr "新增外部個人資料發生錯誤(Error inserting remote profile)"
 
-#: ../actions/recoverpassword.php:201 ../actions/recoverpassword.php:240
-#: actions/recoverpassword.php:246
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
 msgid "Error saving address confirmation."
 msgstr "儲存信箱確認發生錯誤"
 
-#: ../actions/userauthorization.php:139 ../actions/userauthorization.php:140
-#: actions/userauthorization.php:147
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
 msgid "Error saving remote profile"
 msgstr "儲存遠端個人資料發生錯誤"
 
-#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
-#: lib/openid.php:226
+#: ../lib/openid.php:226 lib/openid.php:226
 msgid "Error saving the profile."
 msgstr "儲存個人資料發生錯誤"
 
@@ -410,15 +760,15 @@ msgid "Error saving the user."
 msgstr "儲存使用者發生錯誤"
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/profilesettings.php:428
 msgid "Error saving user; invalid."
 msgstr "儲存使用者發生錯誤;使用者名稱無效"
 
-#: ../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/register.php:108 actions/login.php:54 actions/login.php:80
+#: actions/register.php:117
 msgid "Error setting user."
 msgstr "使用者設定發生錯誤"
 
@@ -427,12 +777,11 @@ msgid "Error updating profile"
 msgstr "更新個人資料發生錯誤"
 
 #: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163
+#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:174
 msgid "Error updating remote profile"
 msgstr "更新遠端個人資料發生錯誤"
 
-#: ../actions/recoverpassword.php:79 ../actions/recoverpassword.php:80
-#: actions/recoverpassword.php:80
+#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
 msgid "Error with confirmation code."
 msgstr "確認碼發生錯誤"
 
@@ -440,27 +789,41 @@ msgstr "確認碼發生錯誤"
 msgid "Existing nickname"
 msgstr "這個暱稱已有人用了喔"
 
-#: ../lib/util.php:298 ../lib/util.php:326 lib/util.php:342
+#: ../lib/util.php:326 lib/util.php:342 lib/util.php:354
 msgid "FAQ"
 msgstr "常見問題"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/profilesettings.php:381
 msgid "Failed updating avatar."
 msgstr "無法上傳個人圖像"
 
-#: ../actions/all.php:61 ../actions/allrss.php:74 ../actions/allrss.php:64
-#: actions/all.php:61 actions/allrss.php:64
+#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
+#: actions/allrss.php:64
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "發送給%s好友的訂閱"
 
-#: ../actions/replies.php:61 ../actions/repliesrss.php:80
-#: ../actions/replies.php:65 actions/replies.php:65 actions/repliesrss.php:66
+#: ../actions/replies.php:65 ../actions/repliesrss.php:80
+#: actions/replies.php:65 actions/repliesrss.php:66
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "回應給%s的訂閱"
 
-#: ../actions/login.php:118 ../actions/login.php:122
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:54
+#, php-format
+msgid "Feed for tag %s"
+msgstr ""
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+msgid "Find content of notices"
+msgstr ""
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+msgid "Find people on this site"
+msgstr ""
+
+#: ../actions/login.php:122
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -468,38 +831,48 @@ msgstr "為安全起見，請先重新輸入你的使用者名稱與密碼再更
 
 #: ../actions/profilesettings.php:44 ../actions/register.php:164
 #: actions/profilesettings.php:77 actions/register.php:178
+#: actions/profilesettings.php:79 actions/register.php:205
 msgid "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/profilesettings.php:219 actions/register.php:95
 msgid "Full name is too long (max 255 chars)."
 msgstr "全名過長（最多255字元）"
 
-#: ../lib/util.php:279 ../lib/util.php:322 lib/util.php:338
+#: ../lib/util.php:322 lib/util.php:338 lib/util.php:343 lib/util.php:350
 msgid "Help"
 msgstr "求救"
 
-#: ../lib/util.php:274 ../lib/util.php:298 lib/util.php:314
+#: ../lib/util.php:298 lib/util.php:314 lib/util.php:325
 msgid "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:46 ../actions/register.php:167
+#: actions/profilesettings.php:79 actions/register.php:181
+#: actions/profilesettings.php:81 actions/register.php:208
 msgid "Homepage"
 msgstr "個人首頁"
 
-#: ../actions/profilesettings.php:87 ../actions/profilesettings.php:95
-#: ../actions/register.php:76 actions/profilesettings.php:210
-#: actions/register.php:83
+#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: actions/profilesettings.php:210 actions/register.php:83
+#: actions/profilesettings.php:216 actions/register.php:92
 msgid "Homepage is not a valid URL."
 msgstr "個人首頁位址錯誤"
 
-#: ../actions/imsettings.php:61 ../actions/imsettings.php:60
-#: actions/imsettings.php:61
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+#: actions/emailsettings.php:101
+msgid "I want to post notices by email."
+msgstr ""
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+#: actions/deleteprofile.php:253
+msgid "IM"
+msgstr ""
+
+#: ../actions/imsettings.php:60 actions/imsettings.php:61
 msgid "IM Address"
 msgstr "線上即時通信箱"
 
@@ -519,58 +892,73 @@ msgid ""
 "click \"Add\"."
 msgstr "若想新增OpenID到你的帳號，請在下方空格輸入並勾選『新增』"
 
-#: ../actions/recoverpassword.php:122
+#: ../actions/recoverpassword.php:137
 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 "若忘記或遺失密碼，我們會寄新的密碼到你帳號中的信箱。"
+msgstr ""
+
+#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
+#: actions/emailsettings.php:68 actions/smssettings.php:76
+msgid "Incoming email"
+msgstr ""
+
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+#: actions/emailsettings.php:304
+msgid "Incoming email address removed."
+msgstr ""
 
 #: ../actions/password.php:69 actions/profilesettings.php:388
+#: actions/profilesettings.php:417
 msgid "Incorrect old password"
 msgstr "舊密碼錯誤"
 
-#: ../actions/login.php:63 ../actions/login.php:67 actions/login.php:67
+#: ../actions/login.php:67 actions/login.php:67 actions/login.php:74
 msgid "Incorrect username or password."
 msgstr "使用者名稱或密碼錯誤"
 
-#: ../actions/recoverpassword.php:226 ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:265
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr "我們已寄出一封信到你帳號中的信箱，告訴你如何取回你的密碼。"
 
-#: ../actions/updateprofile.php:113 ../actions/updateprofile.php:114
-#: actions/updateprofile.php:115
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "個人圖像連結%s無效"
 
-#: ../actions/updateprofile.php:97 ../actions/updateprofile.php:98
-#: actions/updateprofile.php:99
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "個人首頁連結%s無效"
 
-#: ../actions/updateprofile.php:81 ../actions/updateprofile.php:82
-#: actions/updateprofile.php:83
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr ""
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:63
 msgid "Invalid notice content"
 msgstr ""
 
 #: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:69
 msgid "Invalid notice uri"
 msgstr ""
 
 #: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:74
 msgid "Invalid notice url"
 msgstr ""
 
-#: ../actions/updateprofile.php:86 ../actions/updateprofile.php:87
-#: actions/updateprofile.php:88
+#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "個人資料連結%s無效"
@@ -580,7 +968,7 @@ msgid "Invalid profile URL (bad format)"
 msgstr "個人資料連結無效(格式錯誤)"
 
 #: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:78
 msgid "Invalid profile URL returned by server."
 msgstr ""
 
@@ -588,78 +976,119 @@ msgstr ""
 msgid "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:235 ../actions/register.php:93
+#: ../actions/register.php:111 actions/finishopenidlogin.php:241
+#: actions/register.php:103 actions/register.php:121
+#: actions/finishopenidlogin.php:256 actions/register.php:112
+#: actions/register.php:130
 msgid "Invalid username or password."
 msgstr "使用者名稱或密碼無效"
 
-#: ../lib/util.php:237 ../lib/util.php:261 lib/util.php:277
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr ""
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
+
+#: ../lib/util.php:306 lib/util.php:322 lib/util.php:332
+msgid "Invite"
+msgstr ""
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr ""
+
+#: ../lib/util.php:261 lib/util.php:277 lib/util.php:288
 #, 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 ""
 
-#: ../actions/imsettings.php:164 ../actions/imsettings.php:173
-#: actions/imsettings.php:181
+#: ../actions/imsettings.php:173 actions/imsettings.php:181
 msgid "Jabber ID already belongs to another user."
 msgstr "此Jabber ID已有人使用"
 
-#: ../actions/imsettings.php:63 ../actions/imsettings.php:62
-#: 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 ""
 
-#: ../actions/profilesettings.php:55 ../actions/profilesettings.php:52
-#: ../actions/register.php:173 actions/profilesettings.php:85
-#: actions/register.php:187
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
+msgid "Language"
+msgstr ""
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr ""
+
+#: ../actions/profilesettings.php:52 ../actions/register.php:173
+#: actions/profilesettings.php:85 actions/register.php:187
+#: actions/profilesettings.php:87 actions/register.php:214
 msgid "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/profilesettings.php:225 actions/register.php:101
 msgid "Location is too long (max 255 chars)."
 msgstr "地點過長（共255個字）"
 
-#: ../actions/login.php:93 ../actions/login.php:102
-#: ../actions/openidlogin.php:68 ../lib/util.php:286 ../actions/login.php:97
-#: ../actions/login.php:106 ../lib/util.php:310 actions/login.php:97
+#: ../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/login.php:104 actions/login.php:113 actions/openidlogin.php:88
+#: lib/util.php:336
 msgid "Login"
 msgstr "登入"
 
 #: ../actions/openidlogin.php:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:60
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "用OpenID(%%doc.openid%%)帳號登入"
 
-#: ../actions/login.php:122 ../actions/login.php:126
+#: ../actions/login.php:126
 #, 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 ""
 
-#: ../lib/util.php:284 ../lib/util.php:308 lib/util.php:324
+#: ../lib/util.php:308 lib/util.php:324 lib/util.php:334
 msgid "Logout"
 msgstr "登出"
 
-#: ../actions/login.php:106 ../actions/login.php:110 actions/login.php:110
+#: ../actions/register.php:166 actions/register.php:180
+#: actions/register.php:207
+msgid "Longer name, preferably your \"real\" name"
+msgstr ""
+
+#: ../actions/login.php:110 actions/login.php:110 actions/login.php:118
 msgid "Lost or forgotten password?"
 msgstr "遺失或忘記密碼了嗎？"
 
-#: ../actions/showstream.php:281 ../actions/showstream.php:300
-#: actions/showstream.php:315
+#: ../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 ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr ""
+
+#: ../actions/showstream.php:300 actions/showstream.php:315
+#: actions/showstream.php:363
 msgid "Member since"
 msgstr "何時加入會員的呢？"
 
@@ -668,55 +1097,80 @@ msgstr "何時加入會員的呢？"
 msgid "Microblog by %s"
 msgstr "&s的微型部落格"
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
-#: ../actions/register.php:188 actions/finishopenidlogin.php:85
-#: actions/register.php:202
+#: ../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 ""
+
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php:85 actions/register.php:202
+#: actions/register.php:229
 msgid "My text and files are available under "
 msgstr ""
 
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+msgid "New"
+msgstr ""
+
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:138
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+#: actions/emailsettings.php:318
+msgid "New incoming email address added."
+msgstr ""
+
 #: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
 msgid "New nickname"
 msgstr "新暱稱"
 
-#: ../actions/newnotice.php:100 ../actions/newnotice.php:87
-#: actions/newnotice.php:96
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:141
 msgid "New notice"
 msgstr "新訊息"
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:164
-#: ../actions/recoverpassword.php:179 actions/profilesettings.php:180
-#: actions/recoverpassword.php:185
+#: ../actions/password.php:41 ../actions/recoverpassword.php:179
+#: actions/profilesettings.php:180 actions/recoverpassword.php:185
+#: actions/profilesettings.php:185
 msgid "New password"
 msgstr "新密碼"
 
-#: ../actions/recoverpassword.php:275 ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:314
 msgid "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/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:108 actions/profilesettings.php:76
+#: actions/register.php:192
 msgid "Nickname"
 msgstr "暱稱"
 
-#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:99
-#: ../actions/register.php:59 ../actions/profilesettings.php:110
+#: ../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/finishopenidlogin.php:192 actions/profilesettings.php:231
+#: actions/register.php:85
 msgid "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/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: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:182 actions/profilesettings.php:209
+#: actions/register.php:83
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "暱稱請用小寫字母或數字，勿加空格。"
 
 #: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:187
 msgid "Nickname not allowed."
 msgstr "此暱稱無法使用"
 
@@ -724,37 +1178,57 @@ msgstr "此暱稱無法使用"
 msgid "Nickname of the user you want to follow"
 msgstr "你想成為誰的粉絲呢？請輸入他/她的暱稱。"
 
-#: ../actions/recoverpassword.php:147 ../actions/recoverpassword.php:162
-#: actions/recoverpassword.php:167
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
 msgid "Nickname or email"
 msgstr "暱稱或信箱"
 
-#: ../actions/imsettings.php:147 ../actions/imsettings.php:156
-#: actions/imsettings.php:164
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:104
+msgid "No"
+msgstr ""
+
+#: ../actions/imsettings.php:156 actions/imsettings.php:164
 msgid "No Jabber ID."
 msgstr "查無此Jabber ID"
 
-#: ../actions/userauthorization.php:128 ../actions/userauthorization.php:129
-#: actions/userauthorization.php:136
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
 msgid "No authorization request!"
 msgstr "無確認請求"
 
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+msgid "No carrier selected."
+msgstr ""
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+msgid "No code entered"
+msgstr ""
+
 #: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
 msgid "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/newnotice.php:44 actions/newmessage.php:53
+#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:52
+#: actions/newnotice.php:53
 msgid "No content!"
 msgstr "無內容"
 
-#: ../actions/userbyid.php:27 ../actions/userbyid.php:32
-#: actions/userbyid.php:32
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+#: actions/emailsettings.php:197
+msgid "No email address."
+msgstr ""
+
+#: ../actions/userbyid.php:32 actions/userbyid.php:32
 msgid "No id."
 msgstr ""
 
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+#: actions/emailsettings.php:292
+msgid "No incoming email address."
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67
+#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:66
 msgid "No nickname provided by remote server."
 msgstr "無遠端伺服器提供的暱稱"
 
@@ -762,30 +1236,33 @@ msgstr "無遠端伺服器提供的暱稱"
 msgid "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:222 ../actions/imsettings.php:206
+#: ../actions/smssettings.php:229 actions/emailsettings.php:240
+#: actions/imsettings.php:214 actions/smssettings.php:237
+#: actions/emailsettings.php:243
 msgid "No pending confirmation to cancel."
 msgstr ""
 
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+msgid "No phone number."
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74
+#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:73
 msgid "No profile URL returned by server."
 msgstr ""
 
-#: ../actions/recoverpassword.php:189 ../actions/recoverpassword.php:226
-#: actions/recoverpassword.php:232
+#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
 msgid "No registered email address for that user."
 msgstr "查無此使用者所註冊的信箱"
 
-#: ../actions/userauthorization.php:48 ../actions/userauthorization.php:49
-#: actions/userauthorization.php:55
+#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
 msgid "No request found!"
 msgstr "目前無請求"
 
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
 #: actions/noticesearch.php:69 actions/peoplesearch.php:69
+#: actions/noticesearch.php:68 actions/peoplesearch.php:59
 msgid "No results"
 msgstr "無結果"
 
@@ -793,6 +1270,17 @@ msgstr "無結果"
 msgid "No size."
 msgstr "無尺寸"
 
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:109
+#: actions/twitapistatuses.php:438
+msgid "No status found with that ID."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:411
+msgid "No status with that ID found."
+msgstr ""
+
 #: ../actions/openidsettings.php:135 actions/openidsettings.php:144
 msgid "No such OpenID."
 msgstr "無此OpenID"
@@ -801,9 +1289,10 @@ msgstr "無此OpenID"
 msgid "No such document."
 msgstr "無此文件"
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:65
-#: ../actions/shownotice.php:83 ../lib/deleteaction.php:30
-#: 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:32
+#: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:38
+#: actions/shownotice.php:114
 msgid "No such notice."
 msgstr "無此通知"
 
@@ -816,28 +1305,31 @@ msgid "No such subscription"
 msgstr "無此訂閱"
 
 #: ../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/foaf.php:40 ../actions/replies.php:57
+#: ../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/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/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/showstream.php:157
+#: classes/Command.php:208 classes/Command.php:242 lib/gallery.php:85
+#: lib/subs.php:105
 msgid "No such user."
 msgstr "無此使用者"
 
-#: ../lib/gallery.php:76 ../lib/gallery.php:80 lib/gallery.php:85
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr ""
+
+#: ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
 msgstr ""
 
@@ -845,8 +1337,18 @@ msgstr ""
 msgid "Not a recovery code."
 msgstr "此恢復碼錯誤"
 
-#: ../actions/imsettings.php:158 ../actions/imsettings.php:167
-#: actions/imsettings.php:175
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+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:423 lib/twitterapi.php:450
+#: lib/twitterapi.php:534
+msgid "Not a supported data format."
+msgstr ""
+
+#: ../actions/imsettings.php:167 actions/imsettings.php:175
 msgid "Not a valid Jabber ID"
 msgstr "此JabberID無效"
 
@@ -854,24 +1356,26 @@ msgstr "此JabberID無效"
 msgid "Not a valid OpenID."
 msgstr "此OpenID無效"
 
-#: ../actions/profilesettings.php:75 ../actions/register.php:53
-#: ../actions/register.php:63 actions/register.php:70
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+#: actions/emailsettings.php:208
+msgid "Not a valid email address"
+msgstr ""
+
+#: ../actions/register.php:63 actions/register.php:70 actions/register.php:79
 msgid "Not a valid email address."
 msgstr "此信箱無效"
 
-#: ../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/profilesettings.php:212 actions/register.php:87
 msgid "Not a valid nickname."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:118 ../actions/remotesubscribe.php:120
-#: actions/remotesubscribe.php:129
+#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
 msgid "Not a valid profile URL (incorrect services)."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:111 ../actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:122
+#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr ""
 
@@ -880,11 +1384,12 @@ msgid "Not a valid profile URL (no YADIS document)."
 msgstr ""
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: actions/profilesettings.php:361
 msgid "Not an image or corrupt file."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:52
 msgid "Not authorized."
 msgstr ""
 
@@ -893,42 +1398,61 @@ msgstr ""
 msgid "Not expecting this response!"
 msgstr ""
 
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
-#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
-#: ../actions/logout.php:33 ../actions/subscribe.php:28
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+#: actions/twitapistatuses.php:304
+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
-#: 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
+#: ../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:31 actions/newnotice.php:30
+#: actions/nudge.php:30 actions/subedit.php:31 actions/unblock.php:31
 msgid "Not logged in."
 msgstr ""
 
-#: ../actions/unsubscribe.php:43 ../lib/subs.php:91 lib/subs.php:104
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:117
 msgid "Not subscribed!."
 msgstr ""
 
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+msgid "Notice Search"
+msgstr ""
+
 #: ../actions/showstream.php:82 actions/showstream.php:82
+#: actions/showstream.php:111 actions/showstream.php:118
+#: actions/showstream.php:123
 #, php-format
 msgid "Notice feed for %s"
 msgstr ""
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
+#: actions/shownotice.php:45
 msgid "Notice has no profile"
 msgstr ""
 
-#: ../actions/showstream.php:297 ../actions/showstream.php:316
-#: actions/showstream.php:331
+#: ../actions/showstream.php:316 actions/showstream.php:331
+#: actions/showstream.php:379
 msgid "Notices"
 msgstr ""
 
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
+#, php-format
+msgid "Notices tagged with %s"
+msgstr ""
+
 #: ../actions/password.php:39 actions/profilesettings.php:178
+#: actions/profilesettings.php:183
 msgid "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 actions/deleteprofile.php:247 lib/util.php:340
 msgid "OpenID"
 msgstr ""
 
@@ -943,11 +1467,13 @@ msgstr ""
 #: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
 #: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
+#: actions/finishopenidlogin.php:150 actions/openidlogin.php:76
 msgid "OpenID Login"
 msgstr ""
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 #: actions/openidlogin.php:74 actions/openidsettings.php:50
+#: actions/openidlogin.php:82
 msgid "OpenID URL"
 msgstr ""
 
@@ -975,92 +1501,112 @@ msgstr ""
 msgid "OpenID settings"
 msgstr ""
 
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: actions/profilesettings.php:350
 msgid "Partial upload."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:90 ../actions/login.php:98
-#: ../actions/register.php:177 ../actions/login.php:102
+#: ../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/register.php:167 actions/login.php:109 actions/register.php:194
 msgid "Password"
 msgstr ""
 
-#: ../actions/recoverpassword.php:249 ../actions/recoverpassword.php:288
-#: actions/recoverpassword.php:301
+#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
 msgid "Password and confirmation do not match."
 msgstr ""
 
-#: ../actions/recoverpassword.php:245 ../actions/recoverpassword.php:284
-#: actions/recoverpassword.php:297
+#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
 msgid "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
 msgid "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/profilesettings.php:437
 msgid "Password saved."
 msgstr ""
 
-#: ../actions/password.php:61 ../actions/register.php:65
-#: ../actions/register.php:88 actions/profilesettings.php:380
-#: actions/register.php:98
+#: ../actions/password.php:61 ../actions/register.php:88
+#: actions/profilesettings.php:380 actions/register.php:98
+#: actions/profilesettings.php:409 actions/register.php:107
 msgid "Passwords don't match."
 msgstr ""
 
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+msgid "People"
+msgstr ""
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+msgid "People Search"
+msgstr ""
+
 #: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
 msgid "People search"
 msgstr ""
 
-#: ../lib/stream.php:44 ../lib/stream.php:50 lib/personal.php:50
+#: ../lib/stream.php:50 lib/personal.php:50
 msgid "Personal"
 msgstr ""
 
-#: ../actions/userauthorization.php:77 ../actions/userauthorization.php:78
+#: ../actions/invite.php:133 actions/invite.php:141
+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 ""
 
-#: ../actions/imsettings.php:74 ../actions/imsettings.php:73
-#: actions/imsettings.php:74
+#: ../actions/imsettings.php:73 actions/imsettings.php:74
 msgid "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: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
 msgid "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:162 ../actions/imsettings.php:144
+#: ../actions/smssettings.php:163 actions/emailsettings.php:180
+#: actions/imsettings.php:152 actions/smssettings.php:171
+#: actions/emailsettings.php:185 actions/othersettings.php:179
 msgid "Preferences saved."
 msgstr ""
 
-#: ../lib/util.php:300 ../lib/util.php:328 lib/util.php:344
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:95
+msgid "Preferred language"
+msgstr ""
+
+#: ../lib/util.php:328 lib/util.php:344 lib/util.php:356
 msgid "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:119 classes/Notice.php:139 classes/Notice.php:149
 msgid "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/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
+#: lib/settingsaction.php:84 actions/deleteprofile.php:241
 msgid "Profile"
 msgstr ""
 
@@ -1072,31 +1618,38 @@ msgstr ""
 msgid "Profile settings"
 msgstr ""
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
-#: ../actions/updateprofile.php:52 actions/postnotice.php:52
-#: actions/updateprofile.php:53
+#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
+#: actions/postnotice.php:52 actions/updateprofile.php:53
 msgid "Profile unknown"
 msgstr ""
 
-#: ../lib/util.php:276
-msgid "Public"
-msgstr ""
-
-#: ../actions/public.php:54 actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:77
 msgid "Public Stream Feed"
 msgstr ""
 
-#: ../actions/public.php:33 actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 lib/stream.php:34
 msgid "Public timeline"
 msgstr ""
 
-#: ../actions/recoverpassword.php:151 ../actions/recoverpassword.php:166
-#: actions/recoverpassword.php:171
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:104
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
 msgid "Recover"
 msgstr ""
 
-#: ../actions/recoverpassword.php:141 ../actions/recoverpassword.php:156
-#: actions/recoverpassword.php:161
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
 msgid "Recover password"
 msgstr ""
 
@@ -1104,25 +1657,33 @@ msgstr ""
 msgid "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:181 actions/register.php:234 lib/util.php:338
 msgid "Register"
 msgstr ""
 
-#: ../actions/userauthorization.php:119 ../actions/userauthorization.php:120
-#: actions/userauthorization.php:127
+#: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:173
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:241
+msgid "Registration successful"
+msgstr ""
+
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
 msgid "Reject"
 msgstr ""
 
-#: ../actions/login.php:99 ../actions/register.php:183
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
-#: actions/register.php:190
+#: actions/register.php:190 actions/login.php:110 actions/openidlogin.php:85
+#: actions/register.php:217
 msgid "Remember me"
 msgstr ""
 
-#: ../actions/updateprofile.php:69 ../actions/updateprofile.php:70
-#: actions/updateprofile.php:71
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
 msgid "Remote profile with no matching profile"
 msgstr ""
 
@@ -1130,13 +1691,13 @@ msgstr ""
 msgid "Remote subscribe"
 msgstr ""
 
-#: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
 #: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
+#: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
 #: ../actions/smssettings.php:50 ../actions/smssettings.php:84
 #: actions/emailsettings.php:48 actions/emailsettings.php:76
 #: actions/imsettings.php:49 actions/openidsettings.php:108
 #: actions/smssettings.php:50 actions/smssettings.php:84
-#: actions/twittersettings.php:59
+#: actions/twittersettings.php:59 actions/twittersettings.php:61
 msgid "Remove"
 msgstr ""
 
@@ -1150,51 +1711,73 @@ msgid ""
 "remove it, add another OpenID first."
 msgstr ""
 
-#: ../lib/stream.php:49 ../lib/stream.php:55 lib/personal.php:55
+#: ../lib/stream.php:55 lib/personal.php:55
 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
 #, 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
 msgid "Reset"
 msgstr ""
 
-#: ../actions/recoverpassword.php:158 ../actions/recoverpassword.php:173
-#: actions/recoverpassword.php:178
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
 msgid "Reset password"
 msgstr ""
 
-#: ../actions/recoverpassword.php:167 ../actions/register.php:180
-#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-msgid "Same as password above"
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/deleteprofile.php:250 actions/subscriptions.php:73
+msgid "SMS"
 msgstr ""
 
-#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
-#: ../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
-msgid "Save"
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+msgid "SMS Phone number"
 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
-msgid "Search"
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+msgid "SMS Settings"
 msgstr ""
 
-#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
-msgid "Search Stream Feed"
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:230
+msgid "SMS confirmation"
 msgstr ""
 
-#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
+msgid "Same as password above"
+msgstr ""
+
+#: ../actions/register.php:156 actions/register.php:170
+#: actions/register.php:197
+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/twittersettings.php:83 actions/emailsettings.php:107
+#: actions/othersettings.php:56 actions/profilesettings.php:106
+#: actions/subscriptions.php:74 actions/tagother.php:100
+#: actions/twittersettings.php:82
+msgid "Save"
+msgstr ""
+
+#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
+#: lib/util.php:316 lib/util.php:327
+msgid "Search"
+msgstr ""
+
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:84
+msgid "Search Stream Feed"
+msgstr ""
+
+#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
+#: actions/noticesearch.php:29
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -1208,25 +1791,51 @@ msgid ""
 "Separate the terms by spaces; they must be 3 characters or more."
 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/smssettings.php:296 actions/smssettings.php:304
+msgid "Select a carrier"
+msgstr ""
+
+#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
+#: lib/util.php:1306 lib/util.php:1731 lib/util.php:1646 lib/util.php:2158
 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
+msgid "Send email to this address to post new notices."
+msgstr ""
+
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+msgid "Send me notices of new subscriptions through email."
+msgstr ""
+
+#: ../actions/imsettings.php:70 actions/imsettings.php:71
 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 ""
+
+#: ../lib/util.php:304 lib/util.php:320 lib/util.php:330
 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:336
 msgid "Settings saved."
 msgstr ""
 
+#: ../actions/tag.php:60 actions/tag.php:60 actions/tag.php:59
+msgid "Showing most popular tags from the last week"
+msgstr ""
+
 #: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
 msgid "Someone else already has this OpenID."
 msgstr ""
@@ -1236,56 +1845,76 @@ 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
+msgid "Sorry, no incoming email allowed."
+msgstr ""
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: ../lib/util.php:330 lib/util.php:346 lib/util.php:358
 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:359
 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:199 actions/finishopenidlogin.php:267
 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:254 lib/util.php:2078
 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:376 lib/gallery.php:136 lib/gallery.php:137
 msgid "Subscribers"
 msgstr ""
 
-#: ../actions/userauthorization.php:309 ../actions/userauthorization.php:310
-#: actions/userauthorization.php:322
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
 msgid "Subscription authorized"
 msgstr ""
 
-#: ../actions/userauthorization.php:319 ../actions/userauthorization.php:320
-#: actions/userauthorization.php:332
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
 msgid "Subscription rejected"
 msgstr ""
 
-#: ../actions/showstream.php:212 ../actions/showstream.php:288
-#: ../actions/subscriptions.php:27 ../actions/showstream.php:230
-#: ../actions/showstream.php:307 actions/showstream.php:240
+#: ../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:288 actions/showstream.php:370 lib/gallery.php:131
+#: lib/gallery.php:132
 msgid "Subscriptions"
 msgstr ""
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
+#: actions/profilesettings.php:353
 msgid "System error uploading file."
 msgstr ""
 
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317 actions/profilesettings.php:90 actions/showstream.php:382
+#: actions/tag.php:40 actions/tagother.php:96 actions/tagother.php:162
+#: lib/profilelist.php:126 lib/profilelist.php:128
+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:33
 msgid "Text search"
 msgstr ""
 
@@ -1301,53 +1930,87 @@ msgstr ""
 msgid "That confirmation code is not for you!"
 msgstr ""
 
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:214
+msgid "That email address already belongs to another user."
+msgstr ""
+
 #: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: actions/profilesettings.php:346
 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
 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:211
+msgid "That is already your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+msgid "That is already your phone number."
+msgstr ""
+
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
 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:270
+msgid "That is not your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+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:247
 msgid "That is the wrong IM address."
 msgstr ""
 
-#: ../actions/newnotice.php:52 ../actions/newnotice.php:49
-#: ../actions/twitapistatuses.php:408 actions/newnotice.php:49
-#: actions/twitapistatuses.php:330
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+msgid "That is the wrong confirmation number."
+msgstr ""
+
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+msgid "That phone number already belongs to another user."
+msgstr ""
+
+#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: actions/newnotice.php:49 actions/twitapistatuses.php:330
+#: actions/newnotice.php:61 actions/twitapistatuses.php:271
 msgid "That's too long. Max notice size is 140 chars."
 msgstr ""
 
-#: ../actions/confirmaddress.php:86 ../actions/confirmaddress.php:92
-#: actions/confirmaddress.php:92
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+#: actions/twitapiaccount.php:55
+msgid "That's too long. Max notice size is 255 chars."
+msgstr ""
+
+#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr ""
 
-#: ../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:285
 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 ""
 
-#: ../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 "
@@ -1372,7 +2035,12 @@ 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
+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 ""
 
@@ -1390,22 +2058,52 @@ msgid ""
 "your existing account, if you have one."
 msgstr ""
 
-#: ../lib/util.php:147 ../lib/util.php:164 lib/util.php:246
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:94
+#: actions/twitapifriendships.php:82 actions/twitapistatuses.php:428
+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:46
+#: actions/twitapidirect_messages.php:117 actions/twitapifriendships.php:30
+#: actions/twitapistatuses.php:239
+msgid "This method requires a POST."
+msgstr ""
+
+#: ../lib/util.php:164 lib/util.php:246 lib/util.php:257
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:101
+msgid "Timezone"
+msgstr ""
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr ""
+
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"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 ""
 
-#: ../actions/profilesettings.php:51 ../actions/profilesettings.php:48
-#: ../actions/register.php:169 actions/profilesettings.php:81
-#: actions/register.php:183
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: actions/twitapifriendships.php:128
+msgid "Two user ids or screen_names must be supplied."
+msgstr ""
+
+#: ../actions/profilesettings.php:48 ../actions/register.php:169
+#: actions/profilesettings.php:81 actions/register.php:183
+#: actions/profilesettings.php:83 actions/register.php:210
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 
@@ -1413,25 +2111,29 @@ 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/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/emailsettings.php:147
+#: actions/othersettings.php:146 actions/twittersettings.php:199
 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
 msgid "Unexpected password reset."
 msgstr ""
 
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60
+#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:59
 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 lib/util.php:296
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
@@ -1442,22 +2144,45 @@ msgstr ""
 msgid "Unrecognized address type %s"
 msgstr ""
 
-#: ../actions/showstream.php:193 ../actions/showstream.php:209
-#: actions/showstream.php:219
+#: ../actions/showstream.php:209 actions/showstream.php:219
+#: actions/showstream.php:267 lib/util.php:2094
 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
 msgid "Unsupported OMB version"
 msgstr ""
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: actions/profilesettings.php:371
 msgid "Unsupported image file format."
 msgstr ""
 
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: actions/deleteprofile.php:251
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: actions/deleteprofile.php:254
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/twitapistatuses.php:126
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:198
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
+
 #: ../actions/avatar.php:68 actions/profilesettings.php:161
+#: actions/profilesettings.php:166
 msgid "Upload"
 msgstr ""
 
@@ -1469,28 +2194,39 @@ msgid ""
 "share."
 msgstr ""
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:182
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr ""
+
+#: ../actions/invite.php:114 actions/invite.php:121
+msgid ""
+"Use this form to invite your friends and colleagues to use this service."
+msgstr ""
+
 #: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176
+#: actions/register.php:173 actions/register.php:176 actions/register.php:200
+#: actions/register.php:203
 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:92
 msgid "User being listened to doesn't exist."
 msgstr ""
 
 #: ../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/showstream.php:57
+#: actions/twitapiaccount.php:63 actions/twitapifavorites.php:40
+#: actions/twitapistatuses.php:163 actions/twitapistatuses.php:492
+#: lib/twitterapi.php:590
 msgid "User has no profile."
 msgstr ""
 
@@ -1498,46 +2234,78 @@ 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:101
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../lib/util.php:1159 lib/util.php:1293 lib/util.php:1630
 #, php-format
 msgid "What's up, %s?"
 msgstr ""
 
-#: ../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:89 actions/register.php:216
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 
-#: ../actions/updateprofile.php:127 ../actions/updateprofile.php:128
-#: actions/updateprofile.php:129
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr ""
 
-#: ../actions/updateprofile.php:122 ../actions/updateprofile.php:123
-#: actions/updateprofile.php:124
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr ""
 
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+#: actions/block.php:105
+msgid "Yes"
+msgstr ""
+
 #: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
 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
 msgid "You are already logged in!"
 msgstr ""
 
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:102
+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/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 ""
 
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
 #: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
@@ -1547,41 +2315,70 @@ msgstr ""
 #: ../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 ""
-"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
+#: actions/finishremotesubscribe.php:83 actions/finishremotesubscribe.php:99
 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/register.php:77
 msgid "You can't register if you don't agree to the license."
 msgstr ""
 
-#: ../actions/updateprofile.php:62 ../actions/updateprofile.php:63
-#: actions/updateprofile.php:64
+#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
 msgid "You did not send us that profile"
 msgstr ""
 
-#: ../actions/recoverpassword.php:134 ../actions/recoverpassword.php:149
+#: ../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 ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: actions/twitapistatuses.php:455
+msgid "You may not delete another user's status."
+msgstr ""
+
+#: ../actions/invite.php:31 actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+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!"
+msgstr ""
+
+#: ../actions/recoverpassword.php:149
 msgid "You've been identified. Enter a  new password below. "
 msgstr ""
 
 #: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:84
 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."
 msgstr ""
 
@@ -1592,788 +2389,84 @@ msgid ""
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
 
-#: ../lib/util.php:814 ../lib/util.php:943 lib/util.php:992
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:1287
 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:1299
 #, 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:1295
 #, 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:1291
 #, 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:1303
 #, 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:1297
 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:1289
 msgid "about a minute ago"
 msgstr ""
 
-#: ../lib/util.php:828 ../lib/util.php:957 lib/util.php:1006
-msgid "about a month ago"
-msgstr ""
-
-#: ../lib/util.php:832 ../lib/util.php:961 lib/util.php:1010
-msgid "about a year ago"
-msgstr ""
-
-#: ../lib/util.php:820 ../lib/util.php:949 lib/util.php:998
-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..."
-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
-msgid "reply"
-msgstr ""
-
-#: ../actions/password.php:44 actions/profilesettings.php:183
-msgid "same as password above"
-msgstr ""
-
-#: ../lib/util.php:1127 ../lib/util.php:1309 lib/util.php:1443
-msgid "« After"
-msgstr ""
-
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr ""
-
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
-
-#: ../actions/invite.php:168 actions/invite.php:176
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
-
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
-
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
-#, php-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#, php-format
-msgid "%s public timeline"
-msgstr ""
-
-#: ../lib/mail.php:206 lib/mail.php:212
-#, php-format
-msgid "%s status"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#, php-format
-msgid "%s timeline"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
-msgstr ""
-
-#: ../actions/register.php:213
-msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
-msgstr ""
-
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-
-#: ../actions/register.php:154 actions/register.php:168
-msgid "6 or more characters. Required."
-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 ""
-
-#: ../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/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!"
-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 ""
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-msgid "Add or remove OpenIDs"
-msgstr ""
-
-#: ../actions/invite.php:131 actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
-msgstr ""
-
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-msgid "Are you sure you want to delete this notice?"
-msgstr ""
-
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr ""
-
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
-msgid "Can't delete this notice."
-msgstr ""
-
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-msgid "Cannot normalize that email address"
-msgstr ""
-
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr ""
-
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
-msgstr ""
-
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-msgid "Change your profile settings"
-msgstr ""
-
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-msgid "Confirmation code"
-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/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
-msgstr ""
-
-#: ../lib/subs.php:54 lib/subs.php:61
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: ../lib/subs.php:46 lib/subs.php:46
-msgid "Could not subscribe."
-msgstr ""
-
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-msgid "Could not update user with confirmed email address."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-msgid "Couldn't find any statuses."
-msgstr ""
-
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-msgid "Couldn't update user for autosubscribe."
-msgstr ""
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-msgid "Couldn't update user record."
-msgstr ""
-
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-msgid "Current confirmed email address."
-msgstr ""
-
-#: ../classes/Notice.php:72 classes/Notice.php:86
-#, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr ""
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-msgid "Delete notice"
-msgstr ""
-
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-msgid "Email Address"
-msgstr ""
-
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-msgid "Email Settings"
-msgstr ""
-
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-msgid "Email address, like \"UserName@example.org\""
-msgstr ""
-
-#: ../actions/invite.php:129 actions/invite.php:137
-msgid "Email addresses"
-msgstr ""
-
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
-msgstr ""
-
-#: ../actions/tag.php:55 actions/tag.php:55
-#, php-format
-msgid "Feed for tag %s"
-msgstr ""
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr ""
-
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr ""
-
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-msgid "I want to post notices by email."
-msgstr ""
-
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
-msgstr ""
-
-#: ../actions/recoverpassword.php:137
-msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
-"email address you have stored  in your account."
-msgstr ""
-
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-msgid "Incoming email"
-msgstr ""
-
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-msgid "Incoming email address removed."
-msgstr ""
-
-#: ../actions/invite.php:55 actions/invite.php:62
-#, php-format
-msgid "Invalid email address: %s"
-msgstr ""
-
-#: ../actions/invite.php:79 actions/invite.php:86
-msgid "Invitation(s) sent"
-msgstr ""
-
-#: ../actions/invite.php:97 actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
-msgstr ""
-
-#: ../lib/util.php:306 lib/util.php:322
-msgid "Invite"
-msgstr ""
-
-#: ../actions/invite.php:123 actions/invite.php:130
-msgid "Invite new users"
-msgstr ""
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Language"
-msgstr ""
-
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-msgid "Language is too long (max 50 chars)."
-msgstr ""
-
-#: ../actions/register.php:166 actions/register.php:180
-msgid "Longer name, preferably your \"real\" name"
-msgstr ""
-
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-#: actions/emailsettings.php:81 actions/smssettings.php:89
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
-
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-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 ""
-
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-msgid "New"
-msgstr ""
-
-#: ../lib/mail.php:144 lib/mail.php:144
-#, php-format
-msgid "New email address for posting to %s"
-msgstr ""
-
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-msgid "New incoming email address added."
-msgstr ""
-
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-msgid "No"
-msgstr ""
-
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-msgid "No carrier selected."
-msgstr ""
-
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-msgid "No code entered"
-msgstr ""
-
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-msgid "No email address."
-msgstr ""
-
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-msgid "No incoming email address."
-msgstr ""
-
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-msgid "No phone number."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-msgid "No status found with that ID."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-msgid "No status with that ID found."
-msgstr ""
-
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-msgid "No user with that email address or username."
-msgstr ""
-
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-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
-msgid "Not a supported data format."
-msgstr ""
-
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-msgid "Not a valid email address"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-msgid "Not found"
-msgstr ""
-
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-msgid "Notice Search"
-msgstr ""
-
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81
-#, php-format
-msgid "Notices tagged with %s"
-msgstr ""
-
-#: ../actions/invite.php:135 actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-msgid "People"
-msgstr ""
-
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-msgid "People Search"
-msgstr ""
-
-#: ../actions/invite.php:133 actions/invite.php:141
-msgid "Personal message"
-msgstr ""
-
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Preferred language"
-msgstr ""
-
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
-
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-msgid "Publish a MicroID for my email address."
-msgstr ""
-
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr ""
-
-#: ../actions/register.php:28 actions/register.php:28
-msgid "Registration not allowed."
-msgstr ""
-
-#: ../actions/register.php:200 actions/register.php:214
-msgid "Registration successful"
-msgstr ""
-
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
-msgstr ""
-
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-msgid "SMS Phone number"
-msgstr ""
-
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-msgid "SMS Settings"
-msgstr ""
-
-#: ../lib/mail.php:219 lib/mail.php:225
-msgid "SMS confirmation"
-msgstr ""
-
-#: ../actions/register.php:156 actions/register.php:170
-msgid "Same as password above. Required."
-msgstr ""
-
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-msgid "Select a carrier"
-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."
-msgstr ""
-
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-msgid "Send me notices of new subscriptions through email."
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr ""
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
-msgstr ""
-
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317
-msgid "Tags"
-msgstr ""
-
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr ""
-
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr ""
-
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-msgid "That is already your email address."
-msgstr ""
-
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-msgid "That is already your phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-msgid "That is not your email address."
-msgstr ""
-
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-msgid "That is not your phone number."
-msgstr ""
-
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-msgid "That is the wrong confirmation number."
-msgstr ""
-
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-msgid "That phone number already belongs to another user."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-msgid "That's too long. Max notice size is 255 chars."
-msgstr ""
-
-#: ../actions/invite.php:89 actions/invite.php:96
-msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
-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."
-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."
-msgstr ""
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "Timezone"
-msgstr ""
-
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-msgid "Timezone not selected."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-msgid "Two user ids or screen_names must be supplied."
-msgstr ""
-
-#: ../index.php:57 index.php:57
-msgid "Unknown action"
-msgstr ""
-
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-msgid "Updates by SMS"
-msgstr ""
-
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr ""
-
-#: ../actions/invite.php:114 actions/invite.php:121
-msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
-msgstr ""
-
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr ""
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "What timezone are you normally in?"
-msgstr ""
-
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-msgid "Yes"
-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/invite.php:81 actions/invite.php:88
-msgid "You are already subscribed to these users:"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
-msgstr ""
-
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-msgid "You may not delete another user's status."
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:1301
+msgid "about a month ago"
 msgstr ""
 
-#: ../actions/invite.php:31 actions/invite.php:31
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:1305
+msgid "about a year ago"
 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!"
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:1293
+msgid "about an hour ago"
 msgstr ""
 
 #: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
+#: actions/showstream.php:441 lib/stream.php:99 lib/noticelist.php:211
 msgid "delete"
 msgstr ""
 
+#: ../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:135
+#: lib/facebookaction.php:202 lib/noticelist.php:189
+msgid "in reply to..."
+msgstr ""
+
+#: ../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:142
+#: lib/noticelist.php:199
+msgid "reply"
+msgstr ""
+
+#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/profilesettings.php:188
+msgid "same as password above"
+msgstr ""
+
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+#: actions/twitapistatuses.php:543
 msgid "unsupported file type"
 msgstr ""
 
+#: ../lib/util.php:1309 lib/util.php:1443 lib/facebookaction.php:251
+#: lib/util.php:1783
+msgid "« After"
+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
@@ -2383,6 +2476,12 @@ msgstr ""
 #: 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:38 actions/deleteprofile.php:127 actions/disfavor.php:47
+#: actions/emailsettings.php:130 actions/favor.php:49 actions/login.php:45
+#: actions/newmessage.php:44 actions/newnotice.php:36 actions/nudge.php:47
+#: actions/othersettings.php:139 actions/profilesettings.php:49
+#: actions/subedit.php:38 actions/tagother.php:113
+#: actions/twittersettings.php:188 actions/unblock.php:38
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -2406,12 +2505,14 @@ msgstr ""
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142
+#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:54
+#: actions/twitapifavorites.php:115
 msgid "This notice is already a favorite!"
 msgstr ""
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
+#: classes/Command.php:132 actions/favor.php:61
+#: actions/twitapifavorites.php:122
 msgid "Could not create favorite."
 msgstr ""
 
@@ -2420,11 +2521,12 @@ msgid "Disfavor"
 msgstr ""
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:62
 #, php-format
 msgid "%s favorite notices"
 msgstr ""
 
-#: actions/favoritesrss.php:64
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:66
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr ""
@@ -2450,47 +2552,50 @@ msgid ""
 "\n"
 msgstr ""
 
-#: actions/login.php:104
+#: actions/login.php:104 actions/login.php:111 actions/openidlogin.php:86
 msgid "Automatically login in the future; "
 msgstr ""
 
-#: actions/login.php:122
+#: actions/login.php:122 actions/login.php:130
 msgid "For security reasons, please re-enter your "
 msgstr ""
 
-#: actions/login.php:126
+#: actions/login.php:126 actions/login.php:134
 msgid "Login with your username and password. "
 msgstr ""
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+#: actions/newmessage.php:60 actions/twitapidirect_messages.php:136
 msgid "That's too long. Max message size is 140 chars."
 msgstr ""
 
-#: actions/newmessage.php:65
+#: actions/newmessage.php:65 actions/newmessage.php:68
 msgid "No recipient specified."
 msgstr ""
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
+#: classes/Command.php:206 actions/newmessage.php:71
+#: actions/newmessage.php:116 classes/Command.php:211
 msgid "You can't send a message to this user."
 msgstr ""
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
+#: classes/Command.php:209 actions/newmessage.php:74
+#: actions/twitapidirect_messages.php:153 classes/Command.php:214
 msgid ""
-"Don't send a message to yourself; just say it to yourself quietly "
-"instead."
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: actions/newmessage.php:108
+#: actions/newmessage.php:108 actions/microsummary.php:32
+#: actions/newmessage.php:111
 msgid "No such user"
 msgstr ""
 
-#: actions/newmessage.php:117
+#: actions/newmessage.php:117 actions/newmessage.php:120
 msgid "New message"
 msgstr ""
 
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:95 actions/noticesearch.php:94
 msgid "Notice without matching profile"
 msgstr ""
 
@@ -2537,6 +2642,7 @@ msgstr ""
 
 #: actions/profilesettings.php:115 actions/remotesubscribe.php:320
 #: actions/userauthorization.php:159 actions/userrss.php:76
+#: actions/profilesettings.php:120 actions/remotesubscribe.php:333
 msgid "User without matching profile"
 msgstr ""
 
@@ -2564,18 +2670,18 @@ msgstr ""
 msgid "New password successfully saved. "
 msgstr ""
 
-#: actions/register.php:95
+#: actions/register.php:95 actions/register.php:104
 msgid "Password must be 6 or more characters."
 msgstr ""
 
-#: actions/register.php:216
+#: actions/register.php:216 actions/register.php:243
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to..."
 msgstr ""
 
-#: actions/register.php:227
+#: actions/register.php:227 actions/register.php:254
 msgid "(You should receive a message by email momentarily, with "
 msgstr ""
 
@@ -2590,6 +2696,7 @@ msgid "Feed for favorites of %s"
 msgstr ""
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:88 actions/twitapifavorites.php:57
 msgid "Could not retrieve favorite notices."
 msgstr ""
 
@@ -2611,7 +2718,7 @@ msgstr ""
 msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: actions/showstream.php:154
+#: actions/showstream.php:154 lib/util.php:2105
 msgid "Send a message"
 msgstr ""
 
@@ -2620,73 +2727,78 @@ msgstr ""
 msgid "Mobile carrier for your phone. "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:64
 #, php-format
 msgid "Direct messages to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:65
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:69
 msgid "Direct Messages You've Sent"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:70
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:132
 msgid "No message text!"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:145
 msgid "Recipient user not found."
 msgstr ""
 
 #: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:148
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
-#: actions/twitapifavorites.php:92
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:64
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
-#: actions/twitapifavorites.php:95
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:67
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
+#: actions/twitapifavorites.php:158 lib/mail.php:303
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr ""
 
 #: actions/twitapifavorites.php:188 lib/mail.php:276
+#: actions/twitapifavorites.php:159 lib/mail.php:304
 #, php-format
 msgid ""
 "%1$s just added your notice from %2$s as one of their favorites.\n"
 "\n"
 msgstr ""
 
-#: actions/twittersettings.php:27
+#: actions/twittersettings.php:27 actions/twittersettings.php:29
 msgid ""
 "Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 
-#: actions/twittersettings.php:41
+#: actions/twittersettings.php:41 actions/twittersettings.php:43
 msgid "Twitter settings"
 msgstr ""
 
-#: actions/twittersettings.php:48
+#: actions/twittersettings.php:48 actions/twittersettings.php:50
 msgid "Twitter Account"
 msgstr ""
 
-#: actions/twittersettings.php:56
+#: actions/twittersettings.php:56 actions/twittersettings.php:58
 msgid "Current verified Twitter account."
 msgstr ""
 
@@ -2714,46 +2826,50 @@ msgstr ""
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:216
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr ""
 
-#: actions/twittersettings.php:128
+#: actions/twittersettings.php:128 actions/twittersettings.php:221
 msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: actions/twittersettings.php:137 actions/twittersettings.php:228
 #, php-format
 msgid "Unable to retrieve account information for \"%s\" from Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:234 actions/twittersettings.php:253
 msgid "Unable to save your Twitter settings!"
 msgstr ""
 
-#: actions/twittersettings.php:174
+#: actions/twittersettings.php:174 actions/twittersettings.php:261
 msgid "Twitter settings saved."
 msgstr ""
 
-#: actions/twittersettings.php:192
+#: actions/twittersettings.php:192 actions/twittersettings.php:272
 msgid "That is not your Twitter account."
 msgstr ""
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:280
 msgid "Couldn't remove Twitter user."
 msgstr ""
 
-#: actions/twittersettings.php:212
+#: actions/twittersettings.php:212 actions/twittersettings.php:284
 msgid "Twitter account removed."
 msgstr ""
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
+#: actions/twittersettings.php:299 actions/twittersettings.php:310
+#: actions/twittersettings.php:322
 msgid "Couldn't save Twitter preferences."
 msgstr ""
 
-#: actions/twittersettings.php:245
+#: actions/twittersettings.php:245 actions/twittersettings.php:330
 msgid "Twitter preferences saved."
 msgstr ""
 
@@ -2769,15 +2885,15 @@ msgstr ""
 msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#: classes/Channel.php:113
+#: classes/Channel.php:113 classes/Channel.php:129
 msgid "Command results"
 msgstr ""
 
-#: classes/Channel.php:148
+#: classes/Channel.php:148 classes/Channel.php:175
 msgid "Command complete"
 msgstr ""
 
-#: classes/Channel.php:158
+#: classes/Channel.php:158 classes/Channel.php:185
 msgid "Command failed"
 msgstr ""
 
@@ -2790,7 +2906,7 @@ msgstr ""
 msgid "Subscriptions: %1$s\n"
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:247
 msgid "User has no last notice"
 msgstr ""
 
@@ -2823,59 +2939,60 @@ msgstr ""
 msgid "About: %s"
 msgstr ""
 
-#: classes/Command.php:200
+#: classes/Command.php:200 classes/Command.php:202
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: classes/Command.php:214
+#: classes/Command.php:214 classes/Command.php:219
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: classes/Command.php:216
+#: classes/Command.php:216 classes/Command.php:221
 msgid "Error sending direct message."
 msgstr ""
 
-#: classes/Command.php:263
+#: classes/Command.php:263 classes/Command.php:268
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: classes/Command.php:270
+#: classes/Command.php:270 classes/Command.php:275
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: classes/Command.php:288
+#: classes/Command.php:288 classes/Command.php:293
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: classes/Command.php:295
+#: classes/Command.php:295 classes/Command.php:300
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330
+#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:315
+#: classes/Command.php:335
 msgid "Command not yet implemented."
 msgstr ""
 
-#: classes/Command.php:313
+#: classes/Command.php:313 classes/Command.php:318
 msgid "Notification off."
 msgstr ""
 
-#: classes/Command.php:315
+#: classes/Command.php:315 classes/Command.php:320
 msgid "Can't turn off notification."
 msgstr ""
 
-#: classes/Command.php:333
+#: classes/Command.php:333 classes/Command.php:338
 msgid "Notification on."
 msgstr ""
 
-#: classes/Command.php:335
+#: classes/Command.php:335 classes/Command.php:340
 msgid "Can't turn on notification."
 msgstr ""
 
-#: classes/Command.php:344
+#: classes/Command.php:344 classes/Command.php:349
 msgid "Commands:\n"
 msgstr ""
 
@@ -2887,23 +3004,23 @@ msgstr ""
 msgid "Could not update message with new URI."
 msgstr ""
 
-#: lib/gallery.php:46
+#: lib/gallery.php:46 lib/gallery.php:55
 msgid "User without matching profile in system."
 msgstr ""
 
-#: lib/mail.php:147
+#: lib/mail.php:147 lib/mail.php:141
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:249
+#: lib/mail.php:249 lib/mail.php:275
 #, php-format
 msgid "New private message from %s"
 msgstr ""
 
-#: lib/mail.php:253
+#: lib/mail.php:253 lib/mail.php:279
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -2947,18 +3064,448 @@ msgstr ""
 msgid "Your sent messages"
 msgstr ""
 
-#: lib/settingsaction.php:99
+#: lib/settingsaction.php:99 actions/deleteprofile.php:256
 msgid "Twitter"
 msgstr ""
 
-#: lib/settingsaction.php:100
+#: lib/settingsaction.php:100 actions/deleteprofile.php:257
 msgid "Twitter integration options"
 msgstr ""
 
-#: lib/util.php:1718
+#: lib/util.php:1718 lib/util.php:2145
 msgid "To"
 msgstr ""
 
 #: scripts/maildaemon.php:45
 msgid "Could not parse message."
 msgstr ""
+
+#: actions/block.php:45 actions/subedit.php:45 actions/unblock.php:45
+msgid "No profile specified."
+msgstr ""
+
+#: actions/block.php:52 actions/subedit.php:52 actions/tagother.php:45
+#: actions/unblock.php:52
+msgid "No profile with that ID."
+msgstr ""
+
+#: actions/block.php:78
+#, fuzzy
+msgid "Block user"
+msgstr "無此使用者"
+
+#: actions/block.php:81
+msgid "Are you sure you want to block this user? "
+msgstr ""
+
+#: actions/block.php:117
+msgid "You have already blocked this user."
+msgstr ""
+
+#: actions/block.php:124
+msgid "Failed to save block information."
+msgstr ""
+
+#: actions/deleteprofile.php:25
+msgid "Code not yet ready."
+msgstr ""
+
+#: actions/deleteprofile.php:36
+msgid "Export and delete your user information."
+msgstr ""
+
+#: actions/deleteprofile.php:88 actions/deleteprofile.php:119
+#, fuzzy
+msgid "Delete my account"
+msgstr "新增帳號"
+
+#: actions/deleteprofile.php:89
+#, fuzzy
+msgid "Delete my account confirmation"
+msgstr "無法取消信箱確認"
+
+#: actions/deleteprofile.php:117
+msgid "Check if you are sure you want to delete your account."
+msgstr ""
+
+#: actions/deleteprofile.php:259 lib/settingsaction.php:102
+msgid "Other"
+msgstr ""
+
+#: actions/deleteprofile.php:260 lib/settingsaction.php:103
+msgid "Other options"
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Add to favorites"
+msgstr ""
+
+#: actions/emailsettings.php:98
+msgid "Allow friends to nudge me and send me an email."
+msgstr ""
+
+#: actions/facebookremove.php:54
+#, fuzzy
+msgid "Couldn't remove Facebook user."
+msgstr "無法更新使用者"
+
+#: actions/favor.php:71
+msgid "Disfavor favorite"
+msgstr ""
+
+#: actions/favorited.php:31 lib/stream.php:45
+#, fuzzy
+msgid "Popular notices"
+msgstr "無此通知"
+
+#: actions/favorited.php:54
+msgid "Showing recently popular notices"
+msgstr ""
+
+#: actions/featured.php:32 actions/featured.php:54 lib/stream.php:41
+msgid "Featured users"
+msgstr ""
+
+#: actions/finishremotesubscribe.php:186
+msgid "That user has blocked you from subscribing."
+msgstr ""
+
+#: actions/microsummary.php:39
+msgid "No current status"
+msgstr ""
+
+#: actions/newnotice.php:93
+msgid "Notice posted"
+msgstr ""
+
+#: actions/newnotice.php:116 classes/Channel.php:140
+msgid "Ajax Error"
+msgstr ""
+
+#: actions/nudge.php:52
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
+
+#: actions/nudge.php:61
+msgid "Nudge sent"
+msgstr ""
+
+#: actions/othersettings.php:27
+msgid "Manage various other options."
+msgstr ""
+
+#: actions/othersettings.php:33
+#, fuzzy
+msgid "Other Settings"
+msgstr "線上即時通設定"
+
+#: actions/othersettings.php:35
+msgid "URL Auto-shortening"
+msgstr ""
+
+#: actions/othersettings.php:54
+msgid "Service"
+msgstr ""
+
+#: actions/othersettings.php:54
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/othersettings.php:155
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "地點過長（共255個字）"
+
+#: actions/peopletag.php:33
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "此信箱無效"
+
+#: actions/peopletag.php:45
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr ""
+
+#: actions/peopletag.php:87
+#, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+msgstr ""
+
+#: actions/profilesettings.php:92
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+
+#: actions/profilesettings.php:246 actions/tagother.php:131
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "個人首頁連結%s無效"
+
+#: actions/profilesettings.php:328
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "無法儲存個人資料"
+
+#: actions/public.php:68
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
+msgstr ""
+
+#: actions/public.php:90
+msgid "Could not retrieve public stream."
+msgstr ""
+
+#: actions/register.php:67 actions/register.php:177
+msgid "Sorry, only invited people can register."
+msgstr ""
+
+#: actions/register.php:156
+msgid "With this form you can create a new account. "
+msgstr ""
+
+#: actions/remotesubscribe.php:136 actions/remotesubscribe.php:141
+msgid "That's a local profile! Login to subscribe."
+msgstr ""
+
+#: actions/subedit.php:68
+msgid "You are not subscribed to that profile."
+msgstr ""
+
+#: actions/subedit.php:81
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "註冊失敗"
+
+#: actions/subscribe.php:53
+#, fuzzy
+msgid "Not a local user."
+msgstr "無此使用者"
+
+#: actions/subscribe.php:67
+#, fuzzy
+msgid "Subscribed"
+msgstr "此帳號已註冊"
+
+#: actions/subscriptions.php:72
+#, fuzzy
+msgid "Jabber"
+msgstr "查無此Jabber ID"
+
+#: actions/tagother.php:31
+#, fuzzy
+msgid "Not logged in"
+msgstr "已登入"
+
+#: actions/tagother.php:40
+#, fuzzy
+msgid "No id argument."
+msgstr "無此文件"
+
+#: actions/tagother.php:56
+msgid "Tag a person"
+msgstr ""
+
+#: actions/tagother.php:98
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
+msgstr ""
+
+#: actions/tagother.php:120
+#, fuzzy
+msgid "No such profile."
+msgstr "無此通知"
+
+#: actions/tagother.php:146
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+
+#: actions/tagother.php:153
+#, fuzzy
+msgid "Could not save tags."
+msgstr "無法存取個人圖像資料"
+
+#: actions/tagother.php:188
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
+
+#: actions/tagrss.php:33
+#, fuzzy
+msgid "No such tag."
+msgstr "無此通知"
+
+#: actions/tagrss.php:62
+#, fuzzy, php-format
+msgid "Microblog tagged with %s"
+msgstr "&s的微型部落格"
+
+#: actions/twitapiblocks.php:45
+msgid "Block user failed."
+msgstr ""
+
+#: actions/twitapiblocks.php:66
+msgid "Unblock user failed."
+msgstr ""
+
+#: actions/twitapiusers.php:45
+#, fuzzy
+msgid "Not found."
+msgstr "目前無請求"
+
+#: actions/twittersettings.php:63
+msgid "Twitter user name"
+msgstr ""
+
+#: actions/twittersettings.php:67
+#, fuzzy
+msgid "Twitter password"
+msgstr "新密碼"
+
+#: actions/twittersettings.php:129
+msgid "Twitter Friends"
+msgstr ""
+
+#: actions/unblock.php:73
+#, fuzzy
+msgid "Error removing the block."
+msgstr "儲存使用者發生錯誤"
+
+#: actions/unsubscribe.php:48
+#, fuzzy
+msgid "No profile id in request."
+msgstr "無確認請求"
+
+#: actions/unsubscribe.php:55
+msgid "No profile with that id."
+msgstr ""
+
+#: actions/unsubscribe.php:69
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "此帳號已註冊"
+
+#: classes/Notice.php:100
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "儲存使用者發生錯誤"
+
+#: classes/Notice.php:105
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+
+#: classes/Notice.php:112
+msgid "You are banned from posting notices on this site."
+msgstr ""
+
+#: lib/gallery.php:98
+msgid "Filter tags"
+msgstr ""
+
+#: lib/gallery.php:104
+msgid "All"
+msgstr ""
+
+#: lib/gallery.php:108
+msgid "Tag"
+msgstr ""
+
+#: lib/gallery.php:109
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/gallery.php:110
+msgid "Go"
+msgstr ""
+
+#: lib/gallery.php:264
+msgid "Subscriptions navigation"
+msgstr ""
+
+#: lib/gallery.php:270 lib/gallery.php:292
+msgid "List"
+msgstr ""
+
+#: lib/gallery.php:280 lib/gallery.php:294
+msgid "Icons"
+msgstr ""
+
+#: lib/mail.php:92
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:242
+#, php-format
+msgid "You've been nudged by %s"
+msgstr ""
+
+#: lib/mail.php:246
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+msgstr ""
+
+#: lib/profilelist.php:146
+msgid "(none)"
+msgstr ""
+
+#: lib/stream.php:33
+msgid "Public"
+msgstr ""
+
+#: lib/stream.php:36 lib/stream.php:37
+msgid "Recent tags"
+msgstr ""
+
+#: lib/stream.php:40
+msgid "Featured"
+msgstr ""
+
+#: lib/stream.php:44
+msgid "Popular"
+msgstr ""
+
+#: lib/subs.php:51
+msgid "User has blocked you."
+msgstr ""
+
+#: lib/util.php:2059
+msgid "Send a nudge"
+msgstr ""
+
+#: lib/util.php:2063
+msgid "Nudge sent!"
+msgstr ""
+
+#: lib/util.php:2194
+msgid "Block"
+msgstr ""
+
+#: lib/util.php:2198
+msgid "Unblock"
+msgstr ""
+
+#~ msgid "Couldn't confirm email."
+#~ msgstr "無法確認信箱"
+
+#~ msgid "Email address"
+#~ msgstr "電子信箱"
+
+#~ msgid "Error inserting notice"
+#~ msgstr "新增訊息時發生錯誤"
+
+#~ msgid ""
+#~ "If you've forgotten or lost your password, you can get a new one sent  "
+#~ "the email address you have stored  in your account."
+#~ msgstr "若忘記或遺失密碼，我們會寄新的密碼到你帳號中的信箱。"