diff --git a/src/accounts/templates/accounts/delete.html b/src/accounts/templates/accounts/delete.html
index 1aae774..c4fe987 100644
--- a/src/accounts/templates/accounts/delete.html
+++ b/src/accounts/templates/accounts/delete.html
@@ -12,7 +12,7 @@
{% trans "Deleted accounts cannot be recovered." %}
{% if bad_password %}
-
{% trans "Password inccorect." %}
+
{% trans "Password incorrect." %}
{% elif deleted %}
{% trans "Your account has been deleted." %}
{% endif %}
diff --git a/src/home/templates/news/en/gitea.html b/src/home/templates/news/en/gitea.html
new file mode 100644
index 0000000..8cc469d
--- /dev/null
+++ b/src/home/templates/news/en/gitea.html
@@ -0,0 +1,3 @@
+We're pleased to announce that 42CTF source code is now available on a self-hosted gitea
+
+If you want to contribute to the platform (development or translation), you can send us a message on or simply fill this
form and we'll contact you !
\ No newline at end of file
diff --git a/src/home/templates/news/fr/gitea.html b/src/home/templates/news/fr/gitea.html
new file mode 100644
index 0000000..711c6f5
--- /dev/null
+++ b/src/home/templates/news/fr/gitea.html
@@ -0,0 +1,3 @@
+Nous sommes heureux de vous annoncer que le code source de 42CTF est désormais disponible sur un auto-hébergé.
+
+Si vous voulez contribuer a la plateforme (développement ou traduction), vous pouvez nous envoyer un message sur ou simplement remplir ce
formulaire et nous vous contacterons !
\ No newline at end of file
diff --git a/src/home/templates/news/ja/gitea.html b/src/home/templates/news/ja/gitea.html
new file mode 100644
index 0000000..a6fe786
--- /dev/null
+++ b/src/home/templates/news/ja/gitea.html
@@ -0,0 +1,3 @@
+42CTFのソースコードがセルフホストのgitea で公開されたことをお知らせします。
+
+プラットフォームへの貢献(開発や翻訳)をしていただける方は、 にメッセージをお送りいただくか、こちらの
フォーム にご記入いただければご連絡いたします!
\ No newline at end of file
diff --git a/src/locale/de/LC_MESSAGES/django.po b/src/locale/de/LC_MESSAGES/django.po
index 31315f4..a75888d 100644
--- a/src/locale/de/LC_MESSAGES/django.po
+++ b/src/locale/de/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-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: 2022-02-10 19:50+0100\n"
"Last-Translator: Clément Hamada
\n"
"Language-Team: \n"
@@ -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
@@ -68,11 +68,26 @@ msgid "Website"
msgstr "Webseite"
#: accounts/templates/accounts/edit.html:36
-#: events/templates/events/manage_team.html:29
-msgid "Apply"
+#, fuzzy
+#| msgid "Apply"
+msgid " Apply"
msgstr "Anwenden"
-#: accounts/templates/accounts/edit.html:47
+#: accounts/templates/accounts/edit.html:45
+#, fuzzy
+#| msgid "Delete account"
+msgid "Connected accounts"
+msgstr "Account löschen"
+
+#: accounts/templates/accounts/edit.html:53
+msgid "Disconnect Discord"
+msgstr ""
+
+#: accounts/templates/accounts/edit.html:59
+msgid "Connect Discord"
+msgstr ""
+
+#: 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
@@ -83,13 +98,15 @@ msgstr "Anwenden"
msgid "Score"
msgstr "Punktzahl"
-#: accounts/templates/accounts/edit.html:55
+#: accounts/templates/accounts/edit.html:78
#: accounts/templates/accounts/profile.html:60
msgid "Registered since"
msgstr "Registriert seit"
-#: accounts/templates/accounts/edit.html:61
-msgid "Delete my account"
+#: accounts/templates/accounts/edit.html:84
+#, fuzzy
+#| msgid "Delete my account"
+msgid " Delete my account"
msgstr "Meinen Account löschen"
#: accounts/templates/accounts/login.html:13
@@ -463,6 +480,10 @@ msgstr "Maximale Mitgliederanzahl erreicht."
msgid "Team password"
msgstr "Teampasswort"
+#: events/templates/events/manage_team.html:29
+msgid "Apply"
+msgstr "Anwenden"
+
#: events/templates/events/manage_team.html:44
#: events/templates/events/team.html:49
msgid "Members"
@@ -520,27 +541,27 @@ msgstr "Flaggen"
msgid "Users"
msgstr "Nutzer"
-#: project/settings.py:115
+#: project/settings.py:116
msgid "English"
msgstr "Englisch"
-#: project/settings.py:116
+#: project/settings.py:117
msgid "German"
msgstr "Deutsch"
-#: project/settings.py:117
+#: project/settings.py:118
msgid "French"
msgstr "Französisch"
-#: project/settings.py:118
+#: project/settings.py:119
msgid "Russian"
msgstr "Russisch"
-#: project/settings.py:119
+#: project/settings.py:120
msgid "Japanese"
msgstr ""
-#: project/settings.py:120
+#: project/settings.py:121
msgid "Spanish"
msgstr ""
diff --git a/src/locale/en/LC_MESSAGES/django.po b/src/locale/en/LC_MESSAGES/django.po
index 520ad0b..813ce58 100644
--- a/src/locale/en/LC_MESSAGES/django.po
+++ b/src/locale/en/LC_MESSAGES/django.po
@@ -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 \n"
"Language-Team: LANGUAGE \n"
@@ -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
@@ -69,11 +69,22 @@ msgid "Website"
msgstr ""
#: accounts/templates/accounts/edit.html:36
-#: events/templates/events/manage_team.html:29
-msgid "Apply"
+msgid " Apply"
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 ""
+
+#: accounts/templates/accounts/edit.html:59
+msgid "Connect Discord"
+msgstr ""
+
+#: 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,13 +95,13 @@ msgstr ""
msgid "Score"
msgstr ""
-#: accounts/templates/accounts/edit.html:55
+#: accounts/templates/accounts/edit.html:78
#: accounts/templates/accounts/profile.html:60
msgid "Registered since"
msgstr ""
-#: accounts/templates/accounts/edit.html:61
-msgid "Delete my account"
+#: accounts/templates/accounts/edit.html:84
+msgid " Delete my account"
msgstr ""
#: accounts/templates/accounts/login.html:13
@@ -460,6 +471,10 @@ msgstr ""
msgid "Team password"
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"
@@ -513,27 +528,27 @@ msgstr ""
msgid "Users"
msgstr ""
-#: project/settings.py:115
+#: project/settings.py:116
msgid "English"
msgstr ""
-#: project/settings.py:116
+#: project/settings.py:117
msgid "German"
msgstr ""
-#: project/settings.py:117
+#: project/settings.py:118
msgid "French"
msgstr ""
-#: project/settings.py:118
+#: project/settings.py:119
msgid "Russian"
msgstr ""
-#: project/settings.py:119
+#: project/settings.py:120
msgid "Japanese"
msgstr ""
-#: project/settings.py:120
+#: project/settings.py:121
msgid "Spanish"
msgstr ""
diff --git a/src/locale/es/LC_MESSAGES/django.po b/src/locale/es/LC_MESSAGES/django.po
index feb899c..f957809 100644
--- a/src/locale/es/LC_MESSAGES/django.po
+++ b/src/locale/es/LC_MESSAGES/django.po
@@ -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: 2022-02-09 10:55+0100\n"
"Last-Translator: Javier Uhagón (uhagontorralvojavier@gmail.com)\n"
"Language-Team: \n"
@@ -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
@@ -69,11 +69,26 @@ msgid "Website"
msgstr "Página Web"
#: accounts/templates/accounts/edit.html:36
-#: events/templates/events/manage_team.html:29
-msgid "Apply"
+#, fuzzy
+#| msgid "Apply"
+msgid " Apply"
msgstr "Aplicar"
-#: accounts/templates/accounts/edit.html:47
+#: accounts/templates/accounts/edit.html:45
+#, fuzzy
+#| msgid "Delete account"
+msgid "Connected accounts"
+msgstr "Borrar cuenta"
+
+#: accounts/templates/accounts/edit.html:53
+msgid "Disconnect Discord"
+msgstr ""
+
+#: accounts/templates/accounts/edit.html:59
+msgid "Connect Discord"
+msgstr ""
+
+#: 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,13 +99,15 @@ msgstr "Aplicar"
msgid "Score"
msgstr "Puntuación"
-#: accounts/templates/accounts/edit.html:55
+#: accounts/templates/accounts/edit.html:78
#: accounts/templates/accounts/profile.html:60
msgid "Registered since"
msgstr "Registrado desde"
-#: accounts/templates/accounts/edit.html:61
-msgid "Delete my account"
+#: accounts/templates/accounts/edit.html:84
+#, fuzzy
+#| msgid "Delete my account"
+msgid " Delete my account"
msgstr "Borrar mi cuenta"
#: accounts/templates/accounts/login.html:13
@@ -463,6 +480,10 @@ msgstr "Tamaño máximo alcanzado."
msgid "Team password"
msgstr "Contraseña del equipo"
+#: events/templates/events/manage_team.html:29
+msgid "Apply"
+msgstr "Aplicar"
+
#: events/templates/events/manage_team.html:44
#: events/templates/events/team.html:49
msgid "Members"
@@ -520,27 +541,27 @@ msgstr "Flags"
msgid "Users"
msgstr "Usuarios"
-#: project/settings.py:115
+#: project/settings.py:116
msgid "English"
msgstr "Inglés"
-#: project/settings.py:116
+#: project/settings.py:117
msgid "German"
msgstr "Alemán"
-#: project/settings.py:117
+#: project/settings.py:118
msgid "French"
msgstr "Francés"
-#: project/settings.py:118
+#: project/settings.py:119
msgid "Russian"
msgstr "Ruso"
-#: project/settings.py:119
+#: project/settings.py:120
msgid "Japanese"
msgstr ""
-#: project/settings.py:120
+#: project/settings.py:121
msgid "Spanish"
msgstr ""
diff --git a/src/locale/fr/LC_MESSAGES/django.po b/src/locale/fr/LC_MESSAGES/django.po
index 244be3b..0b38e57 100644
--- a/src/locale/fr/LC_MESSAGES/django.po
+++ b/src/locale/fr/LC_MESSAGES/django.po
@@ -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 \n"
"Language-Team: LANGUAGE \n"
@@ -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
@@ -73,11 +73,26 @@ msgid "Website"
msgstr "Site internet"
#: accounts/templates/accounts/edit.html:36
-#: events/templates/events/manage_team.html:29
-msgid "Apply"
+#, fuzzy
+#| msgid "Apply"
+msgid " Apply"
msgstr "Appliquer"
-#: accounts/templates/accounts/edit.html:47
+#: accounts/templates/accounts/edit.html:45
+#, fuzzy
+#| msgid "Connected accounts"
+msgid "Connected accounts"
+msgstr "Comptes connectés"
+
+#: accounts/templates/accounts/edit.html:53
+msgid "Disconnect Discord"
+msgstr "Déconnecter Discord"
+
+#: accounts/templates/accounts/edit.html:59
+msgid "Connect Discord"
+msgstr "Connecter 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
@@ -88,15 +103,15 @@ msgstr "Appliquer"
msgid "Score"
msgstr "Score"
-#: accounts/templates/accounts/edit.html:55
+#: accounts/templates/accounts/edit.html:78
#: accounts/templates/accounts/profile.html:60
msgid "Registered since"
msgstr "Inscrit depuis"
-#: accounts/templates/accounts/edit.html:61
+#: accounts/templates/accounts/edit.html:84
#, fuzzy
#| msgid "Connected accounts"
-msgid "Delete my account"
+msgid " Delete my account"
msgstr "Comptes connectés"
#: accounts/templates/accounts/login.html:13
@@ -484,6 +499,10 @@ msgstr "Taille maximale atteinte."
msgid "Team password"
msgstr "Mot de passe de l'équipe"
+#: events/templates/events/manage_team.html:29
+msgid "Apply"
+msgstr "Appliquer"
+
#: events/templates/events/manage_team.html:44
#: events/templates/events/team.html:49
msgid "Members"
@@ -541,27 +560,27 @@ msgstr ""
msgid "Users"
msgstr "Pseudo"
-#: project/settings.py:115
+#: project/settings.py:116
msgid "English"
msgstr "Anglais"
-#: project/settings.py:116
+#: project/settings.py:117
msgid "German"
msgstr "Allemand"
-#: project/settings.py:117
+#: project/settings.py:118
msgid "French"
msgstr "Français"
-#: project/settings.py:118
+#: project/settings.py:119
msgid "Russian"
msgstr "Russe"
-#: project/settings.py:119
+#: project/settings.py:120
msgid "Japanese"
msgstr ""
-#: project/settings.py:120
+#: project/settings.py:121
msgid "Spanish"
msgstr ""
@@ -662,9 +681,3 @@ msgstr "Réinitialiser"
#~ msgid "End at"
#~ msgstr "Fin"
-
-#~ msgid "Disconnect Discord"
-#~ msgstr "Déconnecter Discord"
-
-#~ msgid "Connect Discord"
-#~ msgstr "Connecter Discord"
diff --git a/src/locale/it/LC_MESSAGES/django.po b/src/locale/it/LC_MESSAGES/django.po
index 520ad0b..813ce58 100644
--- a/src/locale/it/LC_MESSAGES/django.po
+++ b/src/locale/it/LC_MESSAGES/django.po
@@ -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 \n"
"Language-Team: LANGUAGE \n"
@@ -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
@@ -69,11 +69,22 @@ msgid "Website"
msgstr ""
#: accounts/templates/accounts/edit.html:36
-#: events/templates/events/manage_team.html:29
-msgid "Apply"
+msgid " Apply"
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 ""
+
+#: accounts/templates/accounts/edit.html:59
+msgid "Connect Discord"
+msgstr ""
+
+#: 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,13 +95,13 @@ msgstr ""
msgid "Score"
msgstr ""
-#: accounts/templates/accounts/edit.html:55
+#: accounts/templates/accounts/edit.html:78
#: accounts/templates/accounts/profile.html:60
msgid "Registered since"
msgstr ""
-#: accounts/templates/accounts/edit.html:61
-msgid "Delete my account"
+#: accounts/templates/accounts/edit.html:84
+msgid " Delete my account"
msgstr ""
#: accounts/templates/accounts/login.html:13
@@ -460,6 +471,10 @@ msgstr ""
msgid "Team password"
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"
@@ -513,27 +528,27 @@ msgstr ""
msgid "Users"
msgstr ""
-#: project/settings.py:115
+#: project/settings.py:116
msgid "English"
msgstr ""
-#: project/settings.py:116
+#: project/settings.py:117
msgid "German"
msgstr ""
-#: project/settings.py:117
+#: project/settings.py:118
msgid "French"
msgstr ""
-#: project/settings.py:118
+#: project/settings.py:119
msgid "Russian"
msgstr ""
-#: project/settings.py:119
+#: project/settings.py:120
msgid "Japanese"
msgstr ""
-#: project/settings.py:120
+#: project/settings.py:121
msgid "Spanish"
msgstr ""
diff --git a/src/locale/ja/LC_MESSAGES/django.po b/src/locale/ja/LC_MESSAGES/django.po
index 0537e62..702284e 100644
--- a/src/locale/ja/LC_MESSAGES/django.po
+++ b/src/locale/ja/LC_MESSAGES/django.po
@@ -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 \n"
"Language-Team: LANGUAGE \n"
@@ -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
@@ -49,8 +49,7 @@ msgstr "パスワード"
#: accounts/templates/accounts/edit.html:21
#: accounts/templates/accounts/login.html:18
#: accounts/templates/accounts/register.html:22
-#: ctfs/templates/ctfs/ctf_info.html:63
-#: ctfs/templates/ctfs/ctfs_list.html:12
+#: ctfs/templates/ctfs/ctf_info.html:63 ctfs/templates/ctfs/ctfs_list.html:12
#: events/templates/events/ctf_info.html:65
#: events/templates/events/event_info.html:64
#: scoreboard/templates/scoreboard/scoreboard.html:13
@@ -70,14 +69,28 @@ msgid "Website"
msgstr "ウェブサイト"
#: accounts/templates/accounts/edit.html:36
-#: events/templates/events/manage_team.html:29
-msgid "Apply"
+#, fuzzy
+#| msgid "Apply"
+msgid " Apply"
msgstr "適用する"
-#: accounts/templates/accounts/edit.html:47
+#: accounts/templates/accounts/edit.html:45
+#, fuzzy
+#| msgid "Delete account"
+msgid "Connected accounts"
+msgstr "アカウント削除"
+
+#: accounts/templates/accounts/edit.html:53
+msgid "Disconnect Discord"
+msgstr ""
+
+#: accounts/templates/accounts/edit.html:59
+msgid "Connect Discord"
+msgstr ""
+
+#: 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
+#: ctfs/templates/ctfs/ctf_info.html:65 ctfs/templates/ctfs/ctfs_list.html:13
#: events/templates/events/event_info.html:66
#: events/templates/events/event_info.html:89
#: events/templates/events/manage_team.html:40
@@ -86,13 +99,15 @@ msgstr "適用する"
msgid "Score"
msgstr "スコア"
-#: accounts/templates/accounts/edit.html:55
+#: accounts/templates/accounts/edit.html:78
#: accounts/templates/accounts/profile.html:60
msgid "Registered since"
msgstr "登録日"
-#: accounts/templates/accounts/edit.html:61
-msgid "Delete my account"
+#: accounts/templates/accounts/edit.html:84
+#, fuzzy
+#| msgid "Delete my account"
+msgid " Delete my account"
msgstr "アカウント削除"
#: accounts/templates/accounts/login.html:13
@@ -241,15 +256,13 @@ msgstr "おめでとうございます!"
msgid "Already flagged"
msgstr "すでにフラグが立っています"
-#: ctfs/templates/ctfs/ctf_info.html:33
-#: ctfs/templates/ctfs/ctf_info.html:42
+#: 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 "チャレンジ開始"
-#: ctfs/templates/ctfs/ctf_info.html:35
-#: ctfs/templates/ctfs/ctf_info.html:44
+#: 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"
@@ -306,8 +319,7 @@ msgstr "このイベントは始まります。"
msgid "You need to be registered to the event."
msgstr "このイベントに登録する必要があります。"
-#: events/templates/events/create_team.html:20
-#: events/views/teams.py:120
+#: events/templates/events/create_team.html:20 events/views/teams.py:120
msgid "Name already taken."
msgstr "名前はすでに使用されています。"
@@ -471,6 +483,10 @@ msgstr "最大サイズに達しました。"
msgid "Team password"
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"
@@ -524,27 +540,27 @@ msgstr "フラグ"
msgid "Users"
msgstr "ユーザー"
-#: project/settings.py:115
+#: project/settings.py:116
msgid "English"
msgstr "英語"
-#: project/settings.py:116
+#: project/settings.py:117
msgid "German"
msgstr "ドイツ語"
-#: project/settings.py:117
+#: project/settings.py:118
msgid "French"
msgstr "フランス語"
-#: project/settings.py:118
+#: project/settings.py:119
msgid "Russian"
msgstr "ロシア語"
-#: project/settings.py:119
+#: project/settings.py:120
msgid "Japanese"
msgstr "日本語"
-#: project/settings.py:120
+#: project/settings.py:121
msgid "Spanish"
msgstr "スペイン語"
diff --git a/src/locale/ru/LC_MESSAGES/django.po b/src/locale/ru/LC_MESSAGES/django.po
index d66f8a1..54fb9c0 100644
--- a/src/locale/ru/LC_MESSAGES/django.po
+++ b/src/locale/ru/LC_MESSAGES/django.po
@@ -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 \n"
"Language-Team: LANGUAGE \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 ""
+msgid " Apply"
+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
-msgid "Delete my account"
-msgstr ""
+#: accounts/templates/accounts/edit.html:84
+msgid " Delete my account"
+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,99 @@ 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."
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 +291,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 +428,71 @@ 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."
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 +504,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 +516,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 ""
-
-#: project/settings.py:115
-msgid "English"
-msgstr ""
+msgstr "Пользователи"
#: project/settings.py:116
-msgid "German"
-msgstr ""
+msgid "English"
+msgstr "Английский"
#: project/settings.py:117
-msgid "French"
-msgstr ""
+msgid "German"
+msgstr "Немецкий"
#: project/settings.py:118
-msgid "Russian"
-msgstr ""
+msgid "French"
+msgstr "Французский"
#: project/settings.py:119
-msgid "Japanese"
-msgstr ""
+msgid "Russian"
+msgstr "Русский"
#: project/settings.py:120
+msgid "Japanese"
+msgstr "Японский"
+
+#: project/settings.py:121
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 +596,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 can’t 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 can’t be a commonly used password."
-msgstr ""
+msgstr "Твой пароль не может быть одним из распространенных паролей."
#: templates/registration/password_reset_confirm.html:23
msgid "Your password can’t 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 "Сбросить"
diff --git a/src/resources/locale/de/LC_MESSAGES/django.po b/src/resources/locale/de/LC_MESSAGES/django.po
index e23519e..b24ad5b 100644
--- a/src/resources/locale/de/LC_MESSAGES/django.po
+++ b/src/resources/locale/de/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-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: 2022-02-10 19:27+0100\n"
"Last-Translator: Clément Hamada \n"
"Language-Team: \n"
@@ -225,7 +225,7 @@ msgstr ""
"Folgende Zahlungsmethoden sind für eine Spende an 42CTF oder den Kauf einer "
"Mitgliedshaft verfügbar:"
-#: resources/templates/resources/donate.html:46
+#: resources/templates/resources/donate.html:44
msgid ""
"If you would like us to add another payment method or if you want to pay in "
"cash, send us a message !"
@@ -233,7 +233,7 @@ msgstr ""
"Falls Sie möchten, dass wir eine andere Zahlungsmethode hinzufügen oder "
"lieber Bar zahlen möchten, schicken Sie uns eine Nachricht!"
-#: resources/templates/resources/donate.html:48
+#: resources/templates/resources/donate.html:46
msgid ""
"If you're paying for your membership, don't forget to send us your first and "
"last name, as well as your 42CTF pseudo."
@@ -241,7 +241,7 @@ msgstr ""
"Falls Sie für eine Mitgliedschaft zahlen, vergessen Sie nicht uns Ihren vor "
"und Nachnamen, sowie Ihren 42CTF Nutzernamen mitzuteilen."
-#: resources/templates/resources/donate.html:49
+#: resources/templates/resources/donate.html:47
msgid ""
"We will only use thoe data to keep track of our members and grant you "
"advantages, and we will never communicate them to any third party."
@@ -250,6 +250,21 @@ msgstr ""
"Behalten und ihnen Vorteile zu bieten, und werden Sie niemals an einem "
"Dritten übermitteln."
+#: resources/templates/resources/donate.html:50
+msgid "What will we do with your money ?"
+msgstr ""
+
+#: resources/templates/resources/donate.html:51
+msgid ""
+"Hosting a website - and especially a CTF platform - costs money:\n"
+" more precisely, it costs us 50 euros per month.
\n"
+" If we had 40 members each year, it would be enough to "
+"cover the hosting of 42CTF.
\n"
+" With the additional money, we could for example offer prizes "
+"for limited-time events, but we will update this page as soon as we reach "
+"this threshold :)"
+msgstr ""
+
#: resources/templates/resources/edit.html:7
msgid "Edit this page"
msgstr "Diese Seite bearbeiten"
diff --git a/src/resources/locale/en/LC_MESSAGES/django.po b/src/resources/locale/en/LC_MESSAGES/django.po
index 1a19e2b..3c855f0 100644
--- a/src/resources/locale/en/LC_MESSAGES/django.po
+++ b/src/resources/locale/en/LC_MESSAGES/django.po
@@ -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 \n"
"Language-Team: LANGUAGE \n"
@@ -187,24 +187,39 @@ msgid ""
"You can donate to 42CTF or pay your membership with the following means:"
msgstr ""
-#: resources/templates/resources/donate.html:46
+#: resources/templates/resources/donate.html:44
msgid ""
"If you would like us to add another payment method or if you want to pay in "
"cash, send us a message !"
msgstr ""
-#: resources/templates/resources/donate.html:48
+#: resources/templates/resources/donate.html:46
msgid ""
"If you're paying for your membership, don't forget to send us your first and "
"last name, as well as your 42CTF pseudo."
msgstr ""
-#: resources/templates/resources/donate.html:49
+#: resources/templates/resources/donate.html:47
msgid ""
"We will only use thoe data to keep track of our members and grant you "
"advantages, and we will never communicate them to any third party."
msgstr ""
+#: resources/templates/resources/donate.html:50
+msgid "What will we do with your money ?"
+msgstr ""
+
+#: resources/templates/resources/donate.html:51
+msgid ""
+"Hosting a website - and especially a CTF platform - costs money:\n"
+" more precisely, it costs us 50 euros per month.
\n"
+" If we had 40 members each year, it would be enough to "
+"cover the hosting of 42CTF.
\n"
+" With the additional money, we could for example offer prizes "
+"for limited-time events, but we will update this page as soon as we reach "
+"this threshold :)"
+msgstr ""
+
#: resources/templates/resources/edit.html:7
msgid "Edit this page"
msgstr ""
diff --git a/src/resources/locale/es/LC_MESSAGES/django.po b/src/resources/locale/es/LC_MESSAGES/django.po
index 66d5ca1..800ee4e 100644
--- a/src/resources/locale/es/LC_MESSAGES/django.po
+++ b/src/resources/locale/es/LC_MESSAGES/django.po
@@ -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: 2022-02-09 10:55+0100\n"
"Last-Translator: Javier Uhagón (uhagontorralvojavier@gmail.com)\n"
"Language-Team: \n"
@@ -215,7 +215,7 @@ msgid ""
msgstr ""
"Puedes donar a 42CTF o pagar tu membresía con los siguientes métodos de pago:"
-#: resources/templates/resources/donate.html:46
+#: resources/templates/resources/donate.html:44
msgid ""
"If you would like us to add another payment method or if you want to pay in "
"cash, send us a message !"
@@ -223,7 +223,7 @@ msgstr ""
"Si quieres que añadamos otro metodo de pago o quieres pagarnos en efectivo "
"¡Mandanos un mensaje!"
-#: resources/templates/resources/donate.html:48
+#: resources/templates/resources/donate.html:46
msgid ""
"If you're paying for your membership, don't forget to send us your first and "
"last name, as well as your 42CTF pseudo."
@@ -231,7 +231,7 @@ msgstr ""
"Si estás pagando por tu membresía, no olvides mandarnos tu nombre y "
"apellido, también tu nombre de usuario en 42CTF"
-#: resources/templates/resources/donate.html:49
+#: resources/templates/resources/donate.html:47
msgid ""
"We will only use thoe data to keep track of our members and grant you "
"advantages, and we will never communicate them to any third party."
@@ -239,6 +239,21 @@ msgstr ""
"Solo usarmos los datos para tener control de la lista de miembros y darte "
"las ventajas de miembro, nunca se los daremos a ningún tercero."
+#: resources/templates/resources/donate.html:50
+msgid "What will we do with your money ?"
+msgstr ""
+
+#: resources/templates/resources/donate.html:51
+msgid ""
+"Hosting a website - and especially a CTF platform - costs money:\n"
+" more precisely, it costs us 50 euros per month.
\n"
+" If we had 40 members each year, it would be enough to "
+"cover the hosting of 42CTF.
\n"
+" With the additional money, we could for example offer prizes "
+"for limited-time events, but we will update this page as soon as we reach "
+"this threshold :)"
+msgstr ""
+
#: resources/templates/resources/edit.html:7
msgid "Edit this page"
msgstr "Editar esta página"
diff --git a/src/resources/locale/fr/LC_MESSAGES/django.po b/src/resources/locale/fr/LC_MESSAGES/django.po
index 04ec123..cc10f9e 100644
--- a/src/resources/locale/fr/LC_MESSAGES/django.po
+++ b/src/resources/locale/fr/LC_MESSAGES/django.po
@@ -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 \n"
"Language-Team: LANGUAGE \n"
@@ -36,7 +36,7 @@ msgstr ""
"les participants doivent résoudre des challenges dans différentes catégories "
"pour gagner des points et progresser dans le classement."
-#: resources/templates/resources/42ctf.html:122
+#: resources/templates/resources/42ctf.html:12
msgid ""
"The challenges require participants to find sort of passwords called \"flags"
"\" and to submit them on the platform."
@@ -224,7 +224,7 @@ msgid ""
msgstr ""
"Vous pouvez donner à 42CTF ou payer votre adhésion avec les moyens suivants :"
-#: resources/templates/resources/donate.html:46
+#: resources/templates/resources/donate.html:44
msgid ""
"If you would like us to add another payment method or if you want to pay in "
"cash, send us a message !"
@@ -232,7 +232,7 @@ msgstr ""
"Si vous aimeriez qu'on ajoute un autre moyen de paiement, ou si vous voulez "
"payer en liquide, envoyez-nous un message !"
-#: resources/templates/resources/donate.html:48
+#: resources/templates/resources/donate.html:46
msgid ""
"If you're paying for your membership, don't forget to send us your first and "
"last name, as well as your 42CTF pseudo."
@@ -240,7 +240,7 @@ msgstr ""
"Si vous payez pour l'adhésion, n'oubliez pas de nous envoyer vos noms et "
"prénoms, ainsi que votre pseudo 42CTF."
-#: resources/templates/resources/donate.html:49
+#: resources/templates/resources/donate.html:47
msgid ""
"We will only use thoe data to keep track of our members and grant you "
"advantages, and we will never communicate them to any third party."
@@ -249,6 +249,21 @@ msgstr ""
"et vous accorder des avantages, nous ne transmettrons jamais ces données à "
"des tierces parties."
+#: resources/templates/resources/donate.html:50
+msgid "What will we do with your money ?"
+msgstr ""
+
+#: resources/templates/resources/donate.html:51
+msgid ""
+"Hosting a website - and especially a CTF platform - costs money:\n"
+" more precisely, it costs us 50 euros per month.
\n"
+" If we had 40 members each year, it would be enough to "
+"cover the hosting of 42CTF.
\n"
+" With the additional money, we could for example offer prizes "
+"for limited-time events, but we will update this page as soon as we reach "
+"this threshold :)"
+msgstr ""
+
#: resources/templates/resources/edit.html:7
msgid "Edit this page"
msgstr "Modifier cette page"
diff --git a/src/resources/locale/it/LC_MESSAGES/django.po b/src/resources/locale/it/LC_MESSAGES/django.po
index 1a19e2b..3c855f0 100644
--- a/src/resources/locale/it/LC_MESSAGES/django.po
+++ b/src/resources/locale/it/LC_MESSAGES/django.po
@@ -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 \n"
"Language-Team: LANGUAGE \n"
@@ -187,24 +187,39 @@ msgid ""
"You can donate to 42CTF or pay your membership with the following means:"
msgstr ""
-#: resources/templates/resources/donate.html:46
+#: resources/templates/resources/donate.html:44
msgid ""
"If you would like us to add another payment method or if you want to pay in "
"cash, send us a message !"
msgstr ""
-#: resources/templates/resources/donate.html:48
+#: resources/templates/resources/donate.html:46
msgid ""
"If you're paying for your membership, don't forget to send us your first and "
"last name, as well as your 42CTF pseudo."
msgstr ""
-#: resources/templates/resources/donate.html:49
+#: resources/templates/resources/donate.html:47
msgid ""
"We will only use thoe data to keep track of our members and grant you "
"advantages, and we will never communicate them to any third party."
msgstr ""
+#: resources/templates/resources/donate.html:50
+msgid "What will we do with your money ?"
+msgstr ""
+
+#: resources/templates/resources/donate.html:51
+msgid ""
+"Hosting a website - and especially a CTF platform - costs money:\n"
+" more precisely, it costs us 50 euros per month.
\n"
+" If we had 40 members each year, it would be enough to "
+"cover the hosting of 42CTF.
\n"
+" With the additional money, we could for example offer prizes "
+"for limited-time events, but we will update this page as soon as we reach "
+"this threshold :)"
+msgstr ""
+
#: resources/templates/resources/edit.html:7
msgid "Edit this page"
msgstr ""
diff --git a/src/resources/locale/ja/LC_MESSAGES/django.po b/src/resources/locale/ja/LC_MESSAGES/django.po
index 1c94f45..ffd0706 100644
--- a/src/resources/locale/ja/LC_MESSAGES/django.po
+++ b/src/resources/locale/ja/LC_MESSAGES/django.po
@@ -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 \n"
"Language-Team: LANGUAGE \n"
@@ -219,7 +219,7 @@ msgid ""
msgstr ""
"42CTFへのご寄付やメンバーシップのお支払いは、以下の手段で行うことができます:"
-#: resources/templates/resources/donate.html:46
+#: resources/templates/resources/donate.html:44
msgid ""
"If you would like us to add another payment method or if you want to pay in "
"cash, send us a message !"
@@ -227,7 +227,7 @@ msgstr ""
"他のお支払い方法や現金でのお支払いをご希望の場合は、メッセージをお送りくださ"
"い。"
-#: resources/templates/resources/donate.html:48
+#: resources/templates/resources/donate.html:46
msgid ""
"If you're paying for your membership, don't forget to send us your first and "
"last name, as well as your 42CTF pseudo."
@@ -235,7 +235,7 @@ msgstr ""
"メンバーシップをお支払いになる場合は、氏名と42CTFのアカウント名を忘れずにお送"
"りください。"
-#: resources/templates/resources/donate.html:49
+#: resources/templates/resources/donate.html:47
msgid ""
"We will only use thoe data to keep track of our members and grant you "
"advantages, and we will never communicate them to any third party."
@@ -243,6 +243,21 @@ msgstr ""
"これらのデータは、メンバーの管理と特典の付与のためにのみ使用し、第三者に提供"
"することはありません。"
+#: resources/templates/resources/donate.html:50
+msgid "What will we do with your money ?"
+msgstr ""
+
+#: resources/templates/resources/donate.html:51
+msgid ""
+"Hosting a website - and especially a CTF platform - costs money:\n"
+" more precisely, it costs us 50 euros per month.
\n"
+" If we had 40 members each year, it would be enough to "
+"cover the hosting of 42CTF.
\n"
+" With the additional money, we could for example offer prizes "
+"for limited-time events, but we will update this page as soon as we reach "
+"this threshold :)"
+msgstr ""
+
#: resources/templates/resources/edit.html:7
msgid "Edit this page"
msgstr "このページの編集"
diff --git a/src/resources/locale/ru/LC_MESSAGES/django.po b/src/resources/locale/ru/LC_MESSAGES/django.po
index a09037d..af459a6 100644
--- a/src/resources/locale/ru/LC_MESSAGES/django.po
+++ b/src/resources/locale/ru/LC_MESSAGES/django.po
@@ -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 \n"
"Language-Team: LANGUAGE \n"
@@ -189,24 +189,39 @@ msgid ""
"You can donate to 42CTF or pay your membership with the following means:"
msgstr ""
-#: resources/templates/resources/donate.html:46
+#: resources/templates/resources/donate.html:44
msgid ""
"If you would like us to add another payment method or if you want to pay in "
"cash, send us a message !"
msgstr ""
-#: resources/templates/resources/donate.html:48
+#: resources/templates/resources/donate.html:46
msgid ""
"If you're paying for your membership, don't forget to send us your first and "
"last name, as well as your 42CTF pseudo."
msgstr ""
-#: resources/templates/resources/donate.html:49
+#: resources/templates/resources/donate.html:47
msgid ""
"We will only use thoe data to keep track of our members and grant you "
"advantages, and we will never communicate them to any third party."
msgstr ""
+#: resources/templates/resources/donate.html:50
+msgid "What will we do with your money ?"
+msgstr ""
+
+#: resources/templates/resources/donate.html:51
+msgid ""
+"Hosting a website - and especially a CTF platform - costs money:\n"
+" more precisely, it costs us 50 euros per month.
\n"
+" If we had 40 members each year, it would be enough to "
+"cover the hosting of 42CTF.
\n"
+" With the additional money, we could for example offer prizes "
+"for limited-time events, but we will update this page as soon as we reach "
+"this threshold :)"
+msgstr ""
+
#: resources/templates/resources/edit.html:7
msgid "Edit this page"
msgstr ""
diff --git a/src/resources/templates/resources/donate.html b/src/resources/templates/resources/donate.html
index dbd80df..acc445c 100644
--- a/src/resources/templates/resources/donate.html
+++ b/src/resources/templates/resources/donate.html
@@ -25,29 +25,34 @@
{% trans "Donate to 42CTF" %}
{% trans "You can donate to 42CTF or pay your membership with the following means:" %}
-
-
+
-
+ -->
-
+
{% trans "If you would like us to add another payment method or if you want to pay in cash, send us a message !" %}
{% trans "If you're paying for your membership, don't forget to send us your first and last name, as well as your 42CTF pseudo." %}
{% trans "We will only use thoe data to keep track of our members and grant you advantages, and we will never communicate them to any third party." %}
+
+ {% trans "What will we do with your money ?" %}
+ {% blocktranslate %}Hosting a website - and especially a CTF platform - costs money:
+ more precisely, it costs us 50 euros per month.
+ If we had 40 members each year, it would be enough to cover the hosting of 42CTF.
+ We currently have {{nb_members}} members.
+ With the additional money, we could for example offer prizes for limited-time events, but we will update this page as soon as we reach this threshold :){% endblocktranslate %}
diff --git a/src/resources/templates/resources/edit.html b/src/resources/templates/resources/edit.html
index 2835308..2a4f666 100644
--- a/src/resources/templates/resources/edit.html
+++ b/src/resources/templates/resources/edit.html
@@ -9,7 +9,7 @@
- {% trans "More information coming soon, but as you can guess it involves making a pull request to your favorite" %}
repository ;)
+ {% trans "More information coming soon, but as you can guess it involves making a pull request to your favorite" %}
repository ;)
diff --git a/src/resources/templates/resources/translate.html b/src/resources/templates/resources/translate.html
index 6f5f495..a881d6a 100644
--- a/src/resources/templates/resources/translate.html
+++ b/src/resources/templates/resources/translate.html
@@ -7,9 +7,9 @@
{% trans "Translate 42CTF" %}
- {% trans "42CTF source code is publicly available on this"%}
github.
+ {% trans "42CTF source code is publicly available on this"%}
git.
{% trans "Translation does not require any programming skill and is a good way to contribute if you want to help us, by making the platform always more accessible." %}
- {% trans "We have a" %}
wiki {% trans "describing how to translate pages with the Django internalization module." %}
+ {% trans "We have a" %}
wiki {% trans "describing how to translate pages with the Django internalization module." %}
{% trans "We invite you to read it to know all the details, but it merely requires you to edit text files, so you see, no programming skills required ;)" %}
{% trans "You will need to fork the git repository, make your changes, push them, and then open a pull request so that we can merge your contributions into our repository." %}
{% trans "Don't hesitate to reach for help on" %}
diff --git a/src/resources/urls.py b/src/resources/urls.py
index 9b57e19..53f26cd 100644
--- a/src/resources/urls.py
+++ b/src/resources/urls.py
@@ -5,10 +5,4 @@ app_name = "resources"
urlpatterns = [
path('', views.resources, name='resources'),
- path('42ctf', views.ctf42, name='42ctf'),
- path('tools', views.tools, name='tools'),
- path('create_challenge', views.create_challenge, name='create_challenge'),
- path('translate', views.translate, name='translate'),
- path('edit', views.edit, name='edit'),
- path('donate', views.donate, name='donate'),
]
diff --git a/src/resources/views.py b/src/resources/views.py
index 3bfbbc3..fb41648 100644
--- a/src/resources/views.py
+++ b/src/resources/views.py
@@ -1,26 +1,9 @@
from django.shortcuts import render
-from django.core.paginator import Paginator
from accounts.models import UserProfileInfo
+from django.contrib.auth.models import timezone
# Create your views here.
def resources(request):
- return render(request, 'resources/resources.html')
-
-def ctf42(request):
- return render(request, 'resources/42ctf.html')
-
-def tools(request):
- return render(request, 'resources/tools.html')
-
-def create_challenge(request):
- return render(request, 'resources/create_challenge.html')
-
-def translate(request):
- return render(request, 'resources/translate.html')
-
-def edit(request):
- return render(request, 'resources/edit.html')
-
-def donate(request):
- return render(request, 'resources/donate.html')
\ No newline at end of file
+ nb_members = UserProfileInfo.objects.filter(member=True, member_until__gt=timezone.now()).count()
+ return render(request, 'resources/resources.html', {'nb_members':nb_members})
\ No newline at end of file
diff --git a/src/statics/css/style.css b/src/statics/css/style.css
index 402c2e4..4731362 100644
--- a/src/statics/css/style.css
+++ b/src/statics/css/style.css
@@ -120,6 +120,7 @@ input[type="url"] {
background-color: #2d2d2d;
padding: 3px;
border-radius: 4px;
+ color: #d9d9d9;
}
input[type="submit"] {
padding: 0;
@@ -356,7 +357,7 @@ footer {
cursor: unset;
}
.is-member {
- color: #2b908f;
+ color: #26fcef;
}
@media only screen and (min-width : 1200px) {
diff --git a/src/templates/base.html b/src/templates/base.html
index 8e97e6d..2e139c5 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -126,7 +126,7 @@