Compare commits

...

9 Commits

8 changed files with 153 additions and 130 deletions

View File

@ -12,7 +12,7 @@
{% trans "Deleted accounts cannot be recovered." %}<br><br>
<div class="col-sm-8 col-md-6 mx-auto">
{% if bad_password %}
<span class="message error-msg">{% trans "Password inccorect." %}</span>
<span class="message error-msg">{% trans "Password incorrect." %}</span>
{% elif deleted %}
<span class="message success-msg">{% trans "Your account has been deleted." %}</span>
{% endif %}

View File

@ -30,7 +30,7 @@ msgid "Deleted accounts cannot be recovered."
msgstr "Gelöschte Accounts können nicht wiederhergestellt werden."
#: accounts/templates/accounts/delete.html:15
msgid "Password inccorect."
msgid "Password incorrect."
msgstr "Falsches Passwort."
#: accounts/templates/accounts/delete.html:17

View File

@ -31,7 +31,7 @@ msgid "Deleted accounts cannot be recovered."
msgstr ""
#: accounts/templates/accounts/delete.html:15
msgid "Password inccorect."
msgid "Password incorrect."
msgstr ""
#: accounts/templates/accounts/delete.html:17

View File

@ -31,7 +31,7 @@ msgid "Deleted accounts cannot be recovered."
msgstr "Las cuentas borradas no pueden ser recuperadas."
#: accounts/templates/accounts/delete.html:15
msgid "Password inccorect."
msgid "Password incorrect."
msgstr "Contraseña incorrecta."
#: accounts/templates/accounts/delete.html:17

View File

@ -33,7 +33,7 @@ msgid "Deleted accounts cannot be recovered."
msgstr ""
#: accounts/templates/accounts/delete.html:15
msgid "Password inccorect."
msgid "Password incorrect."
msgstr ""
#: accounts/templates/accounts/delete.html:17

View File

@ -31,7 +31,7 @@ msgid "Deleted accounts cannot be recovered."
msgstr ""
#: accounts/templates/accounts/delete.html:15
msgid "Password inccorect."
msgid "Password incorrect."
msgstr ""
#: accounts/templates/accounts/delete.html:17

View File

@ -31,7 +31,7 @@ msgid "Deleted accounts cannot be recovered."
msgstr "削除されたアカウントは復元できません。"
#: accounts/templates/accounts/delete.html:15
msgid "Password inccorect."
msgid "Password incorrect."
msgstr "パスワードが正しくありません。"
#: accounts/templates/accounts/delete.html:17

View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-02-16 20:02+0100\n"
"POT-Creation-Date: 2022-03-13 18:04+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -22,23 +22,23 @@ msgstr ""
#: accounts/templates/accounts/delete.html:8
msgid "Delete account"
msgstr ""
msgstr "Удалить аккаунт"
#: accounts/templates/accounts/delete.html:11
msgid "Please confirm your password to delete your account."
msgstr ""
msgstr "Пожалуйста, подтвердите свой пароль, чтобы удалить свой аккаунт."
#: accounts/templates/accounts/delete.html:12
msgid "Deleted accounts cannot be recovered."
msgstr ""
msgstr "Удаленные аккаунты невозможно восстановить."
#: accounts/templates/accounts/delete.html:15
msgid "Password inccorect."
msgstr ""
msgid "Password incorrect."
msgstr "Неверный пароль."
#: accounts/templates/accounts/delete.html:17
msgid "Your account has been deleted."
msgstr ""
msgstr "Твой аккаунт был удален."
#: accounts/templates/accounts/delete.html:22
#: accounts/templates/accounts/login.html:19
@ -46,7 +46,7 @@ msgstr ""
#: events/templates/events/create_team.html:27
#: events/templates/events/join_team.html:32
msgid "Password"
msgstr ""
msgstr "Пароль"
#: accounts/templates/accounts/edit.html:21
#: accounts/templates/accounts/login.html:18
@ -56,11 +56,11 @@ msgstr ""
#: events/templates/events/event_info.html:64
#: scoreboard/templates/scoreboard/scoreboard.html:13
msgid "Username"
msgstr ""
msgstr "Имя пользователя"
#: accounts/templates/accounts/edit.html:25
msgid "Email"
msgstr ""
msgstr "Электронная почта"
#: accounts/templates/accounts/edit.html:30
#: ctfs/templates/ctfs/ctf_info.html:64
@ -68,14 +68,25 @@ msgstr ""
#: events/templates/events/event_info.html:65
#: scoreboard/templates/scoreboard/scoreboard.html:14
msgid "Website"
msgstr ""
msgstr "Веб-сайт"
#: accounts/templates/accounts/edit.html:36
#: events/templates/events/manage_team.html:29
msgid " Apply"
msgstr ""
msgstr "Применить"
#: accounts/templates/accounts/edit.html:47
#: accounts/templates/accounts/edit.html:45
msgid "Connected accounts"
msgstr "Связанные аккаунты"
#: accounts/templates/accounts/edit.html:53
msgid "Disconnect Discord"
msgstr "Отключить Discord"
#: accounts/templates/accounts/edit.html:59
msgid "Connect Discord"
msgstr "Подключить Discord"
#: accounts/templates/accounts/edit.html:70
#: accounts/templates/accounts/profile.html:46
#: ctfs/templates/ctfs/ctf_info.html:65 ctfs/templates/ctfs/ctfs_list.html:13
#: events/templates/events/event_info.html:66
@ -84,24 +95,24 @@ msgstr ""
#: events/templates/events/team.html:45
#: scoreboard/templates/scoreboard/scoreboard.html:15
msgid "Score"
msgstr "счет"
msgstr "Счет"
#: accounts/templates/accounts/edit.html:55
#: accounts/templates/accounts/edit.html:78
#: accounts/templates/accounts/profile.html:60
msgid "Registered since"
msgstr ""
msgstr "Зарегистрирован с"
#: accounts/templates/accounts/edit.html:61
#: accounts/templates/accounts/edit.html:84
msgid " Delete my account"
msgstr ""
msgstr " Удалить мой аккаунт"
#: accounts/templates/accounts/login.html:13
msgid "Please, verify your infos."
msgstr ""
msgstr "Пожалуйста, проверь свои данные."
#: accounts/templates/accounts/login.html:22
msgid "Reset password"
msgstr ""
msgstr "Сбросить пароль"
#: accounts/templates/accounts/login.html:31
#: accounts/templates/accounts/register.html:38 templates/base.html:97
@ -119,37 +130,37 @@ msgstr "Авторизоваться"
#: templates/registration/password_reset_done.html:19
#: templates/registration/password_reset_form.html:27
msgid "Sign up"
msgstr ""
msgstr "Зарегистрироваться"
#: accounts/templates/accounts/profile.html:10
msgid "Challenges Solved by"
msgstr ""
msgstr "Челленджы решенные"
#: accounts/templates/accounts/profile.html:21
#: events/templates/events/team.html:20
msgid "Challenge Name"
msgstr ""
msgstr "Название челленджа"
#: accounts/templates/accounts/profile.html:22
#: events/templates/events/team.html:21
msgid "Category"
msgstr "Категории"
msgstr "Категория"
#: accounts/templates/accounts/profile.html:23
#: events/templates/events/team.html:22
msgid "Points"
msgstr ""
msgstr "Баллы"
#: accounts/templates/accounts/profile.html:24
#: ctfs/templates/ctfs/ctf_info.html:66
#: events/templates/events/ctf_info.html:67
#: events/templates/events/team.html:23
msgid "Date"
msgstr ""
msgstr "Дата"
#: accounts/templates/accounts/profile.html:39
msgid "It seems that this user has not solved any challenge yet..."
msgstr ""
msgstr "Похоже, что этот пользователь ещё не решил ни одного челленджа..."
#: accounts/templates/accounts/profile.html:47
#: events/templates/events/event_info.html:63
@ -158,20 +169,20 @@ msgstr ""
#: events/templates/events/team.html:46
#: scoreboard/templates/scoreboard/scoreboard.html:12
msgid "Rank"
msgstr ""
msgstr "Рейтинг"
#: accounts/templates/accounts/profile.html:56
msgid "Status: Member"
msgstr ""
msgstr "Статус: Участник"
#: accounts/templates/accounts/profile.html:58
msgid "Status: Visitor"
msgstr ""
msgstr "Статус: Гость"
#: accounts/templates/accounts/profile.html:64
#: events/templates/events/team.html:57
msgid "Categories stats"
msgstr ""
msgstr "Статистика по категориям"
#: accounts/templates/accounts/register.html:13
msgid "Welcome !"
@ -179,99 +190,102 @@ msgstr "Добро пожаловать !"
#: accounts/templates/accounts/register.html:14
msgid "Your account has been created."
msgstr ""
msgstr "Твой аккаунт был создан."
#: accounts/templates/accounts/register.html:25
msgid "Personal website"
msgstr ""
msgstr "Персональный сайт"
#: accounts/templates/accounts/register.html:26
#: events/templates/events/event_info.html:119
msgid "Register"
msgstr ""
msgstr "Зарегистрироваться"
#: accounts/views/views.py:33
msgid "Your account was inactive."
msgstr ""
msgstr "Твой аккаунт был неактивен."
#: accounts/views/views.py:52
msgid ""
"The password must contain at least one letter and at least one digit or "
"punctuation character."
msgstr ""
"Пароль должен содержать как минимум одну букву и как минимум одну цифру или "
"знак препинания"
#: accounts/views/views.py:54
msgid "A user with that email already exists."
msgstr ""
msgstr "Пользователь с таким электронным адресом уже существует."
#: accounts/views/views.py:67
msgid "A user with that username already exists."
msgstr ""
msgstr "Пользователь с таким именем уже существует."
#: accounts/views/views.py:95
msgid "Email already taken."
msgstr ""
msgstr "Электронная почта уже занята."
#: accounts/views/views.py:101
msgid "Username already taken."
msgstr ""
msgstr "Имя пользователя уже занято."
#: accounts/views/views.py:105 events/views/teams.py:124
msgid "Updated."
msgstr ""
msgstr "Обновлено."
#: ctfs/templates/ctfs/ctf_info.html:12
#: events/templates/events/ctf_info.html:12
msgid "Published date"
msgstr ""
msgstr "Дата публикации"
#: ctfs/templates/ctfs/ctf_info.html:16
#, fuzzy
#| msgid "No article available."
#| msgstr "Нет доступных статей."
msgid "Challenge is not yet available."
msgstr "Нет доступных статей."
msgstr "Челлендж пока не доступен."
#: ctfs/templates/ctfs/ctf_info.html:29
#: events/templates/events/ctf_info.html:24
msgid "Congratulation !"
msgstr ""
msgstr "Поздравление !"
#: ctfs/templates/ctfs/ctf_info.html:31
#: events/templates/events/ctf_info.html:26
msgid "Already flagged"
msgstr ""
msgstr "Уже отмечено"
#: ctfs/templates/ctfs/ctf_info.html:33 ctfs/templates/ctfs/ctf_info.html:42
#: events/templates/events/ctf_info.html:36
#: events/templates/events/ctf_info.html:45
msgid "Start the challenge"
msgstr ""
msgstr "Начать челлендж"
#: ctfs/templates/ctfs/ctf_info.html:35 ctfs/templates/ctfs/ctf_info.html:44
#: events/templates/events/ctf_info.html:38
#: events/templates/events/ctf_info.html:47
msgid "Download"
msgstr ""
msgstr "Скачать"
#: ctfs/templates/ctfs/ctf_info.html:39
#: events/templates/events/ctf_info.html:42
msgid "Wrong flag ! You can do it !"
msgstr ""
msgstr "Неверный флаг ! У тебя всё получится !"
#: ctfs/templates/ctfs/ctf_info.html:58
#: events/templates/events/ctf_info.html:60
msgid "Solved by"
msgstr ""
msgstr "Решен"
#: ctfs/templates/ctfs/ctf_info.html:82
#: events/templates/events/ctf_info.html:90
msgid "Nobody has solved this challenge yet."
msgstr ""
msgstr "Никто еще не решил этот челлендж."
#: ctfs/templates/ctfs/ctf_info.html:89
#: events/templates/events/ctf_info.html:97
msgid "Author"
msgstr ""
msgstr "Автор"
#: ctfs/templates/ctfs/ctf_info.html:90
#: events/templates/events/ctf_info.html:98
@ -280,132 +294,134 @@ msgstr ""
#: ctfs/templates/ctfs/ctfs_list.html:14
msgid "Solved"
msgstr ""
msgstr "Решено"
#: ctfs/templates/ctfs/ctfs_list.html:37
msgid "No ctf available for this category."
msgstr ""
msgstr "Для этой категории нет доступных CTF."
#: ctfs/templates/ctfs/ctfs_list.html:42
msgid "Categories"
msgstr ""
msgstr "Категории"
#: ctfs/templates/ctfs/ctfs_list.html:48 templates/base.html:54
msgid "No category available."
msgstr ""
msgstr "Категория отсутствует."
#: events/templates/events/create_team.html:10
#: events/templates/events/join_team.html:10
msgid "This event starts at"
msgstr ""
msgstr "Это соревнование начнётся в"
#: events/templates/events/create_team.html:17
#: events/templates/events/join_team.html:17
msgid "You need to be registered to the event."
msgstr ""
msgstr "Ты должнен быть зарегистрированы на это соревнование."
#: events/templates/events/create_team.html:20 events/views/teams.py:120
msgid "Name already taken."
msgstr ""
msgstr "Имя уже занято."
#: events/templates/events/create_team.html:26
#: events/templates/events/join_team.html:31
#: events/templates/events/manage_team.html:22
msgid "Team name"
msgstr ""
msgstr "Название команды"
#: events/templates/events/create_team.html:28
#: events/templates/events/create_team.html:49
#: events/templates/events/join_team.html:54
msgid "Create Team"
msgstr ""
msgstr "Создать команду"
#: events/templates/events/create_team.html:33
#: events/templates/events/event_pwd.html:28
#: events/templates/events/join_team.html:38
msgid "You need to be logged to access this event."
msgstr ""
msgstr "Для доступа к этому событию тебе необходимо авторизоваться."
#: events/templates/events/create_team.html:42
#: events/templates/events/event_info.html:113
#: events/templates/events/event_pwd.html:36
#: events/templates/events/join_team.html:47
msgid "Starts at"
msgstr ""
msgstr "Начинается в"
#: events/templates/events/create_team.html:43
#: events/templates/events/event_info.html:114
#: events/templates/events/event_pwd.html:37
#: events/templates/events/join_team.html:48
msgid "Ends at"
msgstr ""
msgstr "Заканчивается в"
#: events/templates/events/create_team.html:47
#: events/templates/events/event_info.html:129
#: events/templates/events/join_team.html:52
msgid "Manage my team"
msgstr ""
msgstr "Управлять моей командой"
#: events/templates/events/create_team.html:48
#: events/templates/events/join_team.html:33
#: events/templates/events/join_team.html:53
msgid "Join Team"
msgstr ""
msgstr "Присоединиться к команде"
#: events/templates/events/create_team.html:53
#: events/templates/events/join_team.html:58
msgid "Auto-matching"
msgstr ""
msgstr "Автоматический выбор"
#: events/templates/events/create_team.html:57
#: events/templates/events/join_team.html:62
msgid "Find me a team !"
msgstr ""
msgstr "Найди мне команду!"
#: events/templates/events/ctf_info.html:10
msgid "Event"
msgstr ""
msgstr "Событие"
#: events/templates/events/ctf_info.html:18
msgid ""
"No translation available. Please try another language (English or French)."
msgstr ""
"Перевод недоступен. Пожалуйста, попобуй другой язык (английский или французский)."
#: events/templates/events/ctf_info.html:28
#: events/templates/events/event_info.html:18
msgid "This event is over."
msgstr ""
msgstr "Это соревнование закончилось."
#: events/templates/events/ctf_info.html:30
msgid "Error while processing your request. (Invalid Form)"
msgstr ""
msgstr "Ошибка при обработке твоего запроса. (Недействительная заявка)"
#: events/templates/events/ctf_info.html:32
msgid "You must register to the event before submitting flags."
msgstr ""
msgstr "Перед вводом флагов необходимо зарегистрироваться на соревнование."
#: events/templates/events/ctf_info.html:34
msgid ""
"This is a team event, please create or join a team before submitting flags."
msgstr ""
"Это командное соревнование, пожалуйста, создай или вступи в команду перед тем как отправить флаги."
#: events/templates/events/event_info.html:9
msgid "Subscriptions is over."
msgstr ""
msgstr "Регистрация уже завершена."
#: events/templates/events/event_info.html:12
#: events/templates/events/event_pwd.html:18
msgid "You're already registered to this event."
msgstr ""
msgstr "Ты уже зарегистрирован на это соревнование."
#: events/templates/events/event_info.html:20
#: events/templates/events/event_pwd.html:9
msgid "This event start at"
msgstr ""
msgstr "Это событие начётся в"
#: events/templates/events/event_info.html:30
msgid "Challenges"
msgstr ""
msgstr "Челленджы"
#: events/templates/events/event_info.html:47
#, fuzzy
@ -415,69 +431,74 @@ msgstr "Нет доступных статей."
#: events/templates/events/event_info.html:51
msgid "The event has not started yet."
msgstr ""
msgstr "Это событие еще не началось."
#: events/templates/events/event_info.html:57
#, fuzzy
#| msgid "Score"
msgid "ScoreBoard"
msgstr "счет"
msgstr "Таблица результатов"
#: events/templates/events/event_info.html:88
msgid "Team"
msgstr ""
msgstr "Команда"
#: events/templates/events/event_info.html:106
msgid "No one have earn point yet, you gonna be the first ?"
msgstr ""
msgstr "Никто еще не получил балла, собираешься стать первым ?"
#: events/templates/events/event_pwd.html:15
#: events/templates/events/join_team.html:22
msgid "Wrong password submited."
msgstr ""
msgstr "Введен неправильный пароль."
#: events/templates/events/event_pwd.html:20
msgid "This event is password protected"
msgstr ""
msgstr "Это соревнование защищено паролем"
#: events/templates/events/event_pwd.html:21
msgid "You need to submit the event password to gain access to this event."
msgstr ""
msgstr "Чтобы получить доступ к этому соревнованию, необходимо ввести пароль."
#: events/templates/events/events_list.html:6 templates/base.html:61
msgid "Events"
msgstr ""
msgstr "События"
#: events/templates/events/events_list.html:38
msgid "See more"
msgstr ""
msgstr "Смотреть далее"
#: events/templates/events/events_list.html:44
#, fuzzy
#| msgid "No article available."
#msgstr "Нет доступных статей."
msgid "No events available."
msgstr "Нет доступных статей."
msgstr "Нет доступных соревнований."
#: events/templates/events/join_team.html:20
msgid "Team does not exist."
msgstr ""
msgstr "Команда не существует."
#: events/templates/events/join_team.html:24
msgid "Maximum size reached."
msgstr ""
msgstr "Максимальный размер достигнут."
#: events/templates/events/manage_team.html:26
msgid "Team password"
msgstr ""
msgstr "Пароль команды"
#: events/templates/events/manage_team.html:29
msgid "Apply"
msgstr "Применить"
#: events/templates/events/manage_team.html:44
#: events/templates/events/team.html:49
msgid "Members"
msgstr ""
msgstr "Участники"
#: events/templates/events/manage_team.html:52
msgid "Leave Team"
msgstr ""
msgstr "Покинуть команду"
#: events/templates/events/manage_team.html:59
msgid "Open to automatching"
@ -489,11 +510,11 @@ msgstr ""
#: events/templates/events/team.html:38
msgid "It seems that this team has not solved any challenge yet..."
msgstr ""
msgstr "Кажется, что эта команда еще не решила ни одной задачи..."
#: home/templates/home/home.html:21
msgid "Weekly Top 5"
msgstr ""
msgstr "Еженедельная пятерка лучших"
#: home/templates/home/home.html:48
msgid "No article available."
@ -501,79 +522,79 @@ msgstr "Нет доступных статей."
#: home/templates/home/home.html:53
msgid "Latest challenges added"
msgstr ""
msgstr "Последние добавленные челленджы"
#: home/templates/home/home.html:58
msgid "points"
msgstr ""
msgstr "очки"
#: home/templates/home/home.html:62
msgid "No ctf available."
msgstr ""
msgstr "Нет доступных CTF."
#: home/templates/home/home.html:66
msgid "Latest Flags"
msgstr ""
msgstr "Последние флаги"
#: home/templates/home/home.html:80
msgid "Flags"
msgstr ""
msgstr "Флаги"
#: home/templates/home/home.html:86
msgid "Users"
msgstr ""
msgstr "Пользователи"
#: project/settings.py:115
msgid "English"
msgstr ""
msgstr "Английский"
#: project/settings.py:116
msgid "German"
msgstr ""
msgstr "Немецкий"
#: project/settings.py:117
msgid "French"
msgstr ""
msgstr "Французский"
#: project/settings.py:118
msgid "Russian"
msgstr ""
msgstr "Русский"
#: project/settings.py:119
msgid "Japanese"
msgstr ""
msgstr "Японский"
#: project/settings.py:120
msgid "Spanish"
msgstr ""
msgstr "Испанский"
#: scoreboard/templates/scoreboard/scoreboard.html:38
msgid "First"
msgstr ""
msgstr "Первый"
#: scoreboard/templates/scoreboard/scoreboard.html:39
msgid "Previous"
msgstr ""
msgstr "Предыдущий"
#: scoreboard/templates/scoreboard/scoreboard.html:43
msgid "Page "
msgstr ""
msgstr "Страница "
#: scoreboard/templates/scoreboard/scoreboard.html:47
msgid "Next"
msgstr ""
msgstr "Следующий"
#: scoreboard/templates/scoreboard/scoreboard.html:48
msgid "Last"
msgstr ""
msgstr "Последний"
#: templates/base.html:59
msgid "Scoreboard"
msgstr ""
msgstr "Табло"
#: templates/base.html:64
msgid "Resources"
msgstr ""
msgstr "Ресурсы"
#: templates/base.html:93
msgid "Logout"
@ -581,46 +602,48 @@ msgstr "Выйти"
#: templates/base.html:100
msgid "Sign Up"
msgstr ""
msgstr "Зарегистрироваться"
#: templates/base.html:135
msgid "Become a Patron!"
msgstr ""
msgstr "Стать спонсором!"
#: templates/registration/password_reset_complete.html:11
msgid "Your new password has been set."
msgstr ""
msgstr "Твой новый пароль был установлен."
#: templates/registration/password_reset_confirm.html:20
msgid "Your password cant be too similar to your other personal information."
msgstr ""
msgstr "Твой пароль не должен быть слишком похож на другие твои личные данные."
#: templates/registration/password_reset_confirm.html:21
msgid "Your password must contain at least 8 characters."
msgstr ""
msgstr "Твой пароль должен содержать не менее 8 символов."
#: templates/registration/password_reset_confirm.html:22
msgid "Your password cant be a commonly used password."
msgstr ""
msgstr "Твой пароль не может быть одним из распространенных паролей."
#: templates/registration/password_reset_confirm.html:23
msgid "Your password cant be entirely numeric."
msgstr ""
msgstr "Твой пароль не может состоять только из цифр."
#: templates/registration/password_reset_confirm.html:26
msgid "Confirm"
msgstr ""
msgstr "Подтвердить"
#: templates/registration/password_reset_confirm.html:28
msgid "Submit"
msgstr ""
msgstr "Отправить"
#: templates/registration/password_reset_done.html:11
msgid ""
"We've emailed you instructions for setting your password. You should receive "
"the email shortly!"
msgstr ""
"Мы отправили тебе по электронной почте инструкции по установке пароля."
"Письмо будет получено совсем скоро!"
#: templates/registration/password_reset_form.html:16
msgid "Reset"
msgstr ""
msgstr "Сбросить"