summaryrefslogtreecommitdiff
path: root/locale/ru/LC_MESSAGES/statusnet.po
diff options
context:
space:
mode:
Diffstat (limited to 'locale/ru/LC_MESSAGES/statusnet.po')
-rw-r--r--locale/ru/LC_MESSAGES/statusnet.po1920
1 files changed, 1185 insertions, 735 deletions
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index 03aaa074a..7f697bd8d 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -12,12 +12,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-06 23:49+0000\n"
-"PO-Revision-Date: 2010-03-06 23:50:54+0000\n"
+"POT-Creation-Date: 2010-04-24 14:16+0000\n"
+"PO-Revision-Date: 2010-04-26 22:18:15+0000\n"
"Language-Team: Russian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ru\n"
"X-Message-Group: out-statusnet\n"
@@ -26,7 +26,7 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
msgid "Access"
msgstr "Принять"
@@ -77,7 +77,13 @@ msgstr "Закрыта"
msgid "Save access settings"
msgstr "Сохранить настройки доступа"
-#: actions/accessadminpanel.php:203
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
+#. TRANS: Button label
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
msgctxt "BUTTON"
msgid "Save"
msgstr "Сохранить"
@@ -85,8 +91,8 @@ msgstr "Сохранить"
#. TRANS: Server error when page not found (404)
#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
-msgid "No such page"
-msgstr "Нет такой страницы"
+msgid "No such page."
+msgstr "Нет такой страницы."
#: actions/all.php:75 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
@@ -96,9 +102,9 @@ msgstr "Нет такой страницы"
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -106,11 +112,9 @@ msgstr "Нет такой страницы"
#: actions/otp.php:76 actions/remotesubscribe.php:145
#: actions/remotesubscribe.php:154 actions/replies.php:73
#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
-#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302
-#: lib/command.php:355 lib/command.php:401 lib/command.php:462
-#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82
-#: lib/profileaction.php:77
+#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Нет такого пользователя."
@@ -122,8 +126,9 @@ msgstr "%1$s и друзья, страница %2$d"
#. TRANS: Page title. %1$s is user nickname
#. TRANS: H1 text. %1$s is user nickname
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#. TRANS: Message is used as link title. %s is a user nickname.
+#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -188,8 +193,10 @@ msgstr ""
msgid "You and friends"
msgstr "Вы и друзья"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:119
-#: actions/apitimelinehome.php:120
+#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
+#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
+#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Обновлено от %1$s и его друзей на %2$s!"
@@ -204,18 +211,18 @@ msgstr "Обновлено от %1$s и его друзей на %2$s!"
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:132
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
+#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
#: actions/apigroupshow.php:115 actions/apihelptest.php:88
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184
-#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
msgid "API method not found."
msgstr "Метод API не найден."
@@ -228,16 +235,18 @@ msgstr "Метод API не найден."
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:118
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr "Этот метод требует POST."
#: actions/apiaccountupdatedeliverydevice.php:105
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
-"none"
-msgstr "Укажите параметр с именем 'device' и значением sms, im или none."
+"none."
+msgstr ""
+"Вы должны указать параметр с именем «device» и одним из значений: sms, im, "
+"none."
#: actions/apiaccountupdatedeliverydevice.php:132
msgid "Could not update user."
@@ -248,7 +257,7 @@ msgstr "Не удаётся обновить пользователя."
#: actions/apiaccountupdateprofilecolors.php:185
#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
-#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66
+#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
#: lib/profileaction.php:84
msgid "User has no profile."
msgstr "У пользователя нет профиля."
@@ -258,9 +267,9 @@ msgid "Could not save profile."
msgstr "Не удаётся сохранить профиль."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
@@ -346,7 +355,7 @@ msgstr "Нет статуса с таким ID."
msgid "This status is already a favorite."
msgstr "Этот статус уже входит в число любимых."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Не удаётся создать любимую запись."
@@ -441,11 +450,10 @@ msgstr "Слишком длинное месторасположение (мак
msgid "Too many aliases! Maximum %d."
msgstr "Слишком много алиасов! Максимальное число — %d."
-#: actions/apigroupcreate.php:266 actions/editgroup.php:228
-#: actions/newgroup.php:168
+#: actions/apigroupcreate.php:266
#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Неверный алиас: «%s»"
+msgid "Invalid alias: \"%s\"."
+msgstr "Ошибочный псевдоним: «%s»."
#: actions/apigroupcreate.php:275 actions/editgroup.php:232
#: actions/newgroup.php:172
@@ -461,14 +469,14 @@ msgstr "Алиас не может совпадать с именем."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
-msgid "Group not found!"
-msgstr "Группа не найдена!"
+msgid "Group not found."
+msgstr "Группа не найдена."
#: actions/apigroupjoin.php:110 actions/joingroup.php:100
msgid "You are already a member of that group."
msgstr "Вы уже являетесь членом этой группы."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "Вы заблокированы из этой группы администратором."
@@ -486,17 +494,26 @@ msgstr "Вы не являетесь членом этой группы."
msgid "Could not remove user %1$s from group %2$s."
msgstr "Не удаётся удалить пользователя %1$s из группы %2$s."
-#: actions/apigrouplist.php:95
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:97
#, php-format
msgid "%s's groups"
msgstr "Группы %s"
-#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
+#: actions/apigrouplist.php:107
+#, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "Группы %1$s, в которых состоит %2$s."
+
+#. TRANS: Message is used as a title. %s is a site name.
+#. TRANS: Message is used as a page title. %s is a nick name.
+#: actions/apigrouplistall.php:91 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr "Группы %s"
-#: actions/apigrouplistall.php:94
+#: actions/apigrouplistall.php:95
#, php-format
msgid "groups on %s"
msgstr "группы на %s"
@@ -510,17 +527,17 @@ msgid "Invalid token."
msgstr "Неправильный токен"
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -552,12 +569,15 @@ msgstr ""
msgid "The request token %s has been denied and revoked."
msgstr "Запрос токена %s был запрещен и аннулирован."
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
-#: actions/designadminpanel.php:103 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/designadminpanel.php:104 actions/editapplication.php:139
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Нетиповое подтверждение формы."
@@ -581,20 +601,22 @@ msgstr ""
"предоставлять разрешение на доступ к вашей учётной записи %4$s только тем "
"сторонним приложениям, которым вы доверяете."
-#: actions/apioauthauthorize.php:310 lib/action.php:438
+#. TRANS: Main menu option when logged in for access to user settings
+#: actions/apioauthauthorize.php:310 lib/action.php:440
msgid "Account"
msgstr "Настройки"
#: actions/apioauthauthorize.php:313 actions/login.php:230
#: actions/profilesettings.php:106 actions/register.php:424
-#: actions/showgroup.php:244 actions/tagother.php:94
+#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:131
+#: lib/userprofile.php:132
msgid "Nickname"
msgstr "Имя"
+#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:116
+#: actions/register.php:429 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Пароль"
@@ -639,17 +661,17 @@ msgstr "Статус удалён."
msgid "No status with that ID found."
msgstr "Не найдено статуса с таким ID."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Слишком длинная запись. Максимальная длина — %d знаков."
-#: actions/apistatusesupdate.php:202
-msgid "Not found"
-msgstr "Не найдено"
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
+msgid "Not found."
+msgstr "Не найдено."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "Максимальная длина записи — %d символов, включая URL вложения."
@@ -658,12 +680,12 @@ msgstr "Максимальная длина записи — %d символов
msgid "Unsupported format."
msgstr "Неподдерживаемый формат."
-#: actions/apitimelinefavorites.php:108
+#: actions/apitimelinefavorites.php:109
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Любимое от %2$s"
-#: actions/apitimelinefavorites.php:117
+#: actions/apitimelinefavorites.php:118
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "Обновления %1$s, отмеченные как любимые %2$s / %2$s."
@@ -673,17 +695,17 @@ msgstr "Обновления %1$s, отмеченные как любимые %2
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Обновления, упоминающие %2$s"
-#: actions/apitimelinementions.php:127
+#: actions/apitimelinementions.php:130
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s обновил этот ответ на сообщение: %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Общая лента %s"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "Обновления %s от всех!"
@@ -698,20 +720,16 @@ msgstr "Повторено для %s"
msgid "Repeats of %s"
msgstr "Повторы за %s"
-#: actions/apitimelinetag.php:102 actions/tag.php:67
+#: actions/apitimelinetag.php:104 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Записи с тегом %s"
-#: actions/apitimelinetag.php:104 actions/tagrss.php:65
+#: actions/apitimelinetag.php:106 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Обновления с тегом %1$s на %2$s!"
-#: actions/apiusershow.php:96
-msgid "Not found."
-msgstr "Не найдено."
-
#: actions/attachment.php:73
msgid "No such attachment."
msgstr "Нет такого вложения."
@@ -731,8 +749,9 @@ msgstr "Нет размера."
msgid "Invalid size."
msgstr "Неверный размер."
-#: actions/avatarsettings.php:67 actions/showgroup.php:229
-#: lib/accountsettingsaction.php:112
+#. TRANS: Link description in user account settings menu.
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
+#: lib/accountsettingsaction.php:118
msgid "Avatar"
msgstr "Аватара"
@@ -743,10 +762,10 @@ msgstr ""
"Вы можете загрузить свою аватару. Максимальный размер файла составляет %s."
#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
-#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
-#: actions/userrss.php:106
-msgid "User without matching profile"
-msgstr "Пользователь без соответствующего профиля"
+#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:108
+msgid "User without matching profile."
+msgstr "Пользователь без соответствующего профиля."
#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
#: actions/grouplogo.php:254
@@ -764,7 +783,7 @@ msgid "Preview"
msgstr "Просмотр"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:655
+#: lib/deleteuserform.php:66 lib/noticelist.php:656
msgid "Delete"
msgstr "Удалить"
@@ -776,23 +795,27 @@ msgstr "Загрузить"
msgid "Crop"
msgstr "Обрезать"
-#: actions/avatarsettings.php:328
+#: actions/avatarsettings.php:305
+msgid "No file uploaded."
+msgstr "Файл не загружен."
+
+#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
msgstr "Подберите нужный квадратный участок для вашей аватары"
-#: actions/avatarsettings.php:343 actions/grouplogo.php:380
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr "Потеряна информация о файле."
-#: actions/avatarsettings.php:366
+#: actions/avatarsettings.php:370
msgid "Avatar updated."
msgstr "Аватара обновлена."
-#: actions/avatarsettings.php:369
+#: actions/avatarsettings.php:373
msgid "Failed updating avatar."
msgstr "Неудача при обновлении аватары."
-#: actions/avatarsettings.php:393
+#: actions/avatarsettings.php:397
msgid "Avatar deleted."
msgstr "Аватара удалена."
@@ -800,7 +823,7 @@ msgstr "Аватара удалена."
msgid "You already blocked that user."
msgstr "Вы уже заблокировали этого пользователя."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
msgid "Block user"
msgstr "Заблокировать пользователя."
@@ -814,27 +837,42 @@ msgstr ""
"будет отписан от вас без возможности подписаться в будущем, а вам не будут "
"приходить уведомления об @-ответах от него."
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
+msgctxt "BUTTON"
msgid "No"
msgstr "Нет"
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Не блокировать этого пользователя"
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+msgctxt "BUTTON"
msgid "Yes"
msgstr "Да"
-#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Заблокировать пользователя."
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr "Не удаётся сохранить информацию о блокировании."
@@ -847,8 +885,8 @@ msgstr "Не удаётся сохранить информацию о блок
#: actions/groupunblock.php:86 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212
-#: lib/command.php:260
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
msgid "No such group."
msgstr "Нет такой группы."
@@ -878,9 +916,11 @@ msgstr "Разблокировать"
msgid "Unblock this user"
msgstr "Разблокировать пользователя."
-#: actions/bookmarklet.php:50
-msgid "Post to "
-msgstr "Отправить в "
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, php-format
+msgid "Post to %s"
+msgstr "Отправить в %s"
#: actions/confirmaddress.php:75
msgid "No confirmation code."
@@ -894,33 +934,43 @@ msgstr "Код подтверждения не найден."
msgid "That confirmation code is not for you!"
msgstr "Это не Ваш код подтверждения!"
-#: actions/confirmaddress.php:90
+#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
+#: actions/confirmaddress.php:91
#, php-format
-msgid "Unrecognized address type %s"
-msgstr "Нераспознанный тип адреса %s"
+msgid "Unrecognized address type %s."
+msgstr "Нераспознанный тип адреса %s."
-#: actions/confirmaddress.php:94
+#. TRANS: Client error for an already confirmed email/jabbel/sms address.
+#: actions/confirmaddress.php:96
msgid "That address has already been confirmed."
msgstr "Этот адрес уже подтверждён."
-#: actions/confirmaddress.php:114 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "Не удаётся обновить пользователя."
-#: actions/confirmaddress.php:126 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Не удаётся удалить подверждение по электронному адресу."
-#: actions/confirmaddress.php:144
+#: actions/confirmaddress.php:146
msgid "Confirm address"
msgstr "Подтвердить адрес"
-#: actions/confirmaddress.php:159
+#: actions/confirmaddress.php:161
#, php-format
msgid "The address \"%s\" has been confirmed for your account."
msgstr "Адрес «%s» подтверждён для вашего аккаунта."
@@ -930,7 +980,7 @@ msgid "Conversation"
msgstr "Дискуссия"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:218 lib/searchgroupnav.php:82
+#: lib/profileaction.php:229 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Записи"
@@ -949,7 +999,7 @@ msgstr "Вы не являетесь владельцем этого прило
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1217
+#: lib/action.php:1253
msgid "There was a problem with your session token."
msgstr "Проблема с Вашей сессией. Попробуйте ещё раз, пожалуйста."
@@ -967,15 +1017,17 @@ msgstr ""
"применении из базы данных, включая все существующие подключения "
"пользователей."
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
msgid "Do not delete this application"
msgstr "Не удаляйте это приложение"
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
msgid "Delete this application"
msgstr "Удалить это приложение"
-#. TRANS: Client error message
+#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
@@ -1006,11 +1058,13 @@ msgstr "Удалить запись"
msgid "Are you sure you want to delete this notice?"
msgstr "Вы уверены, что хотите удалить эту запись?"
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
msgid "Do not delete this notice"
msgstr "Не удалять эту запись"
-#: actions/deletenotice.php:146 lib/noticelist.php:655
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
msgid "Delete this notice"
msgstr "Удалить эту запись"
@@ -1034,58 +1088,61 @@ msgstr ""
"Вы действительно хотите удалить этого пользователя? Это повлечёт удаление "
"всех данных о пользователе из базы данных без возможности восстановления."
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
msgid "Delete this user"
msgstr "Удалить этого пользователя"
-#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#. TRANS: Message used as title for design settings for the site.
+#. TRANS: Link description in user account settings menu.
+#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
#: lib/groupnav.php:119
msgid "Design"
msgstr "Оформление"
-#: actions/designadminpanel.php:73
+#: actions/designadminpanel.php:74
msgid "Design settings for this StatusNet site."
msgstr "Настройки оформления для этого сайта StatusNet."
-#: actions/designadminpanel.php:275
+#: actions/designadminpanel.php:276
msgid "Invalid logo URL."
msgstr "Неверный URL логотипа."
-#: actions/designadminpanel.php:279
+#: actions/designadminpanel.php:280
#, php-format
-msgid "Theme not available: %s"
-msgstr "Тема не доступна: %s"
+msgid "Theme not available: %s."
+msgstr "Тема не доступна: %s."
-#: actions/designadminpanel.php:375
+#: actions/designadminpanel.php:376
msgid "Change logo"
msgstr "Изменить логотип"
-#: actions/designadminpanel.php:380
+#: actions/designadminpanel.php:381
msgid "Site logo"
msgstr "Логотип сайта"
-#: actions/designadminpanel.php:387
+#: actions/designadminpanel.php:388
msgid "Change theme"
msgstr "Изменить тему"
-#: actions/designadminpanel.php:404
+#: actions/designadminpanel.php:405
msgid "Site theme"
msgstr "Тема сайта"
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:406
msgid "Theme for the site."
msgstr "Тема для сайта."
-#: actions/designadminpanel.php:417 lib/designsettings.php:101
+#: actions/designadminpanel.php:418 lib/designsettings.php:101
msgid "Change background image"
msgstr "Изменение фонового изображения"
-#: actions/designadminpanel.php:422 actions/designadminpanel.php:497
+#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
#: lib/designsettings.php:178
msgid "Background"
msgstr "Фон"
-#: actions/designadminpanel.php:427
+#: actions/designadminpanel.php:428
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1094,67 +1151,68 @@ msgstr ""
"Вы можете загрузить фоновое изображение для сайта. Максимальный размер файла "
"составляет %1$s."
-#: actions/designadminpanel.php:457 lib/designsettings.php:139
+#. TRANS: Used as radio button label to add a background image.
+#: actions/designadminpanel.php:459 lib/designsettings.php:139
msgid "On"
msgstr "Включить"
-#: actions/designadminpanel.php:473 lib/designsettings.php:155
+#. TRANS: Used as radio button label to not add a background image.
+#: actions/designadminpanel.php:476 lib/designsettings.php:155
msgid "Off"
msgstr "Отключить"
-#: actions/designadminpanel.php:474 lib/designsettings.php:156
+#: actions/designadminpanel.php:477 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Включить или отключить показ фонового изображения."
-#: actions/designadminpanel.php:479 lib/designsettings.php:161
+#: actions/designadminpanel.php:482 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Растянуть фоновое изображение"
-#: actions/designadminpanel.php:488 lib/designsettings.php:170
+#: actions/designadminpanel.php:491 lib/designsettings.php:170
msgid "Change colours"
msgstr "Изменение цветовой гаммы"
-#: actions/designadminpanel.php:510 lib/designsettings.php:191
+#: actions/designadminpanel.php:513 lib/designsettings.php:191
msgid "Content"
msgstr "Содержание"
-#: actions/designadminpanel.php:523 lib/designsettings.php:204
+#: actions/designadminpanel.php:526 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Боковая панель"
-#: actions/designadminpanel.php:536 lib/designsettings.php:217
+#: actions/designadminpanel.php:539 lib/designsettings.php:217
msgid "Text"
msgstr "Текст"
-#: actions/designadminpanel.php:549 lib/designsettings.php:230
+#: actions/designadminpanel.php:552 lib/designsettings.php:230
msgid "Links"
msgstr "Ссылки"
-#: actions/designadminpanel.php:577 lib/designsettings.php:247
+#: actions/designadminpanel.php:580 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Использовать значения по умолчанию"
-#: actions/designadminpanel.php:578 lib/designsettings.php:248
+#: actions/designadminpanel.php:581 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Восстановить оформление по умолчанию"
-#: actions/designadminpanel.php:584 lib/designsettings.php:254
+#: actions/designadminpanel.php:587 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Восстановить значения по умолчанию"
-#: actions/designadminpanel.php:586 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#. TRANS: Submit button title
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Сохранить"
-#: actions/designadminpanel.php:587 lib/designsettings.php:257
+#: actions/designadminpanel.php:590 lib/designsettings.php:257
msgid "Save design"
msgstr "Сохранить оформление"
@@ -1259,11 +1317,16 @@ msgstr "Заполните информацию о группе в следую
msgid "description is too long (max %d chars)."
msgstr "Слишком длинное описание (максимум %d символов)"
+#: actions/editgroup.php:228 actions/newgroup.php:168
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Неверный алиас: «%s»"
+
#: actions/editgroup.php:258
msgid "Could not update group."
msgstr "Не удаётся обновить информацию о группе."
-#: actions/editgroup.php:264 classes/User_group.php:493
+#: actions/editgroup.php:264 classes/User_group.php:496
msgid "Could not create aliases."
msgstr "Не удаётся создать алиасы."
@@ -1271,31 +1334,42 @@ msgstr "Не удаётся создать алиасы."
msgid "Options saved."
msgstr "Настройки сохранены."
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
msgid "Email settings"
msgstr "Настройка почты"
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr "Управление процессом получения электронной почты с %%site.name%%."
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Адрес"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "Адрес эл. почты"
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr "Подтверждённый в настоящее время электронный адрес."
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+msgctxt "BUTTON"
msgid "Remove"
-msgstr "Убрать"
+msgstr "Удалить"
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1303,116 +1377,146 @@ msgstr ""
"Ожидание подтверждения этого адреса. Проверьте свой почтовый ящик (и папку "
"для спама!), там будут дальнейшие инструкции."
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:331
-#: lib/applicationeditform.php:332
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+msgctxt "BUTTON"
msgid "Cancel"
-msgstr "Отменить"
-
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "Адрес эл. почты"
+msgstr "Отмена"
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
msgstr "Электронный адрес вида \"UserName@example.org\""
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+msgctxt "BUTTON"
msgid "Add"
msgstr "Добавить"
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Входящий электронный адрес"
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr ""
"Отправляйте электронные письма на этот адрес для отсылки новых записей."
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr ""
"Создать новый адрес электронной почты для отсылки сообщений; отменяет старый "
"адрес."
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+msgctxt "BUTTON"
msgid "New"
msgstr "Новый"
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
-msgstr "Предпочтения"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+msgid "Email preferences"
+msgstr "Настройки эл. почты"
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr "Уведомлять меня о новых подписчиках по почте."
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
"Посылать мне сообщение по электронной почте, если кто-нибудь добавит мою "
"запись в число любимых."
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr ""
"Посылать мне сообщение по электронной почте, если кто-нибудь пошлёт мне "
"приватное сообщение."
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr ""
"Посылать мне сообщение по электронной почте, если кто-нибудь пошлёт мне «@-"
"ответ»."
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr ""
"Разрешить друзьям «подталкивать» меня и посылать мне электронные сообщения."
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr "Я хочу отправлять записи по электронной почте."
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr "Опубликовать MicroID для моего электронного адреса."
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "Предпочтения сохранены."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+msgid "Email preferences saved."
+msgstr "Настройки эл. почты сохранены."
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr "Нет электронного адреса."
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
msgid "Cannot normalize that email address"
msgstr "Не удаётся стандартизировать этот электронный адрес"
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Неверный электронный адрес."
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
msgid "That is already your email address."
msgstr "Это уже Ваш электронный адрес."
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
msgid "That email address already belongs to another user."
msgstr "Этот электронный адрес уже задействован другим пользователем."
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Не удаётся вставить код подтверждения."
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
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."
@@ -1421,43 +1525,53 @@ msgstr ""
"папку входящей почты (а также папку спама!), чтобы найти этот кода и "
"инструкции по его использованию."
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Нет подтверждения отказа."
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
-msgstr "Это неверный IM-адрес."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+msgid "That is the wrong email address."
+msgstr "Это неверный адрес эл. почты."
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
-msgstr "Подтверждение отменено."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+msgid "Email confirmation cancelled."
+msgstr "Подтверждение эл. почты отменено."
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
msgid "That is not your email address."
msgstr "Это не Ваш электронный адрес."
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
-msgstr "Адрес удалён."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+msgid "The email address was removed."
+msgstr "Адрес эл. почты удалён."
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Нет входящего электронного адреса."
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Не удаётся обновить пользовательскую запись."
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Входящий электронный адрес удалён."
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Новый входящий электронный адрес добавлен."
@@ -1576,9 +1690,9 @@ msgstr "Не удаётся преобразовать ключ запроса
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Удалённый сервис использует неизвестную версию протокола OMB."
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr "Ошибка обновления удалённого профиля"
+#: actions/finishremotesubscribe.php:138
+msgid "Error updating remote profile."
+msgstr "Ошибка обновления удалённого профиля."
#: actions/getfile.php:79
msgid "No such file."
@@ -1633,11 +1747,11 @@ msgstr "Пользователь уже заблокирован из групп
msgid "User is not a member of group."
msgstr "Пользователь не является членом этой группы."
-#: actions/groupblock.php:136 actions/groupmembers.php:323
+#: actions/groupblock.php:134 actions/groupmembers.php:360
msgid "Block user from group"
msgstr "Заблокировать пользователя из группы."
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1648,15 +1762,17 @@ msgstr ""
"Пользователь будет удалён из группы без возможности отправлять и "
"подписываться на группу в будущем."
-#: actions/groupblock.php:178
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
msgid "Do not block this user from this group"
msgstr "Не блокировать этого пользователя из этой группы"
-#: actions/groupblock.php:179
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
msgid "Block this user from this group"
msgstr "Заблокировать этого пользователя из этой группы"
-#: actions/groupblock.php:196
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr "Ошибка базы данных при блокировании пользователя из группы."
@@ -1701,10 +1817,6 @@ msgstr ""
"Здесь вы можете загрузить логотип для группы. Максимальный размер файла "
"составляет %s."
-#: actions/grouplogo.php:181
-msgid "User without matching profile."
-msgstr "Пользователь без соответствующего профиля."
-
#: actions/grouplogo.php:365
msgid "Pick a square area of the image to be the logo."
msgstr "Подберите нужный квадратный участок для вашего логотипа."
@@ -1735,34 +1847,38 @@ msgstr "Список пользователей, являющихся члена
msgid "Admin"
msgstr "Настройки"
-#: actions/groupmembers.php:355 lib/blockform.php:69
+#: actions/groupmembers.php:392 lib/blockform.php:69
msgid "Block"
msgstr "Блокировать"
-#: actions/groupmembers.php:450
+#: actions/groupmembers.php:487
msgid "Make user an admin of the group"
msgstr "Сделать пользователя администратором группы"
-#: actions/groupmembers.php:482
+#: actions/groupmembers.php:519
msgid "Make Admin"
msgstr "Сделать администратором"
-#: actions/groupmembers.php:482
+#: actions/groupmembers.php:519
msgid "Make this user an admin"
msgstr "Сделать этого пользователя администратором"
-#: actions/grouprss.php:138 actions/userrss.php:93
-#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67
+#. TRANS: Message is used as link title. %s is a user nickname.
+#. TRANS: Title in atom group notice feed. %s is a group name.
+#. TRANS: Title in atom user notice feed. %s is a user name.
+#: actions/grouprss.php:139 actions/userrss.php:94
+#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "Лента %s"
-#: actions/grouprss.php:140
+#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
+#: actions/grouprss.php:142
#, php-format
msgid "Updates from members of %1$s on %2$s!"
msgstr "Обновления участников %1$s на %2$s!"
-#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232
+#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Группы"
@@ -1787,7 +1903,7 @@ msgstr ""
"группу, которая вас интересует? Попробуйте [найти её](%%%%action.groupsearch%"
"%%%) или [создайте собственную](%%%%action.newgroup%%%%)!"
-#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
msgid "Create a new group"
msgstr "Создать новую группу"
@@ -1839,11 +1955,15 @@ msgstr "Пользователь не заблокировал вас из гр
msgid "Error removing the block."
msgstr "Ошибка при удалении данного блока."
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
msgid "IM settings"
msgstr "IM-установки"
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1852,15 +1972,24 @@ msgstr ""
"Вы можете отправлять и получать записи через Jabber/GTalk [онлайн-мессенджер]"
"(%%doc.im%%). Настройте ваш аккаунт и предпочтения ниже."
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
msgid "IM is not available."
msgstr "IM не доступен."
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "IM-адрес"
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr "Подтверждённый в настоящее время Jabber/Gtalk - адрес."
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1870,11 +1999,9 @@ msgstr ""
"сообщения с дальнейшими инструкциями. (Вы включили %s в ваш список "
"контактов?)"
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "IM-адрес"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1884,44 +2011,65 @@ msgstr ""
"убедитесь, что добавили %s в список Ваших корреспондентов на Вашем IM-"
"мессенджере или в GTalk."
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+msgid "IM preferences"
+msgstr "Настройки IM"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr "Посылать мне записи через Jabber/GTalk."
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr "Публиковать запись, когда мой Jabber/GTalk - статус изменяется."
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr ""
"Посылать мне реплики через Jabber/GTalk от людей, на которых я не подписан."
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr "Опубликовать MicroID для моего Jabber/GTalk - адреса."
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Предпочтения сохранены."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr "Не Jabber ID."
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr "Не удаётся стандартизировать этот Jabber ID"
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr "Неверный код Jabber ID"
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr "Это уже Ваш Jabber ID."
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr "Этот Jabber ID уже используется другим пользователем."
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
@@ -1930,10 +2078,32 @@ msgstr ""
"Код подтверждения выслан на добавленный вами IM-адрес. Вы должны подтвердить "
"%s для отправки вам сообщений."
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Это неверный IM-адрес."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+msgid "Couldn't delete IM confirmation."
+msgstr "Не удаётся удалить подверждение IM."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+msgid "IM confirmation cancelled."
+msgstr "Подтверждение IM отменено."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr "Это не Ваш Jabber ID."
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+msgid "The IM address was removed."
+msgstr "Адрес IM удалён."
+
#: actions/inbox.php:59
#, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -1956,10 +2126,10 @@ msgstr "Приглашения отключены."
#: actions/invite.php:41
#, php-format
-msgid "You must be logged in to invite other users to use %s"
+msgid "You must be logged in to invite other users to use %s."
msgstr ""
-"Вы должны авторизоваться, чтобы приглашать других пользователей следовать за "
-"%s"
+"Вы должны авторизоваться, чтобы приглашать других пользователей использовать "
+"%s."
#: actions/invite.php:72
#, php-format
@@ -1978,7 +2148,9 @@ msgstr "Пригласить новых пользователей"
msgid "You are already subscribed to these users:"
msgstr "Вы уже подписаны на пользователя:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2029,12 +2201,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr "Отправить"
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr "%1$s пригласил вас присоединиться к нему на %2$s"
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2099,7 +2273,9 @@ msgstr "Вы должны авторизоваться для вступлени
msgid "No nickname or ID."
msgstr "Нет имени или ID."
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
#, php-format
msgid "%1$s joined group %2$s"
msgstr "%1$s вступил в группу %2$s"
@@ -2108,11 +2284,13 @@ msgstr "%1$s вступил в группу %2$s"
msgid "You must be logged in to leave a group."
msgstr "Вы должны авторизоваться, чтобы покинуть группу."
-#: actions/leavegroup.php:100 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:373
msgid "You are not a member of that group."
msgstr "Вы не являетесь членом этой группы."
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
#, php-format
msgid "%1$s left group %2$s"
msgstr "%1$s покинул группу %2$s"
@@ -2158,13 +2336,16 @@ msgstr ""
"изменять Ваши установки."
#: actions/login.php:270
+msgid "Login with your username and password."
+msgstr "Войти с вашим именем участника и паролем."
+
+#: actions/login.php:273
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
-"Вход с вашим логином и паролем. Нет аккаунта? [Зарегистрируйте](%%action."
-"register%%) новый аккаунт."
+"У вас нет логина? [Зарегистрируйте](%%action.register%%) новую учётную "
+"запись."
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
@@ -2187,8 +2368,8 @@ msgid "Can't make %1$s an admin for group %2$s."
msgstr "Невозможно сделать %1$s администратором группы %2$s."
#: actions/microsummary.php:69
-msgid "No current status"
-msgstr "Нет текущего статуса"
+msgid "No current status."
+msgstr "Нет текущего состояния."
#: actions/newapplication.php:52
msgid "New Application"
@@ -2222,12 +2403,12 @@ msgstr "Используйте эту форму для создания нов
msgid "New message"
msgstr "Новое сообщение"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
msgid "You can't send a message to this user."
msgstr "Вы не можете послать сообщение этому пользователю."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
-#: lib/command.php:475
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr "Нет контента!"
@@ -2235,7 +2416,7 @@ msgstr "Нет контента!"
msgid "No recipient specified."
msgstr "Нет адресата."
-#: actions/newmessage.php:164 lib/command.php:361
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr "Не посылайте сообщения сами себе; просто потихоньку скажите это себе."
@@ -2249,7 +2430,7 @@ msgstr "Сообщение отправлено"
msgid "Direct message to %s sent."
msgstr "Прямое сообщение для %s послано."
-#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
msgstr "Ошибка AJAX"
@@ -2257,7 +2438,7 @@ msgstr "Ошибка AJAX"
msgid "New notice"
msgstr "Новая запись"
-#: actions/newnotice.php:211
+#: actions/newnotice.php:217
msgid "Notice posted"
msgstr "Запись опубликована"
@@ -2352,11 +2533,11 @@ msgid "You are not a user of that application."
msgstr "Вы не являетесь пользователем этого приложения."
#: actions/oauthconnectionssettings.php:186
-msgid "Unable to revoke access for app: "
-msgstr "Не удаётся отозвать права для приложения: "
+#, php-format
+msgid "Unable to revoke access for app: %s."
+msgstr "Не удаётся отозвать доступ для приложения: %s."
#: actions/oauthconnectionssettings.php:198
-#, php-format
msgid "You have not authorized any applications to use your account."
msgstr "Вы не разрешили приложениям использовать вашу учётную запись."
@@ -2365,24 +2546,29 @@ msgid "Developers can edit the registration settings for their applications "
msgstr "Разработчики могут изменять настройки регистрации своих приложений "
#: actions/oembed.php:79 actions/shownotice.php:100
-msgid "Notice has no profile"
-msgstr "Запись без профиля"
+msgid "Notice has no profile."
+msgstr "Уведомление не имеет профиля."
-#: actions/oembed.php:86 actions/shownotice.php:180
+#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Статус %1$s на %2$s"
-#: actions/oembed.php:157
-msgid "content type "
-msgstr "тип содержимого "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, php-format
+msgid "Content type %s not supported."
+msgstr "Тип содержимого %s не поддерживается."
-#: actions/oembed.php:160
-msgid "Only "
-msgstr "Только "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s URLs over plain HTTP please."
+msgstr "Только %s URL в простом HTTP, пожалуйста."
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042
-#: lib/apiaction.php:1070 lib/apiaction.php:1179
+#. TRANS: Client error on an API request with an unsupported data format.
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr "Неподдерживаемый формат данных."
@@ -2487,7 +2673,7 @@ msgid "6 or more characters"
msgstr "6 или больше знаков"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr "Подтверждение"
@@ -2515,7 +2701,7 @@ msgstr "Некорректный старый пароль"
msgid "Error saving user; invalid."
msgstr "Ошибка сохранения пользователя; неверное имя."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
msgstr "Не удаётся сохранить новый пароль."
@@ -2524,7 +2710,7 @@ msgid "Password saved."
msgstr "Пароль сохранён."
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
msgid "Paths"
msgstr "Пути"
@@ -2534,23 +2720,23 @@ msgstr "Настройки путей и серверов для этого са
#: actions/pathsadminpanel.php:157
#, php-format
-msgid "Theme directory not readable: %s"
-msgstr "Директория тем недоступна для чтения: %s"
+msgid "Theme directory not readable: %s."
+msgstr "Директория тем не доступна для чтения: %s."
#: actions/pathsadminpanel.php:163
#, php-format
-msgid "Avatar directory not writable: %s"
-msgstr "Директория аватар не доступна для записи: %s"
+msgid "Avatar directory not writable: %s."
+msgstr "Директория аватар не доступна для записи: %s."
#: actions/pathsadminpanel.php:169
#, php-format
-msgid "Background directory not writable: %s"
-msgstr "Директория фоновых изображений не доступна для записи: %s"
+msgid "Background directory not writable: %s."
+msgstr "Директория фоновых изображений не доступна для записи: %s."
#: actions/pathsadminpanel.php:177
#, php-format
-msgid "Locales directory not readable: %s"
-msgstr "Директория локализаций не доступна для чтения: %s"
+msgid "Locales directory not readable: %s."
+msgstr "Директория локализаций не доступна для чтения: %s."
#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
@@ -2689,19 +2875,19 @@ msgstr ""
msgid "People search"
msgstr "Поиск людей"
-#: actions/peopletag.php:70
+#: actions/peopletag.php:68
#, php-format
-msgid "Not a valid people tag: %s"
-msgstr "Неверный тег человека: %s"
+msgid "Not a valid people tag: %s."
+msgstr "Неверный тег человека: %s."
-#: actions/peopletag.php:144
+#: actions/peopletag.php:142
#, php-format
msgid "Users self-tagged with %1$s - page %2$d"
msgstr "Пользователи, установившие себе тег %1$s — страница %2$d"
#: actions/postnotice.php:95
-msgid "Invalid notice content"
-msgstr "Неверный контент записи"
+msgid "Invalid notice content."
+msgstr "Ошибочное содержание записи."
#: actions/postnotice.php:101
#, php-format
@@ -2728,13 +2914,14 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 латинских строчных буквы или цифры, без пробелов"
#: actions/profilesettings.php:111 actions/register.php:448
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:149
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Полное имя"
+#. TRANS: Form input field label.
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/applicationeditform.php:228 lib/groupeditform.php:161
+#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Главная"
@@ -2756,9 +2943,9 @@ msgid "Bio"
msgstr "Биография"
#: actions/profilesettings.php:132 actions/register.php:471
-#: actions/showgroup.php:264 actions/tagother.php:112
+#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:164
+#: lib/userprofile.php:165
msgid "Location"
msgstr "Месторасположение"
@@ -2772,7 +2959,7 @@ msgstr "Делиться своим текущим местоположение
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
msgid "Tags"
msgstr "Теги"
@@ -2845,8 +3032,8 @@ msgstr "Настройки сохранены."
#: actions/public.php:83
#, php-format
-msgid "Beyond the page limit (%s)"
-msgstr "Превышен предел страницы (%s)"
+msgid "Beyond the page limit (%s)."
+msgstr "Превышен предел страницы (%s)."
#: actions/public.php:92
msgid "Could not retrieve public stream."
@@ -3012,7 +3199,7 @@ msgstr "Переустановить пароль"
msgid "Recover password"
msgstr "Восстановление пароля"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
msgstr "Запрошено восстановление пароля"
@@ -3032,19 +3219,19 @@ msgstr "Сбросить"
msgid "Enter a nickname or email address."
msgstr "Введите имя или электронный адрес."
-#: actions/recoverpassword.php:272
+#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
msgstr "Нет пользователя с таким электронным адресом или именем."
-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
msgstr "Нет зарегистрированных электронных адресов для этого пользователя."
-#: actions/recoverpassword.php:301
+#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
msgstr "Ошибка сохранения подтверждённого адреса."
-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -3052,23 +3239,23 @@ msgstr ""
"Инструкции по восстановлению пароля посланы на электронный адрес, который Вы "
"указали при регистрации вашего аккаунта."
-#: actions/recoverpassword.php:344
+#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
msgstr "Нетиповая переустановка пароля."
-#: actions/recoverpassword.php:352
+#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
msgstr "Пароль должен быть длиной не менее 6 символов."
-#: actions/recoverpassword.php:356
+#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
msgstr "Пароль и его подтверждение не совпадают."
-#: actions/recoverpassword.php:375 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
msgstr "Ошибка в установках пользователя."
-#: actions/recoverpassword.php:382
+#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
msgstr "Новый пароль успешно сохранён. Вы авторизовались."
@@ -3084,7 +3271,7 @@ msgstr "Извините, неверный пригласительный код
msgid "Registration successful"
msgstr "Регистрация успешна!"
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr "Регистрация"
@@ -3108,13 +3295,12 @@ msgstr "Неверное имя или пароль."
#: actions/register.php:343
msgid ""
-"With this form you can create a new account. You can then post notices and "
+"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-"При помощи этой формы вы можете создать новый аккаунт, чтобы публиковать "
-"короткие сообщения и устанавливать связи с друзьями и коллегами (Есть "
-"[OpenID](http://openid.net/) аккаунт? Тогда используй [OpenID регистрацию](%%"
-"action.openidlogin%%)!)"
+"С помощью этой формы вы можете создать новую учётную запись. Тогда вы "
+"получите возможность публиковать короткие сообщения и устанавливать связи с "
+"друзьями и коллегами. "
#: actions/register.php:425
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
@@ -3129,8 +3315,9 @@ msgstr "6 или более символов. Обязательное поле.
msgid "Same as password above. Required."
msgstr "Тот же пароль что и сверху. Обязательное поле."
+#. TRANS: Link description in user account settings menu.
#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Email"
@@ -3143,22 +3330,15 @@ msgid "Longer name, preferably your \"real\" name"
msgstr "Полное имя, предпочтительно Ваше настоящее имя"
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr "Мои тексты и файлы находятся под лицензией"
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr "Creative Commons Attribution 3.0"
-
-#: actions/register.php:497
+#, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr ""
-", за исключением моей личной информации: пароля, почты, мессенджера и номера "
-"телефона."
+"Мои тексты и файлы доступны на условиях %s, за исключением следующей личной "
+"информации: пароля, почтового адреса, номера мессенджера и номера телефона."
-#: actions/register.php:538
+#: actions/register.php:542
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3192,7 +3372,7 @@ msgstr ""
"Спасибо за то, что присоединились к нам, надеемся, что вы получите "
"удовольствие от использования данного сервиса!"
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3235,7 +3415,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "Адрес URL твоего профиля на другом подходящем сервисе микроблогинга"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:394
+#: lib/userprofile.php:406
msgid "Subscribe"
msgstr "Подписаться"
@@ -3271,7 +3451,7 @@ msgstr "Вы не можете повторить собственную зап
msgid "You already repeated that notice."
msgstr "Вы уже повторили эту запись."
-#: actions/repeat.php:114 lib/noticelist.php:674
+#: actions/repeat.php:114 lib/noticelist.php:675
msgid "Repeated"
msgstr "Повторено"
@@ -3360,7 +3540,7 @@ msgstr "Пользователь уже в режиме песочницы."
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:390
+#: lib/adminpanelaction.php:391
msgid "Sessions"
msgstr "Сессии"
@@ -3397,26 +3577,30 @@ msgstr "Вы должны авторизоваться, чтобы просма
msgid "Application profile"
msgstr "Профиль приложения"
-#: actions/showapplication.php:159 lib/applicationeditform.php:180
+#. TRANS: Form input field label for application icon.
+#: actions/showapplication.php:159 lib/applicationeditform.php:182
msgid "Icon"
msgstr "Иконка"
+#. TRANS: Form input field label for application name.
#: actions/showapplication.php:169 actions/version.php:195
-#: lib/applicationeditform.php:195
+#: lib/applicationeditform.php:199
msgid "Name"
msgstr "Имя"
-#: actions/showapplication.php:178 lib/applicationeditform.php:222
+#. TRANS: Form input field label.
+#: actions/showapplication.php:178 lib/applicationeditform.php:235
msgid "Organization"
msgstr "Организация"
+#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:198
-#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+#: lib/applicationeditform.php:216 lib/groupeditform.php:172
msgid "Description"
msgstr "Описание"
-#: actions/showapplication.php:192 actions/showgroup.php:438
-#: lib/profileaction.php:176
+#: actions/showapplication.php:192 actions/showgroup.php:444
+#: lib/profileaction.php:187
msgid "Statistics"
msgstr "Статистика"
@@ -3524,7 +3708,7 @@ msgstr ""
#: actions/showfavorites.php:243
msgid "This is a way to share what you like."
-msgstr "Это способ разделить то, что вам нравится."
+msgstr "Это способ поделиться тем, что вам нравится."
#: actions/showgroup.php:82 lib/groupnav.php:86
#, php-format
@@ -3536,67 +3720,67 @@ msgstr "Группа %s"
msgid "%1$s group, page %2$d"
msgstr "Группа %1$s, страница %2$d"
-#: actions/showgroup.php:226
+#: actions/showgroup.php:227
msgid "Group profile"
msgstr "Профиль группы"
-#: actions/showgroup.php:271 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:177
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
msgstr "URL"
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:194
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
msgid "Note"
msgstr "Запись"
-#: actions/showgroup.php:292 lib/groupeditform.php:184
+#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
msgstr "Алиасы"
-#: actions/showgroup.php:301
+#: actions/showgroup.php:302
msgid "Group actions"
msgstr "Действия группы"
-#: actions/showgroup.php:337
+#: actions/showgroup.php:338
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Лента записей группы %s (RSS 1.0)"
-#: actions/showgroup.php:343
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Лента записей группы %s (RSS 2.0)"
-#: actions/showgroup.php:349
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Лента записей группы %s (Atom)"
-#: actions/showgroup.php:354
+#: actions/showgroup.php:355
#, php-format
msgid "FOAF for %s group"
msgstr "FOAF для группы %s"
-#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91
msgid "Members"
msgstr "Участники"
-#: actions/showgroup.php:395 lib/profileaction.php:117
-#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95
-#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
+#: actions/showgroup.php:398 lib/profileaction.php:117
+#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(пока ничего нет)"
-#: actions/showgroup.php:401
+#: actions/showgroup.php:404
msgid "All members"
msgstr "Все участники"
-#: actions/showgroup.php:441
+#: actions/showgroup.php:447
msgid "Created"
msgstr "Создано"
-#: actions/showgroup.php:457
+#: actions/showgroup.php:463
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3612,7 +3796,7 @@ msgstr ""
"action.register%%%%), чтобы стать участником группы и получить множество "
"других возможностей! ([Читать далее](%%%%doc.help%%%%))"
-#: actions/showgroup.php:463
+#: actions/showgroup.php:469
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3625,7 +3809,7 @@ msgstr ""
"обеспечении [StatusNet](http://status.net/). Участники обмениваются "
"короткими сообщениями о своей жизни и интересах. "
-#: actions/showgroup.php:491
+#: actions/showgroup.php:497
msgid "Admins"
msgstr "Администраторы"
@@ -3767,12 +3951,12 @@ msgid "Unknown language \"%s\"."
msgstr "Неизвестный язык «%s»."
#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 140 characters."
-msgstr "Минимальное ограничение текста составляет 140 символов."
+msgid "Minimum text limit is 0 (unlimited)."
+msgstr "Минимальное ограничение текста составляет 0 (без ограничений)."
#: actions/siteadminpanel.php:171
-msgid "Dupe limit must 1 or more seconds."
-msgstr "Ограничение дублирования должно составлять 1 или более секунд."
+msgid "Dupe limit must be one or more seconds."
+msgstr "Ограничение дублирования должно составлять одну или более секунд."
#: actions/siteadminpanel.php:221
msgid "General"
@@ -3863,8 +4047,8 @@ msgid "Unable to save site notice."
msgstr "Не удаётся сохранить уведомление сайта."
#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars"
-msgstr "Максимальная длина уведомления сайта составляет 255 символов"
+msgid "Max length for the site-wide notice is 255 chars."
+msgstr "Максимальная длина уведомления сайта составляет 255 символов."
#: actions/sitenoticeadminpanel.php:176
msgid "Site notice text"
@@ -3878,46 +4062,73 @@ msgstr "Текст уведомления сайта (максимум 255 си
msgid "Save site notice"
msgstr "Сохранить уведомление сайта"
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
msgid "SMS settings"
msgstr "Установки СМС"
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr ""
"Вы можете отправлять СМС-сообщения по электронному адресу от %%site.name%%."
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
msgid "SMS is not available."
msgstr "Отправка СМС недоступна."
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+msgid "SMS address"
+msgstr "SMS-адрес"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr ""
"Подтверждённый в настоящее время SMS-доступный номер мобильного телефона."
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr "В ожидании подтверждения данного номера телефона."
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
msgid "Confirmation code"
msgstr "Код подтверждения"
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr "Введите код, который вы получили по телефону."
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Подтвердить"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
msgid "SMS phone number"
msgstr "Номер телефона для СМС"
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr "Номер телефона, без пробелов, с кодом зоны"
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+msgid "SMS preferences"
+msgstr "Настройки SMS"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
@@ -3925,23 +4136,33 @@ msgstr ""
"Посылать мне записи через СМС; я понимаю, что это может привести к расходам "
"по пересылке."
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+msgid "SMS preferences saved."
+msgstr "Настройки SMS сохранены."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr "Нет номера телефона."
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
msgid "No carrier selected."
msgstr "Провайдер не выбран."
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
msgid "That is already your phone number."
msgstr "Это уже ваш номер телефона."
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr "Этот телефонный номер уже задействован другим пользователем."
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
@@ -3949,23 +4170,40 @@ msgstr ""
"Код подтверждения выслан на мобильный номер, который вы добавили. Проверьте "
"телефон для нахождения этого кода и инструкций по его использованию."
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
msgstr "Это неверный номер подтверждения."
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+msgid "SMS confirmation cancelled."
+msgstr "Подтверждение SMS отменено."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr "Это не Ваш номер телефона."
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+msgid "The SMS phone number was removed."
+msgstr "Номер SMS телефона удалён."
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
msgid "Mobile carrier"
msgstr "Выбор провайдера"
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr "Выбор провайдера"
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -3975,13 +4213,14 @@ msgstr ""
"принимает СМС при помощи электронных адресов и которого нет в списке ниже, "
"то сообщите нам об этом по электронной почте %s."
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr "Код не введён"
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:406
+#: lib/adminpanelaction.php:407
msgid "Snapshots"
msgstr "Снимки"
@@ -4002,8 +4241,8 @@ msgid "Invalid snapshot report URL."
msgstr "Неверный URL отчёта снимка."
#: actions/snapshotadminpanel.php:200
-msgid "Randomly during Web hit"
-msgstr "При случайном посещении"
+msgid "Randomly during web hit"
+msgstr "При случайном веб-обращении"
#: actions/snapshotadminpanel.php:201
msgid "In a scheduled job"
@@ -4041,8 +4280,7 @@ msgstr "Сохранить настройки снимка"
msgid "You are not subscribed to that profile."
msgstr "Вы не подписаны на этот профиль."
-#: actions/subedit.php:83 classes/Subscription.php:89
-#: classes/Subscription.php:116
+#: actions/subedit.php:83 classes/Subscription.php:132
msgid "Could not save subscription."
msgstr "Не удаётся сохранить подписку."
@@ -4145,11 +4383,11 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s не просматривает ничьи записи."
-#: actions/subscriptions.php:199
+#: actions/subscriptions.php:208
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "СМС"
@@ -4182,12 +4420,12 @@ msgstr "Нет аргумента ID."
msgid "Tag %s"
msgstr "Теги %s"
-#: actions/tagother.php:77 lib/userprofile.php:75
+#: actions/tagother.php:77 lib/userprofile.php:76
msgid "User profile"
msgstr "Профиль пользователя"
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:102
+#: lib/userprofile.php:103
msgid "Photo"
msgstr "Фото"
@@ -4240,7 +4478,7 @@ msgid "User is not silenced."
msgstr "Пользователь не заглушён."
#: actions/unsubscribe.php:77
-msgid "No profile id in request."
+msgid "No profile ID in request."
msgstr "Нет ID профиля в запросе."
#: actions/unsubscribe.php:98
@@ -4278,7 +4516,8 @@ msgstr ""
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr "Неверная подписка по умолчанию: «%1$s» не является пользователем."
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#. TRANS: Link description in user account settings menu.
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Профиль"
@@ -4439,28 +4678,34 @@ msgstr ""
msgid "Enjoy your hotdog!"
msgstr "Приятного аппетита!"
-#: actions/usergroups.php:64
+#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
+#: actions/usergroups.php:66
#, php-format
msgid "%1$s groups, page %2$d"
msgstr "Группы %1$s, страница %2$d"
-#: actions/usergroups.php:130
+#: actions/usergroups.php:132
msgid "Search for more groups"
msgstr "Искать другие группы"
-#: actions/usergroups.php:157
+#: actions/usergroups.php:159
#, php-format
msgid "%s is not a member of any group."
msgstr "%s не состоит ни в одной группе."
-#: actions/usergroups.php:162
+#: actions/usergroups.php:164
#, php-format
msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
msgstr ""
"Попробуйте [найти группы](%%action.groupsearch%%) и присоединиться к ним."
-#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66
-#: lib/atomusernoticefeed.php:72
+#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
+#. TRANS: Message is used as a subtitle in atom group notice feed.
+#. TRANS: %1$s is a group name, %2$s is a site name.
+#. TRANS: Message is used as a subtitle in atom user notice feed.
+#. TRANS: %1$s is a user name, %2$s is a site name.
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
+#: lib/atomusernoticefeed.php:75
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr "Обновлено от %1$s на %2$s!"
@@ -4520,7 +4765,8 @@ msgstr ""
msgid "Plugins"
msgstr "Плагины"
-#: actions/version.php:196 lib/action.php:767
+#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
+#: actions/version.php:196 lib/action.php:779
msgid "Version"
msgstr "Версия"
@@ -4528,7 +4774,7 @@ msgstr "Версия"
msgid "Author(s)"
msgstr "Автор(ы)"
-#: classes/File.php:144
+#: classes/File.php:169
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
@@ -4537,12 +4783,12 @@ msgstr ""
"Файл не может быть больше %d байт, тогда как отправленный вами файл содержал "
"%d байт. Попробуйте загрузить меньшую версию."
-#: classes/File.php:154
+#: classes/File.php:179
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr "Файл такого размера превысит вашу пользовательскую квоту в %d байта."
-#: classes/File.php:161
+#: classes/File.php:186
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr "Файл такого размера превысит вашу месячную квоту в %d байта."
@@ -4580,27 +4826,28 @@ msgstr "Не удаётся вставить сообщение."
msgid "Could not update message with new URI."
msgstr "Не удаётся обновить сообщение с новым URI."
-#: classes/Notice.php:172
+#. TRANS: Server exception. %s are the error details.
+#: classes/Notice.php:176
#, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr "Ошибка баз данных при вставке хеш-тегов для %s"
+msgid "Database error inserting hashtag: %s"
+msgstr "Ошибка баз данных при вставке хеш-тегов: %s"
-#: classes/Notice.php:241
+#: classes/Notice.php:245
msgid "Problem saving notice. Too long."
msgstr "Проблемы с сохранением записи. Слишком длинно."
-#: classes/Notice.php:245
+#: classes/Notice.php:249
msgid "Problem saving notice. Unknown user."
msgstr "Проблема при сохранении записи. Неизвестный пользователь."
-#: classes/Notice.php:250
+#: classes/Notice.php:254
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Слишком много записей за столь короткий срок; передохните немного и "
"попробуйте вновь через пару минут."
-#: classes/Notice.php:256
+#: classes/Notice.php:260
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4608,287 +4855,319 @@ msgstr ""
"Слишком много одинаковых записей за столь короткий срок; передохните немного "
"и попробуйте вновь через пару минут."
-#: classes/Notice.php:262
+#: classes/Notice.php:266
msgid "You are banned from posting notices on this site."
msgstr "Вам запрещено поститься на этом сайте (бан)"
-#: classes/Notice.php:328 classes/Notice.php:354
+#: classes/Notice.php:332 classes/Notice.php:358
msgid "Problem saving notice."
msgstr "Проблемы с сохранением записи."
-#: classes/Notice.php:927
+#: classes/Notice.php:967
msgid "Problem saving group inbox."
msgstr "Проблемы с сохранением входящих сообщений группы."
-#: classes/Notice.php:1459
+#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
+#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
+#: classes/Notice.php:1535
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/Subscription.php:66 lib/oauthstore.php:465
+#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
msgstr "Вы заблокированы от подписки."
-#: classes/Subscription.php:70
+#: classes/Subscription.php:78
msgid "Already subscribed!"
msgstr "Уже подписаны!"
-#: classes/Subscription.php:74
+#: classes/Subscription.php:82
msgid "User has blocked you."
msgstr "Пользователь заблокировал Вас."
-#: classes/Subscription.php:157
+#: classes/Subscription.php:167
msgid "Not subscribed!"
msgstr "Не подписаны!"
-#: classes/Subscription.php:163
+#: classes/Subscription.php:173
msgid "Couldn't delete self-subscription."
msgstr "Невозможно удалить самоподписку."
-#: classes/Subscription.php:190
+#: classes/Subscription.php:200
msgid "Couldn't delete subscription OMB token."
msgstr "Не удаётся удалить подписочный жетон OMB."
-#: classes/Subscription.php:201 lib/subs.php:69
+#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
msgstr "Не удаётся удалить подписку."
-#: classes/User.php:373
+#: classes/User.php:363
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Добро пожаловать на %1$s, @%2$s!"
-#: classes/User_group.php:477
+#: classes/User_group.php:480
msgid "Could not create group."
msgstr "Не удаётся создать группу."
-#: classes/User_group.php:486
+#: classes/User_group.php:489
msgid "Could not set group URI."
msgstr "Не удаётся назначить URI группы."
-#: classes/User_group.php:507
+#: classes/User_group.php:510
msgid "Could not set group membership."
msgstr "Не удаётся назначить членство в группе."
-#: classes/User_group.php:521
+#: classes/User_group.php:524
msgid "Could not save local group info."
msgstr "Не удаётся сохранить информацию о локальной группе."
-#: lib/accountsettingsaction.php:108
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:109
msgid "Change your profile settings"
msgstr "Изменить ваши настройки профиля"
-#: lib/accountsettingsaction.php:112
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:116
msgid "Upload an avatar"
msgstr "Загрузить аватару"
-#: lib/accountsettingsaction.php:116
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:123
msgid "Change your password"
msgstr "Измените свой пароль"
-#: lib/accountsettingsaction.php:120
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:130
msgid "Change email handling"
msgstr "Изменить электронный адрес"
-#: lib/accountsettingsaction.php:124
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:137
msgid "Design your profile"
msgstr "Оформить ваш профиль"
-#: lib/accountsettingsaction.php:128
-msgid "Other"
-msgstr "Другое"
-
-#: lib/accountsettingsaction.php:128
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:144
msgid "Other options"
msgstr "Другие опции"
-#: lib/action.php:144
+#. TRANS: Link description in user account settings menu.
+#: lib/accountsettingsaction.php:146
+msgid "Other"
+msgstr "Другое"
+
+#. TRANS: Page title. %1$s is the title, %2$s is the site name.
+#: lib/action.php:145
#, php-format
msgid "%1$s - %2$s"
msgstr "%1$s — %2$s"
-#: lib/action.php:159
+#. TRANS: Page title for a page without a title set.
+#: lib/action.php:161
msgid "Untitled page"
msgstr "Страница без названия"
-#: lib/action.php:424
+#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
+#: lib/action.php:426
msgid "Primary site navigation"
msgstr "Главная навигация"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:430
+#: lib/action.php:432
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Личный профиль и лента друзей"
-#: lib/action.php:433
+#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
+#: lib/action.php:435
msgctxt "MENU"
msgid "Personal"
msgstr "Личное"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:435
+#: lib/action.php:437
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Изменить ваш email, аватар, пароль, профиль"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:440
+#: lib/action.php:442
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Соединить с сервисами"
-#: lib/action.php:443
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
+#: lib/action.php:445
msgid "Connect"
msgstr "Соединить"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:446
+#: lib/action.php:448
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Изменить конфигурацию сайта"
-#: lib/action.php:449
+#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#: lib/action.php:451
msgctxt "MENU"
msgid "Admin"
msgstr "Настройки"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:453
+#: lib/action.php:455
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Пригласите друзей и коллег стать такими же как Вы участниками %s"
-#: lib/action.php:456
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
+#: lib/action.php:458
msgctxt "MENU"
msgid "Invite"
msgstr "Пригласить"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:462
+#: lib/action.php:464
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Выйти"
-#: lib/action.php:465
+#. TRANS: Main menu option when logged in to log out the current user
+#: lib/action.php:467
msgctxt "MENU"
msgid "Logout"
msgstr "Выход"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:470
+#: lib/action.php:472
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Создать новый аккаунт"
-#: lib/action.php:473
+#. TRANS: Main menu option when not logged in to register a new account
+#: lib/action.php:475
msgctxt "MENU"
msgid "Register"
msgstr "Регистрация"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:476
+#: lib/action.php:478
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Войти"
-#: lib/action.php:479
+#: lib/action.php:481
msgctxt "MENU"
msgid "Login"
msgstr "Вход"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:482
+#: lib/action.php:484
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Помощь"
-#: lib/action.php:485
+#: lib/action.php:487
msgctxt "MENU"
msgid "Help"
msgstr "Помощь"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:488
+#: lib/action.php:490
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Искать людей или текст"
-#: lib/action.php:491
+#: lib/action.php:493
msgctxt "MENU"
msgid "Search"
msgstr "Поиск"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:513 lib/adminpanelaction.php:398
+#: lib/action.php:515 lib/adminpanelaction.php:399
msgid "Site notice"
msgstr "Новая запись"
-#: lib/action.php:579
+#. TRANS: DT element for local views block. String is hidden in default CSS.
+#: lib/action.php:582
msgid "Local views"
msgstr "Локальные виды"
-#: lib/action.php:645
+#. TRANS: DT element for page notice. String is hidden in default CSS.
+#: lib/action.php:649
msgid "Page notice"
msgstr "Новая запись"
-#: lib/action.php:747
+#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
+#: lib/action.php:752
msgid "Secondary site navigation"
msgstr "Навигация по подпискам"
-#: lib/action.php:752
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+#: lib/action.php:758
msgid "Help"
msgstr "Помощь"
-#: lib/action.php:754
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+#: lib/action.php:761
msgid "About"
msgstr "О проекте"
-#: lib/action.php:756
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+#: lib/action.php:764
msgid "FAQ"
msgstr "ЧаВо"
-#: lib/action.php:760
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+#: lib/action.php:769
msgid "TOS"
msgstr "TOS"
-#: lib/action.php:763
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+#: lib/action.php:773
msgid "Privacy"
msgstr "Пользовательское соглашение"
-#: lib/action.php:765
+#. TRANS: Secondary navigation menu option.
+#: lib/action.php:776
msgid "Source"
msgstr "Исходный код"
-#: lib/action.php:769
+#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
+#: lib/action.php:782
msgid "Contact"
msgstr "Контактная информация"
-#: lib/action.php:771
+#: lib/action.php:784
msgid "Badge"
msgstr "Бедж"
-#: lib/action.php:799
+#. TRANS: DT element for StatusNet software license.
+#: lib/action.php:813
msgid "StatusNet software license"
msgstr "StatusNet лицензия"
-#: lib/action.php:802
+#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
+#: lib/action.php:817
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"broughtby%%](%%site.broughtbyurl%%)."
msgstr ""
-"**%%site.name%%** — это сервис микроблогинга, созданный для вас при помощи [%"
-"%site.broughtby%%](%%site.broughtbyurl%%). "
+"**%%site.name%%** — это служба микроблогинга, организованная [%%site."
+"broughtby%%](%%site.broughtbyurl%%)."
-#: lib/action.php:804
+#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
+#: lib/action.php:820
#, php-format
-msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** — сервис микроблогинга. "
+msgid "**%%site.name%%** is a microblogging service."
+msgstr "**%%site.name%%** — сервис микроблогинга."
-#: lib/action.php:806
+#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
+#: lib/action.php:824
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4900,70 +5179,84 @@ msgstr ""
"лицензией [GNU Affero General Public License](http://www.fsf.org/licensing/"
"licenses/agpl-3.0.html)."
-#: lib/action.php:821
+#. TRANS: DT element for StatusNet site content license.
+#: lib/action.php:840
msgid "Site content license"
msgstr "Лицензия содержимого сайта"
-#: lib/action.php:826
+#. TRANS: Content license displayed when license is set to 'private'.
+#. TRANS: %1$s is the site name.
+#: lib/action.php:847
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Содержание и данные %1$s являются личными и конфиденциальными."
-#: lib/action.php:831
+#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
+#. TRANS: %1$s is the copyright owner.
+#: lib/action.php:854
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
"Авторские права на содержание и данные принадлежат %1$s. Все права защищены."
-#: lib/action.php:834
+#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
+#: lib/action.php:858
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Авторские права на содержание и данные принадлежат разработчикам. Все права "
"защищены."
-#: lib/action.php:847
-msgid "All "
-msgstr "All "
-
-#: lib/action.php:853
-msgid "license."
-msgstr "license."
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:871
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
+msgstr "Все материалы и данные %1$s доступны на условиях лицензии %2$s."
-#: lib/action.php:1152
+#. TRANS: DT element for pagination (previous/next, etc.).
+#: lib/action.php:1182
msgid "Pagination"
msgstr "Разбиение на страницы"
-#: lib/action.php:1161
+#. TRANS: Pagination message to go to a page displaying information more in the
+#. TRANS: present than the currently displayed information.
+#: lib/action.php:1193
msgid "After"
msgstr "Сюда"
-#: lib/action.php:1169
+#. TRANS: Pagination message to go to a page displaying information more in the
+#. TRANS: past than the currently displayed information.
+#: lib/action.php:1203
msgid "Before"
msgstr "Туда"
-#: lib/activity.php:453
+#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
+#: lib/activity.php:121
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr "Ожидался корневой элемент потока, а получен XML-документ целиком."
+
+#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
msgstr "Пока ещё нельзя обрабатывать удалённое содержимое."
-#: lib/activity.php:481
+#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
msgstr "Пока ещё нельзя обрабатывать встроенный XML."
-#: lib/activity.php:485
+#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
msgstr "Пока ещё нельзя обрабатывать встроенное содержание Base64."
-#. TRANS: Client error message
+#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
#: lib/adminpanelaction.php:98
msgid "You cannot make changes to this site."
msgstr "Вы не можете изменять этот сайт."
-#. TRANS: Client error message
+#. TRANS: Client error message throw when a certain panel's settings cannot be changed.
#: lib/adminpanelaction.php:110
msgid "Changes to that panel are not allowed."
msgstr "Изменения для этой панели недопустимы."
-#. TRANS: Client error message
+#. TRANS: Client error message.
#: lib/adminpanelaction.php:229
msgid "showForm() not implemented."
msgstr "showForm() не реализована."
@@ -4973,156 +5266,192 @@ msgstr "showForm() не реализована."
msgid "saveSettings() not implemented."
msgstr "saveSettings() не реализована."
-#. TRANS: Client error message
-#: lib/adminpanelaction.php:283
+#. TRANS: Client error message thrown if design settings could not be deleted in
+#. TRANS: the admin panel Design.
+#: lib/adminpanelaction.php:284
msgid "Unable to delete design setting."
msgstr "Не удаётся удалить настройки оформления."
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:348
+#: lib/adminpanelaction.php:349
msgid "Basic site configuration"
msgstr "Основная конфигурация сайта"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:350
+#: lib/adminpanelaction.php:351
msgctxt "MENU"
msgid "Site"
msgstr "Сайт"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:356
+#: lib/adminpanelaction.php:357
msgid "Design configuration"
msgstr "Конфигурация оформления"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:358
+#: lib/adminpanelaction.php:359
msgctxt "MENU"
msgid "Design"
msgstr "Оформление"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:364
+#: lib/adminpanelaction.php:365
msgid "User configuration"
msgstr "Конфигурация пользователя"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
msgid "User"
msgstr "Пользователь"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:372
+#: lib/adminpanelaction.php:373
msgid "Access configuration"
msgstr "Конфигурация доступа"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:380
+#: lib/adminpanelaction.php:381
msgid "Paths configuration"
msgstr "Конфигурация путей"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:388
+#: lib/adminpanelaction.php:389
msgid "Sessions configuration"
msgstr "Конфигурация сессий"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:396
+#: lib/adminpanelaction.php:397
msgid "Edit site notice"
msgstr "Изменить уведомление сайта"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:404
+#: lib/adminpanelaction.php:405
msgid "Snapshots configuration"
msgstr "Конфигурация снимков"
-#: lib/apiauth.php:94
+#. TRANS: Client error 401.
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
"API ресурса требует доступ для чтения и записи, но у вас есть только доступ "
"для чтения."
-#: lib/apiauth.php:272
-#, php-format
-msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
-msgstr ""
-"Неудачная попытка авторизации через API, nickname = %1$s, proxy = %2$s, ip = "
-"%3$s"
-
-#: lib/applicationeditform.php:136
+#. TRANS: Form legend.
+#: lib/applicationeditform.php:137
msgid "Edit application"
msgstr "Изменить приложение"
-#: lib/applicationeditform.php:184
+#. TRANS: Form guide.
+#: lib/applicationeditform.php:187
msgid "Icon for this application"
msgstr "Иконка для этого приложения"
-#: lib/applicationeditform.php:204
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:209
#, php-format
msgid "Describe your application in %d characters"
msgstr "Опишите ваше приложение при помощи %d символов"
-#: lib/applicationeditform.php:207
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:213
msgid "Describe your application"
msgstr "Опишите ваше приложение"
-#: lib/applicationeditform.php:216
-msgid "Source URL"
-msgstr "URL источника"
-
-#: lib/applicationeditform.php:218
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:224
msgid "URL of the homepage of this application"
msgstr "URL-адрес домашней страницы этого приложения"
-#: lib/applicationeditform.php:224
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:226
+msgid "Source URL"
+msgstr "URL источника"
+
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:233
msgid "Organization responsible for this application"
msgstr "Организация, ответственная за это приложение"
-#: lib/applicationeditform.php:230
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:242
msgid "URL for the homepage of the organization"
msgstr "URL-адрес домашней страницы организации"
-#: lib/applicationeditform.php:236
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:251
msgid "URL to redirect to after authentication"
msgstr "URL для перенаправления после проверки подлинности"
-#: lib/applicationeditform.php:258
+#. TRANS: Radio button label for application type
+#: lib/applicationeditform.php:278
msgid "Browser"
msgstr "Браузер"
-#: lib/applicationeditform.php:274
+#. TRANS: Radio button label for application type
+#: lib/applicationeditform.php:295
msgid "Desktop"
msgstr "Операционная система"
-#: lib/applicationeditform.php:275
+#. TRANS: Form guide.
+#: lib/applicationeditform.php:297
msgid "Type of application, browser or desktop"
msgstr "Среда выполнения приложения: браузер или операционная система"
-#: lib/applicationeditform.php:297
+#. TRANS: Radio button label for access type.
+#: lib/applicationeditform.php:320
msgid "Read-only"
msgstr "Только чтение"
-#: lib/applicationeditform.php:315
+#. TRANS: Radio button label for access type.
+#: lib/applicationeditform.php:339
msgid "Read-write"
msgstr "Чтение и запись"
-#: lib/applicationeditform.php:316
+#. TRANS: Form guide.
+#: lib/applicationeditform.php:341
msgid "Default access for this application: read-only, or read-write"
msgstr ""
"Доступ по умолчанию для этого приложения: только чтение или чтение и запись"
-#: lib/applicationlist.php:154
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
+msgid "Cancel"
+msgstr "Отменить"
+
+#. TRANS: Application access type
+#: lib/applicationlist.php:136
+msgid "read-write"
+msgstr "чтение/запись"
+
+#. TRANS: Application access type
+#: lib/applicationlist.php:138
+msgid "read-only"
+msgstr "только чтение"
+
+#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only)
+#: lib/applicationlist.php:144
+#, php-format
+msgid "Approved %1$s - \"%2$s\" access."
+msgstr "Подтверждён доступ %1$s — «%2$s»."
+
+#. TRANS: Button label
+#: lib/applicationlist.php:159
+msgctxt "BUTTON"
msgid "Revoke"
msgstr "Отозвать"
-#: lib/attachmentlist.php:87
+#. TRANS: DT element label in attachment list.
+#: lib/attachmentlist.php:88
msgid "Attachments"
msgstr "Вложения"
+#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:265
msgid "Author"
msgstr "Автор"
-#: lib/attachmentlist.php:278
+#. TRANS: DT element label in attachment list item.
+#: lib/attachmentlist.php:279
msgid "Provider"
msgstr "Сервис"
@@ -5142,37 +5471,56 @@ msgstr "Изменение пароля не удалось"
msgid "Password changing is not allowed"
msgstr "Смена пароля не разрешена"
-#: lib/channel.php:138 lib/channel.php:158
+#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
msgstr "Команда исполнена"
-#: lib/channel.php:210 lib/mailhandler.php:142
+#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
msgstr "Команда завершена"
-#: lib/channel.php:221
+#: lib/channel.php:240
msgid "Command failed"
msgstr "Команда неудачна"
-#: lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "Простите, эта команда ещё не выполнена."
+#: lib/command.php:83 lib/command.php:105
+msgid "Notice with that id does not exist"
+msgstr "Записи с таким id не существует"
-#: lib/command.php:88
+#: lib/command.php:99 lib/command.php:596
+msgid "User has no last notice"
+msgstr "У пользователя нет последней записи."
+
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "Не удаётся найти пользователя с именем %s"
-#: lib/command.php:92
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
+#, php-format
+msgid "Could not find a local user with nickname %s"
+msgstr "Не удаётся найти пользователя с именем %s"
+
+#: lib/command.php:180
+msgid "Sorry, this command is not yet implemented."
+msgstr "Простите, эта команда ещё не выполнена."
+
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Нет смысла «подталкивать» самого себя!"
-#: lib/command.php:99
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, php-format
msgid "Nudge sent to %s"
msgstr "«Подталкивание» послано %s"
-#: lib/command.php:126
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5183,198 +5531,206 @@ msgstr ""
"Подписчиков: %2$s\n"
"Записей: %3$s"
-#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-msgid "Notice with that id does not exist"
-msgstr "Записи с таким id не существует"
-
-#: lib/command.php:168 lib/command.php:406 lib/command.php:467
-#: lib/command.php:523
-msgid "User has no last notice"
-msgstr "У пользователя нет последней записи."
-
-#: lib/command.php:190
+#: lib/command.php:302
msgid "Notice marked as fave."
msgstr "Запись помечена как любимая."
-#: lib/command.php:217
+#: lib/command.php:323
msgid "You are already a member of that group"
msgstr "Вы уже являетесь членом этой группы."
-#: lib/command.php:231
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Не удаётся присоединить пользователя %s к группе %s"
-
-#: lib/command.php:236
-#, php-format
-msgid "%s joined group %s"
-msgstr "%1$s вступил в группу %2$s"
-
-#: lib/command.php:275
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
#, php-format
-msgid "Could not remove user %s to group %s"
-msgstr "Не удаётся удалить пользователя %1$s из группы %2$s."
+msgid "Could not join user %1$s to group %2$s"
+msgstr "Не удаётся присоединить пользователя %1$s к группе %2$s."
-#: lib/command.php:280
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
#, php-format
-msgid "%s left group %s"
-msgstr "%1$s покинул группу %2$s"
+msgid "Could not remove user %1$s from group %2$s"
+msgstr "Не удаётся удалить пользователя %1$s из группы %2$s"
-#: lib/command.php:309
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, php-format
msgid "Fullname: %s"
msgstr "Полное имя: %s"
-#: lib/command.php:312 lib/mail.php:258
+#. TRANS: Whois output. %s is the location of the queried user.
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Месторасположение: %s"
-#: lib/command.php:315 lib/mail.php:260
+#. TRANS: Whois output. %s is the homepage of the queried user.
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Домашняя страница: %s"
-#: lib/command.php:318
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, php-format
msgid "About: %s"
msgstr "О пользователе: %s"
-#: lib/command.php:349
+#: lib/command.php:457
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+"%s профиль другой системы; вы можете отсылать личное сообщение только "
+"пользователям этой системы."
+
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
-msgstr "Сообщение слишком длинное — не больше %d символов, вы посылаете %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgstr ""
+"Сообщение слишком велико. Предельно допустимая длина составляет %1$d "
+"символов, вы отправили %2$d."
-#: lib/command.php:367
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
msgstr "Прямое сообщение для %s послано."
-#: lib/command.php:369
+#: lib/command.php:494
msgid "Error sending direct message."
msgstr "Ошибка при отправке прямого сообщения."
-#: lib/command.php:413
+#: lib/command.php:514
msgid "Cannot repeat your own notice"
msgstr "Невозможно повторить собственную запись."
-#: lib/command.php:418
+#: lib/command.php:519
msgid "Already repeated that notice"
msgstr "Эта запись уже повторена"
-#: lib/command.php:426
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
#, php-format
msgid "Notice from %s repeated"
msgstr "Запись %s повторена"
-#: lib/command.php:428
+#: lib/command.php:531
msgid "Error repeating notice."
msgstr "Ошибка при повторении записи."
-#: lib/command.php:482
+#: lib/command.php:562
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr "Запись слишком длинная — не больше %d символов, вы посылаете %d"
-#: lib/command.php:491
+#: lib/command.php:571
#, php-format
msgid "Reply to %s sent"
msgstr "Ответ %s отправлен"
-#: lib/command.php:493
+#: lib/command.php:573
msgid "Error saving notice."
msgstr "Проблемы с сохранением записи."
-#: lib/command.php:547
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr "Укажите имя пользователя для подписки."
-#: lib/command.php:554 lib/command.php:589
-msgid "No such user"
-msgstr "Нет такого пользователя."
+#: lib/command.php:628
+msgid "Can't subscribe to OMB profiles by command."
+msgstr "Невозможно подписаться командой на профили OMB."
-#: lib/command.php:561
+#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
msgstr "Подписано на %s"
-#: lib/command.php:582 lib/command.php:685
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr "Укажите имя пользователя для отмены подписки."
-#: lib/command.php:595
+#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
msgstr "Отписано от %s"
-#: lib/command.php:613 lib/command.php:636
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr "Команда ещё не выполнена."
-#: lib/command.php:616
+#: lib/command.php:685
msgid "Notification off."
msgstr "Оповещение отсутствует."
-#: lib/command.php:618
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr "Нет оповещения."
-#: lib/command.php:639
+#: lib/command.php:708
msgid "Notification on."
msgstr "Есть оповещение."
-#: lib/command.php:641
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr "Есть оповещение."
-#: lib/command.php:654
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr "Команда входа отключена"
-#: lib/command.php:665
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr "Эта ссылка действительна только один раз в течение 2 минут: %s"
-#: lib/command.php:692
+#: lib/command.php:761
#, php-format
msgid "Unsubscribed %s"
msgstr "Отписано %s"
-#: lib/command.php:709
+#: lib/command.php:778
msgid "You are not subscribed to anyone."
msgstr "Вы ни на кого не подписаны."
-#: lib/command.php:711
+#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Вы подписаны на этих людей:"
msgstr[1] "Вы подписаны на этих людей:"
msgstr[2] "Вы подписаны на этих людей:"
-#: lib/command.php:731
+#: lib/command.php:800
msgid "No one is subscribed to you."
msgstr "Никто не подписан на вас."
-#: lib/command.php:733
+#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Эти люди подписались на вас:"
msgstr[1] "Эти люди подписались на вас:"
msgstr[2] "Эти люди подписались на вас:"
-#: lib/command.php:753
+#: lib/command.php:822
msgid "You are not a member of any groups."
msgstr "Вы не состоите ни в одной группе."
-#: lib/command.php:755
+#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Вы являетесь участником следующих групп:"
msgstr[1] "Вы являетесь участником следующих групп:"
msgstr[2] "Вы являетесь участником следующих групп:"
-#: lib/command.php:769
+#: lib/command.php:838
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5454,19 +5810,19 @@ msgstr ""
"tracks — пока не реализовано.\n"
"tracking — пока не реализовано.\n"
-#: lib/common.php:148
+#: lib/common.php:135
msgid "No configuration file found. "
msgstr "Конфигурационный файл не найден. "
-#: lib/common.php:149
+#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
msgstr "Конфигурационные файлы искались в следующих местах: "
-#: lib/common.php:151
+#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
msgstr "Возможно, вы решите запустить установщик для исправления этого."
-#: lib/common.php:152
+#: lib/common.php:139
msgid "Go to the installer."
msgstr "Перейти к установщику"
@@ -5640,53 +5996,54 @@ msgstr "Группы с наибольшим количеством записе
msgid "Tags in %s group's notices"
msgstr "Теги записей группы %s"
-#: lib/htmloutputter.php:103
+#. TRANS: Client exception 406
+#: lib/htmloutputter.php:104
msgid "This page is not available in a media type you accept"
msgstr "Страница недоступна для того типа, который Вы задействовали."
-#: lib/imagefile.php:75
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr "Неподдерживаемый формат файла изображения."
+
+#: lib/imagefile.php:88
#, php-format
msgid "That file is too big. The maximum file size is %s."
msgstr "Этот файл слишком большой. Максимальный размер файла составляет %s."
-#: lib/imagefile.php:80
+#: lib/imagefile.php:93
msgid "Partial upload."
msgstr "Частичная загрузка."
-#: lib/imagefile.php:88 lib/mediafile.php:170
+#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
msgstr "Системная ошибка при загрузке файла."
-#: lib/imagefile.php:96
+#: lib/imagefile.php:109
msgid "Not an image or corrupt file."
msgstr "Не является изображением или повреждённый файл."
-#: lib/imagefile.php:109
-msgid "Unsupported image file format."
-msgstr "Неподдерживаемый формат файла изображения."
-
#: lib/imagefile.php:122
msgid "Lost our file."
msgstr "Потерян файл."
-#: lib/imagefile.php:166 lib/imagefile.php:231
+#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
msgstr "Неподдерживаемый тип файла"
-#: lib/imagefile.php:251
+#: lib/imagefile.php:244
msgid "MB"
msgstr "МБ"
-#: lib/imagefile.php:253
+#: lib/imagefile.php:246
msgid "kB"
msgstr "КБ"
-#: lib/jabber.php:220
+#: lib/jabber.php:387
#, php-format
msgid "[%s]"
msgstr "[%s]"
-#: lib/jabber.php:400
+#: lib/jabber.php:567
#, php-format
msgid "Unknown inbox source %d."
msgstr "Неизвестный источник входящих сообщений %d."
@@ -5707,11 +6064,13 @@ msgstr "Войти с вашим ником и паролем."
msgid "Sign up for a new account"
msgstr "Создать новый аккаунт"
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr "Подтверждение электронного адреса"
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5741,12 +6100,14 @@ msgstr ""
"Благодарим за потраченное время, \n"
"%s\n"
-#: lib/mail.php:240
+#. TRANS: Subject of new-subscriber notification e-mail
+#: lib/mail.php:243
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s теперь следит за вашими записями на %2$s."
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5771,17 +6132,20 @@ msgstr ""
"----\n"
"Измените email-адрес и настройки уведомлений на %8$s\n"
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, php-format
msgid "Bio: %s"
msgstr "Биография: %s"
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr "Новый электронный адрес для постинга %s"
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5802,21 +6166,31 @@ msgstr ""
"Искренне Ваш,\n"
"%4$s"
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, php-format
msgid "%s status"
msgstr "%s статус"
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr "Подтверждение СМС"
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr "%s. Подтвердите, что это ваш телефон, следующим кодом:"
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr "Вас «подтолкнул» пользователь %s"
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5843,12 +6217,14 @@ msgstr ""
"С уважением,\n"
"%4$s\n"
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr "Новое приватное сообщение от %s"
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5881,12 +6257,14 @@ msgstr ""
"С уважением,\n"
"%5$s\n"
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) добавил вашу запись в число своих любимых"
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5923,12 +6301,25 @@ msgstr ""
"С уважением,\n"
"%6$s\n"
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+"Всю цепочку можно прочитать здесь:\n"
+"\n"
+"%s"
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) отправил запись для вашего внимания"
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5941,18 +6332,41 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
+"%5$sYou can reply back here:\n"
+"\n"
+"\t%6$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
-"%1$s (@%9$s) только что отправил запись для вашего внимания («@-ответ») на %2"
-"$s.\n"
+"%1$s (@%9$s) отправил вам сообщение («@-ответ») на %2$s.\n"
"\n"
-"Текст записи:\n"
+"Сообщение находится здесь:\n"
"\n"
"%3$s\n"
"\n"
-"Оно содержит:\n"
+"В нём говорится:\n"
"\n"
"%4$s\n"
"\n"
+"%5$sВы можете ответить здесь:\n"
+"\n"
+"%6$s\n"
+"\n"
+"Список всех @-ответов для вас находится здесь:\n"
+"\n"
+"%7$s\n"
+"\n"
+"С уважением,\n"
+"%2$s\n"
+"\n"
+"PS Вы можете отключить эти уведомления по электронной почте здесь: %8$s\n"
#: lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
@@ -5967,7 +6381,7 @@ msgstr ""
"вовлечения других пользователей в разговор. Сообщения, получаемые от других "
"людей, видите только вы."
-#: lib/mailbox.php:227 lib/noticelist.php:482
+#: lib/mailbox.php:227 lib/noticelist.php:494
msgid "from"
msgstr "от "
@@ -6097,48 +6511,52 @@ msgstr ""
"К сожалению, получение информации о вашем местонахождении заняло больше "
"времени, чем ожидалось; повторите попытку позже"
-#: lib/noticelist.php:429
-#, php-format
-msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-msgstr "%1$u°%2$u'%3$u\" %4$s %5$u°%6$u'%7$u\" %8$s"
-
+#. TRANS: Used in coordinates as abbreviation of north
#: lib/noticelist.php:430
msgid "N"
msgstr "с. ш."
-#: lib/noticelist.php:430
+#. TRANS: Used in coordinates as abbreviation of south
+#: lib/noticelist.php:432
msgid "S"
msgstr "ю. ш."
-#: lib/noticelist.php:431
+#. TRANS: Used in coordinates as abbreviation of east
+#: lib/noticelist.php:434
msgid "E"
msgstr "в. д."
-#: lib/noticelist.php:431
+#. TRANS: Used in coordinates as abbreviation of west
+#: lib/noticelist.php:436
msgid "W"
msgstr "з. д."
#: lib/noticelist.php:438
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr "%1$u°%2$u'%3$u\" %4$s %5$u°%6$u'%7$u\" %8$s"
+
+#: lib/noticelist.php:447
msgid "at"
msgstr "на"
-#: lib/noticelist.php:566
+#: lib/noticelist.php:567
msgid "in context"
msgstr "в контексте"
-#: lib/noticelist.php:601
+#: lib/noticelist.php:602
msgid "Repeated by"
msgstr "Повторено"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:629
msgid "Reply to this notice"
msgstr "Ответить на эту запись"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:630
msgid "Reply"
msgstr "Ответить"
-#: lib/noticelist.php:673
+#: lib/noticelist.php:674
msgid "Notice repeated"
msgstr "Запись повторена"
@@ -6162,6 +6580,10 @@ msgstr "Ошибка при вставке нового профиля"
msgid "Error inserting avatar"
msgstr "Ошибка при вставке аватары"
+#: lib/oauthstore.php:306
+msgid "Error updating remote profile"
+msgstr "Ошибка обновления удалённого профиля"
+
#: lib/oauthstore.php:311
msgid "Error inserting remote profile"
msgstr "Ошибка вставки удалённого профиля"
@@ -6211,7 +6633,7 @@ msgstr "Теги записей пользователя %s"
msgid "Unknown"
msgstr "Неизвестно"
-#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Подписки"
@@ -6219,31 +6641,32 @@ msgstr "Подписки"
msgid "All subscriptions"
msgstr "Все подписки."
-#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90
+#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Подписчики"
-#: lib/profileaction.php:159
+#: lib/profileaction.php:161
msgid "All subscribers"
msgstr "Все подписчики"
-#: lib/profileaction.php:180
+#: lib/profileaction.php:191
msgid "User ID"
msgstr "ID пользователя"
-#: lib/profileaction.php:185
+#: lib/profileaction.php:196
msgid "Member since"
msgstr "Регистрация"
-#: lib/profileaction.php:247
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:235
+msgid "Daily average"
+msgstr "Среднесуточная"
+
+#: lib/profileaction.php:264
msgid "All groups"
msgstr "Все группы"
-#: lib/profileformaction.php:123
-msgid "No return-to arguments."
-msgstr "Нет аргумента return-to."
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr "Нереализованный метод."
@@ -6267,11 +6690,19 @@ msgstr "Особые"
msgid "Popular"
msgstr "Популярное"
+#: lib/redirectingaction.php:94
+msgid "No return-to arguments."
+msgstr "Нет аргумента return-to."
+
#: lib/repeatform.php:107
msgid "Repeat this notice?"
msgstr "Повторить эту запись?"
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Да"
+
+#: lib/repeatform.php:132
msgid "Repeat this notice"
msgstr "Повторить эту запись"
@@ -6280,7 +6711,7 @@ msgstr "Повторить эту запись"
msgid "Revoke the \"%s\" role from this user"
msgstr "Отозвать у этого пользователя роль «%s»"
-#: lib/router.php:671
+#: lib/router.php:704
msgid "No single user defined for single-user mode."
msgstr "Ни задан пользователь для однопользовательского режима."
@@ -6406,89 +6837,108 @@ msgstr "Отписаться от этого пользователя"
msgid "Unsubscribe"
msgstr "Отписаться"
-#: lib/userprofile.php:116
+#: lib/usernoprofileexception.php:58
+#, php-format
+msgid "User %s (%d) has no profile record."
+msgstr "У пользователя %s (%d) нет профильной записи."
+
+#: lib/userprofile.php:117
msgid "Edit Avatar"
msgstr "Изменить аватару"
-#: lib/userprofile.php:236
+#: lib/userprofile.php:234 lib/userprofile.php:248
msgid "User actions"
msgstr "Действия пользователя"
-#: lib/userprofile.php:251
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr "Идёт удаление пользователя…"
+
+#: lib/userprofile.php:263
msgid "Edit profile settings"
msgstr "Изменение настроек профиля"
-#: lib/userprofile.php:252
+#: lib/userprofile.php:264
msgid "Edit"
msgstr "Редактировать"
-#: lib/userprofile.php:275
+#: lib/userprofile.php:287
msgid "Send a direct message to this user"
msgstr "Послать приватное сообщение этому пользователю."
-#: lib/userprofile.php:276
+#: lib/userprofile.php:288
msgid "Message"
msgstr "Сообщение"
-#: lib/userprofile.php:314
+#: lib/userprofile.php:326
msgid "Moderate"
msgstr "Модерировать"
-#: lib/userprofile.php:352
+#: lib/userprofile.php:364
msgid "User role"
msgstr "Роль пользователя"
-#: lib/userprofile.php:354
+#: lib/userprofile.php:366
msgctxt "role"
msgid "Administrator"
msgstr "Администратор"
-#: lib/userprofile.php:355
+#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
msgstr "Модератор"
-#: lib/util.php:1015
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1083
msgid "a few seconds ago"
msgstr "пару секунд назад"
-#: lib/util.php:1017
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1086
msgid "about a minute ago"
msgstr "около минуты назад"
-#: lib/util.php:1019
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
msgstr "около %d минут(ы) назад"
-#: lib/util.php:1021
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1093
msgid "about an hour ago"
msgstr "около часа назад"
-#: lib/util.php:1023
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
msgstr "около %d часа(ов) назад"
-#: lib/util.php:1025
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1100
msgid "about a day ago"
msgstr "около дня назад"
-#: lib/util.php:1027
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
msgstr "около %d дня(ей) назад"
-#: lib/util.php:1029
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1107
msgid "about a month ago"
msgstr "около месяца назад"
-#: lib/util.php:1031
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
msgstr "около %d месяца(ев) назад"
-#: lib/util.php:1033
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1114
msgid "about a year ago"
msgstr "около года назад"
@@ -6504,7 +6954,7 @@ msgstr ""
"%s не является допустимым цветом! Используйте 3 или 6 шестнадцатеричных "
"символов."
-#: lib/xmppmanager.php:402
+#: lib/xmppmanager.php:403
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""