From e8d4071195c245854f798cb3a58d8ea9e9ca7a20 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <git@evanprodromou.name>
Date: Sun, 11 Jan 2009 07:54:25 -0500
Subject: [PATCH] Update Russian translation

---
 locale/ru_RU/LC_MESSAGES/laconica.mo |  Bin 0 -> 12622 bytes
 locale/ru_RU/LC_MESSAGES/laconica.po | 1677 ++++++++++++++++++--------
 2 files changed, 1196 insertions(+), 481 deletions(-)
 create mode 100644 locale/ru_RU/LC_MESSAGES/laconica.mo

diff --git a/locale/ru_RU/LC_MESSAGES/laconica.mo b/locale/ru_RU/LC_MESSAGES/laconica.mo
new file mode 100644
index 0000000000000000000000000000000000000000..1adc55b88a83486b3ca3e1fed49dd97b8a435bf2
GIT binary patch
literal 12622
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

literal 0
HcmV?d00001

diff --git a/locale/ru_RU/LC_MESSAGES/laconica.po b/locale/ru_RU/LC_MESSAGES/laconica.po
index ec51b3884f..fc08785b7a 100644
--- a/locale/ru_RU/LC_MESSAGES/laconica.po
+++ b/locale/ru_RU/LC_MESSAGES/laconica.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
@@ -6,9 +7,22 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"#-#-#-#-#  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"
 "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,21 +30,24 @@ 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
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
 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
 msgid " from "
-msgstr ""
+msgstr " из"
 
-#: ../actions/twitapistatuses.php:478
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
 msgstr ""
@@ -38,7 +55,7 @@ msgstr ""
 #: ../actions/invite.php:168
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
+msgstr "%1$s приглашает тебя записаться на %2$s"
 
 #: ../actions/invite.php:170
 #, php-format
@@ -70,8 +87,23 @@ msgid ""
 "\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С уважением,\n%2$s\n"
 
-#: ../lib/mail.php:124
+#: ../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."
 msgstr ""
@@ -86,23 +118,29 @@ msgid ""
 "Faithfully yours,\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:482 actions/twitapistatuses.php:415
 #, 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
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr ""
 
-#: ../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 ""
 
-#: ../actions/publicrss.php:62
+#: ../actions/publicrss.php:62 actions/publicrss.php:48
 #, php-format
 msgid "%s Public Stream"
 msgstr ""
@@ -111,24 +149,24 @@ msgstr ""
 #: ../actions/twitapistatuses.php:238 ../lib/stream.php:51
 #, php-format
 msgid "%s and friends"
-msgstr ""
+msgstr "%s и друзья"
 
-#: ../actions/twitapistatuses.php:49
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
 #, php-format
 msgid "%s public timeline"
 msgstr ""
 
-#: ../lib/mail.php:206
+#: ../lib/mail.php:206 lib/mail.php:212
 #, php-format
 msgid "%s status"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:338
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
 #, php-format
 msgid "%s timeline"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:52
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
@@ -139,58 +177,58 @@ msgid ""
 "to confirm your email address.)"
 msgstr ""
 
-#: ../lib/util.php:257
+#: ../lib/util.php:257 lib/util.php:273
 #, 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:259 lib/util.php:275
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr ""
 
-#: ../lib/util.php:274
+#: ../lib/util.php:274 lib/util.php:290
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 буквы или цифры нижнего регистра, без "
+msgstr "1-64 латинских строчных букв или цифр, без "
 
 #: ../actions/register.php:152
-#, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1-64 буквы или цифры нижнего регистра, без "
+msgstr ""
+"1-64 латинских строчных букв или цифр, без "
+"пробелов и знаков препинания. Обязательно."
 
 #: ../actions/password.php:42
 msgid "6 or more characters"
-msgstr "6 или более символов"
+msgstr "6 или больше знаков"
 
-#: ../actions/recoverpassword.php:180
+#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
 msgid "6 or more characters, and don't forget it!"
-msgstr "6 или более символов, не забудьте его!"
-
-#: ../actions/register.php:154
-#, fuzzy
-msgid "6 or more characters. Required."
-msgstr "6 или более символов"
-
-#: ../actions/imsettings.php:197
-#, php-format
-msgid ""
-"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/register.php:154
+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."
+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: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."
@@ -199,7 +237,14 @@ 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/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 ""
 
@@ -212,12 +257,18 @@ msgstr ""
 #: ../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
 msgid "About"
-msgstr ""
+msgstr "О проекте"
 
 #: ../actions/userauthorization.php:119
 msgid "Accept"
@@ -228,63 +279,65 @@ msgstr "Принять"
 msgid "Add"
 msgstr "Добавить"
 
-#: ../actions/openidsettings.php:43
+#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
 msgid "Add OpenID"
-msgstr "Добавить OpenID"
+msgstr ""
 
-#: ../lib/settingsaction.php:97
-#, fuzzy
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
 msgid "Add or remove OpenIDs"
-msgstr "Добавить OpenID"
+msgstr ""
 
 #: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
 #: ../actions/smssettings.php:39
 msgid "Address"
-msgstr "Адрес "
+msgstr "Адрес"
 
 #: ../actions/invite.php:131
 msgid "Addresses of friends to invite (one per line)"
-msgstr ""
+msgstr "Адреса друзей, которых ты хочешь пригласить (по одному на строчку)"
 
 #: ../actions/showstream.php:273
 msgid "All subscriptions"
 msgstr "Все подписки"
 
-#: ../actions/publicrss.php:64
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
 #, php-format
 msgid "All updates for %s"
-msgstr "Все обновления для %s"
+msgstr ""
 
-#: ../actions/noticesearchrss.php:66
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
 #, 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 "Вы уже авторизованы."
+msgstr ""
 
-#: ../lib/subs.php:42
+#: ../lib/subs.php:42 lib/subs.php:42
 msgid "Already subscribed!."
 msgstr ""
 
 #: ../actions/deletenotice.php:54
 msgid "Are you sure you want to delete this notice?"
-msgstr ""
+msgstr "Ты точно хочешь удалить эту заметку?"
 
-#: ../actions/userauthorization.php:77
+#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
 msgid "Authorize subscription"
 msgstr ""
 
 #: ../actions/login.php:104 ../actions/register.php:178
 msgid "Automatically login in the future; not for shared computers!"
-msgstr ""
+msgstr "В следующий раз зайти автоматически. Не для общественных компьютеров!"
 
 #: ../actions/profilesettings.php:65
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
-msgstr ""
+"Automatically subscribe to whoever subscribes to me (best for "
+"non-humans)"
+msgstr "Автоматически подписываться на всех, кто "
 
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
 msgid "Avatar"
@@ -292,9 +345,9 @@ msgstr "Аватар"
 
 #: ../actions/avatar.php:113
 msgid "Avatar updated."
-msgstr "Аватар обновлен."
+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 "
@@ -306,51 +359,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:1318
 msgid "Before »"
-msgstr "Ранее »"
+msgstr "Предыдущие »"
 
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
 msgid "Bio"
-msgstr "О себе"
+msgstr "Интересы"
 
 #: ../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
 msgid "Bio is too long (max 140 chars)."
-msgstr "Текст \"О себе\" не может быть длиннее 140 символов"
+msgstr ""
 
 #: ../lib/deleteaction.php:41
 msgid "Can't delete this notice."
-msgstr ""
+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'"
+msgstr ""
 
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
+#: actions/profilesettings.php:404 actions/recoverpassword.php:313
 msgid "Can't save new password."
-msgstr "Не могу сохранить новый пароль"
+msgstr ""
 
 #: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
 #: ../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 ""
 
-#: ../actions/imsettings.php:163
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
 msgid "Cannot normalize that Jabber ID"
 msgstr ""
 
-#: ../actions/emailsettings.php:181
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
 msgid "Cannot normalize that email address"
 msgstr ""
 
@@ -358,7 +415,7 @@ msgstr ""
 msgid "Change"
 msgstr "Изменить"
 
-#: ../lib/settingsaction.php:88
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
 msgid "Change email handling"
 msgstr ""
 
@@ -367,12 +424,10 @@ msgid "Change password"
 msgstr "Изменить пароль"
 
 #: ../lib/settingsaction.php:94
-#, fuzzy
 msgid "Change your password"
 msgstr "Изменить пароль"
 
 #: ../lib/settingsaction.php:85
-#, fuzzy
 msgid "Change your profile settings"
 msgstr "Настройки профиля"
 
@@ -386,18 +441,18 @@ 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
 msgid "Confirmation cancelled."
-msgstr "Подтверждение отменено."
+msgstr ""
 
-#: ../actions/smssettings.php:63
-#, fuzzy
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
 msgid "Confirmation code"
-msgstr "Код подтверждения не был найден. "
+msgstr ""
 
-#: ../actions/confirmaddress.php:38
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
 msgid "Confirmation code not found."
-msgstr "Код подтверждения не был найден. "
+msgstr ""
 
 #: ../actions/register.php:202
 #, php-format
@@ -420,95 +475,102 @@ msgstr ""
 
 #: ../actions/finishopenidlogin.php:91
 msgid "Connect"
-msgstr "Соединиться "
+msgstr "Соединить"
 
-#: ../actions/finishopenidlogin.php:86
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
 msgid "Connect existing account"
-msgstr "Подключиться к существующей учетной записи"
+msgstr ""
 
 #: ../lib/util.php:332
 msgid "Contact"
-msgstr "Контакт "
+msgstr "Связь"
 
-#: ../lib/openid.php:178
+#: ../lib/openid.php:178 lib/openid.php:178
 #, php-format
 msgid "Could not create OpenID form: %s"
 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 actions/twitapifriendships.php:53
 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 ""
 
-#: ../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 ""
 
-#: ../lib/subs.php:54
+#: ../lib/subs.php:54 lib/subs.php:61
 msgid "Could not subscribe other to you."
 msgstr ""
 
-#: ../lib/subs.php:46
-#, fuzzy
+#: ../lib/subs.php:46 lib/subs.php:46
 msgid "Could not subscribe."
-msgstr "Удаленная подписка"
+msgstr ""
 
-#: ../actions/recoverpassword.php:102
+#: ../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
 msgid "Couldn't convert request tokens to access tokens."
 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."
 msgstr ""
 
-#: ../lib/subs.php:103
+#: ../lib/subs.php:103 lib/subs.php:116
 msgid "Couldn't delete subscription."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:93
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
 msgid "Couldn't find any statuses."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:127
+#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
 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
 msgid "Couldn't insert confirmation code."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:180
+#: actions/finishremotesubscribe.php:182
 msgid "Couldn't insert new subscription."
 msgstr ""
 
 #: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
 msgid "Couldn't save profile."
 msgstr ""
 
-#: ../actions/profilesettings.php:161
+#: ../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 ""
 
@@ -516,6 +578,10 @@ 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
 msgid "Couldn't update user."
 msgstr ""
 
@@ -523,185 +589,190 @@ msgstr ""
 msgid "Create"
 msgstr "Создать"
 
-#: ../actions/finishopenidlogin.php:70
+#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
 msgid "Create a new user with this nickname."
-msgstr "Создать нового пользователя с таким псевдонимом."
+msgstr ""
 
 #: ../actions/finishopenidlogin.php:68
 msgid "Create new account"
-msgstr "Создать новую учетную запись"
+msgstr "Создать новый учёт"
 
-#: ../actions/finishopenidlogin.php:191
+#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
 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 ""
 
-#: ../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
 msgid "Currently"
-msgstr ""
+msgstr "Сейчас"
 
-#: ../classes/Notice.php:72
+#: ../classes/Notice.php:72 classes/Notice.php:86
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr ""
 
-#: ../lib/util.php:1061
+#: ../lib/util.php:1061 lib/util.php:1110
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr ""
 
 #: ../actions/deletenotice.php:41
-#, fuzzy
 msgid "Delete notice"
-msgstr "Новое уведомление"
+msgstr "Удалить заметку"
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 msgid "Describe yourself and your interests in 140 chars"
-msgstr ""
+msgstr "Опиши себя и свои увлечения с помощью 140 букв"
 
 #: ../actions/register.php:158 ../actions/register.php:161
 #: ../lib/settingsaction.php:87
 msgid "Email"
-msgstr ""
+msgstr "Почта"
 
 #: ../actions/emailsettings.php:59
-#, fuzzy
 msgid "Email Address"
-msgstr "Адрес "
+msgstr "Почтовый адрес"
 
 #: ../actions/emailsettings.php:32
-#, fuzzy
 msgid "Email Settings"
-msgstr "Настройки"
+msgstr "Настройка почты"
 
-#: ../actions/register.php:73
+#: ../actions/register.php:73 actions/register.php:80
 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 ""
 
 #: ../actions/invite.php:129
 msgid "Email addresses"
-msgstr ""
+msgstr "Почтовые адреса"
 
-#: ../actions/recoverpassword.php:191
+#: ../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:253
+#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
 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
 msgid "Error inserting avatar"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:143
+#: actions/finishremotesubscribe.php:145
 msgid "Error inserting new profile"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169
 msgid "Error inserting remote profile"
 msgstr ""
 
-#: ../actions/recoverpassword.php:240
+#: ../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 ""
 
-#: ../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
 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
 msgid "Error setting user."
 msgstr ""
 
-#: ../actions/finishaddopenid.php:83
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
 msgid "Error updating profile"
-msgstr "Ошибка обновления профиля"
+msgstr ""
 
 #: ../actions/finishremotesubscribe.php:161
+#: actions/finishremotesubscribe.php:163
 msgid "Error updating remote profile"
-msgstr "Ошибка обновления удаленного профиля"
+msgstr ""
 
-#: ../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 "Уже существующий псевдоним"
+msgstr ""
 
 #: ../lib/util.php:326
 msgid "FAQ"
-msgstr "ЧаВО"
+msgstr "ЧАВО"
 
-#: ../actions/avatar.php:115
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
 msgid "Failed updating avatar."
-msgstr "Ошибка при обновлении аватара."
+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 ""
 
 #: ../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/tag.php:55
+#: ../actions/tag.php:55 actions/tag.php:55
 #, php-format
 msgid "Feed for tag %s"
 msgstr ""
 
-#: ../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 ""
 
@@ -718,7 +789,7 @@ msgstr "Полное имя"
 #: ../actions/profilesettings.php:98 ../actions/register.php:79
 #: ../actions/updateprofile.php:93
 msgid "Full name is too long (max 255 chars)."
-msgstr "Полное имя слишком длинное (максимум 255 символов)"
+msgstr "Полное имя слишком длинное (максимум 255 букв)."
 
 #: ../lib/util.php:322
 msgid "Help"
@@ -726,35 +797,34 @@ msgstr "Помощь"
 
 #: ../lib/util.php:298
 msgid "Home"
-msgstr "Домой"
+msgstr "Моё"
 
 #: ../actions/profilesettings.php:46 ../actions/register.php:167
-#, fuzzy
 msgid "Homepage"
-msgstr "Личная страница"
+msgstr "Страница"
 
 #: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: actions/profilesettings.php:210 actions/register.php:83
 msgid "Homepage is not a valid URL."
 msgstr ""
 
-#: ../actions/emailsettings.php:91
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
 msgid "I want to post notices by email."
 msgstr ""
 
-#: ../lib/settingsaction.php:102
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
 msgid "IM"
 msgstr ""
 
-#: ../actions/imsettings.php:60
-#, fuzzy
+#: ../actions/imsettings.php:60 actions/imsettings.php:61
 msgid "IM Address"
-msgstr "Адрес IM"
+msgstr ""
 
-#: ../actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
 msgid "IM Settings"
-msgstr "Настройки IM"
+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."
@@ -773,20 +843,21 @@ msgid ""
 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
 msgid "Incoming email address removed."
 msgstr ""
 
-#: ../actions/password.php:69
+#: ../actions/password.php:69 actions/profilesettings.php:388
 msgid "Incorrect old password"
-msgstr "Старый пароль не верен"
+msgstr ""
 
-#: ../actions/login.php:67
+#: ../actions/login.php:67 actions/login.php:67
 msgid "Incorrect username or password."
-msgstr "Неверное имя пользователя или пароль."
+msgstr ""
 
 #: ../actions/recoverpassword.php:265
 msgid ""
@@ -794,89 +865,91 @@ msgid ""
 "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'"
+msgstr ""
 
-#: ../actions/invite.php:55
+#: ../actions/invite.php:55 actions/invite.php:62
 #, php-format
 msgid "Invalid email address: %s"
 msgstr ""
 
-#: ../actions/updateprofile.php:98
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr ""
 
-#: ../actions/updateprofile.php:82
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr ""
 
-#: ../actions/postnotice.php:61
+#: ../actions/postnotice.php:61 actions/postnotice.php:62
 msgid "Invalid notice content"
 msgstr ""
 
-#: ../actions/postnotice.php:67
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
 msgid "Invalid notice uri"
 msgstr ""
 
-#: ../actions/postnotice.php:72
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
 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 ""
 
-#: ../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
 msgid "Invalid profile URL returned by server."
 msgstr ""
 
-#: ../actions/avatarbynickname.php:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
 msgid "Invalid size."
-msgstr "Неправильный размер. "
+msgstr ""
 
 #: ../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
 msgid "Invalid username or password."
-msgstr "Не правильное имя пользователя или пароль."
+msgstr ""
 
-#: ../actions/invite.php:79
+#: ../actions/invite.php:79 actions/invite.php:86
 msgid "Invitation(s) sent"
 msgstr ""
 
-#: ../actions/invite.php:97
+#: ../actions/invite.php:97 actions/invite.php:104
 msgid "Invitation(s) sent to the following people:"
 msgstr ""
 
 #: ../lib/util.php:306
 msgid "Invite"
-msgstr ""
+msgstr "Пригласить"
 
-#: ../actions/invite.php:123
+#: ../actions/invite.php:123 actions/invite.php:130
 msgid "Invite new users"
 msgstr ""
 
-#: ../lib/util.php:261
+#: ../lib/util.php:261 lib/util.php:277
 #, 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:173 actions/imsettings.php:181
 msgid "Jabber ID already belongs to another user."
-msgstr "Jabber ID уже принадлежит другому пользователю."
+msgstr ""
 
-#: ../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 "
@@ -885,28 +958,28 @@ msgstr ""
 
 #: ../actions/profilesettings.php:57
 msgid "Language"
-msgstr ""
+msgstr "Язык"
 
-#: ../actions/profilesettings.php:113
-#, fuzzy
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
 msgid "Language is too long (max 50 chars)."
-msgstr "Полное имя слишком длинное (максимум 255 символов)"
+msgstr ""
 
 #: ../actions/profilesettings.php:52 ../actions/register.php:173
 msgid "Location"
-msgstr "Местонахождение"
+msgstr "Место жительства"
 
 #: ../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
 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
 msgid "Login"
-msgstr ""
+msgstr "Вход"
 
-#: ../actions/openidlogin.php:44
+#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr ""
@@ -914,37 +987,38 @@ 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
 msgid "Logout"
-msgstr "Выход"
+msgstr "Выйти"
 
 #: ../actions/register.php:166
 msgid "Longer name, preferably your \"real\" name"
+msgstr "Полное имя, лучше всего настоящее"
+
+#: ../actions/login.php:110 actions/login.php:110
+msgid "Lost or forgotten password?"
 msgstr ""
 
-#: ../actions/login.php:110
-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 ""
 
 #: ../actions/showstream.php:300
 msgid "Member since"
-msgstr "Участник с"
+msgstr "Регистрация"
 
-#: ../actions/userrss.php:70
+#: ../actions/userrss.php:70 actions/userrss.php:67
 #, php-format
 msgid "Microblog by %s"
 msgstr ""
@@ -958,28 +1032,29 @@ msgstr ""
 
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
 msgid "My text and files are available under "
-msgstr "Мои тексты и файлы доступны под"
+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:144
 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""
 
-#: ../actions/emailsettings.php:297
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
 msgid "New incoming email address added."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:71
+#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
 msgid "New nickname"
-msgstr "Новый псевдоним"
+msgstr ""
 
-#: ../actions/newnotice.php:87
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
 msgid "New notice"
-msgstr "Новое уведомление"
+msgstr ""
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
 msgid "New password"
@@ -987,142 +1062,148 @@ msgstr "Новый пароль"
 
 #: ../actions/recoverpassword.php:314
 msgid "New password successfully saved. You are now logged in."
-msgstr "Новый пароль успешно сохранен. Вы теперь авторизованы. "
+msgstr ""
 
 #: ../actions/login.php:101 ../actions/profilesettings.php:41
 #: ../actions/register.php:151
-#, fuzzy
 msgid "Nickname"
-msgstr "Псевдоним"
+msgstr "Кличка"
 
 #: ../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
 msgid "Nickname already in use. Try another one."
-msgstr "Имя пользователя уже используется. Попробуйте другое."
+msgstr ""
 
 #: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
 #: ../actions/register.php:67 ../actions/updateprofile.php:77
-#, fuzzy
+#: 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."
 msgstr ""
-"Имя пользователя должно состоять из букв (в нижнего регистре), цифр и не "
-"должно содержать пробелов."
 
-#: ../actions/finishopenidlogin.php:170
+#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
 msgid "Nickname not allowed."
-msgstr "Имя пользователя не разрешено"
+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:162
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
 msgid "Nickname or email"
 msgstr ""
 
 #: ../actions/deletenotice.php:59
 msgid "No"
-msgstr ""
+msgstr "Нет"
 
-#: ../actions/imsettings.php:156
+#: ../actions/imsettings.php:156 actions/imsettings.php:164
 msgid "No Jabber ID."
 msgstr ""
 
-#: ../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:44
+#: ../actions/newnotice.php:44 actions/newmessage.php:53
+#: actions/newnotice.php:44 classes/Command.php:197
 msgid "No content!"
 msgstr ""
 
-#: ../actions/emailsettings.php:174
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
 msgid "No email address."
 msgstr ""
 
-#: ../actions/userbyid.php:32
+#: ../actions/userbyid.php:32 actions/userbyid.php:32
 msgid "No id."
 msgstr ""
 
-#: ../actions/emailsettings.php:271
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
 msgid "No incoming email address."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:65
+#: actions/finishremotesubscribe.php:67
 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
 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
 msgid "No profile URL returned by server."
 msgstr ""
 
-#: ../actions/recoverpassword.php:226
+#: ../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
 msgid "No results"
-msgstr "Нет результатов"
+msgstr ""
 
-#: ../actions/avatarbynickname.php:32
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
 msgid "No size."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:595
+#: ../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:555 actions/twitapistatuses.php:478
 msgid "No status with that ID found."
 msgstr ""
 
-#: ../actions/openidsettings.php:135
+#: ../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:83
-#: ../lib/deleteaction.php:30
+#: ../lib/deleteaction.php:30 actions/shownotice.php:32
+#: actions/shownotice.php:83 lib/deleteaction.php:30
 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 ""
 
@@ -1132,110 +1213,126 @@ msgstr ""
 #: ../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
 msgid "No such user."
 msgstr ""
 
-#: ../actions/recoverpassword.php:211
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
 msgid "No user with that email address or username."
 msgstr ""
 
-#: ../lib/gallery.php:80
-#, fuzzy
+#: ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
-msgstr "Некого показывать!"
+msgstr ""
 
-#: ../actions/recoverpassword.php:60
+#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
 msgid "Not a recovery code."
 msgstr ""
 
-#: ../scripts/maildaemon.php:50
+#: ../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:332 lib/twitterapi.php:391 lib/twitterapi.php:418
+#: lib/twitterapi.php:502
 msgid "Not a supported data format."
 msgstr ""
 
-#: ../actions/imsettings.php:167
+#: ../actions/imsettings.php:167 actions/imsettings.php:175
 msgid "Not a valid Jabber ID"
 msgstr ""
 
-#: ../lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131
 msgid "Not a valid OpenID."
 msgstr ""
 
-#: ../actions/emailsettings.php:185
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
 msgid "Not a valid email address"
 msgstr ""
 
-#: ../actions/register.php:63
+#: ../actions/register.php:63 actions/register.php:70
 msgid "Not a valid email address."
 msgstr ""
 
 #: ../actions/profilesettings.php:91 ../actions/register.php:71
+#: actions/profilesettings.php:206 actions/register.php:78
 msgid "Not a valid nickname."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:120
+#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
 msgid "Not a valid profile URL (incorrect services)."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:113
+#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:104
+#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
 msgid "Not a valid profile URL (no YADIS document)."
 msgstr ""
 
-#: ../actions/avatar.php:95
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
 msgid "Not an image or corrupt file."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53
 msgid "Not authorized."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38
 msgid "Not expecting this response!"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:422
 msgid "Not found"
-msgstr ""
+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
 msgid "Not logged in."
 msgstr ""
 
-#: ../lib/subs.php:91
+#: ../lib/subs.php:91 lib/subs.php:104
 msgid "Not subscribed!."
 msgstr ""
 
-#: ../actions/opensearch.php:35
-#, fuzzy
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
 msgid "Notice Search"
-msgstr "Поиск"
+msgstr ""
 
-#: ../actions/showstream.php:82
+#: ../actions/showstream.php:82 actions/showstream.php:82
 #, php-format
 msgid "Notice feed for %s"
 msgstr ""
 
-#: ../actions/shownotice.php:39
+#: ../actions/shownotice.php:39 actions/shownotice.php:39
 msgid "Notice has no profile"
 msgstr ""
 
 #: ../actions/showstream.php:316
 msgid "Notices"
-msgstr ""
+msgstr "Заметки"
 
-#: ../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 ""
@@ -1244,54 +1341,59 @@ msgstr ""
 msgid "Old password"
 msgstr "Старый пароль"
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314
+#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
+#: lib/util.php:330
 msgid "OpenID"
-msgstr "OpenID"
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:61
+#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
 msgid "OpenID Account Setup"
 msgstr ""
 
-#: ../lib/openid.php:180
+#: ../lib/openid.php:180 lib/openid.php:180
 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
 msgid "OpenID Login"
 msgstr ""
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
+#: actions/openidlogin.php:74 actions/openidsettings.php:50
 msgid "OpenID URL"
 msgstr ""
 
 #: ../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 ""
 
-#: ../lib/openid.php:133
+#: ../lib/openid.php:133 lib/openid.php:133
 #, php-format
 msgid "OpenID failure: %s"
 msgstr ""
 
-#: ../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/invite.php:135
 msgid "Optionally add a personal message to the invitation."
-msgstr ""
+msgstr "Дополнительно добавь к приглашению личное сообщение."
 
-#: ../actions/avatar.php:84
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
 msgid "Partial upload."
 msgstr ""
 
@@ -1300,53 +1402,52 @@ msgstr ""
 msgid "Password"
 msgstr "Пароль"
 
-#: ../actions/recoverpassword.php:288
+#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
 msgid "Password and confirmation do not match."
-msgstr "Пароль и подтверждение пароля не совпадают."
+msgstr ""
 
-#: ../actions/recoverpassword.php:284
+#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
 msgid "Password must be 6 chars or more."
-msgstr "Пароль должен быть не короче 6 символов."
+msgstr ""
 
 #: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-#, fuzzy
+#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 msgid "Password recovery requested"
-msgstr "Запрошено восстановление пароля "
+msgstr ""
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: actions/profilesettings.php:408 actions/recoverpassword.php:326
 msgid "Password saved."
-msgstr "Пароль сохранен."
+msgstr ""
 
 #: ../actions/password.php:61 ../actions/register.php:88
+#: actions/profilesettings.php:380 actions/register.php:98
 msgid "Passwords don't match."
-msgstr "Пароли не совпадают."
+msgstr ""
 
 #: ../lib/searchaction.php:100
-#, fuzzy
 msgid "People"
-msgstr "Поиск людей"
+msgstr "Люди"
 
-#: ../actions/opensearch.php:33
-#, fuzzy
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
 msgid "People Search"
-msgstr "Поиск людей"
+msgstr ""
 
-#: ../actions/peoplesearch.php:33
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
 msgid "People search"
-msgstr "Поиск людей"
+msgstr ""
 
 #: ../lib/stream.php:50
 msgid "Personal"
-msgstr ""
+msgstr "Свои"
 
 #: ../actions/invite.php:133
 msgid "Personal message"
-msgstr ""
+msgstr "Личное сообщение"
 
-#: ../actions/smssettings.php:69
-#, fuzzy
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
 msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "1-64 буквы или цифры нижнего регистра, без "
+msgstr ""
 
 #: ../actions/userauthorization.php:78
 msgid ""
@@ -1355,30 +1456,31 @@ msgid ""
 "click \"Cancel\"."
 msgstr ""
 
-#: ../actions/imsettings.php:73
+#: ../actions/imsettings.php:73 actions/imsettings.php:74
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
 #: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
 #: ../actions/smssettings.php:94
 msgid "Preferences"
-msgstr "Настройки"
+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
 msgid "Preferences saved."
 msgstr ""
 
 #: ../actions/profilesettings.php:57
-#, fuzzy
 msgid "Preferred language"
-msgstr "Настройки"
+msgstr "Любимый язык"
 
 #: ../lib/util.php:328
 msgid "Privacy"
-msgstr "Приватность"
+msgstr "Частное"
 
-#: ../classes/Notice.php:95 ../classes/Notice.php:106
+#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
+#: classes/Notice.php:119
 msgid "Problem saving notice."
 msgstr ""
 
@@ -1386,64 +1488,65 @@ msgstr ""
 msgid "Profile"
 msgstr "Профиль"
 
-#: ../actions/remotesubscribe.php:73
+#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
 msgid "Profile URL"
-msgstr "Ссылка на профиль "
+msgstr ""
 
 #: ../actions/profilesettings.php:34
 msgid "Profile settings"
 msgstr "Настройки профиля"
 
 #: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
+#: actions/postnotice.php:52 actions/updateprofile.php:53
 msgid "Profile unknown"
-msgstr "Профиль неизвестен "
+msgstr ""
 
-#: ../actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54
 msgid "Public Stream Feed"
 msgstr ""
 
 #: ../actions/public.php:33
 msgid "Public timeline"
-msgstr ""
+msgstr "Публичная дорожка"
 
-#: ../actions/imsettings.php:79
+#: ../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: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 actions/tag.php:75
+#: actions/tag.php:76
 msgid "Recent Tags"
 msgstr ""
 
-#: ../actions/recoverpassword.php:166
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
 msgid "Recover"
-msgstr "Восстановить "
+msgstr ""
 
-#: ../actions/recoverpassword.php:156
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
 msgid "Recover password"
-msgstr "Восстановить пароль"
+msgstr ""
 
-#: ../actions/recoverpassword.php:67
+#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
 msgid "Recovery code for unknown user."
 msgstr ""
 
 #: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
 msgid "Register"
-msgstr "Регистрация"
+msgstr "Учёт"
 
-#: ../actions/register.php:28
-#, fuzzy
+#: ../actions/register.php:28 actions/register.php:28
 msgid "Registration not allowed."
-msgstr "Имя пользователя не разрешено"
+msgstr ""
 
-#: ../actions/register.php:200
+#: ../actions/register.php:200 actions/register.php:214
 msgid "Registration successful"
 msgstr ""
 
-#: ../actions/userauthorization.php:120
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
 msgid "Reject"
 msgstr ""
 
@@ -1451,21 +1554,25 @@ msgstr ""
 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 "Удаленная подписка"
+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"
 msgstr ""
 
-#: ../actions/openidsettings.php:68
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
 msgid "Remove OpenID"
 msgstr ""
 
@@ -1480,42 +1587,42 @@ 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"
+msgstr ""
 
-#: ../actions/recoverpassword.php:183
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
 msgid "Reset"
 msgstr ""
 
-#: ../actions/recoverpassword.php:173
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
 msgid "Reset password"
 msgstr ""
 
-#: ../lib/settingsaction.php:99
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
 msgid "SMS"
 msgstr ""
 
-#: ../actions/smssettings.php:67
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
 msgid "SMS Phone number"
 msgstr ""
 
-#: ../actions/smssettings.php:33
-#, fuzzy
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
 msgid "SMS Settings"
-msgstr "Настройки IM"
+msgstr ""
 
-#: ../lib/mail.php:219
+#: ../lib/mail.php:219 lib/mail.php:225
 msgid "SMS confirmation"
 msgstr ""
 
-#: ../actions/recoverpassword.php:182
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
 msgid "Same as password above"
 msgstr ""
 
 #: ../actions/register.php:156
 msgid "Same as password above. Required."
-msgstr ""
+msgstr "Тот же пароль что и сверху. Обязательно."
 
 #: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
 #: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
@@ -1526,7 +1633,7 @@ msgstr "Сохранить"
 msgid "Search"
 msgstr "Поиск"
 
-#: ../actions/noticesearch.php:80
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
 msgid "Search Stream Feed"
 msgstr ""
 
@@ -1536,6 +1643,8 @@ 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 буквы."
 
 #: ../actions/peoplesearch.php:28
 #, php-format
@@ -1543,38 +1652,40 @@ 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 буквы."
 
-#: ../actions/smssettings.php:296
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
 msgid "Select a carrier"
 msgstr ""
 
 #: ../actions/invite.php:137 ../lib/util.php:1172
 msgid "Send"
-msgstr "Отправить"
+msgstr "Послать"
 
 #: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
+#: actions/emailsettings.php:74 actions/smssettings.php:82
 msgid "Send email to this address to post new notices."
 msgstr ""
 
 #: ../actions/emailsettings.php:88
-#, fuzzy
 msgid "Send me notices of new subscriptions through email."
-msgstr "Отправлять мне уведомления через Jabber/GTalk."
+msgstr "Уведомлять меня о новых подписчиках по почте."
 
-#: ../actions/imsettings.php:70
+#: ../actions/imsettings.php:70 actions/imsettings.php:71
 msgid "Send me notices through Jabber/GTalk."
-msgstr "Отправлять мне уведомления через Jabber/GTalk."
+msgstr ""
 
-#: ../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 ""
 
-#: ../actions/imsettings.php:76
-#, fuzzy
+#: ../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."
+msgstr ""
 
 #: ../lib/util.php:304
 msgid "Settings"
@@ -1584,152 +1695,152 @@ msgstr "Настройки"
 msgid "Settings saved."
 msgstr "Настройки сохранены."
 
-#: ../actions/tag.php:60
+#: ../actions/tag.php:60 actions/tag.php:60
 msgid "Showing most popular tags from the last week"
 msgstr ""
 
-#: ../actions/finishaddopenid.php:66
+#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
 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 ""
 
-#: ../scripts/maildaemon.php:58
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
 msgid "Sorry, no incoming email allowed."
 msgstr ""
 
-#: ../scripts/maildaemon.php:54
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
 msgid "Sorry, that is not your incoming email address."
 msgstr ""
 
 #: ../lib/util.php:330
 msgid "Source"
-msgstr "Источник"
+msgstr "Исходник"
 
 #: ../actions/showstream.php:296
 msgid "Statistics"
 msgstr "Статистика"
 
 #: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
+#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
 msgid "Stored OpenID not found."
-msgstr "Хранимый OpenID не найден."
+msgstr ""
 
 #: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
 #: ../actions/showstream.php:197
 msgid "Subscribe"
-msgstr "Подписка"
+msgstr "Подписаться"
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
 msgid "Subscribers"
 msgstr "Подписчики"
 
-#: ../actions/userauthorization.php:310
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
 msgid "Subscription authorized"
-msgstr "Подписка авторизована  "
+msgstr ""
 
-#: ../actions/userauthorization.php:320
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
 msgid "Subscription rejected"
-msgstr "Подписка отклонена"
+msgstr ""
 
 #: ../actions/showstream.php:230 ../actions/showstream.php:307
 #: ../actions/subscriptions.php:27
 msgid "Subscriptions"
-msgstr "Подписки"
+msgstr "Подписка"
 
-#: ../actions/avatar.php:87
-#, fuzzy
+#: ../actions/avatar.php:87 actions/profilesettings.php:324
 msgid "System error uploading file."
-msgstr "Системная ошибка при загрузке файла."
+msgstr ""
 
 #: ../actions/tag.php:41 ../lib/util.php:301
 msgid "Tags"
-msgstr ""
+msgstr "Метки"
 
 #: ../lib/searchaction.php:104
 msgid "Text"
+msgstr "Текст"
+
+#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
+msgid "Text search"
 msgstr ""
 
-#: ../actions/noticesearch.php:34
-#, fuzzy
-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/emailsettings.php:191
-#, fuzzy
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
 msgid "That email address already belongs to another user."
-msgstr "Jabber ID уже принадлежит другому пользователю."
+msgstr ""
 
-#: ../actions/avatar.php:80
-#, fuzzy
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
 msgid "That file is too big."
-msgstr "Файл слишком большой."
+msgstr ""
 
-#: ../actions/imsettings.php:170
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
 msgid "That is already your Jabber ID."
 msgstr ""
 
-#: ../actions/emailsettings.php:188
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
 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 ""
 
-#: ../actions/emailsettings.php:249
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
 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
 msgid "That is the wrong IM address."
 msgstr ""
 
-#: ../actions/smssettings.php:233
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
 msgid "That is the wrong confirmation number."
 msgstr ""
 
-#: ../actions/smssettings.php:191
-#, fuzzy
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
 msgid "That phone number already belongs to another user."
-msgstr "Jabber ID уже принадлежит другому пользователю."
+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."
 msgstr ""
 
-#: ../actions/twitapiaccount.php:74
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
 msgid "That's too long. Max notice size is 255 chars."
 msgstr ""
 
-#: ../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 ""
 
 #: ../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
 msgid "The address was removed."
 msgstr ""
 
@@ -1747,27 +1858,28 @@ msgid ""
 "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 ""
 
-#: ../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 ""
 
-#: ../actions/subscriptions.php:33
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
 msgid "These are the people whose notices you listen to."
 msgstr ""
 
-#: ../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 ""
 
 #: ../actions/recoverpassword.php:88
@@ -1780,7 +1892,7 @@ 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 "
@@ -1789,107 +1901,117 @@ msgid ""
 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/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 ""
 
-#: ../lib/util.php:164
+#: ../lib/util.php:164 lib/util.php:246
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
 #: ../actions/profilesettings.php:63
 msgid "Timezone"
-msgstr ""
+msgstr "Часовой пояс"
 
-#: ../actions/profilesettings.php:107
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
 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:163 actions/twitapifriendships.php:167
 msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 msgid "URL of your homepage, blog, or profile on another site"
-msgstr ""
+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/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."
 msgstr ""
 
-#: ../actions/recoverpassword.php:276
+#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
 msgid "Unexpected password reset."
 msgstr ""
 
-#: ../index.php:57
+#: ../index.php:57 index.php:57
 msgid "Unknown action"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:58
+#: actions/finishremotesubscribe.php:60
 msgid "Unknown version of OMB protocol."
-msgstr "Неизвестная версия OMB протокола. "
+msgstr ""
 
-#: ../lib/util.php:269
+#: ../lib/util.php:269 lib/util.php:285
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
 msgstr ""
 
-#: ../actions/confirmaddress.php:48
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr ""
 
 #: ../actions/showstream.php:209
 msgid "Unsubscribe"
-msgstr ""
+msgstr "Аннулировать подписку"
 
 #: ../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
 msgid "Unsupported image file format."
 msgstr ""
 
-#: ../lib/settingsaction.php:100
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
 msgid "Updates by SMS"
 msgstr ""
 
-#: ../lib/settingsaction.php:103
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
 msgid "Updates by instant messenger (IM)"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:241
+#: ../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:341 actions/twitapistatuses.php:268
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
 #: ../actions/avatar.php:68
 msgid "Upload"
-msgstr "Загрузка"
+msgstr "Загрузить"
 
 #: ../actions/avatar.php:27
 msgid ""
@@ -1905,14 +2027,16 @@ msgstr ""
 
 #: ../actions/invite.php:114
 msgid ""
-"Use this form to invite your friends and colleagues to use this service."
-msgstr ""
+"Use this form to invite your friends and colleagues to use this "
+"service."
+msgstr "В этом формуляре ты можешь пригласить друзей и коллег на наш сервис."
 
 #: ../actions/register.php:159 ../actions/register.php:162
 msgid "Used only for updates, announcements, and password recovery"
-msgstr ""
+msgstr "Нужна только для обновлений, осведомлений и восстановления пароля."
 
 #: ../actions/finishremotesubscribe.php:86
+#: actions/finishremotesubscribe.php:88
 msgid "User being listened to doesn't exist."
 msgstr ""
 
@@ -1920,65 +2044,69 @@ msgstr ""
 #: ../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
 msgid "User has no profile."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:71
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
 msgid "User nickname"
 msgstr ""
 
 #: ../actions/twitapiusers.php:75
-#, fuzzy
 msgid "User not found."
-msgstr "Хранимый OpenID не найден."
+msgstr "Пользователь не найден."
 
 #: ../actions/profilesettings.php:63
 msgid "What timezone are you normally in?"
-msgstr ""
+msgstr "В каком часовом поясе ты обычно находишься?"
 
 #: ../lib/util.php:1159
-#, fuzzy, php-format
+#, php-format
 msgid "What's up, %s?"
-msgstr "Как дела, %s?"
+msgstr "Что слышно, %s?"
 
 #: ../actions/profilesettings.php:54 ../actions/register.php:175
 msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr ""
+msgstr "Где ты находишься, например «Город, Страна»"
 
-#: ../actions/updateprofile.php:128
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr ""
 
-#: ../actions/updateprofile.php:123
+#: ../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
 msgid "Yes"
-msgstr ""
+msgstr "Да"
 
-#: ../actions/finishaddopenid.php:64
+#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
 msgid "You already have this OpenID!"
 msgstr ""
 
-#: ../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 "Вы уже авторизованы!"
+msgstr ""
 
-#: ../actions/invite.php:81
+#: ../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:128
 msgid "You are not friends with the specified user."
 msgstr ""
 
@@ -1988,9 +2116,9 @@ msgstr ""
 
 #: ../actions/register.php:135
 msgid "You can create a new account to start posting notices."
-msgstr ""
+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 ""
@@ -2001,27 +2129,29 @@ msgid ""
 "\"Remove\"."
 msgstr ""
 
-#: ../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 ""
 
 #: ../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
 msgid "You can use the local subscription!"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
 msgid "You can't register if you don't agree to the license."
-msgstr ""
+msgstr "Ты не можешь встать на учёт, если ты не согласен с лицензией."
 
-#: ../actions/updateprofile.php:63
+#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
 msgid "You did not send us that profile"
 msgstr ""
 
@@ -2038,16 +2168,16 @@ msgid ""
 "%4$s"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:612
+#: ../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 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: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!"
@@ -2057,10 +2187,9 @@ msgstr ""
 msgid "You've been identified. Enter a  new password below. "
 msgstr ""
 
-#: ../actions/openidlogin.php:67
-#, fuzzy
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
 msgid "Your OpenID URL"
-msgstr "Ссылка на ваш OpenID"
+msgstr ""
 
 #: ../actions/recoverpassword.php:164
 msgid "Your nickname on this server, or your registered email address."
@@ -2075,51 +2204,51 @@ msgstr ""
 
 #: ../lib/util.php:943
 msgid "a few seconds ago"
-msgstr ""
+msgstr "пару секунд назад"
 
 #: ../lib/util.php:955
 #, php-format
 msgid "about %d days ago"
-msgstr ""
+msgstr "%d дней назад"
 
 #: ../lib/util.php:951
 #, php-format
 msgid "about %d hours ago"
-msgstr ""
+msgstr "%d часов назад"
 
 #: ../lib/util.php:947
 #, php-format
 msgid "about %d minutes ago"
-msgstr ""
+msgstr "%d минут назад"
 
 #: ../lib/util.php:959
 #, php-format
 msgid "about %d months ago"
-msgstr ""
+msgstr "%d месяцев назад"
 
 #: ../lib/util.php:953
 msgid "about a day ago"
-msgstr ""
+msgstr "день назад"
 
 #: ../lib/util.php:945
 msgid "about a minute ago"
-msgstr ""
+msgstr "минуту назад"
 
 #: ../lib/util.php:957
 msgid "about a month ago"
-msgstr ""
+msgstr "месяц назад"
 
 #: ../lib/util.php:961
 msgid "about a year ago"
-msgstr ""
+msgstr "год назад"
 
 #: ../lib/util.php:949
 msgid "about an hour ago"
-msgstr ""
+msgstr "час назад"
 
 #: ../actions/showstream.php:423 ../lib/stream.php:132
 msgid "delete"
-msgstr ""
+msgstr "удалить"
 
 #: ../actions/noticesearch.php:130 ../actions/showstream.php:408
 #: ../lib/stream.php:117
@@ -2129,19 +2258,605 @@ msgstr "в ответ на..."
 #: ../actions/noticesearch.php:137 ../actions/showstream.php:415
 #: ../lib/stream.php:124
 msgid "reply"
-msgstr ""
+msgstr "ответить"
 
 #: ../actions/password.php:44
 msgid "same as password above"
-msgstr ""
+msgstr "повторить пароль сверху"
 
-#: ../actions/twitapistatuses.php:755
+#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
 msgid "unsupported file type"
 msgstr ""
 
 #: ../lib/util.php:1309
 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
+#: 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 ""
 
-#~ msgid "Public"
-#~ msgstr "Публичное "
+#: actions/disfavor.php:55
+msgid "This notice is not a favorite!"
+msgstr ""
+
+#: actions/disfavor.php:63
+msgid "Could not delete favorite."
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Favor"
+msgstr ""
+
+#: actions/emailsettings.php:92
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr ""
+
+#: actions/emailsettings.php:95
+msgid "Send me email when someone sends me a private message."
+msgstr ""
+
+#: actions/favor.php:53 actions/twitapifavorites.php:142
+msgid "This notice is already a favorite!"
+msgstr ""
+
+#: actions/favor.php:60 actions/twitapifavorites.php:151
+#: classes/Command.php:132
+msgid "Could not create favorite."
+msgstr ""
+
+#: actions/favor.php:70
+msgid "Disfavor"
+msgstr ""
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#, php-format
+msgid "%s favorite notices"
+msgstr ""
+
+#: actions/favoritesrss.php:64
+#, php-format
+msgid "Feed of favorite notices of %s"
+msgstr ""
+
+#: actions/inbox.php:28
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr ""
+
+#: actions/inbox.php:30
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:53
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr ""
+
+#: actions/invite.php:178
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+msgstr ""
+
+#: actions/login.php:104
+msgid "Automatically login in the future; "
+msgstr ""
+
+#: actions/login.php:122
+msgid "For security reasons, please re-enter your "
+msgstr ""
+
+#: actions/login.php:126
+msgid "Login with your username and password. "
+msgstr ""
+
+#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+msgid "That's too long. Max message size is 140 chars."
+msgstr ""
+
+#: actions/newmessage.php:65
+msgid "No recipient specified."
+msgstr ""
+
+#: actions/newmessage.php:68 actions/newmessage.php:113
+#: classes/Command.php:206
+msgid "You can't send a message to this user."
+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 ""
+
+#: actions/newmessage.php:108
+msgid "No such user"
+msgstr ""
+
+#: actions/newmessage.php:117
+msgid "New message"
+msgstr ""
+
+#: actions/noticesearch.php:95
+msgid "Notice without matching profile"
+msgstr ""
+
+#: actions/openidsettings.php:28
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgstr ""
+
+#: actions/openidsettings.php:46
+msgid "If you want to add an OpenID to your account, "
+msgstr ""
+
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
+msgstr ""
+
+#: actions/openidsettings.php:87
+msgid "You can remove an OpenID from your account "
+msgstr ""
+
+#: actions/outbox.php:28
+#, php-format
+msgid "Outbox for %s - page %d"
+msgstr ""
+
+#: actions/outbox.php:30
+#, php-format
+msgid "Outbox for %s"
+msgstr ""
+
+#: actions/outbox.php:53
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr ""
+
+#: actions/peoplesearch.php:28
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+msgstr ""
+
+#: actions/profilesettings.php:27
+msgid "You can update your personal profile info here "
+msgstr ""
+
+#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
+#: actions/userauthorization.php:159 actions/userrss.php:76
+msgid "User without matching profile"
+msgstr ""
+
+#: actions/recoverpassword.php:91
+msgid "This confirmation code is too old. "
+msgstr ""
+
+#: actions/recoverpassword.php:141
+msgid "If you've forgotten or lost your"
+msgstr ""
+
+#: actions/recoverpassword.php:154
+msgid "You've been identified. Enter a "
+msgstr ""
+
+#: actions/recoverpassword.php:169
+msgid "Your nickname on this server, "
+msgstr ""
+
+#: actions/recoverpassword.php:271
+msgid "Instructions for recovering your password "
+msgstr ""
+
+#: actions/recoverpassword.php:327
+msgid "New password successfully saved. "
+msgstr ""
+
+#: actions/register.php:95
+msgid "Password must be 6 or more characters."
+msgstr ""
+
+#: actions/register.php:216
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to..."
+msgstr ""
+
+#: actions/register.php:227
+msgid "(You should receive a message by email momentarily, with "
+msgstr ""
+
+#: actions/remotesubscribe.php:51
+#, php-format
+msgid "To subscribe, you can [login](%%action.login%%),"
+msgstr ""
+
+#: actions/showfavorites.php:61
+#, php-format
+msgid "Feed for favorites of %s"
+msgstr ""
+
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+msgid "Could not retrieve favorite notices."
+msgstr ""
+
+#: actions/showmessage.php:33
+msgid "No such message."
+msgstr ""
+
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
+msgstr ""
+
+#: actions/showmessage.php:61
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr ""
+
+#: actions/showmessage.php:66
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr ""
+
+#: actions/showstream.php:154
+msgid "Send a message"
+msgstr ""
+
+#: actions/smssettings.php:312
+#, php-format
+msgid "Mobile carrier for your phone. "
+msgstr ""
+
+#: actions/twitapidirect_messages.php:76
+#, php-format
+msgid "Direct messages to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:77
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:81
+msgid "Direct Messages You've Sent"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:82
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:128
+msgid "No message text!"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:138
+msgid "Recipient user not found."
+msgstr ""
+
+#: actions/twitapidirect_messages.php:141
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+
+#: actions/twitapifavorites.php:92
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr ""
+
+#: actions/twitapifavorites.php:95
+#, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr ""
+
+#: actions/twitapifavorites.php:187 lib/mail.php:275
+#, php-format
+msgid "%s added your notice as a favorite"
+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 ""
+
+#: actions/twittersettings.php:27
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
+msgstr ""
+
+#: actions/twittersettings.php:41
+msgid "Twitter settings"
+msgstr ""
+
+#: actions/twittersettings.php:48
+msgid "Twitter Account"
+msgstr ""
+
+#: actions/twittersettings.php:56
+msgid "Current verified Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
+msgstr ""
+
+#: actions/twittersettings.php:65
+msgid "No spaces, please."
+msgstr ""
+
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
+msgstr ""
+
+#: actions/twittersettings.php:72
+msgid "Automatically send my notices to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:75
+msgid "Send local \"@\" replies to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:78
+msgid "Subscribe to my Twitter friends here."
+msgstr ""
+
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
+msgstr ""
+
+#: actions/twittersettings.php:128
+msgid "Could not verify your Twitter credentials!"
+msgstr ""
+
+#: actions/twittersettings.php:137
+#, php-format
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:151 actions/twittersettings.php:170
+msgid "Unable to save your Twitter settings!"
+msgstr ""
+
+#: actions/twittersettings.php:174
+msgid "Twitter settings saved."
+msgstr ""
+
+#: actions/twittersettings.php:192
+msgid "That is not your Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+msgid "Couldn't remove Twitter user."
+msgstr ""
+
+#: actions/twittersettings.php:212
+msgid "Twitter account removed."
+msgstr ""
+
+#: actions/twittersettings.php:225 actions/twittersettings.php:239
+msgid "Couldn't save Twitter preferences."
+msgstr ""
+
+#: actions/twittersettings.php:245
+msgid "Twitter preferences saved."
+msgstr ""
+
+#: actions/userauthorization.php:84
+msgid "Please check these details to make sure "
+msgstr ""
+
+#: actions/userauthorization.php:324
+msgid "The subscription has been authorized, but no "
+msgstr ""
+
+#: actions/userauthorization.php:334
+msgid "The subscription has been rejected, but no "
+msgstr ""
+
+#: classes/Channel.php:113
+msgid "Command results"
+msgstr ""
+
+#: classes/Channel.php:148
+msgid "Command complete"
+msgstr ""
+
+#: classes/Channel.php:158
+msgid "Command failed"
+msgstr ""
+
+#: classes/Command.php:39
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: classes/Command.php:96
+#, php-format
+msgid "Subscriptions: %1$s\n"
+msgstr ""
+
+#: classes/Command.php:125 classes/Command.php:242
+msgid "User has no last notice"
+msgstr ""
+
+#: classes/Command.php:146
+msgid "Notice marked as fave."
+msgstr ""
+
+#: classes/Command.php:166
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr ""
+
+#: classes/Command.php:169
+#, php-format
+msgid "Fullname: %s"
+msgstr ""
+
+#: classes/Command.php:172
+#, php-format
+msgid "Location: %s"
+msgstr ""
+
+#: classes/Command.php:175
+#, php-format
+msgid "Homepage: %s"
+msgstr ""
+
+#: classes/Command.php:178
+#, php-format
+msgid "About: %s"
+msgstr ""
+
+#: classes/Command.php:200
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
+msgstr ""
+
+#: classes/Command.php:214
+#, php-format
+msgid "Direct message to %s sent"
+msgstr ""
+
+#: classes/Command.php:216
+msgid "Error sending direct message."
+msgstr ""
+
+#: classes/Command.php:263
+msgid "Specify the name of the user to subscribe to"
+msgstr ""
+
+#: classes/Command.php:270
+#, php-format
+msgid "Subscribed to %s"
+msgstr ""
+
+#: classes/Command.php:288
+msgid "Specify the name of the user to unsubscribe from"
+msgstr ""
+
+#: classes/Command.php:295
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr ""
+
+#: classes/Command.php:310 classes/Command.php:330
+msgid "Command not yet implemented."
+msgstr ""
+
+#: classes/Command.php:313
+msgid "Notification off."
+msgstr ""
+
+#: classes/Command.php:315
+msgid "Can't turn off notification."
+msgstr ""
+
+#: classes/Command.php:333
+msgid "Notification on."
+msgstr ""
+
+#: classes/Command.php:335
+msgid "Can't turn on notification."
+msgstr ""
+
+#: classes/Command.php:344
+msgid "Commands:\n"
+msgstr ""
+
+#: classes/Message.php:53
+msgid "Could not insert message."
+msgstr ""
+
+#: classes/Message.php:63
+msgid "Could not update message with new URI."
+msgstr ""
+
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
+msgstr ""
+
+#: lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:249
+#, php-format
+msgid "New private message from %s"
+msgstr ""
+
+#: lib/mail.php:253
+#, php-format
+msgid ""
+"%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 ""
+
+#: lib/openid.php:195
+msgid "This form should automatically submit itself. "
+msgstr ""
+
+#: lib/personal.php:65
+msgid "Favorites"
+msgstr ""
+
+#: lib/personal.php:66
+#, php-format
+msgid "%s's favorite notices"
+msgstr ""
+
+#: lib/personal.php:66
+msgid "User"
+msgstr ""
+
+#: lib/personal.php:75
+msgid "Inbox"
+msgstr ""
+
+#: lib/personal.php:76
+msgid "Your incoming messages"
+msgstr ""
+
+#: lib/personal.php:80
+msgid "Outbox"
+msgstr ""
+
+#: lib/personal.php:81
+msgid "Your sent messages"
+msgstr ""
+
+#: lib/settingsaction.php:99
+msgid "Twitter"
+msgstr ""
+
+#: lib/settingsaction.php:100
+msgid "Twitter integration options"
+msgstr ""
+
+#: lib/util.php:1718
+msgid "To"
+msgstr ""
+
+#: scripts/maildaemon.php:45
+msgid "Could not parse message."
+msgstr ""