Committing extracted and compiled translations

2 files changed, 504 insertions, 197 deletions

diff --git a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo
index ed28ff43..33347019 100644
--- a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo
+++ b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo
diff --git a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po
index d0ff7bdd..8839bf43 100644
--- a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2013-05-27 13:54-0500\n"
-"PO-Revision-Date: 2013-06-01 21:08+0000\n"
-"Last-Translator: aleksejrs <deletesoftware@yandex.ru>\n"
+"POT-Creation-Date: 2013-08-26 14:18-0500\n"
+"PO-Revision-Date: 2013-08-26 19:18+0000\n"
+"Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/mediagoblin/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,250 +20,280 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: mediagoblin/auth/forms.py:26
-msgid "Username"
-msgstr "Логин"
-
-#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
-#: mediagoblin/tests/test_util.py:110
-msgid "Password"
-msgstr "Пароль"
-
-#: mediagoblin/auth/forms.py:34
-msgid "Email address"
-msgstr "Адрес электронной почты"
+#: mediagoblin/decorators.py:252
+msgid "Sorry, registration is disabled on this instance."
+msgstr "Извините, на этом сайте регистрация запрещена."
 
-#: mediagoblin/auth/forms.py:41
-msgid "Username or Email"
-msgstr "Имя пользователя или адрес электронной почты"
+#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/plugins/persona/views.py:76
+msgid "Sorry, authentication is disabled on this instance."
+msgstr ""
 
-#: mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:25
 msgid "Username or email"
 msgstr "Имя пользователя или адрес электронной почты"
 
-#: mediagoblin/auth/tools.py:31
+#: mediagoblin/auth/tools.py:41
 msgid "Invalid User name or email address."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:32
+#: mediagoblin/auth/tools.py:42
 msgid "This field does not take email addresses."
 msgstr "Это поле не для адреса электронной почты."
 
-#: mediagoblin/auth/tools.py:33
+#: mediagoblin/auth/tools.py:43
 msgid "This field requires an email address."
 msgstr "Это поле — для адреса электронной почты."
 
-#: mediagoblin/auth/views.py:54
-msgid "Sorry, registration is disabled on this instance."
-msgstr "Извините, на этом сайте регистрация запрещена."
-
-#: mediagoblin/auth/views.py:68
+#: mediagoblin/auth/tools.py:146
 msgid "Sorry, a user with that name already exists."
 msgstr "Извините, пользователь с этим именем уже зарегистрирован."
 
-#: mediagoblin/auth/views.py:72
+#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446
 msgid "Sorry, a user with that email address already exists."
 msgstr "Сожалеем, но на этот адрес электронной почты уже зарегистрирована другая учётная запись."
 
-#: mediagoblin/auth/views.py:182
+#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293
+#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423
+msgid "The verification key or user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:161
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr "Ваш адрес электронной почты потвержден. Вы теперь можете войти и начать редактировать свой профиль и загружать новые изображения!"
 
-#: mediagoblin/auth/views.py:188
+#: mediagoblin/auth/views.py:167
 msgid "The verification key or user id is incorrect"
 msgstr "Неверный ключ проверки или идентификатор пользователя"
 
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:185
 msgid "You must be logged in so we know who to send the email to!"
 msgstr "Вам надо представиться, чтобы мы знали, кому отправлять сообщение!"
 
-#: mediagoblin/auth/views.py:214
+#: mediagoblin/auth/views.py:193
 msgid "You've already verified your email address!"
 msgstr "Вы уже потвердили свой адрес электронной почты!"
 
-#: mediagoblin/auth/views.py:227
+#: mediagoblin/auth/views.py:203
 msgid "Resent your verification email."
 msgstr "Переслать сообщение с подтверждением аккаунта."
 
-#: mediagoblin/auth/views.py:258
+#: mediagoblin/auth/views.py:237
 msgid ""
 "If that email address (case sensitive!) is registered an email has been sent"
 " with instructions on how to change your password."
 msgstr "Если с этим адресом электронной почты (сравниваемым чувствительно к регистру символов!) есть учётная запись, то на него отправлено сообщение с указаниями о том, как сменить пароль."
 
-#: mediagoblin/auth/views.py:269
+#: mediagoblin/auth/views.py:248
 msgid "Couldn't find someone with that username."
 msgstr "Не найдено никого с таким именем пользователя."
 
-#: mediagoblin/auth/views.py:272
+#: mediagoblin/auth/views.py:251
 msgid ""
 "An email has been sent with instructions on how to change your password."
 msgstr "Вам отправлено электронное письмо с инструкциями по смене пароля."
 
-#: mediagoblin/auth/views.py:279
+#: mediagoblin/auth/views.py:258
 msgid ""
 "Could not send password recovery email as your username is inactive or your "
 "account's email address has not been verified."
 msgstr "Мы не можем отправить сообщение для восстановления пароля, потому что ваша учётная запись неактивна, либо указанный в ней адрес электронной почты не был подтверждён."
 
-#: mediagoblin/auth/views.py:336
+#: mediagoblin/auth/views.py:306
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:323
 msgid "You can now log in using your new password."
 msgstr "Теперь вы можете войти, используя ваш новый пароль."
 
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
+#: mediagoblin/auth/views.py:334
+msgid "You need to verify your email before you can reset your password."
+msgstr ""
+
+#: mediagoblin/auth/views.py:340
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your accoutn."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86
 #: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
 #: mediagoblin/user_pages/forms.py:45
 msgid "Title"
 msgstr "Название"
 
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31
 msgid "Description of this work"
 msgstr "Описание этого произведения"
 
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
-#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
+#: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54
+#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
 "                      Markdown</a> for formatting."
 msgstr "Для разметки можете использовать язык\n                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n                      Markdown</a>."
 
-#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36
 msgid "Tags"
 msgstr "Метки"
 
-#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
+#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38
 msgid "Separate tags by commas."
 msgstr "(через запятую)"
 
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94
 msgid "Slug"
 msgstr "Отличительная часть адреса"
 
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95
 msgid "The slug can't be empty"
 msgstr "Отличительная часть адреса необходима"
 
-#: mediagoblin/edit/forms.py:40
+#: mediagoblin/edit/forms.py:42
 msgid ""
 "The title part of this media's address. You usually don't need to change "
 "this."
 msgstr "Часть адреса этого файла, производная от его названия. Её обычно не требуется изменять."
 
-#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41
 #: mediagoblin/templates/mediagoblin/utils/license.html:20
 msgid "License"
 msgstr "Лицензия"
 
-#: mediagoblin/edit/forms.py:50
+#: mediagoblin/edit/forms.py:52
 msgid "Bio"
 msgstr "Биография"
 
-#: mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:58
 msgid "Website"
 msgstr "Сайт"
 
-#: mediagoblin/edit/forms.py:58
+#: mediagoblin/edit/forms.py:60
 msgid "This address contains errors"
 msgstr "Этот адрес содержит ошибки"
 
-#: mediagoblin/edit/forms.py:63
+#: mediagoblin/edit/forms.py:65
+msgid "Email me when others comment on my media"
+msgstr "Уведомлять меня по e-mail о комментариях к моим файлам"
+
+#: mediagoblin/edit/forms.py:67
+msgid "Enable/Disable insite notifications"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:69
 msgid "License preference"
 msgstr "Предпочитаемая лицензия"
 
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:75
 msgid "This will be your default license on upload forms."
 msgstr "Она будет лицензией по умолчанию для ваших загрузок"
 
-#: mediagoblin/edit/forms.py:71
-msgid "Email me when others comment on my media"
-msgstr "Уведомлять меня по e-mail о комментариях к моим файлам"
-
-#: mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:87
 msgid "The title can't be empty"
 msgstr "Название не может быть пустым"
 
-#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50
 #: mediagoblin/user_pages/forms.py:48
 msgid "Description of this collection"
 msgstr "Описание этой коллекции"
 
-#: mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:96
 msgid ""
 "The title part of this collection's address. You usually don't need to "
 "change this."
 msgstr "Отличительная часть адреса этой коллекции, основанная на названии.  Обычно не нужно её изменять."
 
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:103
 msgid "Old password"
 msgstr "Старый пароль"
 
-#: mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:105
 msgid "Enter your old password to prove you own this account."
 msgstr "Введите свой старый пароль в качестве доказательства, что это ваша учётная запись."
 
-#: mediagoblin/edit/forms.py:104
+#: mediagoblin/edit/forms.py:108
 msgid "New password"
 msgstr "Новый пароль"
 
-#: mediagoblin/edit/views.py:67
+#: mediagoblin/edit/forms.py:116
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63
+#: mediagoblin/tests/test_util.py:110
+msgid "Password"
+msgstr "Пароль"
+
+#: mediagoblin/edit/forms.py:122
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:73
 msgid "An entry with that slug already exists for this user."
 msgstr "У этого пользователя уже есть файл с такой отличительной частью адреса."
 
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:91
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Вы редактируете файлы другого пользователя. Будьте осторожны."
 
-#: mediagoblin/edit/views.py:155
+#: mediagoblin/edit/views.py:161
 #, python-format
 msgid "You added the attachment %s!"
 msgstr "Вы добавили сопутствующий файл %s!"
 
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:188
 msgid "You can only edit your own profile."
 msgstr "Вы можете редактировать только свой собственный профиль."
 
-#: mediagoblin/edit/views.py:188
+#: mediagoblin/edit/views.py:194
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Вы редактируете профиль пользователя. Будьте осторожны."
 
-#: mediagoblin/edit/views.py:204
+#: mediagoblin/edit/views.py:210
 msgid "Profile changes saved"
 msgstr "Изменения профиля сохранены"
 
-#: mediagoblin/edit/views.py:240
+#: mediagoblin/edit/views.py:247
 msgid "Account settings saved"
 msgstr "Настройки учётной записи записаны"
 
-#: mediagoblin/edit/views.py:274
+#: mediagoblin/edit/views.py:281
 msgid "You need to confirm the deletion of your account."
 msgstr "Вам нужно подтвердить, что вы хотите удалить свою учётную запись."
 
-#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
-#: mediagoblin/user_pages/views.py:222
+#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148
+#: mediagoblin/user_pages/views.py:242
 #, python-format
 msgid "You already have a collection called \"%s\"!"
 msgstr "У вас уже есть коллекция с названием «%s»!"
 
-#: mediagoblin/edit/views.py:314
+#: mediagoblin/edit/views.py:321
 msgid "A collection with that slug already exists for this user."
 msgstr "У этого пользователя уже есть коллекция с такой отличительной частью адреса."
 
-#: mediagoblin/edit/views.py:329
+#: mediagoblin/edit/views.py:336
 msgid "You are editing another user's collection. Proceed with caution."
 msgstr "Вы редактируете коллекцию другого пользователя.  Будьте осторожны."
 
-#: mediagoblin/edit/views.py:348
+#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452
 msgid "Wrong password"
 msgstr "Неправильный пароль"
 
-#: mediagoblin/edit/views.py:363
+#: mediagoblin/edit/views.py:374
 msgid "Your password was changed successfully"
 msgstr "Ваш пароль сменён успешно"
 
+#: mediagoblin/edit/views.py:417
+msgid "Your email address has been verified."
+msgstr ""
+
 #: mediagoblin/gmg_commands/assetlink.py:60
 msgid "Cannot link theme... no theme set\n"
 msgstr "Невозможно привязать тему… не выбрано существующей темы\n"
@@ -298,19 +328,62 @@ msgid ""
 "domain."
 msgstr ""
 
-#: mediagoblin/media_types/__init__.py:111
-#: mediagoblin/media_types/__init__.py:155
+#: mediagoblin/media_types/__init__.py:78
+#: mediagoblin/media_types/__init__.py:100
 msgid "Sorry, I don't support that file type :("
 msgstr "Увы, я не поддерживаю этот тип файлов :("
 
-#: mediagoblin/media_types/pdf/processing.py:136
+#: mediagoblin/media_types/pdf/processing.py:142
 msgid "unoconv failing to run, check log file"
 msgstr ""
 
-#: mediagoblin/media_types/video/processing.py:37
+#: mediagoblin/media_types/video/processing.py:44
 msgid "Video transcoding failed"
 msgstr "Перекодировка видео не удалась"
 
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58
+msgid "commented on your post"
+msgstr "оставил комментарий к вашему файлу"
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+msgid "Username"
+msgstr "Логин"
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr "Адрес электронной почты"
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr "Имя пользователя или адрес электронной почты"
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
+
 #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
 msgid "Location"
 msgstr "На карте"
@@ -374,7 +447,7 @@ msgstr ""
 msgid "This field is required for public clients"
 msgstr ""
 
-#: mediagoblin/plugins/oauth/views.py:56
+#: mediagoblin/plugins/oauth/views.py:55
 msgid "The client {0} has been registered!"
 msgstr "Клиент {0} зарегистрирован!"
 
@@ -387,59 +460,209 @@ msgid "Your OAuth clients"
 msgstr ""
 
 #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
 #: mediagoblin/templates/mediagoblin/submit/collection.html:30
 #: mediagoblin/templates/mediagoblin/submit/start.html:34
 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
 msgid "Add"
 msgstr "Добавить"
 
-#: mediagoblin/processing/__init__.py:193
+#: mediagoblin/plugins/openid/__init__.py:97
+#: mediagoblin/plugins/openid/views.py:268
+#: mediagoblin/plugins/openid/views.py:297
+msgid "Sorry, an account is already registered to that OpenID."
+msgstr ""
+
+#: mediagoblin/plugins/openid/forms.py:38
+msgid "OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:48
+msgid "Sorry, the OpenID server could not be found"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:61
+#, python-format
+msgid "No OpenID service was found for %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:106
+#, python-format
+msgid "Verification of %s failed: %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:117
+msgid "Verification cancelled"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:314
+msgid "Your OpenID url was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:338
+#: mediagoblin/plugins/openid/views.py:393
+msgid "You can't delete your only OpenID URL unless you have a password set"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:343
+#: mediagoblin/plugins/openid/views.py:402
+msgid "That OpenID is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:385
+msgid "OpenID was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
+msgid "Add an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
+msgid "Delete an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+msgid "Delete"
+msgstr "Удалить"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
+msgid "OpenID's"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
+#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:58
+msgid "Log in"
+msgstr "Войти"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
+msgid "Logging in failed!"
+msgstr "Авторизация неуспешна!"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
+msgid "Log in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
+msgid "Or login with a password!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
+msgid "Or login with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
+msgid "Or register with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/__init__.py:90
+msgid "Sorry, an account is already registered to that Persona email."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:137
+msgid "The Persona email address was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:143
+msgid ""
+"You can't delete your only Persona email address unless you have a password "
+"set."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:148
+msgid "That Persona email address is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:175
+msgid ""
+"Sorry, an account is already registered with that Persona email address."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:189
+msgid "Your Person email address was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
+msgid "Delete a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
+msgid "Add a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22
+msgid "Edit your Persona email addresses"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
+msgid "Or login with Persona!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
+msgid "Or register with Persona!"
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:414
 msgid "Invalid file given for media type."
 msgstr "Неправильный формат файла."
 
+#: mediagoblin/processing/__init__.py:421
+msgid "Copying to public storage failed."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:429
+msgid "An acceptable processing file was not found"
+msgstr ""
+
 #: mediagoblin/submit/forms.py:26
 msgid "File"
 msgstr "Файл"
 
-#: mediagoblin/submit/views.py:49
+#: mediagoblin/submit/views.py:52
 msgid "You must provide a file."
 msgstr "Вы должны загрузить файл."
 
-#: mediagoblin/submit/views.py:93
+#: mediagoblin/submit/views.py:101
 msgid "Woohoo! Submitted!"
 msgstr "Ура! Файл загружен!"
 
-#: mediagoblin/submit/views.py:144
+#: mediagoblin/submit/views.py:154
 #, python-format
 msgid "Collection \"%s\" added!"
 msgstr "Коллекция «%s» добавлена!"
 
-#: mediagoblin/templates/mediagoblin/base.html:67
+#: mediagoblin/templates/mediagoblin/base.html:79
 msgid "Verify your email!"
 msgstr "Подтвердите ваш адрес электронной почты!"
 
-#: mediagoblin/templates/mediagoblin/base.html:68
+#: mediagoblin/templates/mediagoblin/base.html:86
 msgid "log out"
 msgstr "завершение сеанса"
 
-#: mediagoblin/templates/mediagoblin/base.html:73
-#: mediagoblin/templates/mediagoblin/auth/login.html:28
-#: mediagoblin/templates/mediagoblin/auth/login.html:36
-#: mediagoblin/templates/mediagoblin/auth/login.html:54
-msgid "Log in"
-msgstr "Войти"
-
-#: mediagoblin/templates/mediagoblin/base.html:82
+#: mediagoblin/templates/mediagoblin/base.html:105
 #, python-format
 msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
 msgstr "Учётная запись <a href=\"%(user_url)s\">%(user_name)s</a>"
 
-#: mediagoblin/templates/mediagoblin/base.html:89
+#: mediagoblin/templates/mediagoblin/base.html:112
 msgid "Change account settings"
 msgstr "Изменить настройки учётной записи"
 
-#: mediagoblin/templates/mediagoblin/base.html:93
-#: mediagoblin/templates/mediagoblin/base.html:108
+#: mediagoblin/templates/mediagoblin/base.html:116
+#: mediagoblin/templates/mediagoblin/base.html:137
 #: mediagoblin/templates/mediagoblin/admin/panel.html:21
 #: mediagoblin/templates/mediagoblin/admin/panel.html:26
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -447,16 +670,16 @@ msgstr "Изменить настройки учётной записи"
 msgid "Media processing panel"
 msgstr "Панель обработки файлов"
 
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:125
 msgid "Log out"
 msgstr "Завершение сеанса"
 
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:128
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156
 msgid "Add media"
 msgstr "Добавить файлы"
 
-#: mediagoblin/templates/mediagoblin/base.html:102
+#: mediagoblin/templates/mediagoblin/base.html:131
 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
 msgid "Create new collection"
 msgstr "Создать новую коллекцию"
@@ -503,6 +726,59 @@ msgstr "Последние 10 удавшихся загрузок"
 msgid "No processed entries, yet!"
 msgstr "Выполненных задач пока нет!"
 
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, meida, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this into your client:"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
 #: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
 msgid "Set your new password"
@@ -535,19 +811,15 @@ msgid ""
 "a happy goblin!"
 msgstr "Привет, %(username)s,\n\nчтобы сменить свой пароль от GNU MediaGoblin, откройте\nследующий URL вашим веб‐браузером:\n\n%(verification_url)s\n\nЕсли вы думаете, что это какая‐то ошибка, то игнорируйте\nэто сообщение и продолжайте быть счастливым гоблином!"
 
-#: mediagoblin/templates/mediagoblin/auth/login.html:39
-msgid "Logging in failed!"
-msgstr "Авторизация неуспешна!"
-
 #: mediagoblin/templates/mediagoblin/auth/login.html:44
 msgid "Don't have an account yet?"
 msgstr "Ещё нету аккаунта?"
 
-#: mediagoblin/templates/mediagoblin/auth/login.html:45
+#: mediagoblin/templates/mediagoblin/auth/login.html:46
 msgid "Create one here!"
 msgstr "Создайте здесь!"
 
-#: mediagoblin/templates/mediagoblin/auth/login.html:51
+#: mediagoblin/templates/mediagoblin/auth/login.html:54
 msgid "Forgot your password?"
 msgstr "Забыли свой пароль?"
 
@@ -556,7 +828,7 @@ msgstr "Забыли свой пароль?"
 msgid "Create an account!"
 msgstr "Создать аккаунт!"
 
-#: mediagoblin/templates/mediagoblin/auth/register.html:40
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
 msgid "Create"
 msgstr "Создать"
 
@@ -590,7 +862,7 @@ msgstr "Он опубликован на условиях <a href=\"http://www.f
 msgid "Explore"
 msgstr "Смотреть"
 
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23
 msgid "Hi there, welcome to this MediaGoblin site!"
 msgstr "Привет! Добро пожаловать на наш MediaGoblin’овый сайт!"
 
@@ -600,22 +872,27 @@ msgid ""
 "extraordinarily great piece of media hosting software."
 msgstr "Этот сайт работает на <a href=\"http://mediagoblin.org\">MediaGoblin</a>, необыкновенно замечательном ПО для хостинга мультимедийных файлов."
 
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26
 msgid ""
 "To add your own media, place comments, and more, you can log in with your "
 "MediaGoblin account."
 msgstr "Для добавления собственных файлов, комментирования и т. п. вы можете представиться с помощью вашей MediaGoblin’овой учётной записи."
 
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
 msgid "Don't have one yet? It's easy!"
 msgstr "У вас её ещё нет? Не проблема!"
 
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
-#, python-format
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35
+msgid ""
+"\n"
+"        >Create an account at this site</a>\n"
+"        or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41
 msgid ""
-"<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n"
-"      or\n"
-"      <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>"
+"\n"
+"        <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/bits/logo.html:23
@@ -630,13 +907,13 @@ msgid "Editing attachments for %(media_title)s"
 msgstr "Добавление сопутствующего файла для %(media_title)s"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:178
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:194
 msgid "Attachments"
 msgstr "Сопутствующие файлы"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:200
 msgid "Add attachment"
 msgstr "Добавить сопутствующий файл"
 
@@ -653,22 +930,29 @@ msgstr "Отмена"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:63
 #: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
 msgid "Save changes"
 msgstr "Сохранить изменения"
 
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
 #, python-format
-msgid "Changing %(username)s's password"
-msgstr "Смена пароля %(username)s"
+msgid "Changing %(username)s's email"
+msgstr ""
 
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
 #: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
 msgid "Save"
 msgstr "Сохранить"
 
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr "Смена пароля %(username)s"
+
 #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
 #, python-format
 msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -696,14 +980,14 @@ msgstr "Редактирование %(media_title)s"
 msgid "Changing %(username)s's account settings"
 msgstr "Настройка учётной записи %(username)s"
 
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
-msgid "Change your password."
-msgstr "Сменить пароль"
-
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53
 msgid "Delete my account"
 msgstr "Удалить мою учётную запись"
 
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Email"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
 #, python-format
 msgid "Editing %(collection_title)s"
@@ -715,6 +999,36 @@ msgstr "Редактирование %(collection_title)s"
 msgid "Editing %(username)s's profile"
 msgstr "Редактирование профиля %(username)s"
 
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:139
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr "%(formatted_time)s назад"
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/listings/collection.html:30
 #: mediagoblin/templates/mediagoblin/listings/collection.html:35
 #: mediagoblin/templates/mediagoblin/listings/tag.html:30
@@ -725,8 +1039,7 @@ msgstr "Файлы с меткой: %(tag_name)s"
 
 #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
 #: mediagoblin/templates/mediagoblin/media_displays/video.html:55
 msgid "Download"
 msgstr "Скачать"
@@ -750,7 +1063,7 @@ msgid ""
 msgstr "Вы можете скачать современный браузер, \n\tспособный проиграть это аудио, с <a href=\"http://getfirefox.com\">\n\t  http://getfirefox.com</a>!"
 
 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
 #: mediagoblin/templates/mediagoblin/media_displays/video.html:61
 msgid "Original file"
 msgstr "Исходный файл"
@@ -759,6 +1072,10 @@ msgstr "Исходный файл"
 msgid "WebM file (Vorbis codec)"
 msgstr "WebM‐файл (кодек — Vorbis)"
 
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
+msgid "Created"
+msgstr "Создан"
+
 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
@@ -770,47 +1087,39 @@ msgstr "WebM‐файл (кодек — Vorbis)"
 msgid "Image for %(media_title)s"
 msgstr "Изображение «%(media_title)s»"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
 msgid "PDF file"
 msgstr "PDF-файл"
 
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
-msgid "Toggle Rotate"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113
 msgid "Perspective"
 msgstr "Перспектива"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115
 msgid "Front"
 msgstr "Спереди"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118
 msgid "Top"
 msgstr "Сверху"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
 msgid "Side"
 msgstr "Сбоку"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
 msgid "WebGL"
 msgstr "WebGL"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132
 msgid "Download model"
 msgstr "Скачать модель"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140
 msgid "File Format"
 msgstr "Формат файла"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142
 msgid "Object Height"
 msgstr "Высота объекта"
 
@@ -829,8 +1138,8 @@ msgid ""
 msgstr "Вы можете скачать современный браузер, способный воспроизводить это видео, с <a href=\"http://getfirefox.com\">\n      http://getfirefox.com</a>!"
 
 #: mediagoblin/templates/mediagoblin/media_displays/video.html:69
-msgid "WebM file (640p; VP8/Vorbis)"
-msgstr "WebM-файл (640p; VP8/Vorbis)"
+msgid "WebM file (VP8/Vorbis)"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/submit/collection.html:26
 msgid "Add a collection"
@@ -856,11 +1165,6 @@ msgstr "%(collection_title)s пользователя <a href=\"%(user_url)s\">%
 msgid "Edit"
 msgstr "Изменить"
 
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
-msgid "Delete"
-msgstr "Удалить"
-
 #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
 #, python-format
@@ -915,29 +1219,22 @@ msgstr "Файлы пользователя <a href=\"%(user_url)s\">%(username)
 msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr "❖ Просмотр файлов пользователя <a href=\"%(user_url)s\">%(username)s</a>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:97
 msgid "Add a comment"
 msgstr "Добавить комментарий"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:108
 msgid "Add this comment"
 msgstr "Добавить этот комментарий"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:132
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:152
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:164
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr "%(formatted_time)s назад"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+msgid "Comment Preview"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:157
 msgid "Added"
 msgstr "Добавлен"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:161
-msgid "Created"
-msgstr "Создан"
-
 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
 #, python-format
@@ -1096,26 +1393,34 @@ msgstr "Метки"
 msgid "Could not read the image file."
 msgstr "Не удалось прочитать файл с изображением."
 
-#: mediagoblin/tools/response.py:35
+#: mediagoblin/tools/response.py:36
 msgid "Oops!"
 msgstr "Ой!"
 
-#: mediagoblin/tools/response.py:36
+#: mediagoblin/tools/response.py:37
 msgid "An error occured"
 msgstr "Произошла ошибка"
 
 #: mediagoblin/tools/response.py:51
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:53
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:60
 msgid "Operation not allowed"
 msgstr "Операция не позволяется"
 
-#: mediagoblin/tools/response.py:52
+#: mediagoblin/tools/response.py:61
 msgid ""
 "Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
 "function that you are not allowed to. Have you been trying to delete all "
 "user accounts again?"
 msgstr ""
 
-#: mediagoblin/tools/response.py:60
+#: mediagoblin/tools/response.py:69
 msgid ""
 "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
 " the address is correct, maybe the page you're looking for has been moved or"
@@ -1152,10 +1457,9 @@ msgstr "Комментировать"
 
 #: mediagoblin/user_pages/forms.py:25
 msgid ""
-"You can use <a "
-"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for"
-" formatting."
-msgstr "Для разметки можете использовать язык <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a>."
+"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" "
+"target=\"_blank\">Markdown</a> for formatting."
+msgstr ""
 
 #: mediagoblin/user_pages/forms.py:31
 msgid "I am sure I want to delete this"
@@ -1177,77 +1481,80 @@ msgstr "-- Выберите --"
 msgid "Include a note"
 msgstr "Примечание"
 
-#: mediagoblin/user_pages/lib.py:58
-msgid "commented on your post"
-msgstr "оставил комментарий к вашему файлу"
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+"                      <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n"
+"                      Markdown</a> for formatting."
+msgstr ""
 
-#: mediagoblin/user_pages/views.py:169
+#: mediagoblin/user_pages/views.py:179
 msgid "Sorry, comments are disabled."
 msgstr "Сожалеем: возможность комментирования отключена."
 
-#: mediagoblin/user_pages/views.py:174
+#: mediagoblin/user_pages/views.py:184
 msgid "Oops, your comment was empty."
 msgstr "Ой, ваш комментарий был пуст."
 
-#: mediagoblin/user_pages/views.py:180
+#: mediagoblin/user_pages/views.py:190
 msgid "Your comment has been posted!"
 msgstr "Ваш комментарий размещён!"
 
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:225
 msgid "Please check your entries and try again."
 msgstr "Пожалуйста, проверьте введённое и попробуйте ещё раз."
 
-#: mediagoblin/user_pages/views.py:245
+#: mediagoblin/user_pages/views.py:265
 msgid "You have to select or add a collection"
 msgstr "Необходимо выбрать или добавить коллекцию"
 
-#: mediagoblin/user_pages/views.py:256
+#: mediagoblin/user_pages/views.py:276
 #, python-format
 msgid "\"%s\" already in collection \"%s\""
 msgstr "«%s» — уже в коллекции «%s»"
 
-#: mediagoblin/user_pages/views.py:262
+#: mediagoblin/user_pages/views.py:282
 #, python-format
 msgid "\"%s\" added to collection \"%s\""
 msgstr "«%s» добавлено в коллекцию «%s»"
 
-#: mediagoblin/user_pages/views.py:282
+#: mediagoblin/user_pages/views.py:302
 msgid "You deleted the media."
 msgstr "Вы удалили файл."
 
-#: mediagoblin/user_pages/views.py:289
+#: mediagoblin/user_pages/views.py:314
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "Файл не удалён, так как вы не подтвердили свою уверенность галочкой."
 
-#: mediagoblin/user_pages/views.py:296
+#: mediagoblin/user_pages/views.py:321
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Вы на пороге удаления файла другого пользователя. Будьте осторожны."
 
-#: mediagoblin/user_pages/views.py:370
+#: mediagoblin/user_pages/views.py:395
 msgid "You deleted the item from the collection."
 msgstr "Вы исключили файл из коллекции."
 
-#: mediagoblin/user_pages/views.py:374
+#: mediagoblin/user_pages/views.py:399
 msgid "The item was not removed because you didn't check that you were sure."
 msgstr "Файл не исключён из коллекции, так как вы не подтвердили своё намерение отметкой."
 
-#: mediagoblin/user_pages/views.py:382
+#: mediagoblin/user_pages/views.py:407
 msgid ""
 "You are about to delete an item from another user's collection. Proceed with"
 " caution."
 msgstr "Вы на пороге исключения файла из коллекции другого пользователя.  Будьте осторожны."
 
-#: mediagoblin/user_pages/views.py:415
+#: mediagoblin/user_pages/views.py:440
 #, python-format
 msgid "You deleted the collection \"%s\""
 msgstr "Вы удалили коллекцию «%s»"
 
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:447
 msgid ""
 "The collection was not deleted because you didn't check that you were sure."
 msgstr "Коллекция не удалена, так как вы не подтвердили своё намерение отметкой."
 
-#: mediagoblin/user_pages/views.py:430
+#: mediagoblin/user_pages/views.py:455
 msgid ""
 "You are about to delete another user's collection. Proceed with caution."
 msgstr "Вы на пороге удаления коллекции другого пользователя.  Будьте осторожны."