From 3c4478dddbf68d6d9ca4d5e72a7b44cee2d3baf8 Mon Sep 17 00:00:00 2001 From: Danhia Date: Mon, 24 Jan 2022 16:16:25 +0100 Subject: [PATCH 01/29] hotfix for duplicate messages in .po files --- src/locale/de/LC_MESSAGES/django.po | 5 +---- src/locale/en/LC_MESSAGES/django.po | 5 +---- src/locale/es/LC_MESSAGES/django.po | 5 +---- src/locale/fr/LC_MESSAGES/django.po | 5 +---- src/locale/it/LC_MESSAGES/django.po | 5 +---- src/locale/ru/LC_MESSAGES/django.po | 5 +---- 6 files changed, 6 insertions(+), 24 deletions(-) diff --git a/src/locale/de/LC_MESSAGES/django.po b/src/locale/de/LC_MESSAGES/django.po index 996564e..1b7f22b 100644 --- a/src/locale/de/LC_MESSAGES/django.po +++ b/src/locale/de/LC_MESSAGES/django.po @@ -159,6 +159,7 @@ msgid "Personal website" msgstr "" #: accounts/templates/accounts/register.html:26 +#: events/templates/events/event_info.html:117 msgid "Register" msgstr "" @@ -385,10 +386,6 @@ msgstr "" msgid "No one have earn point yet, you gonna be the first ?" msgstr "" -#: events/templates/events/event_info.html:117 -msgid "Register" -msgstr "" - #: events/templates/events/event_info.html:127 msgid "Manage my team" msgstr "" diff --git a/src/locale/en/LC_MESSAGES/django.po b/src/locale/en/LC_MESSAGES/django.po index 996564e..1b7f22b 100644 --- a/src/locale/en/LC_MESSAGES/django.po +++ b/src/locale/en/LC_MESSAGES/django.po @@ -159,6 +159,7 @@ msgid "Personal website" msgstr "" #: accounts/templates/accounts/register.html:26 +#: events/templates/events/event_info.html:117 msgid "Register" msgstr "" @@ -385,10 +386,6 @@ msgstr "" msgid "No one have earn point yet, you gonna be the first ?" msgstr "" -#: events/templates/events/event_info.html:117 -msgid "Register" -msgstr "" - #: events/templates/events/event_info.html:127 msgid "Manage my team" msgstr "" diff --git a/src/locale/es/LC_MESSAGES/django.po b/src/locale/es/LC_MESSAGES/django.po index 996564e..1b7f22b 100644 --- a/src/locale/es/LC_MESSAGES/django.po +++ b/src/locale/es/LC_MESSAGES/django.po @@ -159,6 +159,7 @@ msgid "Personal website" msgstr "" #: accounts/templates/accounts/register.html:26 +#: events/templates/events/event_info.html:117 msgid "Register" msgstr "" @@ -385,10 +386,6 @@ msgstr "" msgid "No one have earn point yet, you gonna be the first ?" msgstr "" -#: events/templates/events/event_info.html:117 -msgid "Register" -msgstr "" - #: events/templates/events/event_info.html:127 msgid "Manage my team" msgstr "" diff --git a/src/locale/fr/LC_MESSAGES/django.po b/src/locale/fr/LC_MESSAGES/django.po index 4481aa1..1dcfe9e 100644 --- a/src/locale/fr/LC_MESSAGES/django.po +++ b/src/locale/fr/LC_MESSAGES/django.po @@ -161,6 +161,7 @@ msgid "Personal website" msgstr "Site personnel" #: accounts/templates/accounts/register.html:26 +#: events/templates/events/event_info.html:117 msgid "Register" msgstr "Inscription" @@ -405,10 +406,6 @@ msgstr "Équipe" msgid "No one have earn point yet, you gonna be the first ?" msgstr "Personne n'a encore gagné de point, allez-vous être le premier ?" -#: events/templates/events/event_info.html:117 -msgid "Register" -msgstr "" - #: events/templates/events/event_info.html:127 msgid "Manage my team" msgstr "Gérer mon équipe" diff --git a/src/locale/it/LC_MESSAGES/django.po b/src/locale/it/LC_MESSAGES/django.po index 996564e..1b7f22b 100644 --- a/src/locale/it/LC_MESSAGES/django.po +++ b/src/locale/it/LC_MESSAGES/django.po @@ -159,6 +159,7 @@ msgid "Personal website" msgstr "" #: accounts/templates/accounts/register.html:26 +#: events/templates/events/event_info.html:117 msgid "Register" msgstr "" @@ -385,10 +386,6 @@ msgstr "" msgid "No one have earn point yet, you gonna be the first ?" msgstr "" -#: events/templates/events/event_info.html:117 -msgid "Register" -msgstr "" - #: events/templates/events/event_info.html:127 msgid "Manage my team" msgstr "" diff --git a/src/locale/ru/LC_MESSAGES/django.po b/src/locale/ru/LC_MESSAGES/django.po index f065dab..80c778a 100644 --- a/src/locale/ru/LC_MESSAGES/django.po +++ b/src/locale/ru/LC_MESSAGES/django.po @@ -161,6 +161,7 @@ msgid "Personal website" msgstr "" #: accounts/templates/accounts/register.html:26 +#: events/templates/events/event_info.html:117 msgid "Register" msgstr "" @@ -393,10 +394,6 @@ msgstr "" msgid "No one have earn point yet, you gonna be the first ?" msgstr "" -#: events/templates/events/event_info.html:117 -msgid "Register" -msgstr "" - #: events/templates/events/event_info.html:127 msgid "Manage my team" msgstr "" From 314a7e17b40db1b850c0b517bd0fadc8a5dbe15b Mon Sep 17 00:00:00 2001 From: Danhia Date: Mon, 24 Jan 2022 17:20:23 +0100 Subject: [PATCH 02/29] fixed broken responsive design for footer --- src/templates/base.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/templates/base.html b/src/templates/base.html index 7cdc413..d40eb23 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -121,17 +121,17 @@ -
+
-
+

42ctf@protonmail.com
Made with by ix-56h - CGU

-
+
- +
From 0c08fdda9672c5b9a7648320131832f436e4128c Mon Sep 17 00:00:00 2001 From: Danhia Date: Mon, 24 Jan 2022 21:11:30 +0100 Subject: [PATCH 03/29] hotfix for too long pseudos breaking top10 css --- src/home/templates/home/home.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/home/templates/home/home.html b/src/home/templates/home/home.html index 3e83e8b..a1be62d 100644 --- a/src/home/templates/home/home.html +++ b/src/home/templates/home/home.html @@ -48,7 +48,7 @@
  • Top 10
    • {% for t in top %} {% ismember t.user.userprofileinfo as is_member %} -
  • # {{ forloop.counter }} +
  • # {{ forloop.counter }} {{ t.user.username }} {{ t.score }}
    • {% endfor %} From b352a2341af838d6867a0ceca29c967af9d44807 Mon Sep 17 00:00:00 2001 From: Danhia Date: Sun, 30 Jan 2022 17:59:02 +0100 Subject: [PATCH 04/29] added weekly top 5 + latest flags to home page --- src/home/templates/home/home.html | 55 +++++++++++++++++++++++++------ src/home/views.py | 22 ++++++++++++- src/statics/css/style.css | 11 +++++++ 3 files changed, 77 insertions(+), 11 deletions(-) diff --git a/src/home/templates/home/home.html b/src/home/templates/home/home.html index a1be62d..a8b825a 100644 --- a/src/home/templates/home/home.html +++ b/src/home/templates/home/home.html @@ -4,7 +4,30 @@ {% get_current_language as lang %} {% load is_member %}
    -
    +
    + +
      +
    • Top 10
      • + {% for t in top %} + {% ismember t.user.userprofileinfo as is_member %} +
    • # {{ forloop.counter }} + {{ t.user.username }} + {{ t.score }}
      • + {% endfor %} +
    + +
      +
    • {% trans "Weekly Top 5" %}
      • + {% for user, score in top_weekly %} + {% ismember user as is_member %} +
    • # {{ forloop.counter }} + {{ user }} + {{ score }}
      • + {% endfor %} +
    + +
    +
    {% if news %} {% for n in news %}
    @@ -33,30 +56,42 @@

    {% trans "No article available." %}

    {% endif %}
    -
    +
    • {% trans "Latest challenges added" %}
      • {% if ctfs %} {% for ctf in ctfs %} - {{ ctf.name }} +
    • + {{ ctf.name }} - {{ctf.points}} {% trans "points" %} +
      • {% endfor %} {% else %} -
    • {% trans "No ctf available." %}
      • +
    • {% trans "No ctf available." %}
      • {% endif %}
      -
    • Top 10
      • - {% for t in top %} - {% ismember t.user.userprofileinfo as is_member %} -
    • # {{ forloop.counter }} - {{ t.user.username }} - {{ t.score }}
      • +
    • {% trans "Latest Flags" %}
      • + {% for f in latest_flags %} + {% ismember f.user.userprofileinfo as is_member %} +
    • + + {{ f.user.username }} - {{f.ctf}} {% endfor %}
    +
    +
    • {% trans "Flags counter" %}
    • {{ flags }}
    +
    +
    +
      +
    • {% trans "Users" %}
      • +
    • {{ nb_users }}
      • +
    +
    +
    diff --git a/src/home/views.py b/src/home/views.py index 8960df3..32c2444 100644 --- a/src/home/views.py +++ b/src/home/views.py @@ -8,6 +8,9 @@ from django.urls import translate_url from django.utils.translation import ( LANGUAGE_SESSION_KEY, check_for_language, get_language, ) +import datetime +from collections import defaultdict +import operator def get_content_by_lang(news): lang = get_language() @@ -22,6 +25,19 @@ def get_content_by_lang(news): ret = news.content_ru return ret +def get_weekly_top(): + week_ago = datetime.datetime.now() - datetime.timedelta(days=7) + weekly_flags = CTF_flags.objects.filter(flag_date__gt=week_ago) + scores = defaultdict(int) + + for sol in weekly_flags: + scores[sol.user] += sol.ctf.points + + users = sorted(scores.items(), key=operator.itemgetter(1), reverse=True) + users = [(u[0].userprofileinfo, u[1]) for u in users] + + return(users[:5]) + def home(request): lang_code = get_language() if hasattr(request, 'session') and LANGUAGE_SESSION_KEY in request.session: @@ -36,7 +52,11 @@ def home(request): top10 = UserProfileInfo.objects.select_related().order_by('-score', 'last_submission_date', 'user__username')[:10] nb_flags = CTF_flags.objects.count() nb_users = UserProfileInfo.objects.count() - return render(request, 'home/home.html', {'news' : news, 'ctfs' : latest_ctfs, 'top' : top10, 'flags' : nb_flags}) + latest_flags = CTF_flags.objects.order_by('-flag_date')[:5] + top_weekly = get_weekly_top() + + return render(request, 'home/home.html', {'news' : news, 'ctfs' : latest_ctfs, 'top' : top10, 'flags' : nb_flags, + 'latest_flags':latest_flags, 'top_weekly': top_weekly, 'nb_users': nb_users}) def cgu(request): return render(request, 'cgu.html') diff --git a/src/statics/css/style.css b/src/statics/css/style.css index f8df0ab..ca69b8d 100644 --- a/src/statics/css/style.css +++ b/src/statics/css/style.css @@ -361,4 +361,15 @@ footer { } .is-member { color: #2b908f; +} + +@media only screen and (min-width : 1200px) { + .container { max-width: 1400px; } +} + +@media screen and (max-width: 991px) { + .container { display: flex; flex-flow: column; } + .top-sm { order: 1; } + .middle-sm { order: 2; } + .bottom-sm { order: 3 } } \ No newline at end of file From 0beafc39faa52409c6a64339120cbb06678d062c Mon Sep 17 00:00:00 2001 From: Danhia Date: Sun, 30 Jan 2022 18:22:59 +0100 Subject: [PATCH 05/29] changed timezone in settings.py --- src/project/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/project/settings.py b/src/project/settings.py index 300fa18..f69d126 100644 --- a/src/project/settings.py +++ b/src/project/settings.py @@ -122,7 +122,7 @@ LOCALE_PATHS = ( os.path.join(BASE_DIR, 'locale'), ) -TIME_ZONE = 'UTC' +TIME_ZONE = 'Europe/Paris' USE_I18N = True From da6e51bdcdea795a45a35f71b096d9d480db8b61 Mon Sep 17 00:00:00 2001 From: Danhia Date: Sun, 30 Jan 2022 19:22:58 +0100 Subject: [PATCH 06/29] fixed links css for challenges in home --- src/home/templates/home/home.html | 10 +++++++--- src/statics/css/style.css | 17 +++++++++-------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/home/templates/home/home.html b/src/home/templates/home/home.html index a8b825a..865353a 100644 --- a/src/home/templates/home/home.html +++ b/src/home/templates/home/home.html @@ -62,7 +62,8 @@ {% if ctfs %} {% for ctf in ctfs %}
  • - {{ ctf.name }} - {{ctf.points}} {% trans "points" %} + {{ ctf.name }} + {{ctf.points}} {% trans "points" %}
    • {% endfor %} {% else %} @@ -74,8 +75,11 @@ {% for f in latest_flags %} {% ismember f.user.userprofileinfo as is_member %}
  • - - {{ f.user.username }} - {{f.ctf}} + {{f.ctf}} + + {{ f.user.username }} + +
    • {% endfor %}
    diff --git a/src/statics/css/style.css b/src/statics/css/style.css index ca69b8d..4387d48 100644 --- a/src/statics/css/style.css +++ b/src/statics/css/style.css @@ -77,14 +77,7 @@ pre { .table-dark thead th { border: none; } -.list-group a { - text-decoration: none; - /* color: #4375aa; */ -} -.list-group a:hover { - text-decoration: none; - color: #fff; -} + .ctf-block { background-color: #1d1d1d; min-height: 235px; @@ -372,4 +365,12 @@ footer { .top-sm { order: 1; } .middle-sm { order: 2; } .bottom-sm { order: 3 } +} + +.ctf-link { + color: #fff; +} +.ctf-link:hover { + color: #a9a9a9; + text-decoration: none; } \ No newline at end of file From c38cc8dc944e80e4ad2bc5555a6286165f25e323 Mon Sep 17 00:00:00 2001 From: Danhia Date: Mon, 31 Jan 2022 18:46:34 +0100 Subject: [PATCH 07/29] hotfix for command recompute_scoreboard --- .../management/commands/recompute_scoreboard.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/scoreboard/management/commands/recompute_scoreboard.py b/src/scoreboard/management/commands/recompute_scoreboard.py index 29fee3d..3099143 100644 --- a/src/scoreboard/management/commands/recompute_scoreboard.py +++ b/src/scoreboard/management/commands/recompute_scoreboard.py @@ -7,12 +7,11 @@ class Command(BaseCommand): help = 'Recomputes the score and ranking caches from the solutions' def handle(self, *args, **options): - all_sols = ex_models.CTF_flags.objects.select_related().all() + all_sols = ex_models.CTF_flags.objects.select_related().filter(ctf__event=None) scores = defaultdict(int) for sol in all_sols: scores[sol.user] += sol.ctf.points li = [(s, u) for (u, s) in scores.items()] - # #li.sort(reverse=True) li2 = [] old_rank = None @@ -29,10 +28,4 @@ class Command(BaseCommand): for (u, s, r) in li2: u.userprofileinfo.score = s - # u.userprofileinfo.rank = r u.userprofileinfo.save() - - # not_handled = acc_models.UserProfileInfo.objects.exclude( - # id__in=[u.id for u, s, r in li2] - # ) - # not_handled.update(score=0, rank=rank+1) From 2ab42b20c71ef82131c86ec1e78486de89179153 Mon Sep 17 00:00:00 2001 From: Danhia Date: Mon, 31 Jan 2022 19:21:14 +0100 Subject: [PATCH 08/29] you can now delete your account --- src/accounts/templates/accounts/delete.html | 33 ++++++++ src/accounts/templates/accounts/edit.html | 8 ++ src/accounts/urls.py | 3 +- src/accounts/views/views.py | 17 ++++ src/locale/de/LC_MESSAGES/django.po | 69 ++++++++++++---- src/locale/en/LC_MESSAGES/django.po | 69 ++++++++++++---- src/locale/es/LC_MESSAGES/django.po | 69 ++++++++++++---- src/locale/fr/LC_MESSAGES/django.po | 82 +++++++++++++++---- src/locale/it/LC_MESSAGES/django.po | 69 ++++++++++++---- src/locale/ru/LC_MESSAGES/django.po | 69 ++++++++++++---- src/resources/locale/de/LC_MESSAGES/django.po | 2 +- src/resources/locale/en/LC_MESSAGES/django.po | 2 +- src/resources/locale/es/LC_MESSAGES/django.po | 2 +- src/resources/locale/fr/LC_MESSAGES/django.po | 2 +- src/resources/locale/it/LC_MESSAGES/django.po | 2 +- src/resources/locale/ru/LC_MESSAGES/django.po | 2 +- 16 files changed, 406 insertions(+), 94 deletions(-) create mode 100644 src/accounts/templates/accounts/delete.html diff --git a/src/accounts/templates/accounts/delete.html b/src/accounts/templates/accounts/delete.html new file mode 100644 index 0000000..1aae774 --- /dev/null +++ b/src/accounts/templates/accounts/delete.html @@ -0,0 +1,33 @@ +{% extends 'base.html' %} +{% block content %} +{% load i18n %} +
    +
    +
    +
    +

    {% trans "Delete account" %}

    +
    +
    + {% trans "Please confirm your password to delete your account." %}
    + {% trans "Deleted accounts cannot be recovered." %}

    +
    + {% if bad_password %} + {% trans "Password inccorect." %} + {% elif deleted %} + {% trans "Your account has been deleted." %} + {% endif %} +
    + {% csrf_token %} +
    +
    + +
    +
    +
    +
    +
    + +
    +
    +{% endblock %} + diff --git a/src/accounts/templates/accounts/edit.html b/src/accounts/templates/accounts/edit.html index 0df35aa..07eaba6 100644 --- a/src/accounts/templates/accounts/edit.html +++ b/src/accounts/templates/accounts/edit.html @@ -54,6 +54,14 @@ {% endif %}
  • {% trans "Registered since" %} {{ user.date_joined|date:"Y-m-d" }}
    • +
      +
      + {%csrf_token%} +
    • + +
      • +
      +
    {% endblock %} diff --git a/src/accounts/urls.py b/src/accounts/urls.py index 38b9e53..abf5ec9 100644 --- a/src/accounts/urls.py +++ b/src/accounts/urls.py @@ -12,5 +12,6 @@ urlpatterns = [ path('rank/', views.rank, name='rank'), path('connections/connect/discord', views.connection.connect, name='connections-connect-discord'), path('connections/connect/discord/authorize', views.connection.authorize, name='connections-connect-discord-authorize'), - path('connections/disconnect/discord', views.connection.disconnect, name='connections-disconnect-discord') + path('connections/disconnect/discord', views.connection.disconnect, name='connections-disconnect-discord'), + path('delete_account/', views.delete_account, name='delete_account'), ] diff --git a/src/accounts/views/views.py b/src/accounts/views/views.py index b4367a6..dcfdd8e 100644 --- a/src/accounts/views/views.py +++ b/src/accounts/views/views.py @@ -163,3 +163,20 @@ def rank(request, token): rank += 1 data = {"rank": rank} return JsonResponse(data) + +@login_required +def delete_account(request): + if request.method == 'POST': + user = request.user + + password = request.POST.get('password') + if user.check_password(password): + logout(request) + user.delete() + return render(request, 'accounts/delete.html', {'deleted': True, 'bad_password': False}) + + else: + return render(request, 'accounts/delete.html', {'deleted': False, 'bad_password': True}) + + else: + return render(request, 'accounts/delete.html', {'deleted': False, 'bad_password': False} ) \ 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 1b7f22b..fa163cd 100644 --- a/src/locale/de/LC_MESSAGES/django.po +++ b/src/locale/de/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-01-23 17:31+0000\n" +"POT-Creation-Date: 2022-01-31 19:20+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,6 +18,34 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: accounts/templates/accounts/delete.html:8 +msgid "Delete account" +msgstr "" + +#: accounts/templates/accounts/delete.html:11 +msgid "Please confirm your password to delete your account." +msgstr "" + +#: accounts/templates/accounts/delete.html:12 +msgid "Deleted accounts cannot be recovered." +msgstr "" + +#: accounts/templates/accounts/delete.html:15 +msgid "Password inccorect." +msgstr "" + +#: accounts/templates/accounts/delete.html:17 +msgid "Your account has been deleted." +msgstr "" + +#: accounts/templates/accounts/delete.html:22 +#: accounts/templates/accounts/login.html:19 +#: accounts/templates/accounts/register.html:23 +#: events/templates/events/create_team.html:26 +#: events/templates/events/join_team.html:31 +msgid "Password" +msgstr "" + #: accounts/templates/accounts/edit.html:21 #: accounts/templates/accounts/login.html:18 #: accounts/templates/accounts/register.html:22 @@ -61,15 +89,12 @@ msgstr "" msgid "Registered since" msgstr "" -#: accounts/templates/accounts/login.html:13 -msgid "Please, verify your infos." +#: accounts/templates/accounts/edit.html:61 +msgid "Delete my account" msgstr "" -#: accounts/templates/accounts/login.html:19 -#: accounts/templates/accounts/register.html:23 -#: events/templates/events/create_team.html:26 -#: events/templates/events/join_team.html:31 -msgid "Password" +#: accounts/templates/accounts/login.html:13 +msgid "Please, verify your infos." msgstr "" #: accounts/templates/accounts/login.html:22 @@ -202,7 +227,7 @@ msgid "Challenge is not yet available." msgstr "" #: ctfs/templates/ctfs/ctf_info.html:20 -#: events/templates/events/ctf_info.html:17 home/templates/home/home.html:22 +#: events/templates/events/ctf_info.html:17 home/templates/home/home.html:46 msgid "" "No translation available. Please try another language (English or French)." msgstr "" @@ -440,22 +465,38 @@ msgstr "" msgid "It seems that this team has not solved any challenge yet..." msgstr "" -#: home/templates/home/home.html:32 +#: home/templates/home/home.html:20 +msgid "Weekly Top 5" +msgstr "" + +#: home/templates/home/home.html:56 msgid "No article available." msgstr "" -#: home/templates/home/home.html:37 +#: home/templates/home/home.html:61 msgid "Latest challenges added" msgstr "" -#: home/templates/home/home.html:43 +#: home/templates/home/home.html:66 +msgid "points" +msgstr "" + +#: home/templates/home/home.html:70 msgid "No ctf available." msgstr "" -#: home/templates/home/home.html:53 +#: home/templates/home/home.html:74 +msgid "Latest Flags" +msgstr "" + +#: home/templates/home/home.html:88 msgid "Flags counter" msgstr "" +#: home/templates/home/home.html:94 +msgid "Users" +msgstr "" + #: project/settings.py:115 msgid "English" msgstr "" @@ -508,7 +549,7 @@ msgstr "" msgid "Sign Up" msgstr "" -#: templates/base.html:134 +#: templates/base.html:144 msgid "Become a Patron!" msgstr "" diff --git a/src/locale/en/LC_MESSAGES/django.po b/src/locale/en/LC_MESSAGES/django.po index 1b7f22b..fa163cd 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-01-23 17:31+0000\n" +"POT-Creation-Date: 2022-01-31 19:20+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,6 +18,34 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: accounts/templates/accounts/delete.html:8 +msgid "Delete account" +msgstr "" + +#: accounts/templates/accounts/delete.html:11 +msgid "Please confirm your password to delete your account." +msgstr "" + +#: accounts/templates/accounts/delete.html:12 +msgid "Deleted accounts cannot be recovered." +msgstr "" + +#: accounts/templates/accounts/delete.html:15 +msgid "Password inccorect." +msgstr "" + +#: accounts/templates/accounts/delete.html:17 +msgid "Your account has been deleted." +msgstr "" + +#: accounts/templates/accounts/delete.html:22 +#: accounts/templates/accounts/login.html:19 +#: accounts/templates/accounts/register.html:23 +#: events/templates/events/create_team.html:26 +#: events/templates/events/join_team.html:31 +msgid "Password" +msgstr "" + #: accounts/templates/accounts/edit.html:21 #: accounts/templates/accounts/login.html:18 #: accounts/templates/accounts/register.html:22 @@ -61,15 +89,12 @@ msgstr "" msgid "Registered since" msgstr "" -#: accounts/templates/accounts/login.html:13 -msgid "Please, verify your infos." +#: accounts/templates/accounts/edit.html:61 +msgid "Delete my account" msgstr "" -#: accounts/templates/accounts/login.html:19 -#: accounts/templates/accounts/register.html:23 -#: events/templates/events/create_team.html:26 -#: events/templates/events/join_team.html:31 -msgid "Password" +#: accounts/templates/accounts/login.html:13 +msgid "Please, verify your infos." msgstr "" #: accounts/templates/accounts/login.html:22 @@ -202,7 +227,7 @@ msgid "Challenge is not yet available." msgstr "" #: ctfs/templates/ctfs/ctf_info.html:20 -#: events/templates/events/ctf_info.html:17 home/templates/home/home.html:22 +#: events/templates/events/ctf_info.html:17 home/templates/home/home.html:46 msgid "" "No translation available. Please try another language (English or French)." msgstr "" @@ -440,22 +465,38 @@ msgstr "" msgid "It seems that this team has not solved any challenge yet..." msgstr "" -#: home/templates/home/home.html:32 +#: home/templates/home/home.html:20 +msgid "Weekly Top 5" +msgstr "" + +#: home/templates/home/home.html:56 msgid "No article available." msgstr "" -#: home/templates/home/home.html:37 +#: home/templates/home/home.html:61 msgid "Latest challenges added" msgstr "" -#: home/templates/home/home.html:43 +#: home/templates/home/home.html:66 +msgid "points" +msgstr "" + +#: home/templates/home/home.html:70 msgid "No ctf available." msgstr "" -#: home/templates/home/home.html:53 +#: home/templates/home/home.html:74 +msgid "Latest Flags" +msgstr "" + +#: home/templates/home/home.html:88 msgid "Flags counter" msgstr "" +#: home/templates/home/home.html:94 +msgid "Users" +msgstr "" + #: project/settings.py:115 msgid "English" msgstr "" @@ -508,7 +549,7 @@ msgstr "" msgid "Sign Up" msgstr "" -#: templates/base.html:134 +#: templates/base.html:144 msgid "Become a Patron!" msgstr "" diff --git a/src/locale/es/LC_MESSAGES/django.po b/src/locale/es/LC_MESSAGES/django.po index 1b7f22b..fa163cd 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-01-23 17:31+0000\n" +"POT-Creation-Date: 2022-01-31 19:20+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,6 +18,34 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: accounts/templates/accounts/delete.html:8 +msgid "Delete account" +msgstr "" + +#: accounts/templates/accounts/delete.html:11 +msgid "Please confirm your password to delete your account." +msgstr "" + +#: accounts/templates/accounts/delete.html:12 +msgid "Deleted accounts cannot be recovered." +msgstr "" + +#: accounts/templates/accounts/delete.html:15 +msgid "Password inccorect." +msgstr "" + +#: accounts/templates/accounts/delete.html:17 +msgid "Your account has been deleted." +msgstr "" + +#: accounts/templates/accounts/delete.html:22 +#: accounts/templates/accounts/login.html:19 +#: accounts/templates/accounts/register.html:23 +#: events/templates/events/create_team.html:26 +#: events/templates/events/join_team.html:31 +msgid "Password" +msgstr "" + #: accounts/templates/accounts/edit.html:21 #: accounts/templates/accounts/login.html:18 #: accounts/templates/accounts/register.html:22 @@ -61,15 +89,12 @@ msgstr "" msgid "Registered since" msgstr "" -#: accounts/templates/accounts/login.html:13 -msgid "Please, verify your infos." +#: accounts/templates/accounts/edit.html:61 +msgid "Delete my account" msgstr "" -#: accounts/templates/accounts/login.html:19 -#: accounts/templates/accounts/register.html:23 -#: events/templates/events/create_team.html:26 -#: events/templates/events/join_team.html:31 -msgid "Password" +#: accounts/templates/accounts/login.html:13 +msgid "Please, verify your infos." msgstr "" #: accounts/templates/accounts/login.html:22 @@ -202,7 +227,7 @@ msgid "Challenge is not yet available." msgstr "" #: ctfs/templates/ctfs/ctf_info.html:20 -#: events/templates/events/ctf_info.html:17 home/templates/home/home.html:22 +#: events/templates/events/ctf_info.html:17 home/templates/home/home.html:46 msgid "" "No translation available. Please try another language (English or French)." msgstr "" @@ -440,22 +465,38 @@ msgstr "" msgid "It seems that this team has not solved any challenge yet..." msgstr "" -#: home/templates/home/home.html:32 +#: home/templates/home/home.html:20 +msgid "Weekly Top 5" +msgstr "" + +#: home/templates/home/home.html:56 msgid "No article available." msgstr "" -#: home/templates/home/home.html:37 +#: home/templates/home/home.html:61 msgid "Latest challenges added" msgstr "" -#: home/templates/home/home.html:43 +#: home/templates/home/home.html:66 +msgid "points" +msgstr "" + +#: home/templates/home/home.html:70 msgid "No ctf available." msgstr "" -#: home/templates/home/home.html:53 +#: home/templates/home/home.html:74 +msgid "Latest Flags" +msgstr "" + +#: home/templates/home/home.html:88 msgid "Flags counter" msgstr "" +#: home/templates/home/home.html:94 +msgid "Users" +msgstr "" + #: project/settings.py:115 msgid "English" msgstr "" @@ -508,7 +549,7 @@ msgstr "" msgid "Sign Up" msgstr "" -#: templates/base.html:134 +#: templates/base.html:144 msgid "Become a Patron!" msgstr "" diff --git a/src/locale/fr/LC_MESSAGES/django.po b/src/locale/fr/LC_MESSAGES/django.po index 1dcfe9e..7c4220e 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-01-23 17:31+0000\n" +"POT-Creation-Date: 2022-01-31 19:20+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,6 +18,38 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +#: accounts/templates/accounts/delete.html:8 +#, fuzzy +#| msgid "Connected accounts" +msgid "Delete account" +msgstr "Comptes connectés" + +#: accounts/templates/accounts/delete.html:11 +msgid "Please confirm your password to delete your account." +msgstr "" + +#: accounts/templates/accounts/delete.html:12 +msgid "Deleted accounts cannot be recovered." +msgstr "" + +#: accounts/templates/accounts/delete.html:15 +msgid "Password inccorect." +msgstr "" + +#: accounts/templates/accounts/delete.html:17 +#, fuzzy +#| msgid "Your account has been created." +msgid "Your account has been deleted." +msgstr "Votre compte a été créé." + +#: accounts/templates/accounts/delete.html:22 +#: accounts/templates/accounts/login.html:19 +#: accounts/templates/accounts/register.html:23 +#: events/templates/events/create_team.html:26 +#: events/templates/events/join_team.html:31 +msgid "Password" +msgstr "Mot de passe" + #: accounts/templates/accounts/edit.html:21 #: accounts/templates/accounts/login.html:18 #: accounts/templates/accounts/register.html:22 @@ -61,17 +93,16 @@ msgstr "Score" msgid "Registered since" msgstr "Inscrit depuis" +#: accounts/templates/accounts/edit.html:61 +#, fuzzy +#| msgid "Connected accounts" +msgid "Delete my account" +msgstr "Comptes connectés" + #: accounts/templates/accounts/login.html:13 msgid "Please, verify your infos." msgstr "Merci de vérifier vos informations." -#: accounts/templates/accounts/login.html:19 -#: accounts/templates/accounts/register.html:23 -#: events/templates/events/create_team.html:26 -#: events/templates/events/join_team.html:31 -msgid "Password" -msgstr "Mot de passe" - #: accounts/templates/accounts/login.html:22 msgid "Reset password" msgstr "Réinitialiser le mot de passe" @@ -208,7 +239,7 @@ msgid "Challenge is not yet available." msgstr "Il n'y a pas de catégorie disponible." #: ctfs/templates/ctfs/ctf_info.html:20 -#: events/templates/events/ctf_info.html:17 home/templates/home/home.html:22 +#: events/templates/events/ctf_info.html:17 home/templates/home/home.html:46 msgid "" "No translation available. Please try another language (English or French)." msgstr "" @@ -460,22 +491,42 @@ msgstr "Quitte l'équipe" msgid "It seems that this team has not solved any challenge yet..." msgstr "Il semble que cette équipe n'a pas encore résolu de challenge..." -#: home/templates/home/home.html:32 +#: home/templates/home/home.html:20 +msgid "Weekly Top 5" +msgstr "" + +#: home/templates/home/home.html:56 msgid "No article available." msgstr "Il n'y a pas d'article disponible." -#: home/templates/home/home.html:37 +#: home/templates/home/home.html:61 msgid "Latest challenges added" msgstr "Derniers challenges ajoutés" -#: home/templates/home/home.html:43 +#: home/templates/home/home.html:66 +#, fuzzy +#| msgid "Points" +msgid "points" +msgstr "Points" + +#: home/templates/home/home.html:70 msgid "No ctf available." msgstr "Pas de challenge disponible" -#: home/templates/home/home.html:53 +#: home/templates/home/home.html:74 +msgid "Latest Flags" +msgstr "" + +#: home/templates/home/home.html:88 msgid "Flags counter" msgstr "Compteur de flags" +#: home/templates/home/home.html:94 +#, fuzzy +#| msgid "Username" +msgid "Users" +msgstr "Pseudo" + #: project/settings.py:115 msgid "English" msgstr "Anglais" @@ -528,7 +579,7 @@ msgstr "Déconnexion" msgid "Sign Up" msgstr "Inscription" -#: templates/base.html:134 +#: templates/base.html:144 msgid "Become a Patron!" msgstr "Soutenez nous via Patreon !" @@ -578,9 +629,6 @@ msgstr "Réinitialiser" #~ msgid "End at" #~ msgstr "Fin" -#~ msgid "Connected accounts" -#~ msgstr "Comptes connectés" - #~ msgid "Disconnect Discord" #~ msgstr "Déconnecter Discord" diff --git a/src/locale/it/LC_MESSAGES/django.po b/src/locale/it/LC_MESSAGES/django.po index 1b7f22b..fa163cd 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-01-23 17:31+0000\n" +"POT-Creation-Date: 2022-01-31 19:20+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,6 +18,34 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: accounts/templates/accounts/delete.html:8 +msgid "Delete account" +msgstr "" + +#: accounts/templates/accounts/delete.html:11 +msgid "Please confirm your password to delete your account." +msgstr "" + +#: accounts/templates/accounts/delete.html:12 +msgid "Deleted accounts cannot be recovered." +msgstr "" + +#: accounts/templates/accounts/delete.html:15 +msgid "Password inccorect." +msgstr "" + +#: accounts/templates/accounts/delete.html:17 +msgid "Your account has been deleted." +msgstr "" + +#: accounts/templates/accounts/delete.html:22 +#: accounts/templates/accounts/login.html:19 +#: accounts/templates/accounts/register.html:23 +#: events/templates/events/create_team.html:26 +#: events/templates/events/join_team.html:31 +msgid "Password" +msgstr "" + #: accounts/templates/accounts/edit.html:21 #: accounts/templates/accounts/login.html:18 #: accounts/templates/accounts/register.html:22 @@ -61,15 +89,12 @@ msgstr "" msgid "Registered since" msgstr "" -#: accounts/templates/accounts/login.html:13 -msgid "Please, verify your infos." +#: accounts/templates/accounts/edit.html:61 +msgid "Delete my account" msgstr "" -#: accounts/templates/accounts/login.html:19 -#: accounts/templates/accounts/register.html:23 -#: events/templates/events/create_team.html:26 -#: events/templates/events/join_team.html:31 -msgid "Password" +#: accounts/templates/accounts/login.html:13 +msgid "Please, verify your infos." msgstr "" #: accounts/templates/accounts/login.html:22 @@ -202,7 +227,7 @@ msgid "Challenge is not yet available." msgstr "" #: ctfs/templates/ctfs/ctf_info.html:20 -#: events/templates/events/ctf_info.html:17 home/templates/home/home.html:22 +#: events/templates/events/ctf_info.html:17 home/templates/home/home.html:46 msgid "" "No translation available. Please try another language (English or French)." msgstr "" @@ -440,22 +465,38 @@ msgstr "" msgid "It seems that this team has not solved any challenge yet..." msgstr "" -#: home/templates/home/home.html:32 +#: home/templates/home/home.html:20 +msgid "Weekly Top 5" +msgstr "" + +#: home/templates/home/home.html:56 msgid "No article available." msgstr "" -#: home/templates/home/home.html:37 +#: home/templates/home/home.html:61 msgid "Latest challenges added" msgstr "" -#: home/templates/home/home.html:43 +#: home/templates/home/home.html:66 +msgid "points" +msgstr "" + +#: home/templates/home/home.html:70 msgid "No ctf available." msgstr "" -#: home/templates/home/home.html:53 +#: home/templates/home/home.html:74 +msgid "Latest Flags" +msgstr "" + +#: home/templates/home/home.html:88 msgid "Flags counter" msgstr "" +#: home/templates/home/home.html:94 +msgid "Users" +msgstr "" + #: project/settings.py:115 msgid "English" msgstr "" @@ -508,7 +549,7 @@ msgstr "" msgid "Sign Up" msgstr "" -#: templates/base.html:134 +#: templates/base.html:144 msgid "Become a Patron!" msgstr "" diff --git a/src/locale/ru/LC_MESSAGES/django.po b/src/locale/ru/LC_MESSAGES/django.po index 80c778a..4f6b558 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-01-23 17:31+0000\n" +"POT-Creation-Date: 2022-01-31 19:20+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,6 +20,34 @@ msgstr "" "%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n" "%100>=11 && n%100<=14)? 2 : 3);\n" +#: accounts/templates/accounts/delete.html:8 +msgid "Delete account" +msgstr "" + +#: accounts/templates/accounts/delete.html:11 +msgid "Please confirm your password to delete your account." +msgstr "" + +#: accounts/templates/accounts/delete.html:12 +msgid "Deleted accounts cannot be recovered." +msgstr "" + +#: accounts/templates/accounts/delete.html:15 +msgid "Password inccorect." +msgstr "" + +#: accounts/templates/accounts/delete.html:17 +msgid "Your account has been deleted." +msgstr "" + +#: accounts/templates/accounts/delete.html:22 +#: accounts/templates/accounts/login.html:19 +#: accounts/templates/accounts/register.html:23 +#: events/templates/events/create_team.html:26 +#: events/templates/events/join_team.html:31 +msgid "Password" +msgstr "" + #: accounts/templates/accounts/edit.html:21 #: accounts/templates/accounts/login.html:18 #: accounts/templates/accounts/register.html:22 @@ -63,15 +91,12 @@ msgstr "счет" msgid "Registered since" msgstr "" -#: accounts/templates/accounts/login.html:13 -msgid "Please, verify your infos." +#: accounts/templates/accounts/edit.html:61 +msgid "Delete my account" msgstr "" -#: accounts/templates/accounts/login.html:19 -#: accounts/templates/accounts/register.html:23 -#: events/templates/events/create_team.html:26 -#: events/templates/events/join_team.html:31 -msgid "Password" +#: accounts/templates/accounts/login.html:13 +msgid "Please, verify your infos." msgstr "" #: accounts/templates/accounts/login.html:22 @@ -206,7 +231,7 @@ msgid "Challenge is not yet available." msgstr "Нет доступных статей." #: ctfs/templates/ctfs/ctf_info.html:20 -#: events/templates/events/ctf_info.html:17 home/templates/home/home.html:22 +#: events/templates/events/ctf_info.html:17 home/templates/home/home.html:46 msgid "" "No translation available. Please try another language (English or French)." msgstr "" @@ -450,22 +475,38 @@ msgstr "" msgid "It seems that this team has not solved any challenge yet..." msgstr "" -#: home/templates/home/home.html:32 +#: home/templates/home/home.html:20 +msgid "Weekly Top 5" +msgstr "" + +#: home/templates/home/home.html:56 msgid "No article available." msgstr "Нет доступных статей." -#: home/templates/home/home.html:37 +#: home/templates/home/home.html:61 msgid "Latest challenges added" msgstr "" -#: home/templates/home/home.html:43 +#: home/templates/home/home.html:66 +msgid "points" +msgstr "" + +#: home/templates/home/home.html:70 msgid "No ctf available." msgstr "" -#: home/templates/home/home.html:53 +#: home/templates/home/home.html:74 +msgid "Latest Flags" +msgstr "" + +#: home/templates/home/home.html:88 msgid "Flags counter" msgstr "" +#: home/templates/home/home.html:94 +msgid "Users" +msgstr "" + #: project/settings.py:115 msgid "English" msgstr "" @@ -518,7 +559,7 @@ msgstr "Выйти" msgid "Sign Up" msgstr "" -#: templates/base.html:134 +#: templates/base.html:144 msgid "Become a Patron!" msgstr "" diff --git a/src/resources/locale/de/LC_MESSAGES/django.po b/src/resources/locale/de/LC_MESSAGES/django.po index 7f14a31..8eaef40 100644 --- a/src/resources/locale/de/LC_MESSAGES/django.po +++ b/src/resources/locale/de/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-01-23 17:31+0000\n" +"POT-Creation-Date: 2022-01-31 19:20+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/src/resources/locale/en/LC_MESSAGES/django.po b/src/resources/locale/en/LC_MESSAGES/django.po index 7f14a31..8eaef40 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-01-23 17:31+0000\n" +"POT-Creation-Date: 2022-01-31 19:20+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/src/resources/locale/es/LC_MESSAGES/django.po b/src/resources/locale/es/LC_MESSAGES/django.po index 7f14a31..8eaef40 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-01-23 17:31+0000\n" +"POT-Creation-Date: 2022-01-31 19:20+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/src/resources/locale/fr/LC_MESSAGES/django.po b/src/resources/locale/fr/LC_MESSAGES/django.po index ee0d281..8873f1b 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-01-23 17:31+0000\n" +"POT-Creation-Date: 2022-01-31 19:20+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/src/resources/locale/it/LC_MESSAGES/django.po b/src/resources/locale/it/LC_MESSAGES/django.po index 7f14a31..8eaef40 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-01-23 17:31+0000\n" +"POT-Creation-Date: 2022-01-31 19:20+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/src/resources/locale/ru/LC_MESSAGES/django.po b/src/resources/locale/ru/LC_MESSAGES/django.po index a7c8e1c..53fc387 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-01-23 17:31+0000\n" +"POT-Creation-Date: 2022-01-31 19:20+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" From c25f58341d6a219d806c1b78c4d9daa1d979501c Mon Sep 17 00:00:00 2001 From: Danhia Date: Mon, 31 Jan 2022 19:27:20 +0100 Subject: [PATCH 09/29] replaced flags counter by flag because css is broken on medium devices --- src/home/templates/home/home.html | 2 +- src/locale/de/LC_MESSAGES/django.po | 4 ---- src/locale/en/LC_MESSAGES/django.po | 4 ---- src/locale/es/LC_MESSAGES/django.po | 4 ---- src/locale/fr/LC_MESSAGES/django.po | 4 ---- src/locale/it/LC_MESSAGES/django.po | 4 ---- src/locale/ru/LC_MESSAGES/django.po | 4 ---- 7 files changed, 1 insertion(+), 25 deletions(-) diff --git a/src/home/templates/home/home.html b/src/home/templates/home/home.html index 865353a..5bca43a 100644 --- a/src/home/templates/home/home.html +++ b/src/home/templates/home/home.html @@ -85,7 +85,7 @@
      -
    • {% trans "Flags counter" %}
      • +
    • {% trans "Flags" %}
    • {{ flags }}
    diff --git a/src/locale/de/LC_MESSAGES/django.po b/src/locale/de/LC_MESSAGES/django.po index fa163cd..58dc5c9 100644 --- a/src/locale/de/LC_MESSAGES/django.po +++ b/src/locale/de/LC_MESSAGES/django.po @@ -489,10 +489,6 @@ msgstr "" msgid "Latest Flags" msgstr "" -#: home/templates/home/home.html:88 -msgid "Flags counter" -msgstr "" - #: home/templates/home/home.html:94 msgid "Users" msgstr "" diff --git a/src/locale/en/LC_MESSAGES/django.po b/src/locale/en/LC_MESSAGES/django.po index fa163cd..58dc5c9 100644 --- a/src/locale/en/LC_MESSAGES/django.po +++ b/src/locale/en/LC_MESSAGES/django.po @@ -489,10 +489,6 @@ msgstr "" msgid "Latest Flags" msgstr "" -#: home/templates/home/home.html:88 -msgid "Flags counter" -msgstr "" - #: home/templates/home/home.html:94 msgid "Users" msgstr "" diff --git a/src/locale/es/LC_MESSAGES/django.po b/src/locale/es/LC_MESSAGES/django.po index fa163cd..58dc5c9 100644 --- a/src/locale/es/LC_MESSAGES/django.po +++ b/src/locale/es/LC_MESSAGES/django.po @@ -489,10 +489,6 @@ msgstr "" msgid "Latest Flags" msgstr "" -#: home/templates/home/home.html:88 -msgid "Flags counter" -msgstr "" - #: home/templates/home/home.html:94 msgid "Users" msgstr "" diff --git a/src/locale/fr/LC_MESSAGES/django.po b/src/locale/fr/LC_MESSAGES/django.po index 7c4220e..5d150f0 100644 --- a/src/locale/fr/LC_MESSAGES/django.po +++ b/src/locale/fr/LC_MESSAGES/django.po @@ -517,10 +517,6 @@ msgstr "Pas de challenge disponible" msgid "Latest Flags" msgstr "" -#: home/templates/home/home.html:88 -msgid "Flags counter" -msgstr "Compteur de flags" - #: home/templates/home/home.html:94 #, fuzzy #| msgid "Username" diff --git a/src/locale/it/LC_MESSAGES/django.po b/src/locale/it/LC_MESSAGES/django.po index fa163cd..58dc5c9 100644 --- a/src/locale/it/LC_MESSAGES/django.po +++ b/src/locale/it/LC_MESSAGES/django.po @@ -489,10 +489,6 @@ msgstr "" msgid "Latest Flags" msgstr "" -#: home/templates/home/home.html:88 -msgid "Flags counter" -msgstr "" - #: home/templates/home/home.html:94 msgid "Users" msgstr "" diff --git a/src/locale/ru/LC_MESSAGES/django.po b/src/locale/ru/LC_MESSAGES/django.po index 4f6b558..c6b986d 100644 --- a/src/locale/ru/LC_MESSAGES/django.po +++ b/src/locale/ru/LC_MESSAGES/django.po @@ -499,10 +499,6 @@ msgstr "" msgid "Latest Flags" msgstr "" -#: home/templates/home/home.html:88 -msgid "Flags counter" -msgstr "" - #: home/templates/home/home.html:94 msgid "Users" msgstr "" From 6337a0dcdb4cb4849c22a666a0130c2c8541f58a Mon Sep 17 00:00:00 2001 From: Danhia Date: Wed, 2 Feb 2022 19:23:13 +0100 Subject: [PATCH 10/29] added different color for members almost everywhere --- src/ctfs/templates/ctfs/ctf_info.html | 9 +- src/events/templates/events/ctf_info.html | 9 +- src/events/templates/events/event_info.html | 8 +- src/locale/de/LC_MESSAGES/django.po | 121 +++++++++--------- src/locale/en/LC_MESSAGES/django.po | 121 +++++++++--------- src/locale/es/LC_MESSAGES/django.po | 121 +++++++++--------- src/locale/fr/LC_MESSAGES/django.po | 121 +++++++++--------- src/locale/it/LC_MESSAGES/django.po | 121 +++++++++--------- src/locale/ru/LC_MESSAGES/django.po | 121 +++++++++--------- src/resources/locale/de/LC_MESSAGES/django.po | 2 +- src/resources/locale/en/LC_MESSAGES/django.po | 2 +- src/resources/locale/es/LC_MESSAGES/django.po | 2 +- src/resources/locale/fr/LC_MESSAGES/django.po | 2 +- src/resources/locale/it/LC_MESSAGES/django.po | 2 +- src/resources/locale/ru/LC_MESSAGES/django.po | 2 +- 15 files changed, 401 insertions(+), 363 deletions(-) diff --git a/src/ctfs/templates/ctfs/ctf_info.html b/src/ctfs/templates/ctfs/ctf_info.html index e027fe9..3eab7f2 100644 --- a/src/ctfs/templates/ctfs/ctf_info.html +++ b/src/ctfs/templates/ctfs/ctf_info.html @@ -1,6 +1,7 @@ {% extends 'base.html' %} {% block content %} {% load i18n %} +{% load is_member %}
    @@ -66,7 +67,8 @@ {% for s in solved_list %} - {{ s.user.username }} + {% ismember s.user.userprofileinfo as is_member %} + {{ s.user.username }} {{ s.user.userprofileinfo.portfolio_site }} {{ s.user.userprofileinfo.score }} {{ s.flag_date }} @@ -81,8 +83,9 @@
      -
    • {% trans "Author" %} : {{ ctf.author.username }}
      • -
    • {% trans "Point reward" %} : {{ ctf.points }}
      • + {% ismember ctf.author.userprofileinfo as is_member %} +
    • {% trans "Author" %} : {{ ctf.author.username }}
      • +
    • {% trans "Point reward" %} : {{ ctf.points }}
    diff --git a/src/events/templates/events/ctf_info.html b/src/events/templates/events/ctf_info.html index d3c7b39..3a95a52 100644 --- a/src/events/templates/events/ctf_info.html +++ b/src/events/templates/events/ctf_info.html @@ -1,6 +1,7 @@ {% extends 'base.html' %} {% block content %} {% load i18n %} +{% load is_member %}
    @@ -75,8 +76,9 @@ {% for s in solved_list %} {% if event.team_size == 1%} + {% ismember s.0.userprofileinfo as is_member %} - {{ s.0.username }} + {{ s.0.username }} {{ s.0.userprofileinfo.portfolio_site }} {{ s.1 }} @@ -96,9 +98,10 @@
    + {% ismember ctf.author.userprofileinfo as is_member %}
      -
    • {% trans "Author" %} : {{ ctf.author.username }}
      • -
    • {% trans "Point reward" %} : {{ ctf.points }}
      • +
    • {% trans "Author" %} : {{ ctf.author.username }}
      • +
    • {% trans "Point reward" %} : {{ ctf.points }}
    diff --git a/src/events/templates/events/event_info.html b/src/events/templates/events/event_info.html index f7b9cb6..81a1bf2 100644 --- a/src/events/templates/events/event_info.html +++ b/src/events/templates/events/event_info.html @@ -2,6 +2,7 @@ {% block content %} {% load i18n %} {% load is_flagged %} +{% load is_member %}
    {% if subisover == True %} @@ -68,9 +69,10 @@ {% for s in solved_list %} + {% ismember s.user.userprofileinfo as is_member %} # {{ forloop.counter0|add:1 }} - {{ s.user.username }} + {{ s.user.username }} {{ s.user.userprofileinfo.site }} {{ s.score }} @@ -108,8 +110,8 @@
    • {{ event.name }}
      • -
    • {% trans "Starts at" %} : {{ event.start_date | date:'H:i d-m-y'}}
      • -
    • {% trans "Ends at" %} : {{ event.end_date | date:'H:i d-m-y'}}
      • +
    • {% trans "Starts at" %} : {{ event.start_date | date:'H:i d-m-y'}}
      • +
    • {% trans "Ends at" %} : {{ event.end_date | date:'H:i d-m-y'}}
      • {% if ended == False and IsRegistered == False %}
      {%csrf_token%} diff --git a/src/locale/de/LC_MESSAGES/django.po b/src/locale/de/LC_MESSAGES/django.po index 58dc5c9..b77f7d3 100644 --- a/src/locale/de/LC_MESSAGES/django.po +++ b/src/locale/de/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-01-31 19:20+0100\n" +"POT-Creation-Date: 2022-02-02 19:22+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -49,9 +49,9 @@ 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:60 ctfs/templates/ctfs/ctfs_list.html:12 -#: events/templates/events/ctf_info.html:70 -#: events/templates/events/event_info.html:63 +#: ctfs/templates/ctfs/ctf_info.html:61 ctfs/templates/ctfs/ctfs_list.html:12 +#: events/templates/events/ctf_info.html:71 +#: events/templates/events/event_info.html:64 #: scoreboard/templates/scoreboard/scoreboard.html:13 msgid "Username" msgstr "" @@ -61,9 +61,9 @@ msgid "Email" msgstr "" #: accounts/templates/accounts/edit.html:30 -#: ctfs/templates/ctfs/ctf_info.html:61 -#: events/templates/events/ctf_info.html:71 -#: events/templates/events/event_info.html:64 +#: ctfs/templates/ctfs/ctf_info.html:62 +#: events/templates/events/ctf_info.html:72 +#: events/templates/events/event_info.html:65 #: scoreboard/templates/scoreboard/scoreboard.html:14 msgid "Website" msgstr "" @@ -75,9 +75,9 @@ msgstr "" #: accounts/templates/accounts/edit.html:47 #: accounts/templates/accounts/profile.html:46 -#: ctfs/templates/ctfs/ctf_info.html:62 ctfs/templates/ctfs/ctfs_list.html:13 -#: events/templates/events/event_info.html:65 -#: events/templates/events/event_info.html:87 +#: ctfs/templates/ctfs/ctf_info.html:63 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 #: events/templates/events/team.html:45 #: scoreboard/templates/scoreboard/scoreboard.html:15 @@ -139,8 +139,8 @@ msgid "Points" msgstr "" #: accounts/templates/accounts/profile.html:24 -#: ctfs/templates/ctfs/ctf_info.html:63 -#: events/templates/events/ctf_info.html:72 +#: ctfs/templates/ctfs/ctf_info.html:64 +#: events/templates/events/ctf_info.html:73 #: events/templates/events/team.html:23 msgid "Date" msgstr "" @@ -150,8 +150,8 @@ msgid "It seems that this user has not solved any challenge yet..." msgstr "" #: accounts/templates/accounts/profile.html:47 -#: events/templates/events/event_info.html:62 -#: events/templates/events/event_info.html:85 +#: events/templates/events/event_info.html:63 +#: events/templates/events/event_info.html:87 #: events/templates/events/manage_team.html:41 #: events/templates/events/team.html:46 #: scoreboard/templates/scoreboard/scoreboard.html:12 @@ -184,7 +184,7 @@ msgid "Personal website" msgstr "" #: accounts/templates/accounts/register.html:26 -#: events/templates/events/event_info.html:117 +#: events/templates/events/event_info.html:119 msgid "Register" msgstr "" @@ -218,64 +218,65 @@ msgstr "" msgid "Updated." msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:9 events/templates/events/ctf_info.html:11 +#: ctfs/templates/ctfs/ctf_info.html:10 +#: events/templates/events/ctf_info.html:12 msgid "Published date" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:13 +#: ctfs/templates/ctfs/ctf_info.html:14 msgid "Challenge is not yet available." msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:20 -#: events/templates/events/ctf_info.html:17 home/templates/home/home.html:46 +#: ctfs/templates/ctfs/ctf_info.html:21 +#: events/templates/events/ctf_info.html:18 home/templates/home/home.html:46 msgid "" "No translation available. Please try another language (English or French)." msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:26 -#: events/templates/events/ctf_info.html:31 +#: ctfs/templates/ctfs/ctf_info.html:27 +#: events/templates/events/ctf_info.html:32 msgid "Congratulation !" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:28 -#: events/templates/events/ctf_info.html:33 +#: ctfs/templates/ctfs/ctf_info.html:29 +#: events/templates/events/ctf_info.html:34 msgid "Already flagged" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:30 ctfs/templates/ctfs/ctf_info.html:39 -#: events/templates/events/ctf_info.html:41 -#: events/templates/events/ctf_info.html:50 +#: ctfs/templates/ctfs/ctf_info.html:31 ctfs/templates/ctfs/ctf_info.html:40 +#: events/templates/events/ctf_info.html:42 +#: events/templates/events/ctf_info.html:51 msgid "Start the challenge" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:32 ctfs/templates/ctfs/ctf_info.html:41 -#: events/templates/events/ctf_info.html:43 -#: events/templates/events/ctf_info.html:52 +#: ctfs/templates/ctfs/ctf_info.html:33 ctfs/templates/ctfs/ctf_info.html:42 +#: events/templates/events/ctf_info.html:44 +#: events/templates/events/ctf_info.html:53 msgid "Download" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:36 -#: events/templates/events/ctf_info.html:47 +#: ctfs/templates/ctfs/ctf_info.html:37 +#: events/templates/events/ctf_info.html:48 msgid "Wrong flag ! You can do it !" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:55 -#: events/templates/events/ctf_info.html:65 +#: ctfs/templates/ctfs/ctf_info.html:56 +#: events/templates/events/ctf_info.html:66 msgid "Solved by" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:78 -#: events/templates/events/ctf_info.html:94 +#: ctfs/templates/ctfs/ctf_info.html:80 +#: events/templates/events/ctf_info.html:96 msgid "Nobody has solved this challenge yet." msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:84 -#: events/templates/events/ctf_info.html:100 +#: ctfs/templates/ctfs/ctf_info.html:87 +#: events/templates/events/ctf_info.html:103 msgid "Author" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:85 -#: events/templates/events/ctf_info.html:101 +#: ctfs/templates/ctfs/ctf_info.html:88 +#: events/templates/events/ctf_info.html:104 msgid "Point reward" msgstr "" @@ -328,14 +329,14 @@ msgid "You need to be logged to access this event." msgstr "" #: events/templates/events/create_team.html:41 -#: events/templates/events/event_info.html:111 +#: events/templates/events/event_info.html:113 #: events/templates/events/event_pwd.html:36 #: events/templates/events/join_team.html:46 msgid "Starts at" msgstr "" #: events/templates/events/create_team.html:42 -#: events/templates/events/event_info.html:112 +#: events/templates/events/event_info.html:114 #: events/templates/events/event_pwd.html:37 #: events/templates/events/join_team.html:47 msgid "Ends at" @@ -352,66 +353,66 @@ msgstr "" msgid "Find me a team !" msgstr "" -#: events/templates/events/ctf_info.html:9 +#: events/templates/events/ctf_info.html:10 msgid "Event" msgstr "" -#: events/templates/events/ctf_info.html:24 -#: events/templates/events/event_info.html:8 +#: events/templates/events/ctf_info.html:25 +#: events/templates/events/event_info.html:9 msgid "Subscriptions is over." msgstr "" -#: events/templates/events/ctf_info.html:27 -#: events/templates/events/event_info.html:11 +#: events/templates/events/ctf_info.html:28 +#: events/templates/events/event_info.html:12 #: events/templates/events/event_pwd.html:18 msgid "You're already registered to this event." msgstr "" -#: events/templates/events/ctf_info.html:35 -#: events/templates/events/event_info.html:17 +#: events/templates/events/ctf_info.html:36 +#: events/templates/events/event_info.html:18 msgid "This event is over." msgstr "" -#: events/templates/events/ctf_info.html:37 +#: events/templates/events/ctf_info.html:38 msgid "Error while processing your request. (Invalid Form)" msgstr "" -#: events/templates/events/ctf_info.html:39 +#: events/templates/events/ctf_info.html:40 msgid "" "Error: you're not registered to this event, so you can't register scores, " "fucking logic." msgstr "" -#: events/templates/events/event_info.html:19 +#: events/templates/events/event_info.html:20 #: events/templates/events/event_pwd.html:9 msgid "This event start at" msgstr "" -#: events/templates/events/event_info.html:29 +#: events/templates/events/event_info.html:30 msgid "Challenges" msgstr "" -#: events/templates/events/event_info.html:46 +#: events/templates/events/event_info.html:47 msgid "No challenges available." msgstr "" -#: events/templates/events/event_info.html:50 +#: events/templates/events/event_info.html:51 msgid "The event has not started yet." msgstr "" -#: events/templates/events/event_info.html:56 +#: events/templates/events/event_info.html:57 msgid "ScoreBoard" msgstr "" -#: events/templates/events/event_info.html:86 +#: events/templates/events/event_info.html:88 msgid "Team" msgstr "" -#: events/templates/events/event_info.html:104 +#: events/templates/events/event_info.html:106 msgid "No one have earn point yet, you gonna be the first ?" msgstr "" -#: events/templates/events/event_info.html:127 +#: events/templates/events/event_info.html:129 msgid "Manage my team" msgstr "" @@ -489,6 +490,10 @@ msgstr "" msgid "Latest Flags" msgstr "" +#: home/templates/home/home.html:88 +msgid "Flags" +msgstr "" + #: home/templates/home/home.html:94 msgid "Users" msgstr "" diff --git a/src/locale/en/LC_MESSAGES/django.po b/src/locale/en/LC_MESSAGES/django.po index 58dc5c9..b77f7d3 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-01-31 19:20+0100\n" +"POT-Creation-Date: 2022-02-02 19:22+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -49,9 +49,9 @@ 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:60 ctfs/templates/ctfs/ctfs_list.html:12 -#: events/templates/events/ctf_info.html:70 -#: events/templates/events/event_info.html:63 +#: ctfs/templates/ctfs/ctf_info.html:61 ctfs/templates/ctfs/ctfs_list.html:12 +#: events/templates/events/ctf_info.html:71 +#: events/templates/events/event_info.html:64 #: scoreboard/templates/scoreboard/scoreboard.html:13 msgid "Username" msgstr "" @@ -61,9 +61,9 @@ msgid "Email" msgstr "" #: accounts/templates/accounts/edit.html:30 -#: ctfs/templates/ctfs/ctf_info.html:61 -#: events/templates/events/ctf_info.html:71 -#: events/templates/events/event_info.html:64 +#: ctfs/templates/ctfs/ctf_info.html:62 +#: events/templates/events/ctf_info.html:72 +#: events/templates/events/event_info.html:65 #: scoreboard/templates/scoreboard/scoreboard.html:14 msgid "Website" msgstr "" @@ -75,9 +75,9 @@ msgstr "" #: accounts/templates/accounts/edit.html:47 #: accounts/templates/accounts/profile.html:46 -#: ctfs/templates/ctfs/ctf_info.html:62 ctfs/templates/ctfs/ctfs_list.html:13 -#: events/templates/events/event_info.html:65 -#: events/templates/events/event_info.html:87 +#: ctfs/templates/ctfs/ctf_info.html:63 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 #: events/templates/events/team.html:45 #: scoreboard/templates/scoreboard/scoreboard.html:15 @@ -139,8 +139,8 @@ msgid "Points" msgstr "" #: accounts/templates/accounts/profile.html:24 -#: ctfs/templates/ctfs/ctf_info.html:63 -#: events/templates/events/ctf_info.html:72 +#: ctfs/templates/ctfs/ctf_info.html:64 +#: events/templates/events/ctf_info.html:73 #: events/templates/events/team.html:23 msgid "Date" msgstr "" @@ -150,8 +150,8 @@ msgid "It seems that this user has not solved any challenge yet..." msgstr "" #: accounts/templates/accounts/profile.html:47 -#: events/templates/events/event_info.html:62 -#: events/templates/events/event_info.html:85 +#: events/templates/events/event_info.html:63 +#: events/templates/events/event_info.html:87 #: events/templates/events/manage_team.html:41 #: events/templates/events/team.html:46 #: scoreboard/templates/scoreboard/scoreboard.html:12 @@ -184,7 +184,7 @@ msgid "Personal website" msgstr "" #: accounts/templates/accounts/register.html:26 -#: events/templates/events/event_info.html:117 +#: events/templates/events/event_info.html:119 msgid "Register" msgstr "" @@ -218,64 +218,65 @@ msgstr "" msgid "Updated." msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:9 events/templates/events/ctf_info.html:11 +#: ctfs/templates/ctfs/ctf_info.html:10 +#: events/templates/events/ctf_info.html:12 msgid "Published date" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:13 +#: ctfs/templates/ctfs/ctf_info.html:14 msgid "Challenge is not yet available." msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:20 -#: events/templates/events/ctf_info.html:17 home/templates/home/home.html:46 +#: ctfs/templates/ctfs/ctf_info.html:21 +#: events/templates/events/ctf_info.html:18 home/templates/home/home.html:46 msgid "" "No translation available. Please try another language (English or French)." msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:26 -#: events/templates/events/ctf_info.html:31 +#: ctfs/templates/ctfs/ctf_info.html:27 +#: events/templates/events/ctf_info.html:32 msgid "Congratulation !" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:28 -#: events/templates/events/ctf_info.html:33 +#: ctfs/templates/ctfs/ctf_info.html:29 +#: events/templates/events/ctf_info.html:34 msgid "Already flagged" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:30 ctfs/templates/ctfs/ctf_info.html:39 -#: events/templates/events/ctf_info.html:41 -#: events/templates/events/ctf_info.html:50 +#: ctfs/templates/ctfs/ctf_info.html:31 ctfs/templates/ctfs/ctf_info.html:40 +#: events/templates/events/ctf_info.html:42 +#: events/templates/events/ctf_info.html:51 msgid "Start the challenge" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:32 ctfs/templates/ctfs/ctf_info.html:41 -#: events/templates/events/ctf_info.html:43 -#: events/templates/events/ctf_info.html:52 +#: ctfs/templates/ctfs/ctf_info.html:33 ctfs/templates/ctfs/ctf_info.html:42 +#: events/templates/events/ctf_info.html:44 +#: events/templates/events/ctf_info.html:53 msgid "Download" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:36 -#: events/templates/events/ctf_info.html:47 +#: ctfs/templates/ctfs/ctf_info.html:37 +#: events/templates/events/ctf_info.html:48 msgid "Wrong flag ! You can do it !" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:55 -#: events/templates/events/ctf_info.html:65 +#: ctfs/templates/ctfs/ctf_info.html:56 +#: events/templates/events/ctf_info.html:66 msgid "Solved by" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:78 -#: events/templates/events/ctf_info.html:94 +#: ctfs/templates/ctfs/ctf_info.html:80 +#: events/templates/events/ctf_info.html:96 msgid "Nobody has solved this challenge yet." msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:84 -#: events/templates/events/ctf_info.html:100 +#: ctfs/templates/ctfs/ctf_info.html:87 +#: events/templates/events/ctf_info.html:103 msgid "Author" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:85 -#: events/templates/events/ctf_info.html:101 +#: ctfs/templates/ctfs/ctf_info.html:88 +#: events/templates/events/ctf_info.html:104 msgid "Point reward" msgstr "" @@ -328,14 +329,14 @@ msgid "You need to be logged to access this event." msgstr "" #: events/templates/events/create_team.html:41 -#: events/templates/events/event_info.html:111 +#: events/templates/events/event_info.html:113 #: events/templates/events/event_pwd.html:36 #: events/templates/events/join_team.html:46 msgid "Starts at" msgstr "" #: events/templates/events/create_team.html:42 -#: events/templates/events/event_info.html:112 +#: events/templates/events/event_info.html:114 #: events/templates/events/event_pwd.html:37 #: events/templates/events/join_team.html:47 msgid "Ends at" @@ -352,66 +353,66 @@ msgstr "" msgid "Find me a team !" msgstr "" -#: events/templates/events/ctf_info.html:9 +#: events/templates/events/ctf_info.html:10 msgid "Event" msgstr "" -#: events/templates/events/ctf_info.html:24 -#: events/templates/events/event_info.html:8 +#: events/templates/events/ctf_info.html:25 +#: events/templates/events/event_info.html:9 msgid "Subscriptions is over." msgstr "" -#: events/templates/events/ctf_info.html:27 -#: events/templates/events/event_info.html:11 +#: events/templates/events/ctf_info.html:28 +#: events/templates/events/event_info.html:12 #: events/templates/events/event_pwd.html:18 msgid "You're already registered to this event." msgstr "" -#: events/templates/events/ctf_info.html:35 -#: events/templates/events/event_info.html:17 +#: events/templates/events/ctf_info.html:36 +#: events/templates/events/event_info.html:18 msgid "This event is over." msgstr "" -#: events/templates/events/ctf_info.html:37 +#: events/templates/events/ctf_info.html:38 msgid "Error while processing your request. (Invalid Form)" msgstr "" -#: events/templates/events/ctf_info.html:39 +#: events/templates/events/ctf_info.html:40 msgid "" "Error: you're not registered to this event, so you can't register scores, " "fucking logic." msgstr "" -#: events/templates/events/event_info.html:19 +#: events/templates/events/event_info.html:20 #: events/templates/events/event_pwd.html:9 msgid "This event start at" msgstr "" -#: events/templates/events/event_info.html:29 +#: events/templates/events/event_info.html:30 msgid "Challenges" msgstr "" -#: events/templates/events/event_info.html:46 +#: events/templates/events/event_info.html:47 msgid "No challenges available." msgstr "" -#: events/templates/events/event_info.html:50 +#: events/templates/events/event_info.html:51 msgid "The event has not started yet." msgstr "" -#: events/templates/events/event_info.html:56 +#: events/templates/events/event_info.html:57 msgid "ScoreBoard" msgstr "" -#: events/templates/events/event_info.html:86 +#: events/templates/events/event_info.html:88 msgid "Team" msgstr "" -#: events/templates/events/event_info.html:104 +#: events/templates/events/event_info.html:106 msgid "No one have earn point yet, you gonna be the first ?" msgstr "" -#: events/templates/events/event_info.html:127 +#: events/templates/events/event_info.html:129 msgid "Manage my team" msgstr "" @@ -489,6 +490,10 @@ msgstr "" msgid "Latest Flags" msgstr "" +#: home/templates/home/home.html:88 +msgid "Flags" +msgstr "" + #: home/templates/home/home.html:94 msgid "Users" msgstr "" diff --git a/src/locale/es/LC_MESSAGES/django.po b/src/locale/es/LC_MESSAGES/django.po index 58dc5c9..b77f7d3 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-01-31 19:20+0100\n" +"POT-Creation-Date: 2022-02-02 19:22+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -49,9 +49,9 @@ 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:60 ctfs/templates/ctfs/ctfs_list.html:12 -#: events/templates/events/ctf_info.html:70 -#: events/templates/events/event_info.html:63 +#: ctfs/templates/ctfs/ctf_info.html:61 ctfs/templates/ctfs/ctfs_list.html:12 +#: events/templates/events/ctf_info.html:71 +#: events/templates/events/event_info.html:64 #: scoreboard/templates/scoreboard/scoreboard.html:13 msgid "Username" msgstr "" @@ -61,9 +61,9 @@ msgid "Email" msgstr "" #: accounts/templates/accounts/edit.html:30 -#: ctfs/templates/ctfs/ctf_info.html:61 -#: events/templates/events/ctf_info.html:71 -#: events/templates/events/event_info.html:64 +#: ctfs/templates/ctfs/ctf_info.html:62 +#: events/templates/events/ctf_info.html:72 +#: events/templates/events/event_info.html:65 #: scoreboard/templates/scoreboard/scoreboard.html:14 msgid "Website" msgstr "" @@ -75,9 +75,9 @@ msgstr "" #: accounts/templates/accounts/edit.html:47 #: accounts/templates/accounts/profile.html:46 -#: ctfs/templates/ctfs/ctf_info.html:62 ctfs/templates/ctfs/ctfs_list.html:13 -#: events/templates/events/event_info.html:65 -#: events/templates/events/event_info.html:87 +#: ctfs/templates/ctfs/ctf_info.html:63 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 #: events/templates/events/team.html:45 #: scoreboard/templates/scoreboard/scoreboard.html:15 @@ -139,8 +139,8 @@ msgid "Points" msgstr "" #: accounts/templates/accounts/profile.html:24 -#: ctfs/templates/ctfs/ctf_info.html:63 -#: events/templates/events/ctf_info.html:72 +#: ctfs/templates/ctfs/ctf_info.html:64 +#: events/templates/events/ctf_info.html:73 #: events/templates/events/team.html:23 msgid "Date" msgstr "" @@ -150,8 +150,8 @@ msgid "It seems that this user has not solved any challenge yet..." msgstr "" #: accounts/templates/accounts/profile.html:47 -#: events/templates/events/event_info.html:62 -#: events/templates/events/event_info.html:85 +#: events/templates/events/event_info.html:63 +#: events/templates/events/event_info.html:87 #: events/templates/events/manage_team.html:41 #: events/templates/events/team.html:46 #: scoreboard/templates/scoreboard/scoreboard.html:12 @@ -184,7 +184,7 @@ msgid "Personal website" msgstr "" #: accounts/templates/accounts/register.html:26 -#: events/templates/events/event_info.html:117 +#: events/templates/events/event_info.html:119 msgid "Register" msgstr "" @@ -218,64 +218,65 @@ msgstr "" msgid "Updated." msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:9 events/templates/events/ctf_info.html:11 +#: ctfs/templates/ctfs/ctf_info.html:10 +#: events/templates/events/ctf_info.html:12 msgid "Published date" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:13 +#: ctfs/templates/ctfs/ctf_info.html:14 msgid "Challenge is not yet available." msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:20 -#: events/templates/events/ctf_info.html:17 home/templates/home/home.html:46 +#: ctfs/templates/ctfs/ctf_info.html:21 +#: events/templates/events/ctf_info.html:18 home/templates/home/home.html:46 msgid "" "No translation available. Please try another language (English or French)." msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:26 -#: events/templates/events/ctf_info.html:31 +#: ctfs/templates/ctfs/ctf_info.html:27 +#: events/templates/events/ctf_info.html:32 msgid "Congratulation !" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:28 -#: events/templates/events/ctf_info.html:33 +#: ctfs/templates/ctfs/ctf_info.html:29 +#: events/templates/events/ctf_info.html:34 msgid "Already flagged" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:30 ctfs/templates/ctfs/ctf_info.html:39 -#: events/templates/events/ctf_info.html:41 -#: events/templates/events/ctf_info.html:50 +#: ctfs/templates/ctfs/ctf_info.html:31 ctfs/templates/ctfs/ctf_info.html:40 +#: events/templates/events/ctf_info.html:42 +#: events/templates/events/ctf_info.html:51 msgid "Start the challenge" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:32 ctfs/templates/ctfs/ctf_info.html:41 -#: events/templates/events/ctf_info.html:43 -#: events/templates/events/ctf_info.html:52 +#: ctfs/templates/ctfs/ctf_info.html:33 ctfs/templates/ctfs/ctf_info.html:42 +#: events/templates/events/ctf_info.html:44 +#: events/templates/events/ctf_info.html:53 msgid "Download" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:36 -#: events/templates/events/ctf_info.html:47 +#: ctfs/templates/ctfs/ctf_info.html:37 +#: events/templates/events/ctf_info.html:48 msgid "Wrong flag ! You can do it !" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:55 -#: events/templates/events/ctf_info.html:65 +#: ctfs/templates/ctfs/ctf_info.html:56 +#: events/templates/events/ctf_info.html:66 msgid "Solved by" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:78 -#: events/templates/events/ctf_info.html:94 +#: ctfs/templates/ctfs/ctf_info.html:80 +#: events/templates/events/ctf_info.html:96 msgid "Nobody has solved this challenge yet." msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:84 -#: events/templates/events/ctf_info.html:100 +#: ctfs/templates/ctfs/ctf_info.html:87 +#: events/templates/events/ctf_info.html:103 msgid "Author" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:85 -#: events/templates/events/ctf_info.html:101 +#: ctfs/templates/ctfs/ctf_info.html:88 +#: events/templates/events/ctf_info.html:104 msgid "Point reward" msgstr "" @@ -328,14 +329,14 @@ msgid "You need to be logged to access this event." msgstr "" #: events/templates/events/create_team.html:41 -#: events/templates/events/event_info.html:111 +#: events/templates/events/event_info.html:113 #: events/templates/events/event_pwd.html:36 #: events/templates/events/join_team.html:46 msgid "Starts at" msgstr "" #: events/templates/events/create_team.html:42 -#: events/templates/events/event_info.html:112 +#: events/templates/events/event_info.html:114 #: events/templates/events/event_pwd.html:37 #: events/templates/events/join_team.html:47 msgid "Ends at" @@ -352,66 +353,66 @@ msgstr "" msgid "Find me a team !" msgstr "" -#: events/templates/events/ctf_info.html:9 +#: events/templates/events/ctf_info.html:10 msgid "Event" msgstr "" -#: events/templates/events/ctf_info.html:24 -#: events/templates/events/event_info.html:8 +#: events/templates/events/ctf_info.html:25 +#: events/templates/events/event_info.html:9 msgid "Subscriptions is over." msgstr "" -#: events/templates/events/ctf_info.html:27 -#: events/templates/events/event_info.html:11 +#: events/templates/events/ctf_info.html:28 +#: events/templates/events/event_info.html:12 #: events/templates/events/event_pwd.html:18 msgid "You're already registered to this event." msgstr "" -#: events/templates/events/ctf_info.html:35 -#: events/templates/events/event_info.html:17 +#: events/templates/events/ctf_info.html:36 +#: events/templates/events/event_info.html:18 msgid "This event is over." msgstr "" -#: events/templates/events/ctf_info.html:37 +#: events/templates/events/ctf_info.html:38 msgid "Error while processing your request. (Invalid Form)" msgstr "" -#: events/templates/events/ctf_info.html:39 +#: events/templates/events/ctf_info.html:40 msgid "" "Error: you're not registered to this event, so you can't register scores, " "fucking logic." msgstr "" -#: events/templates/events/event_info.html:19 +#: events/templates/events/event_info.html:20 #: events/templates/events/event_pwd.html:9 msgid "This event start at" msgstr "" -#: events/templates/events/event_info.html:29 +#: events/templates/events/event_info.html:30 msgid "Challenges" msgstr "" -#: events/templates/events/event_info.html:46 +#: events/templates/events/event_info.html:47 msgid "No challenges available." msgstr "" -#: events/templates/events/event_info.html:50 +#: events/templates/events/event_info.html:51 msgid "The event has not started yet." msgstr "" -#: events/templates/events/event_info.html:56 +#: events/templates/events/event_info.html:57 msgid "ScoreBoard" msgstr "" -#: events/templates/events/event_info.html:86 +#: events/templates/events/event_info.html:88 msgid "Team" msgstr "" -#: events/templates/events/event_info.html:104 +#: events/templates/events/event_info.html:106 msgid "No one have earn point yet, you gonna be the first ?" msgstr "" -#: events/templates/events/event_info.html:127 +#: events/templates/events/event_info.html:129 msgid "Manage my team" msgstr "" @@ -489,6 +490,10 @@ msgstr "" msgid "Latest Flags" msgstr "" +#: home/templates/home/home.html:88 +msgid "Flags" +msgstr "" + #: home/templates/home/home.html:94 msgid "Users" msgstr "" diff --git a/src/locale/fr/LC_MESSAGES/django.po b/src/locale/fr/LC_MESSAGES/django.po index 5d150f0..e170cf0 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-01-31 19:20+0100\n" +"POT-Creation-Date: 2022-02-02 19:22+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -53,9 +53,9 @@ msgstr "Mot de passe" #: accounts/templates/accounts/edit.html:21 #: accounts/templates/accounts/login.html:18 #: accounts/templates/accounts/register.html:22 -#: ctfs/templates/ctfs/ctf_info.html:60 ctfs/templates/ctfs/ctfs_list.html:12 -#: events/templates/events/ctf_info.html:70 -#: events/templates/events/event_info.html:63 +#: ctfs/templates/ctfs/ctf_info.html:61 ctfs/templates/ctfs/ctfs_list.html:12 +#: events/templates/events/ctf_info.html:71 +#: events/templates/events/event_info.html:64 #: scoreboard/templates/scoreboard/scoreboard.html:13 msgid "Username" msgstr "Pseudo" @@ -65,9 +65,9 @@ msgid "Email" msgstr "Email" #: accounts/templates/accounts/edit.html:30 -#: ctfs/templates/ctfs/ctf_info.html:61 -#: events/templates/events/ctf_info.html:71 -#: events/templates/events/event_info.html:64 +#: ctfs/templates/ctfs/ctf_info.html:62 +#: events/templates/events/ctf_info.html:72 +#: events/templates/events/event_info.html:65 #: scoreboard/templates/scoreboard/scoreboard.html:14 msgid "Website" msgstr "Site internet" @@ -79,9 +79,9 @@ msgstr "Appliquer" #: accounts/templates/accounts/edit.html:47 #: accounts/templates/accounts/profile.html:46 -#: ctfs/templates/ctfs/ctf_info.html:62 ctfs/templates/ctfs/ctfs_list.html:13 -#: events/templates/events/event_info.html:65 -#: events/templates/events/event_info.html:87 +#: ctfs/templates/ctfs/ctf_info.html:63 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 #: events/templates/events/team.html:45 #: scoreboard/templates/scoreboard/scoreboard.html:15 @@ -145,8 +145,8 @@ msgid "Points" msgstr "Points" #: accounts/templates/accounts/profile.html:24 -#: ctfs/templates/ctfs/ctf_info.html:63 -#: events/templates/events/ctf_info.html:72 +#: ctfs/templates/ctfs/ctf_info.html:64 +#: events/templates/events/ctf_info.html:73 #: events/templates/events/team.html:23 msgid "Date" msgstr "Date" @@ -156,8 +156,8 @@ msgid "It seems that this user has not solved any challenge yet..." msgstr "Il semble que cet utilisateur n'a pas encore résolu de CTF..." #: accounts/templates/accounts/profile.html:47 -#: events/templates/events/event_info.html:62 -#: events/templates/events/event_info.html:85 +#: events/templates/events/event_info.html:63 +#: events/templates/events/event_info.html:87 #: events/templates/events/manage_team.html:41 #: events/templates/events/team.html:46 #: scoreboard/templates/scoreboard/scoreboard.html:12 @@ -192,7 +192,7 @@ msgid "Personal website" msgstr "Site personnel" #: accounts/templates/accounts/register.html:26 -#: events/templates/events/event_info.html:117 +#: events/templates/events/event_info.html:119 msgid "Register" msgstr "Inscription" @@ -228,66 +228,67 @@ msgstr "Le pseudo est déjà utilisé." msgid "Updated." msgstr "Mis à jour." -#: ctfs/templates/ctfs/ctf_info.html:9 events/templates/events/ctf_info.html:11 +#: ctfs/templates/ctfs/ctf_info.html:10 +#: events/templates/events/ctf_info.html:12 msgid "Published date" msgstr "Date de publication" -#: ctfs/templates/ctfs/ctf_info.html:13 +#: ctfs/templates/ctfs/ctf_info.html:14 #, fuzzy #| msgid "No category available." msgid "Challenge is not yet available." msgstr "Il n'y a pas de catégorie disponible." -#: ctfs/templates/ctfs/ctf_info.html:20 -#: events/templates/events/ctf_info.html:17 home/templates/home/home.html:46 +#: ctfs/templates/ctfs/ctf_info.html:21 +#: events/templates/events/ctf_info.html:18 home/templates/home/home.html:46 msgid "" "No translation available. Please try another language (English or French)." msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:26 -#: events/templates/events/ctf_info.html:31 +#: ctfs/templates/ctfs/ctf_info.html:27 +#: events/templates/events/ctf_info.html:32 msgid "Congratulation !" msgstr "Félicitations !" -#: ctfs/templates/ctfs/ctf_info.html:28 -#: events/templates/events/ctf_info.html:33 +#: ctfs/templates/ctfs/ctf_info.html:29 +#: events/templates/events/ctf_info.html:34 msgid "Already flagged" msgstr "Déjà résolu" -#: ctfs/templates/ctfs/ctf_info.html:30 ctfs/templates/ctfs/ctf_info.html:39 -#: events/templates/events/ctf_info.html:41 -#: events/templates/events/ctf_info.html:50 +#: ctfs/templates/ctfs/ctf_info.html:31 ctfs/templates/ctfs/ctf_info.html:40 +#: events/templates/events/ctf_info.html:42 +#: events/templates/events/ctf_info.html:51 msgid "Start the challenge" msgstr "Démarrer le challenge" -#: ctfs/templates/ctfs/ctf_info.html:32 ctfs/templates/ctfs/ctf_info.html:41 -#: events/templates/events/ctf_info.html:43 -#: events/templates/events/ctf_info.html:52 +#: ctfs/templates/ctfs/ctf_info.html:33 ctfs/templates/ctfs/ctf_info.html:42 +#: events/templates/events/ctf_info.html:44 +#: events/templates/events/ctf_info.html:53 msgid "Download" msgstr "Télécharger" -#: ctfs/templates/ctfs/ctf_info.html:36 -#: events/templates/events/ctf_info.html:47 +#: ctfs/templates/ctfs/ctf_info.html:37 +#: events/templates/events/ctf_info.html:48 msgid "Wrong flag ! You can do it !" msgstr "Mauvais flag ! Vous pouvez le faire !" -#: ctfs/templates/ctfs/ctf_info.html:55 -#: events/templates/events/ctf_info.html:65 +#: ctfs/templates/ctfs/ctf_info.html:56 +#: events/templates/events/ctf_info.html:66 msgid "Solved by" msgstr "Résolu par" -#: ctfs/templates/ctfs/ctf_info.html:78 -#: events/templates/events/ctf_info.html:94 +#: ctfs/templates/ctfs/ctf_info.html:80 +#: events/templates/events/ctf_info.html:96 msgid "Nobody has solved this challenge yet." msgstr "Personne n'a résolu ce CTF." -#: ctfs/templates/ctfs/ctf_info.html:84 -#: events/templates/events/ctf_info.html:100 +#: ctfs/templates/ctfs/ctf_info.html:87 +#: events/templates/events/ctf_info.html:103 msgid "Author" msgstr "Auteur" -#: ctfs/templates/ctfs/ctf_info.html:85 -#: events/templates/events/ctf_info.html:101 +#: ctfs/templates/ctfs/ctf_info.html:88 +#: events/templates/events/ctf_info.html:104 msgid "Point reward" msgstr "Points" @@ -346,14 +347,14 @@ msgid "You need to be logged to access this event." msgstr "Vous devez être connecté pour accéder à cet événement." #: events/templates/events/create_team.html:41 -#: events/templates/events/event_info.html:111 +#: events/templates/events/event_info.html:113 #: events/templates/events/event_pwd.html:36 #: events/templates/events/join_team.html:46 msgid "Starts at" msgstr "Début" #: events/templates/events/create_team.html:42 -#: events/templates/events/event_info.html:112 +#: events/templates/events/event_info.html:114 #: events/templates/events/event_pwd.html:37 #: events/templates/events/join_team.html:47 msgid "Ends at" @@ -370,31 +371,31 @@ msgstr "Rejoindre une équipe" msgid "Find me a team !" msgstr "" -#: events/templates/events/ctf_info.html:9 +#: events/templates/events/ctf_info.html:10 msgid "Event" msgstr "Événement" -#: events/templates/events/ctf_info.html:24 -#: events/templates/events/event_info.html:8 +#: events/templates/events/ctf_info.html:25 +#: events/templates/events/event_info.html:9 msgid "Subscriptions is over." msgstr "Les inscriptions sont terminées." -#: events/templates/events/ctf_info.html:27 -#: events/templates/events/event_info.html:11 +#: events/templates/events/ctf_info.html:28 +#: events/templates/events/event_info.html:12 #: events/templates/events/event_pwd.html:18 msgid "You're already registered to this event." msgstr "Vous êtes déjà inscrit à cet événement." -#: events/templates/events/ctf_info.html:35 -#: events/templates/events/event_info.html:17 +#: events/templates/events/ctf_info.html:36 +#: events/templates/events/event_info.html:18 msgid "This event is over." msgstr "Cet événement est terminé." -#: events/templates/events/ctf_info.html:37 +#: events/templates/events/ctf_info.html:38 msgid "Error while processing your request. (Invalid Form)" msgstr "Erreur lors du traitement de votre requête. (Formulaire non valide)" -#: events/templates/events/ctf_info.html:39 +#: events/templates/events/ctf_info.html:40 msgid "" "Error: you're not registered to this event, so you can't register scores, " "fucking logic." @@ -402,42 +403,42 @@ msgstr "" "Erreur : vous n'êtes pas inscrit à cet événement, vous ne pouvez donc pas " "enregistrer de scores,C'est putain de logique." -#: events/templates/events/event_info.html:19 +#: events/templates/events/event_info.html:20 #: events/templates/events/event_pwd.html:9 msgid "This event start at" msgstr "Cet événement débute à" -#: events/templates/events/event_info.html:29 +#: events/templates/events/event_info.html:30 #, fuzzy #| msgid "Challenge Name" msgid "Challenges" msgstr "Nom du challenge" -#: events/templates/events/event_info.html:46 +#: events/templates/events/event_info.html:47 #, fuzzy #| msgid "No category available." msgid "No challenges available." msgstr "Il n'y a pas de catégorie disponible." -#: events/templates/events/event_info.html:50 +#: events/templates/events/event_info.html:51 msgid "The event has not started yet." msgstr "L'événement n'a pas encore commencé." -#: events/templates/events/event_info.html:56 +#: events/templates/events/event_info.html:57 #, fuzzy #| msgid "Scoreboard" msgid "ScoreBoard" msgstr "Classement" -#: events/templates/events/event_info.html:86 +#: events/templates/events/event_info.html:88 msgid "Team" msgstr "Équipe" -#: events/templates/events/event_info.html:104 +#: events/templates/events/event_info.html:106 msgid "No one have earn point yet, you gonna be the first ?" msgstr "Personne n'a encore gagné de point, allez-vous être le premier ?" -#: events/templates/events/event_info.html:127 +#: events/templates/events/event_info.html:129 msgid "Manage my team" msgstr "Gérer mon équipe" @@ -517,6 +518,10 @@ msgstr "Pas de challenge disponible" msgid "Latest Flags" msgstr "" +#: home/templates/home/home.html:88 +msgid "Flags" +msgstr "" + #: home/templates/home/home.html:94 #, fuzzy #| msgid "Username" diff --git a/src/locale/it/LC_MESSAGES/django.po b/src/locale/it/LC_MESSAGES/django.po index 58dc5c9..b77f7d3 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-01-31 19:20+0100\n" +"POT-Creation-Date: 2022-02-02 19:22+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -49,9 +49,9 @@ 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:60 ctfs/templates/ctfs/ctfs_list.html:12 -#: events/templates/events/ctf_info.html:70 -#: events/templates/events/event_info.html:63 +#: ctfs/templates/ctfs/ctf_info.html:61 ctfs/templates/ctfs/ctfs_list.html:12 +#: events/templates/events/ctf_info.html:71 +#: events/templates/events/event_info.html:64 #: scoreboard/templates/scoreboard/scoreboard.html:13 msgid "Username" msgstr "" @@ -61,9 +61,9 @@ msgid "Email" msgstr "" #: accounts/templates/accounts/edit.html:30 -#: ctfs/templates/ctfs/ctf_info.html:61 -#: events/templates/events/ctf_info.html:71 -#: events/templates/events/event_info.html:64 +#: ctfs/templates/ctfs/ctf_info.html:62 +#: events/templates/events/ctf_info.html:72 +#: events/templates/events/event_info.html:65 #: scoreboard/templates/scoreboard/scoreboard.html:14 msgid "Website" msgstr "" @@ -75,9 +75,9 @@ msgstr "" #: accounts/templates/accounts/edit.html:47 #: accounts/templates/accounts/profile.html:46 -#: ctfs/templates/ctfs/ctf_info.html:62 ctfs/templates/ctfs/ctfs_list.html:13 -#: events/templates/events/event_info.html:65 -#: events/templates/events/event_info.html:87 +#: ctfs/templates/ctfs/ctf_info.html:63 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 #: events/templates/events/team.html:45 #: scoreboard/templates/scoreboard/scoreboard.html:15 @@ -139,8 +139,8 @@ msgid "Points" msgstr "" #: accounts/templates/accounts/profile.html:24 -#: ctfs/templates/ctfs/ctf_info.html:63 -#: events/templates/events/ctf_info.html:72 +#: ctfs/templates/ctfs/ctf_info.html:64 +#: events/templates/events/ctf_info.html:73 #: events/templates/events/team.html:23 msgid "Date" msgstr "" @@ -150,8 +150,8 @@ msgid "It seems that this user has not solved any challenge yet..." msgstr "" #: accounts/templates/accounts/profile.html:47 -#: events/templates/events/event_info.html:62 -#: events/templates/events/event_info.html:85 +#: events/templates/events/event_info.html:63 +#: events/templates/events/event_info.html:87 #: events/templates/events/manage_team.html:41 #: events/templates/events/team.html:46 #: scoreboard/templates/scoreboard/scoreboard.html:12 @@ -184,7 +184,7 @@ msgid "Personal website" msgstr "" #: accounts/templates/accounts/register.html:26 -#: events/templates/events/event_info.html:117 +#: events/templates/events/event_info.html:119 msgid "Register" msgstr "" @@ -218,64 +218,65 @@ msgstr "" msgid "Updated." msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:9 events/templates/events/ctf_info.html:11 +#: ctfs/templates/ctfs/ctf_info.html:10 +#: events/templates/events/ctf_info.html:12 msgid "Published date" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:13 +#: ctfs/templates/ctfs/ctf_info.html:14 msgid "Challenge is not yet available." msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:20 -#: events/templates/events/ctf_info.html:17 home/templates/home/home.html:46 +#: ctfs/templates/ctfs/ctf_info.html:21 +#: events/templates/events/ctf_info.html:18 home/templates/home/home.html:46 msgid "" "No translation available. Please try another language (English or French)." msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:26 -#: events/templates/events/ctf_info.html:31 +#: ctfs/templates/ctfs/ctf_info.html:27 +#: events/templates/events/ctf_info.html:32 msgid "Congratulation !" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:28 -#: events/templates/events/ctf_info.html:33 +#: ctfs/templates/ctfs/ctf_info.html:29 +#: events/templates/events/ctf_info.html:34 msgid "Already flagged" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:30 ctfs/templates/ctfs/ctf_info.html:39 -#: events/templates/events/ctf_info.html:41 -#: events/templates/events/ctf_info.html:50 +#: ctfs/templates/ctfs/ctf_info.html:31 ctfs/templates/ctfs/ctf_info.html:40 +#: events/templates/events/ctf_info.html:42 +#: events/templates/events/ctf_info.html:51 msgid "Start the challenge" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:32 ctfs/templates/ctfs/ctf_info.html:41 -#: events/templates/events/ctf_info.html:43 -#: events/templates/events/ctf_info.html:52 +#: ctfs/templates/ctfs/ctf_info.html:33 ctfs/templates/ctfs/ctf_info.html:42 +#: events/templates/events/ctf_info.html:44 +#: events/templates/events/ctf_info.html:53 msgid "Download" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:36 -#: events/templates/events/ctf_info.html:47 +#: ctfs/templates/ctfs/ctf_info.html:37 +#: events/templates/events/ctf_info.html:48 msgid "Wrong flag ! You can do it !" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:55 -#: events/templates/events/ctf_info.html:65 +#: ctfs/templates/ctfs/ctf_info.html:56 +#: events/templates/events/ctf_info.html:66 msgid "Solved by" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:78 -#: events/templates/events/ctf_info.html:94 +#: ctfs/templates/ctfs/ctf_info.html:80 +#: events/templates/events/ctf_info.html:96 msgid "Nobody has solved this challenge yet." msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:84 -#: events/templates/events/ctf_info.html:100 +#: ctfs/templates/ctfs/ctf_info.html:87 +#: events/templates/events/ctf_info.html:103 msgid "Author" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:85 -#: events/templates/events/ctf_info.html:101 +#: ctfs/templates/ctfs/ctf_info.html:88 +#: events/templates/events/ctf_info.html:104 msgid "Point reward" msgstr "" @@ -328,14 +329,14 @@ msgid "You need to be logged to access this event." msgstr "" #: events/templates/events/create_team.html:41 -#: events/templates/events/event_info.html:111 +#: events/templates/events/event_info.html:113 #: events/templates/events/event_pwd.html:36 #: events/templates/events/join_team.html:46 msgid "Starts at" msgstr "" #: events/templates/events/create_team.html:42 -#: events/templates/events/event_info.html:112 +#: events/templates/events/event_info.html:114 #: events/templates/events/event_pwd.html:37 #: events/templates/events/join_team.html:47 msgid "Ends at" @@ -352,66 +353,66 @@ msgstr "" msgid "Find me a team !" msgstr "" -#: events/templates/events/ctf_info.html:9 +#: events/templates/events/ctf_info.html:10 msgid "Event" msgstr "" -#: events/templates/events/ctf_info.html:24 -#: events/templates/events/event_info.html:8 +#: events/templates/events/ctf_info.html:25 +#: events/templates/events/event_info.html:9 msgid "Subscriptions is over." msgstr "" -#: events/templates/events/ctf_info.html:27 -#: events/templates/events/event_info.html:11 +#: events/templates/events/ctf_info.html:28 +#: events/templates/events/event_info.html:12 #: events/templates/events/event_pwd.html:18 msgid "You're already registered to this event." msgstr "" -#: events/templates/events/ctf_info.html:35 -#: events/templates/events/event_info.html:17 +#: events/templates/events/ctf_info.html:36 +#: events/templates/events/event_info.html:18 msgid "This event is over." msgstr "" -#: events/templates/events/ctf_info.html:37 +#: events/templates/events/ctf_info.html:38 msgid "Error while processing your request. (Invalid Form)" msgstr "" -#: events/templates/events/ctf_info.html:39 +#: events/templates/events/ctf_info.html:40 msgid "" "Error: you're not registered to this event, so you can't register scores, " "fucking logic." msgstr "" -#: events/templates/events/event_info.html:19 +#: events/templates/events/event_info.html:20 #: events/templates/events/event_pwd.html:9 msgid "This event start at" msgstr "" -#: events/templates/events/event_info.html:29 +#: events/templates/events/event_info.html:30 msgid "Challenges" msgstr "" -#: events/templates/events/event_info.html:46 +#: events/templates/events/event_info.html:47 msgid "No challenges available." msgstr "" -#: events/templates/events/event_info.html:50 +#: events/templates/events/event_info.html:51 msgid "The event has not started yet." msgstr "" -#: events/templates/events/event_info.html:56 +#: events/templates/events/event_info.html:57 msgid "ScoreBoard" msgstr "" -#: events/templates/events/event_info.html:86 +#: events/templates/events/event_info.html:88 msgid "Team" msgstr "" -#: events/templates/events/event_info.html:104 +#: events/templates/events/event_info.html:106 msgid "No one have earn point yet, you gonna be the first ?" msgstr "" -#: events/templates/events/event_info.html:127 +#: events/templates/events/event_info.html:129 msgid "Manage my team" msgstr "" @@ -489,6 +490,10 @@ msgstr "" msgid "Latest Flags" msgstr "" +#: home/templates/home/home.html:88 +msgid "Flags" +msgstr "" + #: home/templates/home/home.html:94 msgid "Users" msgstr "" diff --git a/src/locale/ru/LC_MESSAGES/django.po b/src/locale/ru/LC_MESSAGES/django.po index c6b986d..e750a8f 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-01-31 19:20+0100\n" +"POT-Creation-Date: 2022-02-02 19:22+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -51,9 +51,9 @@ 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:60 ctfs/templates/ctfs/ctfs_list.html:12 -#: events/templates/events/ctf_info.html:70 -#: events/templates/events/event_info.html:63 +#: ctfs/templates/ctfs/ctf_info.html:61 ctfs/templates/ctfs/ctfs_list.html:12 +#: events/templates/events/ctf_info.html:71 +#: events/templates/events/event_info.html:64 #: scoreboard/templates/scoreboard/scoreboard.html:13 msgid "Username" msgstr "" @@ -63,9 +63,9 @@ msgid "Email" msgstr "" #: accounts/templates/accounts/edit.html:30 -#: ctfs/templates/ctfs/ctf_info.html:61 -#: events/templates/events/ctf_info.html:71 -#: events/templates/events/event_info.html:64 +#: ctfs/templates/ctfs/ctf_info.html:62 +#: events/templates/events/ctf_info.html:72 +#: events/templates/events/event_info.html:65 #: scoreboard/templates/scoreboard/scoreboard.html:14 msgid "Website" msgstr "" @@ -77,9 +77,9 @@ msgstr "" #: accounts/templates/accounts/edit.html:47 #: accounts/templates/accounts/profile.html:46 -#: ctfs/templates/ctfs/ctf_info.html:62 ctfs/templates/ctfs/ctfs_list.html:13 -#: events/templates/events/event_info.html:65 -#: events/templates/events/event_info.html:87 +#: ctfs/templates/ctfs/ctf_info.html:63 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 #: events/templates/events/team.html:45 #: scoreboard/templates/scoreboard/scoreboard.html:15 @@ -141,8 +141,8 @@ msgid "Points" msgstr "" #: accounts/templates/accounts/profile.html:24 -#: ctfs/templates/ctfs/ctf_info.html:63 -#: events/templates/events/ctf_info.html:72 +#: ctfs/templates/ctfs/ctf_info.html:64 +#: events/templates/events/ctf_info.html:73 #: events/templates/events/team.html:23 msgid "Date" msgstr "" @@ -152,8 +152,8 @@ msgid "It seems that this user has not solved any challenge yet..." msgstr "" #: accounts/templates/accounts/profile.html:47 -#: events/templates/events/event_info.html:62 -#: events/templates/events/event_info.html:85 +#: events/templates/events/event_info.html:63 +#: events/templates/events/event_info.html:87 #: events/templates/events/manage_team.html:41 #: events/templates/events/team.html:46 #: scoreboard/templates/scoreboard/scoreboard.html:12 @@ -186,7 +186,7 @@ msgid "Personal website" msgstr "" #: accounts/templates/accounts/register.html:26 -#: events/templates/events/event_info.html:117 +#: events/templates/events/event_info.html:119 msgid "Register" msgstr "" @@ -220,66 +220,67 @@ msgstr "" msgid "Updated." msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:9 events/templates/events/ctf_info.html:11 +#: ctfs/templates/ctfs/ctf_info.html:10 +#: events/templates/events/ctf_info.html:12 msgid "Published date" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:13 +#: ctfs/templates/ctfs/ctf_info.html:14 #, fuzzy #| msgid "No article available." msgid "Challenge is not yet available." msgstr "Нет доступных статей." -#: ctfs/templates/ctfs/ctf_info.html:20 -#: events/templates/events/ctf_info.html:17 home/templates/home/home.html:46 +#: ctfs/templates/ctfs/ctf_info.html:21 +#: events/templates/events/ctf_info.html:18 home/templates/home/home.html:46 msgid "" "No translation available. Please try another language (English or French)." msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:26 -#: events/templates/events/ctf_info.html:31 +#: ctfs/templates/ctfs/ctf_info.html:27 +#: events/templates/events/ctf_info.html:32 msgid "Congratulation !" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:28 -#: events/templates/events/ctf_info.html:33 +#: ctfs/templates/ctfs/ctf_info.html:29 +#: events/templates/events/ctf_info.html:34 msgid "Already flagged" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:30 ctfs/templates/ctfs/ctf_info.html:39 -#: events/templates/events/ctf_info.html:41 -#: events/templates/events/ctf_info.html:50 +#: ctfs/templates/ctfs/ctf_info.html:31 ctfs/templates/ctfs/ctf_info.html:40 +#: events/templates/events/ctf_info.html:42 +#: events/templates/events/ctf_info.html:51 msgid "Start the challenge" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:32 ctfs/templates/ctfs/ctf_info.html:41 -#: events/templates/events/ctf_info.html:43 -#: events/templates/events/ctf_info.html:52 +#: ctfs/templates/ctfs/ctf_info.html:33 ctfs/templates/ctfs/ctf_info.html:42 +#: events/templates/events/ctf_info.html:44 +#: events/templates/events/ctf_info.html:53 msgid "Download" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:36 -#: events/templates/events/ctf_info.html:47 +#: ctfs/templates/ctfs/ctf_info.html:37 +#: events/templates/events/ctf_info.html:48 msgid "Wrong flag ! You can do it !" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:55 -#: events/templates/events/ctf_info.html:65 +#: ctfs/templates/ctfs/ctf_info.html:56 +#: events/templates/events/ctf_info.html:66 msgid "Solved by" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:78 -#: events/templates/events/ctf_info.html:94 +#: ctfs/templates/ctfs/ctf_info.html:80 +#: events/templates/events/ctf_info.html:96 msgid "Nobody has solved this challenge yet." msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:84 -#: events/templates/events/ctf_info.html:100 +#: ctfs/templates/ctfs/ctf_info.html:87 +#: events/templates/events/ctf_info.html:103 msgid "Author" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:85 -#: events/templates/events/ctf_info.html:101 +#: ctfs/templates/ctfs/ctf_info.html:88 +#: events/templates/events/ctf_info.html:104 msgid "Point reward" msgstr "" @@ -332,14 +333,14 @@ msgid "You need to be logged to access this event." msgstr "" #: events/templates/events/create_team.html:41 -#: events/templates/events/event_info.html:111 +#: events/templates/events/event_info.html:113 #: events/templates/events/event_pwd.html:36 #: events/templates/events/join_team.html:46 msgid "Starts at" msgstr "" #: events/templates/events/create_team.html:42 -#: events/templates/events/event_info.html:112 +#: events/templates/events/event_info.html:114 #: events/templates/events/event_pwd.html:37 #: events/templates/events/join_team.html:47 msgid "Ends at" @@ -356,70 +357,70 @@ msgstr "" msgid "Find me a team !" msgstr "" -#: events/templates/events/ctf_info.html:9 +#: events/templates/events/ctf_info.html:10 msgid "Event" msgstr "" -#: events/templates/events/ctf_info.html:24 -#: events/templates/events/event_info.html:8 +#: events/templates/events/ctf_info.html:25 +#: events/templates/events/event_info.html:9 msgid "Subscriptions is over." msgstr "" -#: events/templates/events/ctf_info.html:27 -#: events/templates/events/event_info.html:11 +#: events/templates/events/ctf_info.html:28 +#: events/templates/events/event_info.html:12 #: events/templates/events/event_pwd.html:18 msgid "You're already registered to this event." msgstr "" -#: events/templates/events/ctf_info.html:35 -#: events/templates/events/event_info.html:17 +#: events/templates/events/ctf_info.html:36 +#: events/templates/events/event_info.html:18 msgid "This event is over." msgstr "" -#: events/templates/events/ctf_info.html:37 +#: events/templates/events/ctf_info.html:38 msgid "Error while processing your request. (Invalid Form)" msgstr "" -#: events/templates/events/ctf_info.html:39 +#: events/templates/events/ctf_info.html:40 msgid "" "Error: you're not registered to this event, so you can't register scores, " "fucking logic." msgstr "" -#: events/templates/events/event_info.html:19 +#: events/templates/events/event_info.html:20 #: events/templates/events/event_pwd.html:9 msgid "This event start at" msgstr "" -#: events/templates/events/event_info.html:29 +#: events/templates/events/event_info.html:30 msgid "Challenges" msgstr "" -#: events/templates/events/event_info.html:46 +#: events/templates/events/event_info.html:47 #, fuzzy #| msgid "No article available." msgid "No challenges available." msgstr "Нет доступных статей." -#: events/templates/events/event_info.html:50 +#: events/templates/events/event_info.html:51 msgid "The event has not started yet." msgstr "" -#: events/templates/events/event_info.html:56 +#: events/templates/events/event_info.html:57 #, fuzzy #| msgid "Score" msgid "ScoreBoard" msgstr "счет" -#: events/templates/events/event_info.html:86 +#: events/templates/events/event_info.html:88 msgid "Team" msgstr "" -#: events/templates/events/event_info.html:104 +#: events/templates/events/event_info.html:106 msgid "No one have earn point yet, you gonna be the first ?" msgstr "" -#: events/templates/events/event_info.html:127 +#: events/templates/events/event_info.html:129 msgid "Manage my team" msgstr "" @@ -499,6 +500,10 @@ msgstr "" msgid "Latest Flags" msgstr "" +#: home/templates/home/home.html:88 +msgid "Flags" +msgstr "" + #: home/templates/home/home.html:94 msgid "Users" msgstr "" diff --git a/src/resources/locale/de/LC_MESSAGES/django.po b/src/resources/locale/de/LC_MESSAGES/django.po index 8eaef40..c8b56f4 100644 --- a/src/resources/locale/de/LC_MESSAGES/django.po +++ b/src/resources/locale/de/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-01-31 19:20+0100\n" +"POT-Creation-Date: 2022-02-02 19:22+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/src/resources/locale/en/LC_MESSAGES/django.po b/src/resources/locale/en/LC_MESSAGES/django.po index 8eaef40..c8b56f4 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-01-31 19:20+0100\n" +"POT-Creation-Date: 2022-02-02 19:22+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/src/resources/locale/es/LC_MESSAGES/django.po b/src/resources/locale/es/LC_MESSAGES/django.po index 8eaef40..c8b56f4 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-01-31 19:20+0100\n" +"POT-Creation-Date: 2022-02-02 19:22+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/src/resources/locale/fr/LC_MESSAGES/django.po b/src/resources/locale/fr/LC_MESSAGES/django.po index 8873f1b..6e710b1 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-01-31 19:20+0100\n" +"POT-Creation-Date: 2022-02-02 19:22+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/src/resources/locale/it/LC_MESSAGES/django.po b/src/resources/locale/it/LC_MESSAGES/django.po index 8eaef40..c8b56f4 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-01-31 19:20+0100\n" +"POT-Creation-Date: 2022-02-02 19:22+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/src/resources/locale/ru/LC_MESSAGES/django.po b/src/resources/locale/ru/LC_MESSAGES/django.po index 53fc387..6cf3e12 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-01-31 19:20+0100\n" +"POT-Creation-Date: 2022-02-02 19:22+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" From 911c9f673206e452fd3ae974de7694839eabe113 Mon Sep 17 00:00:00 2001 From: Danhia Date: Wed, 2 Feb 2022 19:34:22 +0100 Subject: [PATCH 11/29] hotfix for 0 division when there is an empty category in profile page --- src/accounts/views/views.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/accounts/views/views.py b/src/accounts/views/views.py index dcfdd8e..83e5854 100644 --- a/src/accounts/views/views.py +++ b/src/accounts/views/views.py @@ -124,7 +124,8 @@ def profile(request, user_name): member = True else: member = False - cats = Category.objects.all() + all_cats = Category.objects.all() + cats = [cat for cat in all_cats if CTF.objects.filter(category__name=cat.name, event=None)] pointDatas = {} for cat in cats: @@ -151,7 +152,7 @@ def profile(request, user_name): solved.append([s.flag_date.timestamp() * 1000,somme]) return render(request,'accounts/profile.html', {'user':user_obj, 'solves':solves,'solved':solved,'catsDatas': catsDatas, 'pointDatas': pointDatas, - 'rank': rank, 'score' : somme, 'member' : member}) + 'rank': rank, 'score' : somme, 'member' : member, 'cats':cats}) def rank(request, token): all_users = UserProfileInfo.objects.filter(score__gt=0).select_related().order_by('-score', 'last_submission_date', 'user__username') From 63d22cdf6db0e3c638aceab16e82454e28f0d54a Mon Sep 17 00:00:00 2001 From: Danhia Date: Thu, 3 Feb 2022 18:37:24 +0100 Subject: [PATCH 12/29] added disabled attribute for challenge + fixed recomputescoreboard --- src/accounts/views/views.py | 11 +++---- src/ctfs/migrations/0007_ctf_disabled.py | 18 ++++++++++++ src/ctfs/models.py | 1 + src/ctfs/views.py | 6 ++-- src/home/views.py | 4 +-- .../commands/recompute_scoreboard.py | 29 ++++++++----------- 6 files changed, 42 insertions(+), 27 deletions(-) create mode 100644 src/ctfs/migrations/0007_ctf_disabled.py diff --git a/src/accounts/views/views.py b/src/accounts/views/views.py index 83e5854..806ad75 100644 --- a/src/accounts/views/views.py +++ b/src/accounts/views/views.py @@ -125,16 +125,17 @@ def profile(request, user_name): else: member = False all_cats = Category.objects.all() - cats = [cat for cat in all_cats if CTF.objects.filter(category__name=cat.name, event=None)] + cats = [cat for cat in all_cats if CTF.objects.filter(category__name=cat.name, event=None, disabled=False)] pointDatas = {} for cat in cats: # prepare categories - solved_count = CTF_flags.objects.filter(user=user_obj, ctf__event=None , ctf__category__name=cat.name).count() - max_count = CTF.objects.filter(category__name=cat.name, event=None).count() + solved = CTF_flags.objects.filter(user=user_obj, ctf__category__name=cat.name, ctf__event=None, ctf__disabled=False).order_by('flag_date') + max_count = CTF.objects.filter(category__name=cat.name, event=None, disabled=False).count() # get datas somme = 0 - solved = CTF_flags.objects.filter(user=user_obj, ctf__category__name=cat.name, ctf__event=None).order_by('flag_date') + solved_count = len(solved) + pointDatas[cat.name] = [] pointDatas[cat.name].append([user_obj.date_joined.timestamp() * 1000, 0]) percent = (solved_count / max_count) * 100 @@ -143,7 +144,7 @@ def profile(request, user_name): somme += flag.ctf.points pointDatas[cat.name].append([flag.flag_date.timestamp() * 1000, somme]) - solves = CTF_flags.objects.filter(user=user_obj, ctf__event=None).order_by('-flag_date') + solves = CTF_flags.objects.filter(user=user_obj, ctf__event=None, ctf__disabled=False).order_by('-flag_date') solved = [] somme = 0 solved.append([user_obj.date_joined.timestamp() * 1000, 0]) diff --git a/src/ctfs/migrations/0007_ctf_disabled.py b/src/ctfs/migrations/0007_ctf_disabled.py new file mode 100644 index 0000000..4d65a87 --- /dev/null +++ b/src/ctfs/migrations/0007_ctf_disabled.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.5 on 2022-02-03 17:19 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ctfs', '0006_alter_ctf_event'), + ] + + operations = [ + migrations.AddField( + model_name='ctf', + name='disabled', + field=models.BooleanField(default=False), + ), + ] diff --git a/src/ctfs/models.py b/src/ctfs/models.py index 6f49ca7..afec01c 100644 --- a/src/ctfs/models.py +++ b/src/ctfs/models.py @@ -12,6 +12,7 @@ class Category(models.Model): class CTF(models.Model): name = models.CharField(max_length=200) flag = models.CharField(max_length=100) + disabled = models.BooleanField(default=False) description = models.TextField(blank=True) description_en = models.TextField(blank=True) description_ru = models.TextField(blank=True) diff --git a/src/ctfs/views.py b/src/ctfs/views.py index a5de830..b7f1bc8 100644 --- a/src/ctfs/views.py +++ b/src/ctfs/views.py @@ -21,14 +21,14 @@ def get_description_by_lang(ctf): def category(request, cat_slug): cat = get_object_or_404(Category, slug=cat_slug) - ctfs = CTF.objects.filter(category=cat, event=None).order_by('points') + ctfs = CTF.objects.filter(category=cat, event=None, disabled=False).order_by('points') for ex in ctfs: ex.solved_num = CTF_flags.objects.filter(ctf=ex).count() ex.solved = ex.solved_by(request.user) return render(request, 'ctfs/ctfs_list.html', {'ctfs' : ctfs, 'cat' : cat}) def ctf(request, cat_slug, ctf_slug): - ctf_info = get_object_or_404(CTF, slug=ctf_slug) + ctf_info = get_object_or_404(CTF, slug=ctf_slug, event=None) flagged = False solved_list = CTF_flags.objects.filter(ctf=ctf_info).order_by('flag_date') description = get_description_by_lang(ctf_info) @@ -39,7 +39,7 @@ def ctf(request, cat_slug, ctf_slug): if request.user.is_authenticated: form = submit_flag(data=request.POST) if flagged == False and form.is_valid(): - if CTF.objects.filter(flag=request.POST.get('flag'), slug=ctf_slug): + if CTF.objects.filter(flag=request.POST.get('flag'), slug=ctf_slug, event=None): new = CTF_flags(user = request.user, ctf = ctf_info, flag_date = timezone.now()) new.save() profil = UserProfileInfo.objects.get(user=request.user) diff --git a/src/home/views.py b/src/home/views.py index 32c2444..eace7f2 100644 --- a/src/home/views.py +++ b/src/home/views.py @@ -27,7 +27,7 @@ def get_content_by_lang(news): def get_weekly_top(): week_ago = datetime.datetime.now() - datetime.timedelta(days=7) - weekly_flags = CTF_flags.objects.filter(flag_date__gt=week_ago) + weekly_flags = CTF_flags.objects.filter(flag_date__gt=week_ago, ctf__disabled=False, ctf__event=None) scores = defaultdict(int) for sol in weekly_flags: @@ -48,7 +48,7 @@ def home(request): response = HttpResponseRedirect(url_translated) return response news = new.objects.order_by('-pub_date')[:5] - latest_ctfs = CTF.objects.filter(event=None).order_by('-pub_date')[:5] + latest_ctfs = CTF.objects.filter(event=None, disabled=False).order_by('-pub_date')[:5] top10 = UserProfileInfo.objects.select_related().order_by('-score', 'last_submission_date', 'user__username')[:10] nb_flags = CTF_flags.objects.count() nb_users = UserProfileInfo.objects.count() diff --git a/src/scoreboard/management/commands/recompute_scoreboard.py b/src/scoreboard/management/commands/recompute_scoreboard.py index 3099143..380f472 100644 --- a/src/scoreboard/management/commands/recompute_scoreboard.py +++ b/src/scoreboard/management/commands/recompute_scoreboard.py @@ -1,31 +1,26 @@ from collections import defaultdict from django.core.management.base import BaseCommand, CommandError -from accounts import models as acc_models +from accounts.models import UserProfileInfo from ctfs import models as ex_models class Command(BaseCommand): - help = 'Recomputes the score and ranking caches from the solutions' + help = 'Recomputes the score cache from the solutions' def handle(self, *args, **options): - all_sols = ex_models.CTF_flags.objects.select_related().filter(ctf__event=None) + all_sols = ex_models.CTF_flags.objects.select_related().filter(ctf__event=None, ctf__disabled=False) + all_users = UserProfileInfo.objects.all() + scores = defaultdict(int) for sol in all_sols: scores[sol.user] += sol.ctf.points + + for u in all_users: + if u.user not in scores.keys(): + u.score = 0 + u.save() + li = [(s, u) for (u, s) in scores.items()] - li2 = [] - old_rank = None - old_score = None - rank = 0 - for (s, u) in li: - rank += 1 - if s == old_score: - li2.append((u, s, old_rank)) - else: - old_score = s - old_rank = rank - li2.append((u, s, rank)) - - for (u, s, r) in li2: + for (u, s) in li: u.userprofileinfo.score = s u.userprofileinfo.save() From a639904ee2bb8048aefdab528aab5a2ed045a44e Mon Sep 17 00:00:00 2001 From: Danhia Date: Thu, 3 Feb 2022 18:46:37 +0100 Subject: [PATCH 13/29] fixed latest flags when chall is disabled + fixed recompute_scoreboard --- src/home/views.py | 2 +- src/scoreboard/management/commands/recompute_scoreboard.py | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/home/views.py b/src/home/views.py index eace7f2..34d93f7 100644 --- a/src/home/views.py +++ b/src/home/views.py @@ -52,7 +52,7 @@ def home(request): top10 = UserProfileInfo.objects.select_related().order_by('-score', 'last_submission_date', 'user__username')[:10] nb_flags = CTF_flags.objects.count() nb_users = UserProfileInfo.objects.count() - latest_flags = CTF_flags.objects.order_by('-flag_date')[:5] + latest_flags = CTF_flags.objects.filter(ctf__event = None, ctf__disabled=False).order_by('-flag_date')[:5] top_weekly = get_weekly_top() return render(request, 'home/home.html', {'news' : news, 'ctfs' : latest_ctfs, 'top' : top10, 'flags' : nb_flags, diff --git a/src/scoreboard/management/commands/recompute_scoreboard.py b/src/scoreboard/management/commands/recompute_scoreboard.py index 380f472..1c24de4 100644 --- a/src/scoreboard/management/commands/recompute_scoreboard.py +++ b/src/scoreboard/management/commands/recompute_scoreboard.py @@ -19,8 +19,6 @@ class Command(BaseCommand): u.score = 0 u.save() - li = [(s, u) for (u, s) in scores.items()] - - for (u, s) in li: - u.userprofileinfo.score = s + for u in scores: + u.userprofileinfo.score = scores[u] u.userprofileinfo.save() From 2f6362360b26f382ef2451769840f7f9d780e049 Mon Sep 17 00:00:00 2001 From: Danhia Date: Thu, 3 Feb 2022 20:27:55 +0100 Subject: [PATCH 14/29] added dynamic scoring for permanent platform, let's hope nothing breaks --- src/ctfs/management/__init__.py | 0 src/ctfs/management/commands/__init__.py | 0 .../management/commands/actualize_points.py | 28 +++++++++++++++++++ src/ctfs/views.py | 20 +++++++++++++ 4 files changed, 48 insertions(+) create mode 100644 src/ctfs/management/__init__.py create mode 100644 src/ctfs/management/commands/__init__.py create mode 100644 src/ctfs/management/commands/actualize_points.py diff --git a/src/ctfs/management/__init__.py b/src/ctfs/management/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/ctfs/management/commands/__init__.py b/src/ctfs/management/commands/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/ctfs/management/commands/actualize_points.py b/src/ctfs/management/commands/actualize_points.py new file mode 100644 index 0000000..39656e4 --- /dev/null +++ b/src/ctfs/management/commands/actualize_points.py @@ -0,0 +1,28 @@ +from collections import defaultdict +from django.core.management.base import BaseCommand, CommandError +from accounts.models import UserProfileInfo +from ctfs.models import CTF_flags, CTF +from math import log + +class Command(BaseCommand): + help = 'Actualize challenges points based on number of solves' + + def handle(self, *args, **options): + challenges = CTF.objects.filter(event=None, disabled=False).exclude(category__name="-Intro-") + + for ctf in challenges: + solves = CTF_flags.objects.filter(ctf=ctf) + nb_solves = len(solves) + + if nb_solves > 0: + new_points = 200 - int(log(nb_solves)*8.5)*5 + else: + new_points = 200 + + if new_points != ctf.points: + diff = ctf.points - new_points + ctf.points = new_points + ctf.save() + for s in solves: + s.user.userprofileinfo.score -= diff + s.user.userprofileinfo.save() \ No newline at end of file diff --git a/src/ctfs/views.py b/src/ctfs/views.py index b7f1bc8..e1680ef 100644 --- a/src/ctfs/views.py +++ b/src/ctfs/views.py @@ -5,6 +5,8 @@ from .models import Category, CTF, CTF_flags from .forms import submit_flag from accounts.models import UserProfileInfo from django.utils.translation import get_language +from math import log +from accounts.models import UserProfileInfo def get_description_by_lang(ctf): lang = get_language() @@ -19,6 +21,23 @@ def get_description_by_lang(ctf): ret = ctf.description_ru return ret +def actualize_points(ctf): + if ctf.category.name == "-Intro-": + return + solves = CTF_flags.objects.filter(ctf=ctf) + nb_solves = len(solves) + + new_points = 200 - int(log(nb_solves)*8.5)*5 + + if new_points != ctf.points: + diff = ctf.points - new_points + ctf.points = new_points + ctf.save() + for s in solves: + s.user.userprofileinfo.score -= diff + s.user.userprofileinfo.save() + + def category(request, cat_slug): cat = get_object_or_404(Category, slug=cat_slug) ctfs = CTF.objects.filter(category=cat, event=None, disabled=False).order_by('points') @@ -46,6 +65,7 @@ def ctf(request, cat_slug, ctf_slug): profil.last_submission_date = timezone.now() profil.score += ctf_info.points profil.save() + actualize_points(ctf_info) return render(request, 'ctfs/ctf_info.html', { 'ctf' : ctf_info, 'solved_list': solved_list, 'valitated': True, 'description': description, 'date': timezone.now()}) else: return render(request, 'ctfs/ctf_info.html', { 'ctf' : ctf_info, 'solved_list': solved_list, 'failed': True, 'description': description, 'date': timezone.now()}) From 0d9057eac47e73a2bc0c394175ca2f6cf39f3a27 Mon Sep 17 00:00:00 2001 From: ix <0x00fi@protonmail.com> Date: Thu, 3 Feb 2022 20:45:56 +0100 Subject: [PATCH 15/29] Fix unused html --- src/templates/base.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/templates/base.html b/src/templates/base.html index d40eb23..cdb1e06 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -57,8 +57,6 @@
    • {% translate "Scoreboard" %} -
    • -
    • {% translate "Events" %}
      • From 0ebf804976019bab3e09376325b15d1da0b48741 Mon Sep 17 00:00:00 2001 From: ix <0x00fi@protonmail.com> Date: Thu, 3 Feb 2022 20:49:02 +0100 Subject: [PATCH 16/29] Fix resources page --- src/resources/templates/resources/42ctf.html | 5 +- .../templates/resources/create_challenge.html | 5 +- src/resources/templates/resources/donate.html | 6 +-- src/resources/templates/resources/edit.html | 6 +-- .../templates/resources/resources.html | 53 +++++++------------ src/resources/templates/resources/tools.html | 5 +- .../templates/resources/translate.html | 5 +- 7 files changed, 25 insertions(+), 60 deletions(-) diff --git a/src/resources/templates/resources/42ctf.html b/src/resources/templates/resources/42ctf.html index 6959f65..a0010fe 100644 --- a/src/resources/templates/resources/42ctf.html +++ b/src/resources/templates/resources/42ctf.html @@ -1,9 +1,7 @@ -{% extends 'base.html' %} {% block content %} {% load i18n %} {% get_current_language as lang %} -
      -
      +

      {% trans "What is 42CTF ?" %}

      @@ -30,5 +28,4 @@
      -
      {% endblock %} \ No newline at end of file diff --git a/src/resources/templates/resources/create_challenge.html b/src/resources/templates/resources/create_challenge.html index 4ffd16a..bec182b 100644 --- a/src/resources/templates/resources/create_challenge.html +++ b/src/resources/templates/resources/create_challenge.html @@ -1,9 +1,7 @@ -{% extends 'base.html' %} {% block content %} {% load i18n %} {% get_current_language as lang %} -
      -
      +

      {% trans "Create new challenges" %}

      @@ -18,5 +16,4 @@
      -
      {% endblock %} \ No newline at end of file diff --git a/src/resources/templates/resources/donate.html b/src/resources/templates/resources/donate.html index 0b3cb83..ce26d06 100644 --- a/src/resources/templates/resources/donate.html +++ b/src/resources/templates/resources/donate.html @@ -1,9 +1,7 @@ -{% extends 'base.html' %} {% block content %} {% load i18n %} {% get_current_language as lang %} -
      -
      +

      {% trans "Donate" %}

      @@ -48,6 +46,4 @@
      - -
      {% endblock %} \ No newline at end of file diff --git a/src/resources/templates/resources/edit.html b/src/resources/templates/resources/edit.html index c2c0a08..33e4feb 100644 --- a/src/resources/templates/resources/edit.html +++ b/src/resources/templates/resources/edit.html @@ -1,9 +1,7 @@ -{% extends 'base.html' %} {% block content %} {% load i18n %} {% get_current_language as lang %} -
      -
      +

      {% trans "Edit this page" %}

      @@ -13,6 +11,4 @@
      - -
      {% endblock %} \ No newline at end of file diff --git a/src/resources/templates/resources/resources.html b/src/resources/templates/resources/resources.html index 6e7b096..2d863be 100644 --- a/src/resources/templates/resources/resources.html +++ b/src/resources/templates/resources/resources.html @@ -3,38 +3,23 @@ {% load i18n %} {% get_current_language as lang %}
      -
      - -
      - -
      - -
      -
        -
      • {% trans "Technical documentation" %}
        • -
      • {% trans "No docs available, contact us if you want to write some :)" %}
        • -
      -
      -
      - -
      - -
      - + {% block 42ctf %} + {% include "./42ctf.html" %} + {% endblock %} + {% block tools %} + {% include "./tools.html" %} + {% endblock %} + {% block translate %} + {% include "./translate.html" %} + {% endblock %} + {% block create_challenge %} + {% include "./create_challenge.html" %} + {% endblock %} + {% block edit %} + {% include "./edit.html" %} + {% endblock %} + {% block donate %} + {% include "./donate.html" %} + {% endblock %}
      -{% endblock %} - +{% endblock %} \ No newline at end of file diff --git a/src/resources/templates/resources/tools.html b/src/resources/templates/resources/tools.html index ba07b1d..18d269c 100644 --- a/src/resources/templates/resources/tools.html +++ b/src/resources/templates/resources/tools.html @@ -1,9 +1,7 @@ -{% extends 'base.html' %} {% block content %} {% load i18n %} {% get_current_language as lang %} -
      -
      +

      {% trans "Recommended Tools" %}

      @@ -31,5 +29,4 @@
      -
      {% endblock %} \ No newline at end of file diff --git a/src/resources/templates/resources/translate.html b/src/resources/templates/resources/translate.html index 9d992ee..06c5726 100644 --- a/src/resources/templates/resources/translate.html +++ b/src/resources/templates/resources/translate.html @@ -1,9 +1,7 @@ -{% extends 'base.html' %} {% block content %} {% load i18n %} {% get_current_language as lang %} -
      -
      +

      {% trans "Translate 42CTF" %}

      @@ -19,5 +17,4 @@
      -
      {% endblock %} \ No newline at end of file From 65214b46d4ddb3a25f47a61b8bd9b5430c1ffabd Mon Sep 17 00:00:00 2001 From: ix <0x00fi@protonmail.com> Date: Thu, 3 Feb 2022 20:49:24 +0100 Subject: [PATCH 17/29] fix spaces between nav elements --- src/statics/css/style.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/statics/css/style.css b/src/statics/css/style.css index 4387d48..2169ebe 100644 --- a/src/statics/css/style.css +++ b/src/statics/css/style.css @@ -50,6 +50,7 @@ pre { padding-left: 15px; font-weight: bolder; } + .dropdown-menu { background-color: #1d1d1d; border: none; @@ -62,6 +63,10 @@ pre { background-color: #1d1d1d; color: #fff; } +.nav-item{ + padding-right: 15px; + padding-left: 15px; +} .flag_link { margin-right: 6px; } From c6bbc2a9a1b15713611b6540987ada3a217fe081 Mon Sep 17 00:00:00 2001 From: ix <0x00fi@protonmail.com> Date: Thu, 3 Feb 2022 21:00:04 +0100 Subject: [PATCH 18/29] Fix resources page --- src/resources/templates/resources/42ctf.html | 2 +- src/resources/templates/resources/create_challenge.html | 2 +- src/resources/templates/resources/donate.html | 8 +++++--- src/resources/templates/resources/edit.html | 7 ++++++- src/resources/templates/resources/tools.html | 4 +++- src/resources/templates/resources/translate.html | 2 +- 6 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/resources/templates/resources/42ctf.html b/src/resources/templates/resources/42ctf.html index a0010fe..c6fb1ec 100644 --- a/src/resources/templates/resources/42ctf.html +++ b/src/resources/templates/resources/42ctf.html @@ -4,7 +4,7 @@
      -

      {% trans "What is 42CTF ?" %}

      +

      {% trans "What is 42CTF ?" %}

      {% trans "A short introduction to CTF" %}

      diff --git a/src/resources/templates/resources/create_challenge.html b/src/resources/templates/resources/create_challenge.html index bec182b..a9da07c 100644 --- a/src/resources/templates/resources/create_challenge.html +++ b/src/resources/templates/resources/create_challenge.html @@ -4,7 +4,7 @@
      -

      {% trans "Create new challenges" %}

      +

      {% trans "Create new challenges" %}

      {% trans "If you want to create new challenges for 42CTF, send us a message on " %} !

      diff --git a/src/resources/templates/resources/donate.html b/src/resources/templates/resources/donate.html index ce26d06..08c9b02 100644 --- a/src/resources/templates/resources/donate.html +++ b/src/resources/templates/resources/donate.html @@ -4,7 +4,7 @@
      -

      {% trans "Donate" %}

      +

      {% trans "Donate" %}

      {% trans "Become a 42CTF member" %}

      @@ -23,7 +23,7 @@ {% trans "However, we will not organize limited time CTF for members only, as this will be equivalent to organize paid events, and we want 42CTF to remain FREE for all." %}


      -

      {% trans "Donate to 42CTF" %}

      +

      {% trans "Donate to 42CTF" %}

      {% trans "You can donate to 42CTF or pay your membership with the following means:" %}
      @@ -37,7 +37,9 @@ -
      + +
      +
      {% 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." %} diff --git a/src/resources/templates/resources/edit.html b/src/resources/templates/resources/edit.html index 33e4feb..2835308 100644 --- a/src/resources/templates/resources/edit.html +++ b/src/resources/templates/resources/edit.html @@ -4,10 +4,15 @@
      -

      {% trans "Edit this page" %}

      +

      {% trans "Edit this page" %}

      +
      +
      {% 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/tools.html b/src/resources/templates/resources/tools.html index 18d269c..8595255 100644 --- a/src/resources/templates/resources/tools.html +++ b/src/resources/templates/resources/tools.html @@ -4,7 +4,7 @@
      -

      {% trans "Recommended Tools" %}

      +

      {% trans "Recommended Tools" %}

      {% trans "To get you started, we built a VM that you can simply import in" %} Virtual Box {% trans "with a bunch of useful tools." %}
      @@ -25,6 +25,8 @@ {% trans "Additionnaly, you will need the following languages interpreters:" %}
      - python3
      - lua
      +
      +
      diff --git a/src/resources/templates/resources/translate.html b/src/resources/templates/resources/translate.html index 06c5726..6f5f495 100644 --- a/src/resources/templates/resources/translate.html +++ b/src/resources/templates/resources/translate.html @@ -4,7 +4,7 @@
      -

      {% trans "Translate 42CTF" %}

      +

      {% trans "Translate 42CTF" %}

      {% trans "42CTF source code is publicly available on this"%} github.
      From d5e2554602010041644515cbf1ecc0cc8cc5bc94 Mon Sep 17 00:00:00 2001 From: Danhia Date: Thu, 3 Feb 2022 21:02:55 +0100 Subject: [PATCH 19/29] hotfix for dynamic scoring --- src/ctfs/management/commands/actualize_points.py | 2 +- src/ctfs/views.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ctfs/management/commands/actualize_points.py b/src/ctfs/management/commands/actualize_points.py index 39656e4..516764f 100644 --- a/src/ctfs/management/commands/actualize_points.py +++ b/src/ctfs/management/commands/actualize_points.py @@ -15,7 +15,7 @@ class Command(BaseCommand): nb_solves = len(solves) if nb_solves > 0: - new_points = 200 - int(log(nb_solves)*8.5)*5 + new_points = max(200 - int(log(nb_solves)*8.5)*5, 5) else: new_points = 200 diff --git a/src/ctfs/views.py b/src/ctfs/views.py index e1680ef..354f131 100644 --- a/src/ctfs/views.py +++ b/src/ctfs/views.py @@ -27,7 +27,7 @@ def actualize_points(ctf): solves = CTF_flags.objects.filter(ctf=ctf) nb_solves = len(solves) - new_points = 200 - int(log(nb_solves)*8.5)*5 + new_points = max(200 - int(log(nb_solves)*8.5)*5, 5) if new_points != ctf.points: diff = ctf.points - new_points From 358de109db0f008e83970f03c6970444efb4d664 Mon Sep 17 00:00:00 2001 From: Danhia Date: Fri, 4 Feb 2022 00:27:29 +0100 Subject: [PATCH 20/29] changed position of logos in footer for mobile devices + added helloasso button in resources --- src/home/templates/home/home.html | 4 ++-- src/resources/templates/resources/donate.html | 5 ++++- src/statics/css/style.css | 7 +++++++ src/statics/img/hello_asso.png | Bin 0 -> 56529 bytes src/templates/base.html | 16 ++++++++-------- 5 files changed, 21 insertions(+), 11 deletions(-) create mode 100644 src/statics/img/hello_asso.png diff --git a/src/home/templates/home/home.html b/src/home/templates/home/home.html index 5bca43a..4d9f255 100644 --- a/src/home/templates/home/home.html +++ b/src/home/templates/home/home.html @@ -83,13 +83,13 @@ {% endfor %}
    -
    +
    • {% trans "Flags" %}
    • {{ flags }}
    -
    +
    • {% trans "Users" %}
    • {{ nb_users }}
      • diff --git a/src/resources/templates/resources/donate.html b/src/resources/templates/resources/donate.html index 08c9b02..dbd80df 100644 --- a/src/resources/templates/resources/donate.html +++ b/src/resources/templates/resources/donate.html @@ -36,7 +36,10 @@ - + + + +
      diff --git a/src/statics/css/style.css b/src/statics/css/style.css index 2169ebe..a1dd296 100644 --- a/src/statics/css/style.css +++ b/src/statics/css/style.css @@ -372,6 +372,13 @@ footer { .bottom-sm { order: 3 } } +@media screen and (min-width: 992px) { + .container { display: flex; flex-flow: column; } + .top-md { order: 1; } + .middle-md { order: 2; } + .bottom-md { order: 3 } +} + .ctf-link { color: #fff; } diff --git a/src/statics/img/hello_asso.png b/src/statics/img/hello_asso.png new file mode 100644 index 0000000000000000000000000000000000000000..bf905114933fb2dfea831ff047cadcbd48ce8b9f GIT binary patch literal 56529 zcmeFY6lNOyNLqzD5@GYCklq#z~TQqnc#P@{k_bmtHvF*L%^ zFz~Y0-p}6qeb)N$`~myZ^}FZGT=$vBah&JT6+O__JYPybr^` zxVr!8{T2p>H$Mi(&MOQI@pKFfDv#_|JxL6VMIALoIm35W`yB*PR?|=s?&4%-X8o&F zV|Fr<=Su3&=}F?<1zGeJqg9{ltCMgs{}_>k8CWMWKO#Ard-kpWSqdXFbMTjp{{A{< zX67HF8AU%>n0IK{Z2@xf08%h`qF*R1J8-sR#wwtu@yslsrXvr1GragAa%iYNWTx}X z%=ysS@;qqC#Pa9elLyN0NnT<9@A1DT_}?h_-$eL-uLWOWfIw*hui^2l+(ee7J5Th{ z=JIab-R<<@S+i20&%alducLrKBZSxa_|;HTVdH#S{0uVJ+;K$mWO{wiHHNIs{kFa1 zIv~$I`%*hE3tr;zZ%JwT9B?z*lvRVS;bB=ZU-0RMAIBwT-H8RE<5AL7x8TXGki)C- z^EWW7-yWc~UU#~j><;&Qk$Rf2%N}{xv%T@&y~lW`^GK@QdKj>DzZ0$Mbr`Fe9pGnj zVeuJ*6F8na zK7o5t`Bct(+xQRXZqOA59MxZx=52?dk$97ZHN1zWsE>2*$jrzs(?NvFq1A#kSc1fj z`PWj|jwAZinQHe%Jbl$@=R-)Kf1QBu!#lp!^HJFX>+5oXW}AGG^O*3NMJ>hJws}fv zk$+tA{=(mhnLK=U7j}6M+E*R!<^;fp$4!m#?-!**M|U+OX7;e2-{RX{EFPa^a$Q{F zqH99_EKwxb22QLL-$uB4d`8V7;m0Ri!F%Uyw;_aiDtFMe2y10V7 zSSUM5E}EpPp6?@vHAzoKu-g#tdtF#?gTMf zyn@yT*gjA5d}Uw5Fg{4J^t+!SF*_rj_7+D@eXnTtZ5h%47ZYc~8X6MHaZw^)d2}1h z<%5)4d{cUWPeX>6vA{Q+(j`&ccwH8GDR-iqsYj?j#<8}}u%~Dv+ff}c%>Y$#A3{8C8}y?Gji zR2f9f24X?{GYqZF_qEWxQFYd!R68;2Pn1Y7$2e~zP-c1JWQ&vpS-hRN1ow5*E%l+O zCA~zKH(ek6?A_y*M!Kem-F680T9pl}?6xsnfOldKO+168AN^a@$TASOK#o!mZ*2P( z@{$BKpnZ(l)(UkUrAfv)rC0Jr6rRFO)AHpM4}1<761U#b{bg%{M_{laK@kV zb!UCCo$p^SLqzhGb|of+?s7YPJJD4)F)>sUOsQyG4rj(+AmOZ1EwfoJo_b9Uc8xF} zTzjVONm}6gk*+|STdVyx+ zs}Hb$uMKz1GI3we;+;a3)_Ic5o8UH-47j6l@(mk@^=Y!{I=_+UwM(IWA$L2z5@Mo< zga21C_&cJ9qzusE%Yz$!)FZ= z%e~^f)hOmD;i=8UrQ}&nCx2j6KRgD%gOcWj%IktkK>cnA^Kc{7T^6$P@Iz<)o}Zu0 zztzqUyiBsIaQJo*y%XOCGfn=CzZKXx*t1gHd3Buag9z$NP~QOabe9}rz+I%fZRv7! z!VmH6MEoe?I1s1jl6Ijj>9~GS+|j^PBqf$qID;k9CFf<^t+F~w-gT4PaC?>t(dK?I z!L!*d`2VYZ|Cz#JjIv<~UGaQ-7O1iCeP>ENw`~YxZmvI^vtiyNzo{!L_NqTFbHH=S zZb3)Pwrz*YoN%tUi5k)8YJiwKK#Y4DoaV0WtJDy`iI}*#32~*qv;t0O+RQWdPR2As zV;H;1{dop7)Mj1!M&SX=jWl-Lil*tM3(~|i#}NEjzg+xg z`$^7}^o*xwML!GnHE{E8-p8x#i;iHt-@$W^LFBQa{aOI-sM}DGqS)A5eEkZpmi<7$ zzj@~Y17>m(UUzlYDlQruuW@=j)G)b>vLMarj-G-s2#pGS3HHZlLS!`vKjj)SG)o>1$T zP-VW5k%6wd(@`fJMg1#S^I(*9I-aj`uDM2@Yy|<{1ZPdzkqGXC6KC$ewdwWck2lfy ztm{@u==Jq^v{+OehGo({A6fq6s2?!w>Qb`%vH^j+BvL&}MOxj+>T}t&z&ilaiVtpS zKu1{LomVqZR3~bR4dKPkJNya^GK1P7>@se7rTwEsNOl(XloIyi|D3CAy{r^O{jvXN z-A+_Wg$$I5}M>6`dh*%w+E zJtFjc&TUIGl|k~&c2tX}9FDx=F;z!sloE?^q2IAWJ51J&^H+zXq+uy%}#&!#@^0Mx-mDha%!VzY|ywo$!x4u%rx7!YRX;D+{`85 zk#MH9<<;(j1OUM-r9on!U|(KGJN-&~M?eE4hBHdZSx;FVM9x`XIoy8jn>=W7Ujljl zHKfBZs10}yX)`c>T*E=h8;0qho;f@p9kEzz5KA5XJjg#59p$l#0U73Y zy|ap^B_%2=g$X`jGQNq`xS8|M?=jq&XLrAv4INw!^~ts5NzJ5F^MKu!Q~zO?Cm)RB zF$QEUb$ShTRdvD>)RKB0g((E6dL??5W%dIbv+Cnad|+cD3!4r;miA$GA&Q`84ytz5 z$U?ILj_0SiP&=-!y-L`gzymU6n^-7HH{aUaWgprIhx(cSOP(0>U@{IgGud4TCv>3v zdd8Fhp+=5+#_ACQzVa5^Pk=pBCYYRu3-aJ912=@(oUi8Qi)5FuCO+;%(`!J=Z_bI; z&dOo5U7ZNZirkDx9uh-pUpmQumx;z$MVwQJiMszwz5ZUVfT4I994Kv(Ne@g_)Gh02 zHQT$+y7gT-1NLbghfE@kprhqlXHW|m0x1~Jgwqscfp*^%F2d<>w!XV{lT;$uwuQ$A zH^^u8?51a?|D=$M5EB18Lr_USsr1N-%Hl18<8h0Wjtoi@p*>xsadjnlD z25ir3?C7mx`EqCNIB@Pg_NX<=MR-?AQY`r1R_=NPnLN{^MRZ*_5929;)64LuOk$zd z6t&_5wZXY^ z={8TBbn_5ur|BkINF*NUpZWYfT(*cq=D`;q()B~g8+i&{l{w}#5N*NWm$iat?MeF@ zmL?B=SEW?QUtDKK#+(@A=0(Wg7y}_Lsacs4L=)|(ioUa(uc|cf{xwkWG1uS4{#nf_ zy^hgWRtt9f7UQKZH|*Q#Loz%!$5lS-k|z_By|8jgZj}~ITfnHHBn9O7+Jr+^hriKE zo^e(>-ok+7(~Q4qit5sI;vedaQ!A_~nh}husqCY@$`3?dahDCb^9eZwYv(U>ed|Vr z{})#MZvdMRj*(c47Xp1lj_rY*h)ay&J$DM_cRu}W@Jx{ZWIl*6>1!J}@S&df^vfoA zCAeKgt+}&CEm)YHOsyO9S?StmUv4wOXrp>-gH*hr}Xa^-Dpt0g{i;phb<9v3Wi7sdxz>{j7XFE4n z){neJ4^Bp}8d+to5uk{m-PtuTL34JiZzUAJ3%xzjL~{TzN|(t?hd$alPW^ecSNw`~ zo(-OgNiflV4!`GVn(2?hFTD!?AsKze#U|H#^a;`05Ts@Jbifj6N-~@5lxbtf3ePX~ ztK{n4=6AJ*LoV7V4`?fXK7hjfJ2v5dLT5ch95X(FSih^u2!TdYoAI|$;%OtBv&A9Uh|JEnf$tz&)%#qG4)!5$7RbF$4BGBv8*o| zVYDd-MJ*nE?jKAvmxG9ryVGxs-8_QVA0an1VYYcbiFViSelTaIr2w%=zd2>8=Cpql zRxruSHt&6JMzBukyPwez*Y_#Bp2;IrBZ6>2a!|_S%ChDrv)$2MBc|!Z9l8Xnef zuQg#Kg1Ph4gA6r$SEcz8-x*W|fuK9XN>^WaPb@(H(`S zOFDc)_OE^SUKTAFDC64AX=H9o90dg(FvCwNanA|gJa+H?Ct&|B%lv0_Tll`@BHmkyxpx%`wM^5;KNHH@*=bFKGK=xOYD ze}5UnZeBvrHFP+ltn6@iKgY4z-AyEG_OxCr(Cxp=H$e8)n``(!qZvbZLYv?wuzKwZ z?2lR)!+{P-_zbjgzwewule1CtTPZA_ckc-`UJKgflfM2vEk9itWU_nd zOOrS#d3|aUo3Rqn5ZY|>SH=Dw{{1incGN~TylL989GpMnI66Z!eC~WY6S)%#JM3QZ zoqbwWb?Uz>dg?Fbm|u%KxsAXTXqZ!J9%}S5_X1A=RGBP!;S4xb>+4~ zE-n3kI-D-{gVjJOspG#mDXUyhnlTUQe7gC%YGy%w z$4e$L+ePR=Az-CK)U0Hzx>CgYbCciWqB}z3P50CKrT^)HC}PH0JK_ctOV)y8RdC4) zmGF)r#q?`C=;x=)!0QR#1;2L`0uKizj7h&qfit^y^$595s=hA14zrLUc%3z1Y228u zF>6yjYW1<}=Jt2b!B_DyNm=T@gmqoO`-^1)inH{1#>o{qWuD_jaRM;f4yNnUj99_? z5rVhhy6$G3xo3-rX*9d0DE-ZXb`s6|ALT>{I~gTR4(F=Qwq1fQuz5WPBlQ9l42>in zrv>Y%bFucAn$)7eaSDhuU)p+}TYY{1vP$mCiQ>G)k(J-=nezKAlf5Elx!#7|SAw@8 z&VGHW#A>YG^J#6|IQ4J#jEbb|J>YIb9bFODk`DziKg*I}b5!~Z>L*PWy=2N^oD#5M zW2GuT;8Gef*l228n9}jMjeq;Grdfy7k;=v`1XJmz#HcAe{^x&Z9V@Zvmk29sRY)mq zYQ07N;7c)weS=L4(3u`~v*UH-s>S7O*mWR|%^9rYFXds~n~an7A?6LY>XDyZTp_>n z5_;iMlzH6H7wB4Z$DLCb9&jdadnV*0E~Aa?cg71D{rj(&7`+nI#NwuG&6Pxg`$Uco zt4yxL8K+jwWusUi+4>!>6q0T)04ENbsn_1K7w!M2i^_(5zl6ozkSkt>_DBIu+{uhY z^(t03U7zu*0--NiyK8F@Za;%yx5g> zAz~NnGjrWA1u74NG(a<6Ig=~>wu@Xc$y`dUDL*LCHIX*X5#|%vgU>p9FL_=cJUh>1%Gl@TiE~Z)tlm5+B;-Zk z&33443I#<`TGn)WByuK!UL{z-v=&asyd~_U3@yL$Z--wkYB08wi&Q096gCNF*Hc^y z-&xJVy%iJaRuKVrE9PTu80Y^S1%TE|ELQ8?}6F_ge| zSF~o#E4hi3YSxwivuRYSVpq4fp0xo6gYbLyoF#PTlyvJq7m>bBEgfd6o_k);lf}I- z;H~)H(mQF*dF;${LwFDd-0^MK{pC3#q6$^ktvY)e-D>14#$}Bd>7QvP5V+>FQ1SPF zD|3K8Wul|WpMd>9rhj`x6J{E2L^Cp%e9`a)DqrOxIULS$RUSEx%?8Kih2mGJtE z5*Mzf&_eDKaPq@>-%aipK>Ax=i3F3co9dZVgTe2l>EPyrv9Gb8d?+V=&vM+HdfR#y zSG@0h=BHIf3yS_|na?sU8ny++?~qqFh8ivtJ2*D`0XuCQbs9$`9Qf_Um!IPBL0}qE z=UJ&$Xv?SmeDYopIquKNI>))Aju@NYxm1GIQ9AHKv2T^r19 zUgQEy5*Yb<#13jr=lU==jnece`+|D2FTh6p+~Y=*WHfQhpwLh7YAd9S9eh+yMkI+JkwsebAc=qr8CoX+dhjS>=gq z6o)~qQTyli2#dkVQVOmeNI9{VgiO-T@O>vGavI)LF#Kj;yjEBpA9c*oGiZ%sebvap zuivY~X((!`yv6?~lTjGd_^aVd^$QIkrJX@Wh?2Uir11`#buc)TZ@5vy4R(XDi|wv8 z(O=o0ZG^*%$|R07{Rm0$84BEaGDh}3ZD;2&|H{;9M2@i%@2)-Z3V5TPlkT`O2qBxettPf zxil}NbFCFFn;3DJK4n1#85UE;sB^C)}v65ZJ z(6i#zO-qUD!jwL*Or@gKf8i9nIoL@h6K+ZSJCnFHsVKT~UAjTPW|(cTEbV&gca)jk z4j)ii1`V+L30G_KN+xRrexdT|wkqpr@tsv#ok>a>zLxVxmihP^UqU3;B-`%TP+Z`B z=c*TsLwvKlA?pthmzS)h$?gHlTf7e;ZZsVa!_GQx{@5f)=ya?P-E8PzuSd$YjR2qR zy=2?*zs5xDlv`&<<~>_`^D(>GI&sW<_O*(4bp6Dv9~tuh@nE`letW z{%JxE*4{}Ml-*!vf~HBq8T!eYmkS6cK?5~!&d zP||-jHRa@YdvalXynPSjzM25Cms-!n!!B-d%8wz;@qWFQKf(4vtCQ1rQWci^`}ATl zu5qhoGCg;Pzr9L;R*_YhkvS}6C%`!Axu)=kACa|(A`1syafz052d)XrzMex5 zZ-#Z(T=y)>eMpXX3_jQj&n2oXli1{1d2vo{?K-+1eEPYt2$f$q!J9mL8dltt5wH(m z55dleKXqC>xsn8M1!FU%v#WR1PMM8Xrs}!~9&(0`+g15xB&S-fm`GbA0r-5t2uL>g zsL7c(i_N-{+jrU8_?m=`W`89g8@O5j?ClYoNA*%@;8tFx&*J6PJ!E>NO2TMR6QUWv z+}dEfu1fzQraQN))^R1cczR40WP(Q*=lqP_)xrzs*{O4a#Y@TfPJf&0Oqo@rN?KF= zjg#N?7N6`R_qHgri9rcvw{I5vsF05B$0tz8uFCV%SpI^C4;u+c)bxMz{WT|hIkPl) zKO6|PIDDMe96!Z@r12XIkSmgTm@kbq=tR}dQ1RFSc}|}sY~kfzrt)Hy*1PWXkGth6nro-W!3Nvt%TLHG8Hu-=l31gCeE9HG!f zC!_*w6zSDfE51NtM~-R5uXoU(eI41%K8~WSD2@TIoO4?@+h;}~wa+oXOneyjnuAW( zk7w@D*DFB5&7!=m8#Qh{&^cqVy3oVv6qclzB$wV)mF75$?DetL)LdySYkhUCZSY~qS&6VkxN&RUuc|Y(zBTZ;dg$0R>=vPrz+1q z2lv^`b&EL-d;v{yhBR86X!gjp*f=Oj_Gs^SJYe!aRK}DCz-V%w#^@a0RimKlp4KFWg?Ww}E)tXA6edaZ z(SK3R8u}NaAN%-lLnib_2J1L4OLUplWi8u%SZI%wQpqRMf&pq6%8}R4-U@=(HOA}a zJLD0(nN>%y#c(4#7CoLcz4@}<9n*j85tj+EqfUGps+DRfHh3!1W<%s4x*t%%ZeC?x zm^mPqDB?Go!n|Ve6kEP7&yq(uDF`;dh;e_%E!qdnPP&{#Sx&_;!=x$>gnH@W%T}=z z{i3x6m>vQ0!Zgziw=w0|esm2*eTIX4dDl3|eKiNT}s#nU=V!=ltAv&NzpuSINM_nG`{ZP!(WWI8o*74T+;G$=U z=<&6i@k(pYFD{(Pw;MK@5psI2Ge%D$_Pc%*M{R}JLM(z{`#(uOaU+-9&(A~EQtPv$ z#2lbhQcfE=SdA$#CGYh**@nHW#|kO0S4_P!!hnx_7$96{1H0ydN}s<+E4>E?qAV)C zF! zX19oEk}ghSX#^8v`78zcs?3WRKP$T$on$G2bMUOwb5CvN%6DvV0s43;&FEYYS^A?L z5i5LC4tcPTks+!G;{lN-$R2@kT$gYxRi4q)2!f$(-01kv{6PAVaZ;{9|CQO`Z`b?n z$e)TTWdTab?_rhSmhc+{Q z(Wj&Z*}-x>9Wci~^M5mExZHdB5V=ZeP5i=S&*WR!3bpwc&NRQ|!T0J<^_dpUUzC19 zus#C@>a6~!ndn)GcobZXs_0JOxGms{S_+@h6ss8lMKuS#By|o_ zID*2jCYa7`>cj#}_M%)#?3vqvkF0$TAQww=t;4oMxfYJYOXL$xDUjH=-P$yP^A$I6 z9qo?V%1!<~a=ih5McexqDg*Q-M8t9+;&n7|x8e`p&udt7~LjV)ZNfQ4|W(>9uuo zg!PAW?(!JA){Y%2jTTYHA@|7S#jBkQ&#=I9^U;C-s1e)In zdq3Qc$gvh5pw8?VNCt&yL++FW^i^6$j)@65r5wZt7kQ*at~63pAQs%`Nhupldj&zR zg2{{Svzf!zWyE{!x0~iI{R@12LgxDt^N#dRB3Ytm6vX$8?=OuS2uKj1Bw=KhXTu?6 zv5Hn@&2O{0hBiI+lkmFl)V{K*43-39{W)iv`UpMPr8G%yZ03a0P-kHEoR#R_%jAId z!m)sQ(<~`oby+|8I?EjhSEN`E$LF)q@!2k?^0sV;KPef=7TkWYqhm$cZ_n*gZDd*S zULI9M4reiCg)^FMa5x?xoX5~RFaVYjpG(L?)%D$8U`b$0c**H`*_=lhBZ5*2=s)V? znhi$1ZOsDQBy`pU@P^ige72QT(jH?P*ii3aP^yWc{l5D8R>AC*tm)ac?%HT8xoz8&;X;B|%~EAb z5d?LQE_k_hRy<5pCE{ls&RR7TKg?YL-j35c$n_SJcIakFJ;uCMyic(%kuTg5JKQQv zZknkZmXv%E)X;(X0hXi<8(J=)+nlF#alH;cCXmt(t_LiIC-6xayQ zv&W_=(8qmEOJari!!eQN(C4&hS~iyNA$+U&wpJk ztTrS+yWW5a_3+TsLYx!#sMk}6RDkFWYw|`FQ+X{N*pkCe0(bVCt!|tU{8%#lePo0C zTywuc>I;Q+Qy}5M@w)CA6$0^9y#_n8@p{Z3x8GUGWm0?)0mBu z{bUZ@Hbb(m8-GSbA^qa-_@c+=z4cx%VQkCG*fe_xwx%2D=k?tP^H7Rr1)Tk*Lk6Dl zxtm|Z!(oet^Ut71DD%#G&y@>bQ7fpEQ7hN&U*Jg(`kY&O@6j9S3cmMGKy8Am^;MdK z=-)rdlWWaTB?)q;Mz(GWB#=EW;gp2!hI*e&)6w9dhEC*%gfoI`k%?a#o7@3QK~+X~ zrWB^(c49U7(Jz|YdIygAWa%6L$6T zf>|IN1&RZjZeqGsT{`>xJTNHvHF=MU-ZMN%$Yswb%~i{;bUk-o5}QA*Kk(W2?bKdO zV_|nm|0HJ=40?lDkSNE62Csh4nT5Uc*b~j#oOPdX4+*48+?@75d@gjIhnT&^ZjlKs z{jkQ^mWHCMtv{&29b|LZON`liQ4{_u;4Sz}I*WVPZ{TRuY|DEmz(`%)AR!3bVv}c- zr(5j$bX0Vt^5U9-CJ?kCd_}8nLJj0C`V5G)p|~Be6SJ!%S`Y!+%=O|0aE?M?c0k{5 zLZi(&f`Bpql~>IwVXtOUu}lir)_n*iTVnO|3dTXMTd34rN2qzwNf9wZyuH4^$ej_4h);EKj$X#aNdr%4BQ+4S< z{gLMBb^_IpH5uRClc}kx^MF{Ky!gL|Jbak^(^nMaeM(a7!h_hHT<5~+b}V~Wc^>Wu z4YcH{$IaFlOpgSXp`hR!JmQTP=9_)Iu3|5n+Cg{kTxUaW@sQFgzPXDdtLZ^p0MxEL z1tEt3>#ltk!y3JT)z>f@TXhA*n?E3^2Z!P>XI#f1@d@n?m@G$Jl7Pf66; zUUcV60E*ArhBUfc+liuXYOX)v<^9K|96KhXqJ&&(c%2D*IRx%N@FLbf3BMF>Sh>f; z)Ohg|YpwYMEv)JC*Bs6btYPEV1;y!)6=_Bz=-!dZPB3{Y4-3wW=4xkOBK8I|7RO4U zU2a!9>W{ct2-+;&jVG0O1Up`OiXq_2KF6fzw$ltmoQEpJ}bU1Pc<2RWZgZl6|lVH-*Fi=ia#OBkScr( zj;(1Yc9onQncnpdj@%?89pG)hr7iz%@*8hm5xmew#BduWZ>dc=MZP91>BO4$xQ zv%on5)XorpquA3Mld=))i_%Am!Ud_D%7}IMZ+rPry;6tl!0MIPPXhJsw=<0_bSz>r zQa1E+>?jVx{O)otfQgyAZ%r<461ELj8oDbxHowf&HSV+R4r|0JUpH6$nfb%|;(qs) zkxABOjInN#Q914H^cb%|azUz^*cPrnVyr(M{9M){5;nBG5E$j zF)8pB{xdP0=B5zki&It?)LvZBn#Gj#*ZRb+yLdY15W?__+8X+LIpb*`GHoY z!^3Ult8nOoex~b3e8EaFkOTBpiIFq&@{53YVS7$44N44G9nr)A@U9_zK&Hcjh6`Q6 z?;wWFe#HES_}&x;Z%V4S?07-*L3f2z=NGx>N!)iNcJsL1KE#CA;&Z<$3bgCHh+YUB zT@cAB^Tqts@B6Knjdcj;AwIFRK-6Ws7)OPW)~B`W95wNkHjdddmX%ZB~zPq%~G&4ia{c z)(=s(c)F=xDI;>7d>w8yB=)7<%?2-}uYPYKK=G;<=~nO)70vjYkAYq?^G_;wd0=zw=1u2|V+HT8}3_H4fjL zM$#xEst!6j-zP7kelQJI^BWVbBKh~6T8E>harN=(75*~A;VmB$cJfiPX@@rcx$VKw zN}uiPbFC_ol-*B|0(VMl+WWUXq56P_aDSKJbZGwt6mOHp#|NZ~nR24NzTaMk7b<-c zEbAu+cU+ELbOTCm0r@i?%_F)=Mk9jq^>WF+u$GV|Ewqx)#fUc3Jkq8$V$A6!s74Ga ze1oYsa~S0KnO%_m#;?qB!RL4tT=)`%z+n$NZyw%zLe%LOYbL4Zj%M2*qTwOm4wB{OWZePZ zd8LwpfW*XARnmNz_qd=w{tPk=yF>RL7ToQ5k%FZBe^7{PVb6i#ghnw2wqskPY;R1~ zh=Xn=!4)O`pNR5e{%S!Vo;(nIC%?5{--_o$s$T_t9YBucK3^~17EWW;qvz31mVs?Z zgh)3WI576}xk%UEI#a0`??7}j?`evDn$3l`NBhras3hjyqKNiCrUiJ_qrJy6`0HCzJRP zKmrcGh1$9&4GNQhtmhhI6m4OCQ^uX4hhPW5tGYFjuu)j-*q)(So#8F`)srU1!Pqcv zM|- z*_CSH_yu+KwwqWd0ybG!E5PUiU(MksLx^Vij<@s)D4Rek#HC_zDr7LYjNgTIFUxmsNL5^+PY$B7wZoh0KL$Z}jjZ0}n zPAiNnyvaKFW71mvcRhzp%vW#j1W(PmiS_et0N6}R?&E1k`tPt;f>eX3(7y=AeQB!L zw~7M_#&1C#w|(Z0tB!x{PYxPXxxY-Cp*%amvUvjm!PwzmF+bHpia&6_j=S9AKA2Bh zk}HC#EY;d{Pb-4ivJB1(^F&JBu}V6&nj`rc_~> z4j%2A?F|vPS@6WM)KTAG`nBZ>cdmZg00;C*c@$fOM6` z1V@fJ4|rEm4C_(4%@#bHnyaf^v@?GrVu-w~Gq~uaoS1)?6^PB;6)4J63Ww;cz5P(l z8`)}u7h1DWIs0p{L@4dD%_Q-Dr=rVul)ehq`P)g}8+v%u7IE?C&8Ivn_o%3uGbBHgPUli1Bl-Fce*n(@OgRNpZq zf2S!GK1&?;T}j0*z69iW>Gmrcq4~}DCFZv;h^##Z4(t8;3UpnDcn+(JlnA21rNU2% zNT26B7ly0<@{q=hNjN$jz=#>Z7hyB@!avu^ zm)Rr`YmXZZvc5A<+BJp1Wpcbu)1oJjerw__pGc}D3!1LQ7>!(9=*y}U=9_>rE5#MC1xq!`r;rcfjoQ$Y6;%!#5$(aF zcKNN!yne>JC4qe7EH`mhBR&sj+w^_nFFQ3~H!fE-0xkdU(lb%=?(Kj7z zt3*NY>)n=E3KWUA-#bjb=~&9g!(s}0i51V9eH|0^uBjk=`Ges5VzER(xnaEd;XrAP z(`FCx-jMH4kwC)CNY53k$HqiN-OLJosGl+=HFpBwXkQv^F-|w$Hu$9MpZ22VQ^Dg`05#|a+Q zJu{C?fNa8PQIDkH#MKd0?^E;j=VmLf6s=Y`P+(=7BxYJ8oH$-8!AMzN#9q@ zGKjbgg`;uDZ=Q-qcXqKM+^LqzC%B2HM5?Rb zJpKfqzgRVmpCU^X(RU9LR2!YbKfh?dgbW~Il_B&zpJ&ZN3WPF(*QOg$)^h@aP3=J^ zEHFeJVvMUWdn}mwm(o*BMQTM~%Dj#CvE9W(Fp9TX;jW4C1o1VyriD;d^2ot=QIHZiPv{DhuPki7V)J^;@ z`7R_MO68QAy!OBoD)N6g+6b%+6R%aB>KTX6@e!!+(^iS+Jj`0h$hHE+FKR&@5}srR zv$rel`z#ROjDw&25%1L}6v{ZOCe!gc8mmwq9H^i<6fB6a=#;;)J}V5k`HY2#@;SxD zE4j)i+k9SVrL%mcXZfuxcWK9M*L83Wq+;Bks$_RwNyVpCi{ae~0T$SiW3FX>ZP^Jj|l z{5zyhN0j9`+&k@_R~jumF>jDGDu%)}|0GV3-# zrd+i)nQzyew4eRRCNblQ6OZ*Hpj+aqsa00wc0fjb_Psh?l@7kQ7}o1CxZsA#gnT4p zKY*108WHTGKxF6-+?&OH%K_B336-o09)6HqPupSm?f49Guv(h{^7s74ud67h%i*Mh zqnIf0{>+lxFRpPWRZcfsd^^5tiik~3saocpxnMEokFWghYGLK<>rvU_g7fLEHDvhy zP`+?cGBHJ&J7&JOO%m_ISFpq$nX5RiHqt!Pd&jSe2{7tt#(TtCYl->b<|~8S@2>T# zWyM^N=3d=*d4Qh;L67s%!;`v5UxO)GQ7Q|6vEUlgUM&d~wrAT%$zjp*5EM9>Bp0vP zbGX~EUhIUqiMD+$0MNF~^9cfmDu3eGM{={yCk;yKu-W9h{@Nd4s=b+5pwY`h;P>Uy zqZ4j(eS7};jO{~@)j=3`+nIN`Gcw#`?b?!Yh{ey9{@dY0V0D1HO5G2WK(3!VK9A_D zjm&t$oL}L0mP!Juv3O^axt?^&=QZN)cb+-XSD(m+*9}pv|C-#+MlQfp93n4QtO1-xQ3X9fW#pJ<%AKGL@H>w)$$WupJ{`4B}vy z(3szIyqPth?DA&V)Uz8iq`b>U^UpTs9iHCkZ3ZTzv^U=}2QHf7a~5Dz(%t3!(hgDx zn>DroJAom7RN;39@J6fKYEAP1;oE-Igb7@K(1i+gFWveKBd;q42)Z)3SfskWp}Hj{ zhki`X3|9V@m-wA678fG);1e2UQw=i0N8?z9%a$GBwBq!hCVQfbhIcbXZ zZO3b8f1-8Qb}c-_n~;(@13S{ZYa1apU50MbCqHg0VkS+fzwuEu{E@i1Ofx*@q~gb+ z^8C3dRG9~4iYOqxQGpGH%2 zYjdMe2UER9r(jOgSAMq%ihbQ&iK zRcEc;8TGiYT2Nu&=E_@zAiS&}1FlNKPUFEfm&WjmKg)R3t(=^Ra9wxs_Hb}Nuc)YA zE?@Z1*~k9*=89TVnOVu=rrrz(J4b&c^S9oEJBAiD!pI9}1g?6RIQ5ce+2wI8GS+&o z$<0kW6~{@9Uad+*dyiwwd3{eJJ%k2JD3{i+ASRbx^`U?XNf#pSZP~W#h0fEEX>%~(uLBH@+|J` z3c29zkg8O$g^t*jd3#NhHRqyP;N#zwPQn$o%6ApEuV6p#jh`|FOyvtruiW}6AN>0h z@1^BBo|?SJLn4TS@s~s`N`!&%_Uz=Ybe|tGhT;oiT?gThpu)_%Qgt+8!2frkugWa*hU{tbsL{R4ajrn zDo73FfpLh$Uu=K88bs-3?j64#k+T^8PE*D7DUAKxnXzARdYc>sX5M)A!zwEeyvbDv z!?Bp^NJfjnLY(*li+e+a*f?OVGo=L4h=65Onic%RXoHYJ^p!#QTAtO(bL)%+Ca2e; znTJ2UK6%|ZgT_vfNg~!i&u4;z`+r7%IH66v{FXGER8UzPhod~zypdjf`}B1F;%fbc z`HEHE%0v327v^WSvlk}k&2W^AA3YppfURqlH*lRx*;@c0U2RKna+jQW9CXuczGU`< z?2V!6OUh+HF0!mf2EQAXr=F7ddYR|u`07>P3ZHA+Y8)OyMW%5OLyqb5aT>_6$x1{W z&5hG=aqto_Srhd#Tqw$-{L|QPFAI+Tj~IhQ@cMk-U7HzoJ?*CPuBJk?$Z(C!$mIZ& zZ+@$5spJ#<-_ku@{lN8389K0Cn6ykmSE2V8F4ejV)yBEgoGbH9-|^ckfiGxH)~84d ztL(*~5Y@Iw5RFpmeoBAXO_9l?X~p)Z1fAr(S59v}t7skw3Gz4#ooNBT)v~qr>E)=} z{+w%xFwEfhl9RRm+N*mW`iOcWU$q7{9iymevN;v=Mv1K!N6lB83 ze)L*SP@2@@s)8F!2Bl=ML=&@>e(qVD4D#1w4u8O>&BxfF_p)^%#!xwLN;71y)9%cx zk%Qy)P@<<>SdPx@PXjDY& zncx~j-wege1fHqE=^Yz$^i0d$(dAG;0=Mb*n!bxdukPrXpdjnXtvVLhy31^qX|k@D z{YSrsU*$Ywy+O~-zE05Z5aSb+#SHJ}sO? z?eNEjm|bi=nkO4M@$fZ~ei8QRFqph8{?@^Jwiia~KzsgF54U%5Obxbk*~usd!PRkk$qM}RMV7I5n+SmNyFq7+3F^_D$AZWL znY4g(kCGY!QX4S3VItiz7%}3T-@mYPcFylS_kCTDgHFGP@=iEy^@_|8OpbFN@$=>c-+e?ib0e9kyg*c>6upm4chhDkuxUH-Z{N5f^g&P+HFG?zna8O8f` z`)q;BPaO!|^m*^gTPzEnsHn_wO1w&4J$G53wZp9IhfU!gtxjfM#i)Aoy0Kh4S+_$= z!5DzN*W?ahLEIW_Xl7LTaX`ITIW#LcU$wx$YX=sFfjFf#hQ85=qpt3_|u6$lV>G4rQ zI|B#^1GLT09cF{NExBH`o+PHtLcM!!MzH-4Loo)a7o0iKi1*LDhvG&Pt-S=%L2R zr6>{g5Rn&xKB%cUbi&nZpeADlPr@k)U)4NEJ`v>eP|1DK1|(<FPtrAX7;;7t%)^qRN=Yb5mK5=)~w+tmgdvxWF_l>=8wst}e zs9nBY!nd<+Gaz(nNzopV-b0RbpUR+@!q@)0`Ny<_frQpGRAie@h6LPjUD2VofgyE- zRXja(si^2pDr7*Qa_`s14V?82A^&7vwR1b0O3ov9Y0`>*(_kpmF9wm>i+~?OgwOY8 zmwkwCE~Z8K88faER!sNdKP^;8pjbJ_6wvA;TZ#?9rZn|6 z{Zk5-U;ENqArmPE=_S+G6eI51tthRVu&Y-Yn_q9^U@`laR6kmmWpqDW+X0M%UXMA) zKYeds%Q-h;AN6teV%1akd^J}w`!ic?l&Q~d0{iyEC4XZvFX+VQ=sz_nt}Tq+*}MBC zc%aW;SO^vF;5j}wxX23|5g!u5C_;sJg^YAJ#0)2PANLkiG`?o^4_dkD&eKc0%oYa! z@t{JC7&#mjKL(VO(~WFA>)^_2j9RW8IBrpI`ie zoXnS|h|FAci|7od&V0h!Gl+KF27{B$YZol3_7XQkH5(ekpH3RPbgXA8lYF>puOQM& zLW5k*+&Y#HgSF1}GE4Hc2M4lh1$=TU$#ov|9uvA+Jv=PE*>qSb(~ylDU^@Buz{bF@nm5zFCluTcZFb18#M zErFQ~ep7s;iuuzU{p|3+Snazyo3-UcCH;%D7`*m7-#Cw>k@ zX^RL~;PVuIl=KHGqWtdj$1sx7_%yyEw4rzNk78mia8wSLGQ|fryGZ|y$1Wk1gQ>2}_#(ki&&b*6ir%?^Zl#N^ntrtB9nd+Br_G`IhG9Eg@%m&U*MCb6CWG`qG6VdoJH$ex%nc(c@ z87l-0TQMbN=BrRy`v;N`gLK_wj>GlIU}jR{0Yejsa!#$}REz@92qY$NB_+fV0U6yO zj&jy<8Ru4kF3~IEvrI+(INB=(=(sX^!c3avVlxv`gLDxu*qLqT<~~qUJ$lv&7b`ph zHgG-b@oq+{@?Dh!V(5TtvxV9pl~?l>pa zrYSN#DxNE}$c@qTcb8Z0NI(2Vh2M?r;ibW-WcNZ%m3QKav3GlvK~ADK#3g_@L6cO% zkazicE;%WyV?(6n+t2%7`rRD`p(dq19~OGBXg^c)7e5pgH)knD(tTnXnugm_$15Q* zLQ|U}jI7sJO^K=zaD}L&-B6p&eW;FQnmG3Z3LeCGJCC6ed^Qi0VRa`G9uV0O)4a`i zpQ-K;lo8OP_Ll8(_`@8>(i#s%an-sA7Be%sfsQ$wlf*`gHU1$F)lC6yM6)ltmFSzt_i_-WE>s29KNpw2S`?z0CI<F3Zsc{5S9{jkI4xJTyRAlUH$^$1A5A!tu$7+Y^+mS?3r`Ft>%86-Mx!8@SOqv zdoeRRbKl}$)*b>mkRhmmFT`&}HZM1JXPp5|o07Yi{FKOdqhk2F%o#R!*CVvSkL9m3 zDqf~y-Q*2r+G3?PNmxtbjH|Dv^N6dkG+z&99N1<{02Pb2OGiBF;nS(>4{Vera`t@h z4p@%XCuvc5T+-XzD?eymDRi?#G4-*(oLL30f^f+8^isv)(il2*9iZGhrIh~G^3Mc+ zOo!k_viL^<0C(y53)_}4(}G1?Jq|?qL&bnzr?FvW68?-|DS}CU=yc6o)oU;jg0F&zides1|kCyb-)j47+2FR)q0qL-Dmm+8VkRt;b<_+45(2H!BgS1m!2EsxKc(c*L+z(Mdz z1)SO+OSj2?+Y;oW(|y;6bh{kEHD>Cy6oH&w3Sa3N^Ix{z9W3C5T?@eiD)c^Gyh~%P zH9>jsf8B1W6w)PkbV&_{<5ywQ65xDfZ0H~Q3*TLgkCLq}70*{bsR6yYSX8wtl;_OW zt!FVi4g4jgRMxY)&lb)2ym%DWlfw#ez1JDb&RX>Xt4=chFOhE<3%pSZSk#ZjX6{Im zBv6sjh4Bbp&4>_}NFR&Jk0x6S!U0`WDoAeBao;94P{ggQSV7g1aaVE4#R^q$yYSq) z(d3A^e_h2|i)_<*im-fgq?{@+Iv$Upi;|1_9(SI0FGBD9W1jY?ICP#3zN{OSy*KI= z8O`{dBK*Yq+wPmA+#;3if(rwj`U}FN_A-Nw2K_bWkY+zKE4#mXH5)2S#np1Gocf=_ z((b9uw#pNmF*$&Nh-CB*bHAVIOEgyp&?Eh@?K;R5GUlpwF5u1->5V6Tro8@*+bykJ z$S>>>|5y`iWXw z`FlF=b!sZ_*jQ#FZ1Q$Q6(nA7y};Ycq3CI)z<0oQd8l2KkDJCszrVu{{E}6Sj_cej^Fsf!IXa1 zVtdyVsI9K0vux0cu!R`ohy36AQh?*0C@URO{^CF*4ge!b4OBsXOeznlL_$I^a`FDuV$CoDJn6iPoGKkR8I5{YYaTBTPP&SO00f=0N1iMC(IRDf_ zS{SiqE6j0JWT!B-H)T5G^ma9H)#;q7v;9frytjJ`moz}~ih*w_?jL!#%^_o$lQkeT znfUt;f>YZ%JZPKPY4}f!CAslcKTtx=I;}gl8!wJxwmJpWPTuieDhxcYus;EY!SZ!l zEqUPHjFf!sI$wL$`9t;Smw~ z5R&NwNNMrk#m_x#p2((#zL8td346|kQiy%SU7`|1p{s1F68PhzRq<7G&Wj@5-bd#i z>ioT%TMzvDbmq~a^V)0iS7O5ye#n+B3--P*10q)l#E)P7CJL*jKURJje7wIVdiXOx zhyz@R+K;Uq*rnntltb1VNZ+l?YhVGvA>ot+1-E~DRnN$xhrahdZAI!($BNb^FS zRP$ctQewu=gDIlzw3}lFh2$%PiY?)5ge`EYV?XhR&!v9X0^}>|FoE65=equbr3SB? z!fqrhjmVy+QBzM zyyt_<-RZ@3v(VWTe9otgS$kRH5%cc9ZzQAzNsTsm2@EM?e&(;D=Il-}KdwpUk>{-B zW*74I5k{)0<_&vZtJk}8*;iVCmyNPzENY(z*hpP7CmsUHbEySFDw^{Sh4;hB)uq~= zo(Fiip08S?oU9m=6k0mU^!2oD)PLaN_upb7P3)P$s)T$hR9hMr&HcQJ7rxjq3X69` z^cbIMY^Kwq{9M1hiqmHnV)zK-kG>S-J;fJW9t{;%ts9q%?pc{OB!Zs@Qn;!55S9Us zvii8=bK$9gb0O>`gHTdAbn%PN9&P92uyZn&-^mxrDP9WBxZ7)S)mJjDht7rHyjC@6 zI+#kqjCJ@VfE|(M70XADUw)8+bH#bIa#zMSh4D1%d`-zjBvUKfin6zCA8LA;R?JmK zx+phhRb# zFphGH+oFycKTd)>K5 z&^V+oH1M68viL%c(N-hu69ksagJ3z$m6sv?lEctB_7fc&(m(|_+RZ4xGEeI#C2+|Z zf6@TIH<|F{JX^;!fAo}@Lpv;q(1!OF#HjPJ@rCU)%cqxN$Jbo)wK0F_cqM$J0tT)V z9rIMLW%G|#SzOBBo0&rd&Y!!~=Ou8xtTtdguPE2o!ruEn>+iuVQIu69_% zqMg3?;z#dAgS%3Cfg-okzoj)xUoFox7(DcMP5f)chDoDSUjrzY3mMpCKs1&662^_pbwf6fokyF2`mf5)+Gn5 z@w+P$+ay7Z++dTD*13Lg(?Yo-CzxQZLC_#s9|g+i^?pPcU4*$uB|w?K(c3DCf0z4I zH)L>^AJ|721L*zxMAr**D3b_c;XaWmF~lw&6MH$mLr;&k9R0oEV1Zo)(xeQ>Qdz2| zo4FZMjMI!GiySc*#EPkjunUfP2MlZ5;SUO#pwDlfcW;HBnCvUr2PkB{8TxTj#4EHG z7osk$Rn2j8O|sv8U(OJ%xYbB1C+x1FrgHf;(MjrpC`qO2=53z3P53)OT#Bq6c9%|b zm#g@o|L>oQQ0kz+J&}`oLXwl4hn#!T>t9_?DIUBHQ57phbvf6-!@)q-oUgD-$(nhW zA+BSTA??kY?Czzu&DWt7e`)Ovj8hqaM{({>b^yKpuly=-{%Q8p4xO8XfGF{aKQO}7 zsVL_!N|k0h?L&vT!D&wZ8^ZP166rox>eGj_kiuyEkRkhgDDi{Fw<+t)tCK zj-=l05W6V&iqB1(l2F&9Lad~4vz3*<8M~td;l|1n;^$0OJ#{IB<&;t_+0%1L+(o!* zGgm0qM12iaBPEbdSRBcDwkq+MlE}x1w7~2kS{V2&Yg2yH+xgsqf_YZ4x@@Rvi%i7- zaoP*q#5RIf(o16zMOCgb%;k}zh+%H*FtI{Xl3w>a=5V|nW^o~$GYU(bSqK=zFH%aM}A{%vYO%$7Xyr_k& zyMnk4OP*U-GJ027 z=norFE7XzO%z6eKKu~2w;Bg{(qZwq&;AxPMaf@q%Cz?${TwwmrNaDnRYuLvwqp;T{ z-q8H}F*@5X%}t4$jjU&Ycm36K$L<<qF#2*0;IW58`&w_vZ(fj<8gy=1}flR z)m;OQKHH_O3FD%k+6j?##cvqQm{pkYJM`_b7gHbM$f#2h_pbF^S*OFnbSvB$0s-HQ zJhozPF6CcfqPm!2s*hp6XS7qjZd(QUd~#hmqdr2o%O^i#Y&rr}2l7>LLzejc9Qc0T z2kHP1l(DTv0R7y2xLfowA(2I{f{ASnMH)*A!PJ|yOXo+}P|u7iTT&(!pm(F&cQxhk zl^G{c2IX7M#o1tSf)-RNu@vWe0rX0^i0sp8W|2GC(DS%k{euakv2_8t&_=0@@Q7c* zQB38BpDB&}2Q%UX>ckE)9h$c3={p?xE}FEW5`lD%!xkOpfn$SUm5`Yl5zhd?H{B)F zn9#R#M@9&g&ObNqwq8ZLOY(+ba3o@|S!B$mheINlQZ-!@zBd+*$vDvMCd z&DAH6L87l7^qrG+(6zOk8*w6%>LA?oY#OjrJw3^3y30cgSpx2bd&%uj91mN5G(nYu z!(TORzvo?oYOeC#oL|@($9=%MRRT7b4}+aQf_qTa5zsa=zFGCAOC0Kj0F8pyI4Vf? zvXgbxg1osVF{tMtzeiKR$91)7pd}ra1ps^mqDrei8$rvb|2#n6lg8ARzTcsMY*VXkT9 zKAYY(Z0ItUfH&6KlotdUrL%_eN9DNYQivZ(q{?x|NPG1}?7Ue|Q@DDwa-7f(b1h>r zJf-y_B3+LC*e?ZLebM}}tZFi_-^W7Nfr%Bz-a0!3!M#vYF^ok)55rcH!t-}#w(aC4 zjKwSC_Q`V6<+#V)$bm*K>dk`m*4DDCYk{jsW5v4`mB#Qk&FE#TfMWFYmiNnWlYyFM8FIo98jpyZSiN)I zLo&W@I_0FvO#TU$w;VUM<3Z@BuZs_t70tVR}VN50+?}+WUrK( ztwY>6=#GzNw0b`f3x#I;#9W=+K;kmImpVp99x?JgI zbPalrVMz}C#DmfZL+94f71ltZK@r@=8W_i=X&s^*P!o-D1X)Vp$Fj zjTs_NhVJbaPMd^YjlY8K4I4kBzGJ%AkGHeVx$3~BW;6A|_C0wjrL}8h=5Lh;TbQ12 zB&E}Hm8eVYKjdz94=`@3?(ga@xGtXEkhqJAom;2$c+PP+l)*rb*(Ys z^Cs_{|FoQ~yg57kE`h-Bf@v&?6nfETrHVH5}Icj+paiQ0zNj3Q=J#gVo9`V@Zk$}d^& zTNbyL@)f-zE_~9`nk{K{?na zPp(Qmn175dYpx6%E}|^yLe=V1TeS2ROYeNz;>H^#>7Q9ahszZ20bH}UCo}vCmS8me zOOJZy(5mghao^PK+Tt1|WO(lzg}W`ge+^`&_(M{}M-t!B+Lwra_w1(yu`04HeWcSZ zC--+y1pIpUGr>~auWo4xa)=tw8|oOTJNNi1Lz;IROE%n3BaTs1?lF%d6o;&B{9Lx@ z&i!*h6cO|@CQ6(b9Av|h-dx=w_(M(?AEQV2rHaO<=xx>T(cWUvUh7bG?Ov!2Nm@Ona3r5pon+?EnG3^9d&^CNurmJqw$3&cj~-EL=|-#4wcWJxw_$YSE(+-Hj#H1-QT_RDOT56P1%}yeg@^k8{AX|vTuGh^k@u=`oh&rTs)+m zJ*5J}hUsNKyr58A0b98DD79hA1UP6r*KWm~`1qcJVbB-%eq^^@87w325g|z&r!Rmd ztb^#97GF|X*T8<95O^fyqPfEaWZe8{G$C-Tf=-}yJLUqcI|hJ6GcnF z!N=|f2mOY9w({o1Vej$xH28?OK#!VbZRog-IlBFVwmN^J_o=R0^|U`5&))2rd9C{M z%T1>hkB`;H`LhiJ8Nsmm8>Xy1Y%VfaCc+<8x(`rAr-0D?6$dfG@pZEStpgW_r{*r}VCK1tQ=4BNleP3C%B=dx?+%_kIQ-c ztwx_;-NR+5ItTfvZL zy(3w9XF>`%;A82xq~*iPMp{rUIhH&ynC4;mbgM?peS;o`)f={-3JGTcD`nTO0Of90 zB*ep@OmM5JgN(x2GPbI9;%_xMZ#NMQ;*^mz=U!)|<*B;_9&ewb2t++HJ@OAT07$TR#saZmRCqz-9vV5 zqrBhiqw^>C``Pbq`k9&ozE88S7i5V+rLl@)VcbE z%O}`T-&NJqXt?s9+i{KfxuDBLt8W5ll6-Cxch4K^X>Buh?8ns;U^|&r^Sk1Is+uJY z1N_HAXyeMf)Wnf(vK!GNlcA>dV-B=vB3Pw|W5qJ=?MGi!cyhGM2JE{(Q2#nF$tiC} zCj9Kz)YQN&Q}~1`e_V9{_{8xd8Nyy#m{co;kMbV|MP8S z`i%ceoG4TOl;q>*K@O(qe zTZ{<58Uo77vKjz0S-suO&zL@U1&?!iJ4Ie z#TbR0{1>dt13xATw%q4Q1FbXhRjiSEcPgpqMhsx!D5XDoS=72i`~Lor9Cms8sJ zp7AZNj?+Vl%~=E=#peq?*@kPsfHT)84yClg+I$WQ+M zMiPnqOUM0Nl66v&eOtF}6n0}Zy%8+*-;v??Lsp`N##Y+RbETI${EDG?Z~@L#!~fXO zZt$vLpSQqbJ!;K!DZyh?IN+8z`#~=YRd};esudsIq@v5g z>E8_LTaOx5i%^jgow;1oLS4eHnhBS8t!HYEv8Ly;(ubE)ug8%a1*<5DnSOiJW7F?j z7!UciQ&!A$&`Nbh~MreE%tvxc(d^DZl{uzg|t{ILqG!WPKD)jDL#2 zpSZPNUaNBmzL~|PiD-ZPCJSvK*I-%eAdq=lEg$nOpv;5%?q4PPFYLX%1G<*+_u)U$ z`o_OO3{F!96hp#=m!M7@X20i+N>)d=4XQw#{a?PBF@}CpAFuxU6LaUJyc_Viq}nV} z%$OT7{L`rBrPZK%R%UzlW4?-50MGr*K9<2ey%nXucM(?sRH>jah85;uE!jNnvX4@q z80gntAp9ZII1YKy#yp43uV8dvn*Lc_#aF<>4GPQRn%I7u3~Csw0F(&E*6rcyW<)nG zA*GalL$ET-t3uJ7XmzO7V94()+fuBRB2TfgeR(|PI%*S@Oxj)n0 zlnCB#I!gCYKao<|$ZT-AUq!L%J>b(&WW6MWpzd$B)|J(U|Ou zL8S*;UBfZe;tM4V#d*COQYuK=o6JSWoK~OPY!s(0M5BxHvtP{OP#aBD*yc{9v(w0h z4`A{KHfK&OZqwaXxG16bp?=7>SG?Ds><@}bTv*PRn1)}&>Y?Gg7Cn2-Nq*^#1NMMc zMby1b(`G8!JylLMDs_#;f`F|Z#A)z)o7F)8<AtEh^_p)9QI}|JN45E^ z%*pRN=eEoF_6&bq(uF6+NGF>wUqCiqNfTHG)+xiq@(+jLZ{wfB42IVSh%`u?A%4{1 zHVJw8&yDS6y#%@{YxrtUtCgi3(;oXQy9Y^S3vx z*fx+U_&ly#FtYwBWDhq-5fElUFwLbUf_ilNiyY1JlSl{s8YN%Z-Rg32JhhR~O+UNM z7z+s~0)$@QJiKv}aUSb3P%ixd=&0N%6fiN1Iwm1Ku$y{TwV;D>!RbGI+Dh=!W_gaU zyFDTn3uSxnc%yf=`dE01z_@tv`B%k5$W6QYN(R|eqrE_NgB0^0xtdb9J={I@WmXe^ zRj)3Kmktv-^J6z<(}s5X%#*z|R!*vlVz`8|6`rN;9V!VY3zX0iK{aft2~JXkh|I*T z6XXpUIvW0|&vdQC>tmm-^Aws-kTI2QC+jko*Rdeyo4hl)N*un~$Y!*)-%8D+ODuip zWbzdLAj-sG2}iqB3a%g3&NT5q7HmjlSLv_J4~qJ=41W05%(1s%BZM)u`Ox!E4zQF4 z=64C@4`6#`^yznb&F)V4+jCp55TSF-{LU@3KB+y}D=6 zn9GSsshY0(Y8y2eIQ=*BW~nwAlwWNU@xdD(baL{I(}qQ=k+3m6>gelyTPEYD>aC0U zjoj7oRmO!U$WP@{Dvr&8mQg3NWtWH;hrTZ#t}>LqX={36FST|=%9?D0*YqG$9y8MM z^vJ*ejh7TW4BUJ*CF#MC9#nTmxlV0tQDS_GOPU|d)K_wf%CzqtQ;hd}o#`huvAW-j z88YJ>&oA$Nz`e_+Pt|bj#t+^_zDC|)r0;sa$(2>Qo;%GP3(in4b2kaOF0cMYhD3|f zP_Op$)KuRb;I_;a7PnCS^EH&=f+dfhjOGK{&S%WiX5p(Mq?R`!a`vDnoYF*+BX4o< zzI~`(Qz(ub*GsdwBLrQt44h=$Y`w0y$^N$@@L6obLC>abdRwFGmZ1S@ylPWgC!Hru zMb(Jiin30o4cFH=RBMgIv0?9z)&udYgrM0q_CJj4+Hiv>)d)^!0dU)pS-w|QEo835 zeAzpLYEH;k{cmJ#ixRd&tKT8F3(_2PBYH8Ox~>D6v*bdMeYO9Em`G}em~uq*-Pi3j z50KneCnMX>8f^Zq5<-bqf(!_Cn82@^mT2zmCB+F*OHV$)f)qIcX}`GMd?NfC9JLW& z9tGR=ul*_%ZC6uYX`=E_bHFP+{w~o*RcJ{{$rVGMX^{q1>+d@L^El^cjKkuu_deaj9V-%+ z@s#)23IiukGcVC0G=p9x55;eusGQ_#oEdY%;`Ov)VBKiX1#Ecg_e{uop=fY0!pHwH zQ=SUb$A3#CaFXwZe9(7W%Q|(O&59M2VlgAQ_-yfZ^~*0Le-ma+qLX-{%6lCU6Q#K^ zB<>-<8kH~zHcw~9u2)_Ct5NLgNqeOv&^0m-mhoZ6D`mgwJ1Q=Vzm*>xBH^(EW?e&m zO($vfTjK+#<0frKzEg_@J?&BI6zHzCh}Ki<-A;mPG}i0hx9_UINS8)^|KP^2qET|w zx185)ENDrX0@4K+jRhC&U=mH^U>%cH#|gcO(h9}pu442F-4}Axn2orQmRTKvFhj-Y z$waES(^S_6D_Qn3gaJryvh%61*2L6^&i&^?xB8n%-`g0|;esJOY<&4i+aUh4{-uZA z*;-GJ*0|fQ+$=lsd&Na$uX4=>c9kUUEq4a`i-n+jez&ZdcAvS^J=?U~;uD+}B7=Ei zC1REt^~Yum?L5X{Rx=yFJ^cLlEp*bgO?FO}NjUa~Bl~8UPcIW+B3ktuF#*{DbU`)X z__OS_RCr~I6Vkm9s_TC%R5qRUES`SO-~PHU*fV#^eY#-5OVF5i6(-3J z(w&u7QVCO+ue$+#U)RG5-&2-}iu&(j58&UG?QDFNd&TJPJPDl@MlJnN~T z$1Z{c;0(y8lbKK$DG6rtCHgae_%>D7^{xH;QHd$84P5W>rdz_qRvdVJqWtKTo5(B~ zl&XNMnyZA!`#KvQz;iHhELcKNi;)Jf_?RNx0H(iY?zfOk@EGc6k~;9DYf;qz+$Vb? z!6loVT3IgZY2JVxZojPFYaDZz!yuWJ&%>nv6&JbXsydbu2mKlCPC_t#|HEk4ym}q2 zA{4vR{yF>iEkn6)suq;NkI8o|j%ai}1B^?-2Z9C1Tg%m61m{OBTG!-yNgNrQJY-8# zrr)9O3{U3@`oAaJMgungIxk^u>Fi|h@S*{CHvMO^%AA-;382!*iF#>$w$smhy%#c^ z2*No~p@B)G3p~wGLM_6L1|{Kl`@861_pWOdqy#;lW&h@?3M9C(LYVb!EF zY>g1A-s@y-Lmds72q0TgEZSata@%|OHp;vm!7T7CKo#oTY8@$)T1LqXiHD1kY;ytm zF7#4Ce~eDMD4{{eklBKlz@>!cM9}#e5eaY_`!=E+RUzQa4}9h)XZgr>E-A*03&?&g zH}syZo)$+6$;x@;qC*uQn7&qlIjz`T`8H9Z6j2p7_fu#8qBVrw@RM04UYFz73Qo^c#9Un@&HEH94Cz6~16dM|-0x7z!0G6eK5f9d!PV?fRkstyY zM)ZO5Nzg9&Np&877JI<}cm+$_zBRkYgL8Jqr>++u(Y5=ypOOF0>$JFt-pNv|r&c)+ zi(9qYGV)6Y%vd+vVGs;%O-*I#yvID}J=??+yFi+*xfwAYMCszsZcBm|&0+ocPXvz3 zX97(xHEI1pG#|qw-0X6c`Jb#;Ztrn3PkoaNPu3+S**>I;>k|LM5V22?G?>|LoCVE3 z|8p8neU=I+S1cdI@u2+ovJZe|$o9VSHmyDOvJzuAtPBj|cDqLSP3*TMoh|l=E5`d6 zvMq&0(Vi^HRfnw@C+$9U>6Gr9JOjaYA0|5Q-94qu%jHbrPEG`&GZBe)L5$(5Rz0<> zpt-5)_PQ5W*ZUC11G))?=zM@|9w*{sZ>}YpIwNFVlauLpW9pStm<><(Yzg7A~gO_ zfRhONRt;fXEV+=>HN#EVGs2319R?_-Bcx1N!5JAmrkGZ2qt)qsv9awT!*yW0>x>d1FrWwjj3B<*^!2$*`L}_*^Wf1?;T#hOt+ugNZaFE*sF(>S+9th&o2P- zwQ;QjTr508?Q0wfzajz|{VRVc7+ziPP}|>~{@axxXQx86yet#Sf5+{m*YqWAoo-50 z&#z5Boi~(U?kkw?Jw0DfS46! zn;>nSQ}6H3>K|p;yg~+v%}A3*0&3R3FpT~6!VKgbT)jctaX7e@I=#^FYt$i+cqxzk zgPPNQ-4LR4N5P`Ugb(C`Vt;N{NDL><%Z`y|TC!F{ zzNdm(>+U|W;{2Hd?qz)XIqM>wgS#YI8+T`TS;X;fh!Nu^g#4p5-rYW{CbgW)fC9Zx z0ONwEedT6&D_X!z74>hG+B3yVldoLHr7P*V>U(U%x=%_;^ym|5gPtke)umB>sY(Tv z(|+?8hzz5zgVLSq>=OW+p2F@Q7%!{ai2wHU?M#uF5+)+ zHN&DxN{df`){a=qvJXjm)`~HBwC_}mYs47kP$HW5@P5ihg;TcEQgBtRvm&~J#PEoJ zY@CYN&BcFsf_swseYYaKx9t8D8pwlxg4Hv$tpE9Md$3>1uRP*}I}-8k2|aPGlO(zC zsyK?W#Wq;zW_ZB52}afUjb6?DM2rU|4!2I@kWJlo8F?>6}FUZuM~a7+($ z9%7I%&1wVSm+8dTPl590jJU>~I43cF^!s0%n_(452Hd`*;r-opot;C=AAq(2@PKXK zV=HTZm^3ruGcm;~jMAXx=ss1$>p%OFis$@4r7d+5WoPE~!XsVxKRW{rqat5z*Bn9D4I<7x8kv*b{rY2Qn z+5Z-k9*Wh-u#eC*TidaPikU<9=K5^V_qr zr)|>`F9*PptAe|^#M#jHhW!ZApH`jn*0Z=x&Qv&?nuQIprpS5HaC*4KQ*Zx9oOv2{ zHN^McB{DR$wo^F_wsQ|QpPwJD#wjWW|sc{(+-<@kzLEF?6?X*tyg1Oq1)9|dQutC5XEyI@Y2kTVk z{!~(Rb(?GBw*$Gd{EfcSH3~R=ZV21$ig_aL!a`Jg#?6p9V<@8K1>I|VeDjEDuDBBp z6}lkkxbuA4!G?g2KpFLYItvqrSopsio`q^9ycI_nWbyvAJ;6ndGF(AnQdQ8yF~>*L7)Pt2E~4KIP<%?fV)| zxLEhLMwxOS9YsMfCOj;zAgUE}!J! zXzslKtYPG8>34zlOGr^hle=omO_SR_p?$rFvxcvLD4A8eq(f&&DwL?p0Ka)C?$#66 zuWqZ@qpP?v$!qorIkb2AK(@|BWgK>M36~&^PpFvuQz>OPBYG-^l=))Yk3#1D_G1K= zolln5?|JqZ_?2x(t~=_d_lByhEmP>5wB-XonJedBkV2$ zqnie`htc&{mUmXpv@SJ=o07TiMEg=#nD?|dZI#|d^R2`LLk4LI8GTrV)OvGYMYqFn(e9#^>=zftgDG1$?4^cWEp6_CP2RB&(;D; z<^2oaDi*7jIRDNS{zcd>nRN%#Qk_H@61`(r)wy==L(I(knxE1TFK2dp|2zlP7#G}8 zJzqU`K0qTI0l7h)RUB?@7F|Alw$xcf_aqaXaXie7+%AFC~q>sc@$^b7e6WYcmVBKj@Ii0=!?VZWGj~?+K`}}(wGKS}jB=IwQfugI{ z1z+oUPRo}48@M;e%WIqx<4Yj%C*0ycimBDwe66=-fg{2Juc!h_QHdvWgrWTHM|X59 zzaq~d%#itaozzjH&$xgQJD;7jhK}Sd>7I}cHK)B63T6RJM+RwL+&`ExuZ4QcEEVuR_8#SL5$+NkAL>L~q%#b*yt^jW>OQ+01+xm*G z3pcN1FU==la{qg*o=+$!x(vGk=iRw>Kb~qk`!MFj-6lQNUEE7_db|YgnjxC-KI4s6 z(3xSsaw&iKzSTBOecyB6Zp3LAl+80B`{4WpG!)}r+98wsyA4tp$4t<&>}qPi?WJ~) z#^ru!$`ajOiiowAxbNW>F8OlB)4l!v6&m|olN1Mv^hGzo51&IT+;%VKbP^0@pxSlb z*!frL-sbFt`WxE_v z9jOOwrjl5vkl2+@%*%W!Em2b?%}B@gOgcH_%V4`VY3*S3dWTv004M(0?MMw%Qec(q zEO_PnC;6}!6}XGW?ZjeP+z3%eD^8+h_KaO1m1L& z2(ynp!CWVAde(4Rj>$XYw|I2eZoc0hiW|zSA%i;e5v7b#@}7A5GnOys!O3)kRtHt( zD1EHW>AU5Z9EN05)87NkXTx|7FDXv0&yz&-uFB(227BTuNwyetM}!LmF@KiASW03u zr<4Mu3726okgOT{sBrb&y<{ojrj5oN7^E5{0USB3!F;ho(}(EkX4nfYIL|f zJ=bp`S#g%d2(U}8cCx#sOSCh4)mVJ+AzW`E zfBfnYXg!&fZ;~WrfN5gFF!GBU7uP{r-7~z>J&0(GXn|T>&CC%LP;-rSTN-`^WP$Vt zX)RKJ$nk&C^Xh7<_P(=@xqrV5LT}%5A05^}V1Li(1lC2aD4 zT%Bc58*lioe-$Y1T0B7UV#Tdkad$6T+#LcGclTn!-7RQwclY8>ic1KbbpB`N$fy0d zJMUz7v+r}?*M+Z2&Oy;eK+Gvt#;Kt^^=MK_R&H#cUPTRfH@e^?J94xq?CN6#5CvEl zY}zk;oY?psFbwCVQz28r0U*+KuGA~J2*~^)uaM(AE@-ThHK${1TC#`Wsc?V^YW*i) z7S*D)tkDKK#*(9JinXNe6%baROyj*(BW9?xdt+t}6WIpl7VntX3od!*oo}9?6^DS_ zVD>Jou5?n~Xfbg5qvFc8+b@|a z#onfKHizR#q2@+&KbTAV%e7IPg*;n4PksKkgnZHk)z}DU)m&cWhE#t!v6`ljgJo@_ zPadiX+6L#a%HVXtsEEe!)5iewnj_27<@*degdw;KI2SWqE8Mnx(PFSCB z|7AK16c!D3t{~UHz*hw)))pQ7Xzbirjg>y32&N*^c*e56=JCD>IQwxiuwMv~ z;?)MylPhh$R1m;)>BRGmC2l^9uib=1p1IJtcpqKo5~$GQfb=}uW96*fN#86LT`CRc z5dEU=?5O_Z!UEBEnYy~0;SnFH|MD<9QceE3N_}7YGA6}H?`Jc5&lgTMi12~etnp^% zN8ooDl$Bgx#8YOc$D>Gu1SMbpmlqPv1E&_uR7ibQ!)B!=j+2lNpQCCYARtz*anu6Q z*0FmRVHhmCNhls{xG7_FOkabOA7)(xhvelqFSAC^L>cXm)+<+71GFZ_amQ6X5(N){ zjZd3ne%#TAC>p6`Ckk65&Ihtx;(W&`_42U)S^-Dbrh=jD9^Hi7Sc zpqn2{*wGI%xO^VsW{~9D95mi5Li^o#-5>g$fx7l`j`tOj`)QP9apWFw(V+S4Wk2xMxS&3gX zw7{!vC+oGG3Q4mk*%p9VgnB_Yx@2>eK&dkB6WXC7fNtarPu~&a`YCoXob}n{OXU;s zHqX%Yi6S&xz@0@B4)`&0#jG1{Kt2@sajzzTsjS7_?9)Iich&I;Q5Vz?| zpWJWF8tW=0ewDy{7l)#!7R3Qx>h&)U7}!g=rQ-vKiu)r1c&2?k)FL%1l7AnPuX%gv z%r5SBM0eZVoZ%UR*Swnwz4&7sCYZJ8Qkj#;?%k zZNHCh72?qLxZ$>ga_Jcnx#dHHt@qY-Y7}F-f7lo7ZOCWfa^R&vgj`PTuVBs^77f2R zgvt9|tcTAr{(F)l+_mJ)THJ=WEWsusj!uW@U?#i&i4mP#6uKslwK6f@Yi| z^GurfhtS5I)@eL+7*==FcqoW`aLt|%7zM^;g$Ni%;Rq-A=c1ooy3OOf5lTUG*BEp| z(r?#$n2)i+kf40n%TY)xcJV;*_xfp9iZ|ru^orQm{GhAcS6VYQNb_fVLW4ZWfcK(= zTL;51rCMo&PaefUWYDCvzLHf_LIg7&{_ZU{>o~jZNB?y}y%60*_8_kDRX2~M*w+Uo zqUcJzXLnZn*_!NPk2ZeXjZLcXst>hgfH)%FVbZiTM$*~*!yjMnZ%4Vw{!inz#Wl(z z`Lm*)n{-pr%=iucFpeR|Q%8}5vv`+Tu{vczmfkZ8!pA6X;_DMH4ze*D!VL;$%1;R< zl9!n4!p{8{5ymVmH)RO0=|>?O_TF2vSf2z{4a6q{i+>{3#1$<=I?sR73u;!+lJ;t6 zd37PTw1)MnCht+F4YS;}<|wlgWNv8~vaer?he8GXkx{bwAgsP?Kv}pIoZ%JHu2vFz z$ay(RId(-P6I;)^zFNkyWWoCRi-o&C9PdA2-8yAhPZ}m=K~E*0dJV^j&6Vlvd~$Y(*OpH%YPQPHUzpVSL=p`C7Ze)0V-!`U{n}6?)BbqL$ z-IYr6tDrTEIg^B_;ziHFU$7JvRie_ej(CZiY*8fgR_8ihx%RXwo2n%oplqq~sZznb zuSsvs8^4}ebs#TQ&vUPvQ)h-&$1{(WqU2BpsSCJzQX2#AaR#p2F7`SgGthTbmL_JYg{k+!0iGF9K=PJiU)P-{7IBnmT)lJl?sLPLy87mbQ#G?Bf84qn@W>RNi>=syIf1jU>3_Y<{y`bT z0SRkcQ4|v{DPEL)d5~RtbcL~0$*L=*4veu8>q%7Xw!Kj_6et6#Z(64J>Ii^6%l6=Hl;W<#B_KwjmGW_%5s|A0cf+wZ?i5MihbHx_kV+02U)u>4ukpa-8c4_B^hp7 ztGUw*&>W{g!=3Nn5FJQ<6U7;Dp+ z-hLk0YOwKFGXh#@zY5)8Q^h^Axy?F?y%^B%jZ`_RXOAghZ7|XG+PvY=rnQTuvS=)-B0U zUSlN4`x3>m)HZwnh(m)T@whwibT*JTeVSE!D!6k}9dxEuCLWuX@rtHFZ2dS1B)PBp zIKToQ)#+{P+u1LBd75?LX;m}J?OR$is?$n0p|c`)R)cwMuT8`2&pHmZ!;hAl5`Utu z;w9}*3$MwUXAC2*;vd$BG^=!d=PG+YtDNpDXRghKEc+3Del(O7>;MN^nUL#40dEoZ$G?>hJ?%b}KRNsixnnX&rR*kF} zqHmtBAKBobXMSeR>&WDMMlV`KK_ZgW_I%j4E5htj#pFZ*h(m1xufA2+qVG&IurQ?Z zZ%8>3L|EQWHn<_`I?pb52j209q}TNO9JPOvOobgt5*OiX8WS}ul@0gSkQgt!iqO$r zI%+7kFvbZM;Dt5?`hnF-Hd2HYUF*-(t2(HngG5uasdip8UUC@5oIxe9w`}<3;<^gM zk9wVaTxcrT$$ARLfjvt^B!3!};eW6H_Lfnk5t}v=QT5p=nAZGpe>lL>irEV+S4ntO zOL=rEQvfZgsxOS%P%KQ4nGJj?><;+-{B{amPQ{HC>*4ZmCn0@Y@Iiv82WH7-1mBAj zgo|J}`(DbVF)+m(MNdjk)g}LaBVQSs2n{KPhooYW3cs*&FrS*8g+}``DsZ7q1;#ru zG{1TDec$gXQ#zIy{Yh~-L5*ucfB>|5;=zKs;yAKMTCWC;Pe^mK6&)U+d$ey@om>^R zT3Y@m5!&j!l=VyZVnY&drAjbEX%9_&MntPgecz*=+s~)_Jn^8o_4#QMX=d@&f`apD zqX{VQd&_NkxVV-V-ds78#cQ&*ln3*3;!2LJZwE1w;ft`rn|ntC^iJQCld4{z)~J1{ zOd0hrpUB^{lY5gXy~}M)we{$&W%!~Wl5h-?RSEBK>fTxBtn#C;8pYUdoNxFfS8uy$ zAw)2mVQvcaQNcu)h?6l(ka8_4mSNA}48Wmx-rONwOGz&(S_9 znGUPD?mK(r&SV<4;>Neu!i~@(KJqUG{corIWs~yjh*mYj2`L6)u}>afx_0>1*mHS@ zf^J_dqWy!vsqM+M$k&D6ylWQ{8*m@r(unbof5C-&m{ZLAQG2~9u2Ko{bu{_?=PJMEs|*dr`bU4)v*Fq?Ek9XoD+fc) z)r;yD=IZ0CnZfa#L`U>n`$FaAs87s@&^rNLU=^E^Lp0F*BGni`3yt%d zm?27m{qVvW^*Qo7JO2|1WC~fR*o6-IlU`L#U_Wj3zg)_-AbH`Lhb7uIB8b~iRiFF^>m>asnqz`|+KMf1)_Ba`VPle%f^Z|y-(s9L$u zqCnVVH35r-Sw~vypnuhjZwm=fyKs44FK#ERcSWyJBbT$B^!0Xejp>t-j@u{;bO;hq z-)@xYD~VFWcv$$V0JHTa+@~nHyA8G(vM^fp8|?BHZXn3aMj0SCS{3ZR&>|7(E~4W; zrApFgZRP`SJ7}>gUV!o4LX83nZe)JM)@UHgVrj?OG^zB;s0DW(7%n=QI9G9T#*`liV6PYDCy7!-mS$Q^{Cus^h<2(}D#?>*3yv zMO;s|nRhElKNLdPz~s-vufckdzKt`ZKHoE5G=Wb!KQRjb-H&27sxbBTYB(ONLindJ zzubxVZ1sOjE2R^ZNmJ;~TR2>?r&SHkKP69jE(1+9JNNH&P*PZ2fD-@FFY%c@LswIu z+85GFV?Rp|VxMsC1eLzORO$A4QEcjPGB|L5@;l*Otot;u)dZWre|nvnsyE2yLqR>$ zpX%J(1oE@1RLLaL*x%Y%UDp39Z~D?~{fe{n;N}|>`$HT~KqYU{%>DFyxnflOIxD=l zs-PWT@~vfFiGK<)TID9~a9pzWH=kh)GM#(q@sbXT48}m9DrCW_7pU&z@nP?INF`d>qNilYSK3+P=OKWNvRY;c)pkSlur9ll~iSfeGE zXj%*l(%mW8!fbI2Vzo0yz7NP6gf6((^rUt5LiBl$tLm8vyla(%UOW^-?=w{}!PnUN z#%-Wzb+;{PDzSdWHZ=JQAXd>qY)WTyM8uH)a)MQYABFF=4B7TI(k_k0k7?nAx|QSS zmx9|C33T+&Hk>P2ZQUsOqVL7isZ`L-=65BbB(Am}hqC9F?`};2gswUIzV!ra9MEuO ze%769iqk?{ zcDu^V!CPO$MGH1l^Id+dTYMa%fk1pN%rBj{n>upO%>Rporf^`ydz876ZrE4-K?h<3! zON%``Q2G-7VNMwQ_LpYGy4{@I{BPy=AWNn?2M=!rZa6`1^z4PwrB1@|IH zUbZSK(6`XxaGkRChiurCbzl>JKc+f&r>|nA!Dghr@?L9FggEis#f@HD8do!ZnG5m3 zX=dmnkV&ygy~ClrD!)=G*yTf?e-4$<430dR<7fE#dVy%KL5BPOXrj^;kLhFxiDkmRO-I{JX335eNP7S=8m3vI|ltC4jc zpJ4j)bBbo&BbkR)9wnYWyX2rxw|VVVVVl?U?!Pc&6zqh*ellu)OPcVV360-rYEe#{ zmTEoXBN_INr@zqrnr8m_(^#gpU08q=4e24@%g)csHCdyF{~(^v_ceYVaEumW?*rOZ zQa6%nbiw+bgxln&S^l32WZmJ;RSqO=Mw9MHT>hu8RL_~tjUOJk-I}brW>u(I)hgJ3 z@ZC*-(!^yFj!L%8SnqS)`FaXjYQqpytz#{n3nU3Z<^I)4s9LVErah9$ zgN!cTqP%&{@1-(`K!b0n{$hjj(oQ+fPZxy6GFV8g3i3&v2T?B|$BHKlI6ZmF_Tw8h z0pA~b?T!2AGfN!RdOMPE_#{F<{WC0Irk3xY0(e3Fd@G;1H3Ss)xNrQTB;R3~qcq*e zB`h*HJAK;E9+aY+QRWzLza<%`%0)CNp!CSOOrQt_Rvwvr5Q-8NMEwTUIcNI&{Gm8^ zw)YLoRmdi16PdBh6nf)5KJ)jSYgClG{3-$kykw4KeTvPJ+TUA#Z6pbVk~Q5-YeCO1 zvEe^t4KP?BW)3Cm4F>*k=Zq-|L+*yBQTrhM>{A7;8Hvqcv+4P9>Q1=uX1?bJ%oU&x1sC{nV4-ur@`ij)Lnl2{-Y<${G=7O4z-G}Iw8<^@4 zl12(kzCF2%`%mYFe^m*KWr$VD`8}Lj@Go?#onziI!g2csfNt)bngm6Yat&?@?Fw*P zh48QB8hRgvw64*VrPo(xv{8;H^pXjH2kW8UE~znWx-Ah3RV%)w%qmQ4hE~!Dx6Bd- zwS)!z5alcsqN8NHAH#l)Ujrp8?(wK(4AcTv-{JhV90s4+g*U2n(GAys!9Sh-aPCvZ zEXwR+V15^ICHzCq7|StkXBQAyc;?F>&6>{_*~qRN0D?lX51u;HbDOtc3HJLFuWbD# zbcVgJ5rVm=c6^5t-92jju`UC9d6kSOsqPh1h#3RL#qJpT!JU}ED>vVqqB>5#m5!~! zH=xCC1kE@#VV0MzFmC?ScIaxn+#f+8BCmed`wX-m(XG%Y)>W^#VHi5;P=1W$Q}u3Z zdi&=@IsQrT2hiUsW0h^H$l2*jJlfak!+6H}r~|uaR+#F1Ngwx~0V_-Vj$fD9)N6h# z#>5>fY3sH39$_~zLlcIHE$#-|71~>yP-CccGh7xV*4;qbf?jXmZV~6tUb(%ToJ6uu z19>khgqH8SX}-Bn+d}-FD;O)RwAVZqw_YjJc8XkT*lYLt?gD~7@#ok?oL1+v<=-Mr zJuTzo(vFe!TcFY~hZtyQVFL$~xef*6Hh8l~YR1yMq%{*5k=k1jEV|c;3YH|5?)za=b%$nZjGojB-Sa@{;-5J*ByTyxskCM~!T_EkqFw6wxKzDd~@C#vzPR1tUuzOeVkUa)Y+s=)8CDD2iyviug{wnM(_3A#28RK0hHK~(}Cu6 zyXp)Gb$A{*oO9=({ch=|gmz6a1od{relmS^w`t#no5RLOpD--GzN7E(1aW!b@(Bg8 zT@+tQ7t#pWpxc;fW0u{)vM{o_uT#bQ>Z5{Pel!g@;90bJ1<~Y6K0Klh(OLKr{kL7d zEWz_InmK;9ut5LgZ-!ro{{8OY@N}2!LwT$mN&!u9osIo63aYA38D3mln0LC}=4k6v zPOouFE#<_= zc${(bQu5WXwB^NSzwh){uO|v9QJkuDzOeZ-5`agiO!ytZIo}BU zAPG&^?kJVicuNXu>}rgZ?o=Qa1|MjEf6x2XTCO=_^aYIfuZVOP4mBF))32?w+de}H zEA^-ReKrg1zN$~DWJ9pz&1gTUc4)*nz23Iw7`sYgM|ir?^-A4h7*}6}DS{|-^Rvu&WIiP_Mc9YS+K~2vxQ9T?IkU=Fq{gA&N5Hdd zLzAmId@~8}THFl|X+HUU(`*2xZP0ZZFM|>3dP%Jp681SN3Obcj5oGdxnKiyKeh*oB ze5*>`8=WOr`G6@_s-_;hgV2av?!nI-Gml^SyIXWkLugBJI5Q#8Gxfpu>wUoqcL*tF zp%oniOBW#k(loC(R(O>P>_N5qWkUjbznIxwzozeaiLvcf)mO-$Oq*rC%DP^1`L?8c zKJ|zRPtmUsw~v06r)YXV6Emc9esJks+QszWRSs=UFlMK+sgs=p*aus9lby9wuW%#T zA)4=0ep~+zL)_q+Kwga(LGV>*8AlW?Qa(T4uPjy%G2+d&-S#OmuSLS+r&1#~A_E%2 zBW!DmS@$Jax%acp`4QJk@SC!Aq=xQ_VNa4(JEQgPi%;?U9z|^x0%}rjG3Pjnk`wLu z^=d1$rR&xWQ=ZJ9`6TxXF`^ANeZRw;_KZXXEqRRVx(*Go#_g1qMD$9hvIc)3+fSu6 zs2ghW71=SLAYwM%13R)ysQm5CwhFom#ygyRX$)+I`9iXD~e5r0HF#wbZUNKY*m~t8eg=)wsLsHFKRvyT`>Av4PdGFye zo}&R}M(;8NG-e!SvwkPvocz_w4c~7=qnP8NcrtDbw8HD>by^i}sV`XjzXvU%WrfB# zi^on0pI)+4(~l2ewQ(%Y+hv9hUbBP@u@OB*dKpF-Uiuep?(m}HM+ zqy4=$WX~r&UrJUZlf$PodnLTp>Ae@9Pk`=xgZ{IJ3j%UI1C)pC1*XUaiq{78&_{Si zV;*5`CajxQ7P!EY=7{OF=yW#tfSLVEym@Y|WH+-{eOnPi9dlPa9g=Q1$z{N|G{~d{ zL@jhBOx~BXpQ~a9oT~V8W>*5Cp8ECKpG=?FCCHBcm22UfC@+)M0eGI%)DxXNfzmG* zmUegMs&UvBKyncy=1QzI$4ZP5QSxNFfU((`)%CHgg0l;4GGbqNRJD-zPE1GBBTYWE z6idC3MDTA{(qf%%l&o2%HMGcwbmJr3e0ds>U)u0`(Gn`nd`mD>HPRTG*4_GE;MJ!! z3S}bGg;4Y0D9aM&M>QF8n%Jgx`HPB8D#vU(HNO+EKRYUZBHU z({8)=!A>Na(D)x6 zKMSVjc@i^c4FwRkEq;A1kFx}F4`V4pDsJ+>9cXF~QyB$V8(vAKo1G#pbf24@lsxOJ zE{xsHr8yl9Ok!+fUmhTOWM);(@@qQ6O$#@5%cc`j_B-=W))c(FkyzSAu z4_-Irs1rXKAKI{%>yC@E(W{&t3px1wypHJVzzcB3%hs`9(jy$ z0g{Cp!ht1e8L6yz{CpmX_hZjC?2d|v=1>@KR9|CHqQ*t z(jT_m66M>z6T-j8-AjFXZ^&R%qoCM)(UGa@vg*ub1II?kbF{BP;yOUmXO0y+iKz9Ii-F{{Riizr8q3tnKr z=uZ4o;*CnKjtclP&fPHcKZ|VUKd$E?9J{~gH%CV9AOJub$7kn|t9N5&0#yediw`AN zd|s&J^8_4p(b$UWPRvQyX-)Kaqw)BUcdH5ANj*(@ z8+8-Mg>$+ivN)Ta&l6vfAk>kF6Amp0u=4tXrPG*8kwX9-d51vAV)EJl*>8njZXM9rv>4*{e`BuYh;HJyl> zM;l}e;gMyP&QD|W3h%9|T8d3+saZXyynpkHBODu74wnN3w}V$ZkZA9S!ubtRj^7=g ze7g>Z1;iQYpQR-oJt&4O^5?Q9vwN38c%K!}xyk}sawj!{->%VBcP>5!{{{JpV)Wgi zhIaS`+lVE6CizCX-ceQ?8`@{5kDIQhcMZ#67j$X8hH~WN9`g$xokx`{a zo4%D8K7ZHxqQI*U2Xv?<*zi@$jRT$hi-gy7@eZ5V>Y#cFmo*8Ig^j2L9F_?n>8=W! zCqiq%(LJI=M`EZe+l!S-6yR&y--qKTs+8S&fSHbL`ph9$e%4kl8v)irq8ocK1;Ni) zB2#6fXQ%O!YDog9*Y2+m=fa04-8w^sIguXpkNnFL0&`$)mxj3W4& z_Se_9=rpOHGWUOoaivoF#kzsNi%0n%WxtMelSJ0$^kso0==RIsqIaKhmuKkxC8C0^4OM)?r|VtTbnwhm@nj-V^~I6 zbMd3s_oH@KQ4*qEqqw`pEc`KfEN%8?qG%)@3SiW^Ef-GyBk(h&#l5b7hPiuNz3OJ* zja-Q4k~ssvL(-^@yI-#fvVNu;CzZm_`r)q`mkto>1t3SL&6Z*FgtZ8$k!KZB087xT z4w}{jE-jERxyiU>xPmiHSbd1CbKG*zg`-?@2^D{9;~nAAsccp*^8W%rymo0+Z^Q;g z_J3f?jnGRaPaq+US8N0OI*&5A4wYesnH2TO8ohC&R|8Ws0hbV)2Bwen6_8I;7xvMw zi&o6GuNb*%EI z-`|Jd`Ik?fqV(MaO5ZiO|IU3iiLK6A_MmNEfWGvC_f_Gwmtd`S)?lbv|YSi3yG!%WSQIKkRMcn~3!`;+vW zV@B(6+(vP?7>(U5Sj=DRt!B{qOkcTLzhIF1X}QNDnDl&Ze*aqeWJ}L-9G2+Z4c#0G zD}2MQvq-@#w(Y{iy<=Rc$*u*e&+?96Yqi>TU{?eJ#^w=<>I2(y9DgWwE9)pu3geu# zfBU8VBYt_DFpn7x{g(D{n>9R>9;kl&P?GkYm>&bpzz)5Kj;l*>Dc>$k!_ArIRdVGN z+jtg9;oc;7#p8OYTbQskw?H?2E?d#R@eh?V1bdSV*P`A3*jiRv#7W|F`boUIQU~iQ zK?VxZ>p>QS!9f|bP6-imO04WyKi_7oPij-G87}u>v$|p>XUPR)b;B8Z@Kx-59Iq_Z zkJu=vcmg<{z$hXRR+H8ZCw_LcyMPh7z8OY!d3I%WkhB8o zLOaqX2bv%jgeDso7%yVS4Qjp*Q zQ$+?UVYOGETii(%!j&j}es$XUSYs~bxb)1=nm*$?-V9u0TwLo9v0l3(Hk0Rr@F_<@ z_zB7D;gcept_n19298Sz%XfEDr_c#ecW4%?Sh#0g=dT9Z2J2VoPRM9;B^U#9Zyz*wuFpjOyeau(p%gt z+}-R-r22;>*s`YmgwgmfLcMJme!G~rS*ejpal^;HS~s+tzuaqBlA(ozh|EG|4OwpY z3|U&G1xI;q#I5{YI;0u(qp^5Sd8?=0fZgHByi--(-%k$nx|5=~ z!_UUd0GgU16C`{R>!qQk<5q6QrlBV7tG|ea?K}U{Kac2_kE52gk#p4c0&|sE5-snS zF6OwqMu2sL-FH{!h9nC_c3TNyR!8@Ry*v9)v{;AXmY#n-?pFHW%QUjbrYD4oxj)oz zLeAOag9TO}qpfhcT%J)IzO?4IG;3x+<=ooVQ($M5X+woqKy=IB+RLarBexzu-V z{Y!e=4<#XL>-T+T&f4k*kj5IhKHg+NpBP}363K;Uup1UzFa@%Bl^#s2z--USc=G*7 z=ArTs^!vXCy{St@C&=0h+TgQhNw^($;d zry0uISs9U4Lf^RHOMF9;3^wF&8ydrs7kg6s%jhn~ygeH8Tm^3(8VY`wY5JDykJEqX zT3+Ra$e2?aBzSfdl8EF$ca8rS{L67vAPsh80#q=oU-)!Dph;q?(cfjC&E#nqdAMFoF4PE~M|QU+)!J{g)D zg&-QW;p}TkCh7mN{ME%Ywkn4rrdKAf0=2^T%he>lxuc78&ab8!WE^3v@2anan3f}k z7>4_9N1EVw!kQeR1Qn;Zy=AQCQs`wJlvqkhqsOWeXA90`oLcH)_-2rU3u#%mUT(n5Sw2 zvb;gp)bbJ%WAIals$w!DYb=BFI*7)kE}sPWg^`vznNJTqa;o(Nug)pKXjw5^#(`%; z!bdzF+rl)6dI{cEQkcu3fihdufbw-<&io86Rg{E;<8TN4-1&y6<0y{pmfs3vGd_!o z4b?;um(q5(#(v_cmlet`@naW=f#A}8fRLp8<13ylrUP2xb0g$P9pt@}PeVP* zN6<6l%bhWGGY)2p{Vd;kNHl{rqJP9=(#Jg%afXSK3QPYLI0fGS{Sc%aqSCOe>bwB? z+`zikJlS1QYiq>7ForhH8!9D=VLkUC!_y-b)bD;pB*-G;FD_f$EN z_>k^!5A$@0^D2PzD%oW%kHpPulpp!6ex4n2U2Z3uVC?So+flKN9&6_e!<5ai6JL}1 zr?z1l65JyV%fA|Ubb_v*=j6U|c~rC&D7WS*liHjcSZnAqst>G}qYLt{@cc1H4%JGN z7)kJk79j`csT!&+OfFF&&5a>Pr;y|BXSaDx@NyfLUz#iu>lE8Wo^))Yp55V}_t7?g z(6P5joki|hX+qzCh$zec^yIT8^yWKj_5W})V`d-Bu2XRNozDJ1hbZE&w^8F)I^Zl) zl>-J4skv8qe!{-dBkgFc_-)otmWhJ&Q@B*6MUsNRoa9$nr`;$LD&&Db^2U5GVf1P5 zT%cT2rHEA&>dsNlnIn#{s)ZDVF^I^Jw`YmLOkQ-!BMs`!FZPV;kkM88!*@J6h1t{i z&Ns3{U|I}7kb0*)VW%5FPQxrd=wQ@LCC;2~3Z%jRK9S5cDRmcb33o|_82%vZlMF|F zW(ndIHy8fU9mYEAifx#FiEqhfZWn(c<guu`IUvqPVRsT$WF-qiO?O0(cvwziTt$Q26#~NUz+G zZTPfZvWu`xOdSEV=!cT43UMCF)bfHw&b-h|ILxM01u~Mx*q>5dj&gohnOZ;mq}wx83{EXeu$b7y6<~` zwh&xczSPg=Z1mQ(vndz)SamXM5-?sOuIN%AB**#z zggH^^w!U%Ung8oHvsZ%?qdZKG5027ls2RHgR0#X8?yAQY(oG7RV?m8L;hvDwn2U13<<+0h$w+<0ojYnI+; zqi0R;6`J9xOiMMvTzHm5oOdbW;EGvf`u#w4l62!N#+n!;5pNJa8)U?P(abGjJPH0L zwwXw#IzlOVXr~)}qPZ0jE-Z@)N@d^wZ!J=8s})TQJISl3blm2hF4cvbas5ciULDpP|`lAm~ zoW8~^6Yl$q=4`CUtD2ji%mjd@V^R>#(5Faj?}@y!-;Z`ZF~sEDKxR@xGAup{l;wdIT zY0z}8!5&{P(c^@g2q@%z1cFddCPl>~J^5JamOStDZMltBw;ZWuk5QqW#1x|niVa2V z?OUOChO1(d`^GI($y=x;wh0+av@%}C(Ff-oHP8Ns0ho*gB`u6WS5RxsbZfDUepUH~ zE+w=c$LZ`I*dbdw7B*OnRqxCG8KH=w6PZ{6Z^KMLfrZ;Se1B_hD2Xd0$ys9*S&wXO zRY{h5*a7M>4*k; zZ1YgTc5B|XVxv3m&mPwM!FIS-_gyk1;mg#8&+B5Q7kJIEKbEEzI}iQin9xmZ@SEuW zsFjJ{0Az1=q^(O~R7ECOM!hITW*-E?mF4Q%a{q|$6$XjB1GT(o68c4~8dS5}{I1Be z0*2otyqEHa>4?la^~;s&X8Wl4hzl(g1p&<765U-O)G!1HeC{`~nW|DZ zYAb({_Pki;nRH95c$*y8hs5?4zM8-P&jBX&eYfkjN~Zzfkge-NIOY?hTDm|Sm@Yf)%BC$+NC;}0c^By0DJvf)R6+qFLsbn397UEiM! zsaCO~1xzYCkWf}Rd|tG`_?h>aa{dVp&?Nv*QZ^KF>lNkqL!P$Yj)@YNyLMpeSCVj+ zI8{@_XAfSDyIj_oDgEXAGPN4xw5Z(Kj~nlZnVNm=t9i~sLYpzvAHfe@I*h# z5Vs#DJynrdyTP~bJMBTI@JEu7_~so9Pj>yB1~-H87yJKmPj*K-)x{2l|=frw0? zK)al8sjV9D!tS<*d*=t%3C}!tR7{55@`cPO-{6+NxOol%o%@#Wzp?Pe9oO^Y-v>+{ zvX4-%tU;r9?zxFx9~s6sgjp$avA@43dh;#d|2q8aqWpStk_y}P_-Y4q80)!BOZ43n zTv)yZDwffQ@uiIe|Ltpbtn!C>ygJjCbCZz@gl3&9D9b=DJTA`D)Es>M;o+ww80bm^ zcuX`SW5xc42!?}-wl*ylYy4)1NRrwX3O!%CYcTM&|9?*WKbO%K`=6LqH*}|`ZY!YG z&!Ti#cHov_s4XF_4^5u2!*4-Ht8T$P;%EAo7mgP8n4WQcn-;1JE2QEk+L4~F_t*cc zy(|BRdjI}HnTE<#%0856MwXC92H6_YwG2kKu|=0=Y=tZ{jFK$j+V`dG%UEKBGNO!# z>ti<(VG%3m)yq@QI-mlj=r?L$IVb#S}EGwvK z0tqBb_y-B?GL^gyHDqlD0(0B_UiGgW{>OxWjtkHX0rch^BYLpQNi= z4yA89R&XYPvgydMBf6u?r=A;_H7qBrurA8KRdE(0MI%kYnwQ2mZ}aC=plFH9BM0@f z!GVW48Kycy7rMT0U(`&z%$(g=*WNtgv3F}mw?t~%_ivMT*={Xa^3wVrK~SBO(n>mG zc0wxH^PkU5CO4$W@u<=Y=?WX(pxe5s&*-|?&#T4V@LkBMBj|B&`|$^fWlfImp6y|n zkC%6Gjp*}?z^gIjtM1D+jfgKNZX{Z0OHJOn^-mQa&|ud&ns>%MtTRAarq?*_-zFlVPiEnXo`+=0vhHy zyV~}_L>Y`;cRD|NLhP-_Z?3F%OBe9XnMcWB)ljlpt(A6PI79UAn81Hq_JM1;+<-Xk zHS!KFh*M_{TU>fNsqc%@*T^otgZvm*=bU>hvbP(cDHl`oew|Il&7CWJ8gBt9fGf-2 z6*f>jZ9u*3>)KDKzS}~RkRN^SiXZnV`GGp^u2~Q+p({L$S6rMpbf%-YZ08a&f_T^xtBCfsL?2G>rYx@W^q$|7*_YTlFbQrg&%m2XS;t| z;o%O;^j7LS-SksnfYD~0qqN>79J`+DOPRH2JG!n?!m%BUsIB2~PWB)u^4PPq>LSDYOfKkxHY=!=Mx(Q3Q=$ zEV}XX%!}0YFEtWY^t+LWduuOn;5;D;dzcm5l*}i zb=dCfWR9<7Nty;<=OVz#D6L$;r-sr@0Pe7ZmXb!o8R`4L(H9_l{=?AsYJ4h^2F@z8 zPBSoyTV*!5Oyn%8Ea`O$GC{J z!Sai*z%Vokqq_*KWK_zjY89bNFF$w3pBiM- z(E{L+WY-~f$oQ`iR>ydox9XI(kux`>N)GEAMpxD7IrMm)1pNZC(ifes`gW7m^l>CQ zCy9`%=~(A0m^V@wFO+e+prgSjD>BM zZ?208JUrrZY#Md(A6$(kk^CFLOV7!kuMX;~{2j~q;&OvNGwH)8l%s3R#-|=HlpMd& zS1@X(nYEf(_kAHXb4x2(grekjLAABKyBE`KGGbybv}Bkmc^?+P zyVVC^L2Kpmt2&m+Zp(z~*?Liariw0r$7^`HP;nnIMgWiDpIICrgx`ZhTn(F!pOcW6 zyEnq3vRZYfF6PZucZOAbp3VUW*JuZ~v=_B zdOU7Os(V7jml=CIQ+1g|1`4d+o6uoP3qRZ=I~EfkT*I^xCEnO(U$*v1f%^2hq*isu z1`{U0MKxySl9jm!C@HObyinT%wvzXM_^!#sos-Lsu^ImFEuq8;>O7-0FR~VehFq=Y z1Kww)wEVCU_<3$_%4ipGtMkgd0Pn+sxY<~R-Ci?QO>+Flhj7!wM~vjAk`?x@WR(_3 z%v(}_Wu(i~Q{7{R8{wR_U0N*#9!A~4CJmV*p$4wLL9=G@*tf7BaR2L#E8F;_(J@kL zh|njRhg0>GA+W)v=qulqj*Xf<%V&QdBv$X7_B(v7QHhP)1c_65d%*u4nli`p_Jyaq zXR(&(QzVy7f^iF-{$YzCMkdo*M&!~Yj(to0l)OjjEl|yn#BPzT_DWE`KYquZmR`|h zB-MF$hDT&-F_U^NDXXu;H+xe!B@p^a*7p9yWBAv|=ask;^4J^IPP;;HORjd=D7aVL zE#wbNee^kwD7l2cvC9AV#Hgd}tbD#;Rb=|a$(~WJ_I%JyACbDNDJRz@3GS6Z%~ziUGNw_G&as*MRlhUqgXl9RBf=aDEzp_I38jVMEh~P`S?C0 z5(QzO>5SfdUmyDY7Y~)HUBIpecR|`oWcQLlsjDza1T1Fds-|y`ZDXA{Xe8;8E z!<#27m-5gIBexzQQWN(4-auhue0lvP@$H&!lhk_yM}6S_7czvU#whfd)4cKYrE%v( z{L|ycl-yqO(iCBJJo5}b#7kUKfCyMS>1p3?Y?tX=uqiiNawn$Nh@OE2 z;Cepg4NZT}>F;&Zqr)<(3=-0tQ8iB2@ELUXeWZto^s;#d>qI2y4GCJtcqcgb$kQPG>k2olnHifsr%SU2 z53Sl}8p!a?Imb=wZqs*UxQ4%JWk?pQD+u{6-QN=e{Sgspg#aY<=8Zab1m4u>mMV5E z1d8=WiDep8&slT|8*q;rmh=&PV(2?O>+ZJVD9T;PVCa3j_S;@v+nX$^RXN2hLVwU$ z%g_MxGZ`fE1Rl%F`x3O@%-GIOYTN&D0x7L0`FMFptUK17mCk(lR>0-uz}fC9tm>^R zSixkNqjk@yAcWKfYv6f>tb6t@^$vaqv9V>{%E(BZ)^=KdurRUPN>HsVLRtld@1eeb zgm?s^IIqCN@f$jiBn68uptod4{fpbrihc%Oex5{OtbGl)6KA(}4$>AbuEU$JJ=>uqgaU$el^|bC)0Q!Ja+n z`S+mrpMk=^-}XV(e^+on)7uw4{(bpBvH!%rGdZ>dUtPET{q{FD)}ya$s6*7U5B)zS C%pBJM literal 0 HcmV?d00001 diff --git a/src/templates/base.html b/src/templates/base.html index cdb1e06..e352708 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -114,25 +114,22 @@
    From de249cab9ce39b9aff4eea129b5d6ba8aafa2792 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Hamada?= Date: Fri, 4 Feb 2022 03:13:51 +0100 Subject: [PATCH 21/29] locale: de: Translate all existing messages --- src/locale/de/LC_MESSAGES/django.po | 254 ++++++++++++++-------------- 1 file changed, 131 insertions(+), 123 deletions(-) diff --git a/src/locale/de/LC_MESSAGES/django.po b/src/locale/de/LC_MESSAGES/django.po index b77f7d3..9b3ad40 100644 --- a/src/locale/de/LC_MESSAGES/django.po +++ b/src/locale/de/LC_MESSAGES/django.po @@ -3,40 +3,40 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-02-02 19:22+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" +"PO-Revision-Date: 2022-02-04 03:08+0100\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Last-Translator: Clément Hamada \n" +"Language-Team: \n" +"X-Generator: Poedit 3.0\n" #: accounts/templates/accounts/delete.html:8 msgid "Delete account" -msgstr "" +msgstr "Account löschen" #: accounts/templates/accounts/delete.html:11 msgid "Please confirm your password to delete your account." -msgstr "" +msgstr "Bitte bestätigen sie ihr Passwort, um ihren Account zu löschen." #: accounts/templates/accounts/delete.html:12 msgid "Deleted accounts cannot be recovered." -msgstr "" +msgstr "Gelöschte accounts können nicht wiederhergestellt werden." #: accounts/templates/accounts/delete.html:15 msgid "Password inccorect." -msgstr "" +msgstr "Falsches Passwort." #: accounts/templates/accounts/delete.html:17 msgid "Your account has been deleted." -msgstr "" +msgstr "Ihr Account wurde gelöscht." #: accounts/templates/accounts/delete.html:22 #: accounts/templates/accounts/login.html:19 @@ -44,7 +44,7 @@ msgstr "" #: events/templates/events/create_team.html:26 #: events/templates/events/join_team.html:31 msgid "Password" -msgstr "" +msgstr "Passwort" #: accounts/templates/accounts/edit.html:21 #: accounts/templates/accounts/login.html:18 @@ -54,11 +54,11 @@ msgstr "" #: events/templates/events/event_info.html:64 #: scoreboard/templates/scoreboard/scoreboard.html:13 msgid "Username" -msgstr "" +msgstr "Nutzername" #: accounts/templates/accounts/edit.html:25 msgid "Email" -msgstr "" +msgstr "Email" #: accounts/templates/accounts/edit.html:30 #: ctfs/templates/ctfs/ctf_info.html:62 @@ -66,12 +66,12 @@ msgstr "" #: events/templates/events/event_info.html:65 #: scoreboard/templates/scoreboard/scoreboard.html:14 msgid "Website" -msgstr "" +msgstr "Webseite" #: accounts/templates/accounts/edit.html:36 #: events/templates/events/manage_team.html:29 msgid "Apply" -msgstr "" +msgstr "Anwenden" #: accounts/templates/accounts/edit.html:47 #: accounts/templates/accounts/profile.html:46 @@ -82,24 +82,24 @@ msgstr "" #: events/templates/events/team.html:45 #: scoreboard/templates/scoreboard/scoreboard.html:15 msgid "Score" -msgstr "" +msgstr "Punktzahl" #: accounts/templates/accounts/edit.html:55 #: accounts/templates/accounts/profile.html:60 msgid "Registered since" -msgstr "" +msgstr "Registriert seit" #: accounts/templates/accounts/edit.html:61 msgid "Delete my account" -msgstr "" +msgstr "Meinen Account löschen" #: accounts/templates/accounts/login.html:13 msgid "Please, verify your infos." -msgstr "" +msgstr "Übeprüfen Sie bitte ihre Daten." #: accounts/templates/accounts/login.html:22 msgid "Reset password" -msgstr "" +msgstr "Passwort zurücksetzen" #: accounts/templates/accounts/login.html:31 #: accounts/templates/accounts/register.html:38 templates/base.html:103 @@ -108,7 +108,7 @@ msgstr "" #: templates/registration/password_reset_done.html:18 #: templates/registration/password_reset_form.html:26 msgid "Login" -msgstr "" +msgstr "Anmelden" #: accounts/templates/accounts/login.html:32 #: accounts/templates/accounts/register.html:37 @@ -117,37 +117,37 @@ msgstr "" #: templates/registration/password_reset_done.html:19 #: templates/registration/password_reset_form.html:27 msgid "Sign up" -msgstr "" +msgstr "Registrieren" #: accounts/templates/accounts/profile.html:10 msgid "Challenges Solved by" -msgstr "" +msgstr "Challenge gelöst von" #: accounts/templates/accounts/profile.html:21 #: events/templates/events/team.html:20 msgid "Challenge Name" -msgstr "" +msgstr "Name der Herausforderung" #: accounts/templates/accounts/profile.html:22 #: events/templates/events/team.html:21 msgid "Category" -msgstr "" +msgstr "Kategorie" #: accounts/templates/accounts/profile.html:23 #: events/templates/events/team.html:22 msgid "Points" -msgstr "" +msgstr "Punkte" #: accounts/templates/accounts/profile.html:24 #: ctfs/templates/ctfs/ctf_info.html:64 #: events/templates/events/ctf_info.html:73 #: events/templates/events/team.html:23 msgid "Date" -msgstr "" +msgstr "Datum" #: accounts/templates/accounts/profile.html:39 msgid "It seems that this user has not solved any challenge yet..." -msgstr "" +msgstr "Es scheint bisher noch keiner diese Herausforderung gelöst zu haben..." #: accounts/templates/accounts/profile.html:47 #: events/templates/events/event_info.html:63 @@ -156,438 +156,446 @@ msgstr "" #: events/templates/events/team.html:46 #: scoreboard/templates/scoreboard/scoreboard.html:12 msgid "Rank" -msgstr "" +msgstr "Rang" #: accounts/templates/accounts/profile.html:56 msgid "Status: Member" -msgstr "" +msgstr "Status: Mitglied" #: accounts/templates/accounts/profile.html:58 msgid "Status: Visitor" -msgstr "" +msgstr "Status: Gast" #: accounts/templates/accounts/profile.html:64 #: events/templates/events/team.html:57 msgid "Categories stats" -msgstr "" +msgstr "Kategorie Statistiken" #: accounts/templates/accounts/register.html:13 msgid "Welcome !" -msgstr "" +msgstr "Willkommen!" #: accounts/templates/accounts/register.html:14 msgid "Your account has been created." -msgstr "" +msgstr "Ihr account wurde erstellt." #: accounts/templates/accounts/register.html:25 msgid "Personal website" -msgstr "" +msgstr "Persönliche Webseite" #: accounts/templates/accounts/register.html:26 #: events/templates/events/event_info.html:119 msgid "Register" -msgstr "" +msgstr "Registrieren" #: accounts/views/views.py:33 msgid "Your account was inactive." -msgstr "" +msgstr "Ihr Account war inaktiv." #: accounts/views/views.py:52 msgid "" "The password must contain at least one letter and at least one digit or " "punctuation character." msgstr "" +"Das Passwort muss mindestens einen Buchstaben und eine Ziffer oder einen " +"Satzzeichen enthalten." #: accounts/views/views.py:54 msgid "A user with that email already exists." -msgstr "" +msgstr "Ein Nutzer mit dieser Email existiert bereits." #: accounts/views/views.py:67 msgid "A user with that username already exists." -msgstr "" +msgstr "Ein Nutzer mit diesem Nutzernamen existiert bereits." #: accounts/views/views.py:95 msgid "Email already taken." -msgstr "" +msgstr "Email bereits vergeben." #: accounts/views/views.py:101 msgid "Username already taken." -msgstr "" +msgstr "Nutzername bereits vergeben." #: accounts/views/views.py:105 events/views/teams.py:122 msgid "Updated." -msgstr "" +msgstr "Aktualisiert." #: ctfs/templates/ctfs/ctf_info.html:10 #: events/templates/events/ctf_info.html:12 msgid "Published date" -msgstr "" +msgstr "Veröffentlichungsdatum" #: ctfs/templates/ctfs/ctf_info.html:14 msgid "Challenge is not yet available." -msgstr "" +msgstr "Herausforderung ist noch nicht verfügbar." #: ctfs/templates/ctfs/ctf_info.html:21 #: events/templates/events/ctf_info.html:18 home/templates/home/home.html:46 msgid "" "No translation available. Please try another language (English or French)." msgstr "" +"Keine Übersetzung verfügbar. Bitte versuchen Sie es auf einer anderen " +"Sprache noch einmal (Englisch oder Französisch)." #: ctfs/templates/ctfs/ctf_info.html:27 #: events/templates/events/ctf_info.html:32 msgid "Congratulation !" -msgstr "" +msgstr "Herzlichen Glückwunsch!" #: ctfs/templates/ctfs/ctf_info.html:29 #: events/templates/events/ctf_info.html:34 msgid "Already flagged" -msgstr "" +msgstr "Schon gelöst" #: ctfs/templates/ctfs/ctf_info.html:31 ctfs/templates/ctfs/ctf_info.html:40 #: events/templates/events/ctf_info.html:42 #: events/templates/events/ctf_info.html:51 msgid "Start the challenge" -msgstr "" +msgstr "Herausforderung beginnen" #: ctfs/templates/ctfs/ctf_info.html:33 ctfs/templates/ctfs/ctf_info.html:42 #: events/templates/events/ctf_info.html:44 #: events/templates/events/ctf_info.html:53 msgid "Download" -msgstr "" +msgstr "Herunterladen" #: ctfs/templates/ctfs/ctf_info.html:37 #: events/templates/events/ctf_info.html:48 msgid "Wrong flag ! You can do it !" -msgstr "" +msgstr "Falsche flagge! Sie können es schaffen!" #: ctfs/templates/ctfs/ctf_info.html:56 #: events/templates/events/ctf_info.html:66 msgid "Solved by" -msgstr "" +msgstr "Gelöst von" #: ctfs/templates/ctfs/ctf_info.html:80 #: events/templates/events/ctf_info.html:96 msgid "Nobody has solved this challenge yet." -msgstr "" +msgstr "Bisher hat noch niemand diese Herausforderung gelöst." #: ctfs/templates/ctfs/ctf_info.html:87 #: events/templates/events/ctf_info.html:103 msgid "Author" -msgstr "" +msgstr "Autor/-in" #: ctfs/templates/ctfs/ctf_info.html:88 #: events/templates/events/ctf_info.html:104 msgid "Point reward" -msgstr "" +msgstr "Belohnungspunkte" #: ctfs/templates/ctfs/ctfs_list.html:14 msgid "Solved" -msgstr "" +msgstr "Gelöst" #: ctfs/templates/ctfs/ctfs_list.html:37 msgid "No ctf available for this category." -msgstr "" +msgstr "Kein CTF in dieser Kategorie verfügbar." #: ctfs/templates/ctfs/ctfs_list.html:42 msgid "Categories" -msgstr "" +msgstr "Kategorien" #: ctfs/templates/ctfs/ctfs_list.html:48 templates/base.html:54 msgid "No category available." -msgstr "" +msgstr "Keine Kategorie verfügbar." #: events/templates/events/create_team.html:9 #: events/templates/events/join_team.html:9 msgid "This event starts at" -msgstr "" +msgstr "Dieses Ereignis beginnt am" #: events/templates/events/create_team.html:16 #: events/templates/events/join_team.html:16 msgid "You need to be registered to the event." -msgstr "" +msgstr "Sie müssen am Ereignis teilnehmen." #: events/templates/events/create_team.html:19 events/views/teams.py:118 msgid "Name already taken." -msgstr "" +msgstr "Name schon vergeben." #: events/templates/events/create_team.html:25 #: events/templates/events/join_team.html:30 #: events/templates/events/manage_team.html:22 msgid "Team name" -msgstr "" +msgstr "Teamname" #: events/templates/events/create_team.html:27 #: events/templates/events/create_team.html:46 #: events/templates/events/join_team.html:52 msgid "Create Team" -msgstr "" +msgstr "Team erstellen" #: events/templates/events/create_team.html:32 #: events/templates/events/event_pwd.html:28 #: events/templates/events/join_team.html:37 msgid "You need to be logged to access this event." -msgstr "" +msgstr "Sie müssen angemeldet sein um auf dieses Ereignis zuzugreifen." #: events/templates/events/create_team.html:41 #: events/templates/events/event_info.html:113 #: events/templates/events/event_pwd.html:36 #: events/templates/events/join_team.html:46 msgid "Starts at" -msgstr "" +msgstr "Beginnt am" #: events/templates/events/create_team.html:42 #: events/templates/events/event_info.html:114 #: events/templates/events/event_pwd.html:37 #: events/templates/events/join_team.html:47 msgid "Ends at" -msgstr "" +msgstr "Endet am" #: events/templates/events/create_team.html:47 #: events/templates/events/join_team.html:32 #: events/templates/events/join_team.html:51 msgid "Join Team" -msgstr "" +msgstr "Team beitreten" #: events/templates/events/create_team.html:54 #: events/templates/events/join_team.html:59 msgid "Find me a team !" -msgstr "" +msgstr "Finde mir einen team!" #: events/templates/events/ctf_info.html:10 msgid "Event" -msgstr "" +msgstr "Ereignis" #: events/templates/events/ctf_info.html:25 #: events/templates/events/event_info.html:9 msgid "Subscriptions is over." -msgstr "" +msgstr "Die Registrierung hat geendet." #: events/templates/events/ctf_info.html:28 #: events/templates/events/event_info.html:12 #: events/templates/events/event_pwd.html:18 msgid "You're already registered to this event." -msgstr "" +msgstr "Sie haben sich schon für dieses Ereignis registriert." #: events/templates/events/ctf_info.html:36 #: events/templates/events/event_info.html:18 msgid "This event is over." -msgstr "" +msgstr "Dieses Ereignis hat bereits geendet." #: events/templates/events/ctf_info.html:38 msgid "Error while processing your request. (Invalid Form)" -msgstr "" +msgstr "Fehler während der Verarbeitung ihrer Anfrage. (Ungültiges Formular)" #: events/templates/events/ctf_info.html:40 msgid "" "Error: you're not registered to this event, so you can't register scores, " "fucking logic." msgstr "" +"Fehler: Sie nehmen an diesem Ereiginis nicht teil, und können deshalb keinen " +"Punktestand registrieren." #: events/templates/events/event_info.html:20 #: events/templates/events/event_pwd.html:9 msgid "This event start at" -msgstr "" +msgstr "Dieses Ereignis startet am" #: events/templates/events/event_info.html:30 msgid "Challenges" -msgstr "" +msgstr "Herausforderungen" #: events/templates/events/event_info.html:47 msgid "No challenges available." -msgstr "" +msgstr "Keine Herausforderung verfügbar." #: events/templates/events/event_info.html:51 msgid "The event has not started yet." -msgstr "" +msgstr "Das Ereignis hat noch nicht begonnen." #: events/templates/events/event_info.html:57 msgid "ScoreBoard" -msgstr "" +msgstr "Punktestand" #: events/templates/events/event_info.html:88 msgid "Team" -msgstr "" +msgstr "Team" #: events/templates/events/event_info.html:106 msgid "No one have earn point yet, you gonna be the first ?" -msgstr "" +msgstr "Niemand hat bisher Punkte verdient, werden Sie der erste sein?" #: events/templates/events/event_info.html:129 msgid "Manage my team" -msgstr "" +msgstr "Team verwalten" #: events/templates/events/event_pwd.html:15 #: events/templates/events/join_team.html:21 msgid "Wrong password submited." -msgstr "" +msgstr "Falsches Passwort eingetragen." #: events/templates/events/event_pwd.html:20 msgid "This event is password protected" -msgstr "" +msgstr "Dieses Ereignis ist passwortgeschützt" #: events/templates/events/event_pwd.html:21 msgid "You need to submit the event password to gain access to this event." -msgstr "" +msgstr "Sie müssen das Ereignispasswort eintragen um darauf zuzugreifen." #: events/templates/events/events_list.html:6 templates/base.html:63 msgid "Events" -msgstr "" +msgstr "Ereignisse" #: events/templates/events/events_list.html:38 msgid "See more" -msgstr "" +msgstr "Weiter" #: events/templates/events/events_list.html:44 msgid "No events available." -msgstr "" +msgstr "Keine Ereignisse verfügbar." #: events/templates/events/join_team.html:19 msgid "Team does not exist." -msgstr "" +msgstr "Team existiert nicht." #: events/templates/events/join_team.html:23 msgid "Maximum size reached." -msgstr "" +msgstr "Maximale Mitgliederanzahl erreicht." #: events/templates/events/manage_team.html:26 msgid "Team password" -msgstr "" +msgstr "Teampasswort" #: events/templates/events/manage_team.html:44 #: events/templates/events/team.html:49 msgid "Members" -msgstr "" +msgstr "Mitgliede" #: events/templates/events/manage_team.html:51 msgid "Leave Team" -msgstr "" +msgstr "Team verlassen" #: events/templates/events/team.html:38 msgid "It seems that this team has not solved any challenge yet..." -msgstr "" +msgstr "Dieses Team scheint noch keine Herausforderung gelöst zu haben..." #: home/templates/home/home.html:20 msgid "Weekly Top 5" -msgstr "" +msgstr "Top 5 der Woche" #: home/templates/home/home.html:56 msgid "No article available." -msgstr "" +msgstr "Kein Artikel verfügbar." #: home/templates/home/home.html:61 msgid "Latest challenges added" -msgstr "" +msgstr "Letzte challenge hinzugefügt" #: home/templates/home/home.html:66 msgid "points" -msgstr "" +msgstr "Punkte" #: home/templates/home/home.html:70 msgid "No ctf available." -msgstr "" +msgstr "Kein CTF verfügbar." #: home/templates/home/home.html:74 msgid "Latest Flags" -msgstr "" +msgstr "Letzte Flaggen" #: home/templates/home/home.html:88 msgid "Flags" -msgstr "" +msgstr "Flaggen" #: home/templates/home/home.html:94 msgid "Users" -msgstr "" +msgstr "Nutzer" #: project/settings.py:115 msgid "English" -msgstr "" +msgstr "Englisch" #: project/settings.py:116 msgid "German" -msgstr "" +msgstr "Deutsch" #: project/settings.py:117 msgid "French" -msgstr "" +msgstr "Französisch" #: project/settings.py:118 msgid "Russian" -msgstr "" +msgstr "Russisch" #: scoreboard/templates/scoreboard/scoreboard.html:38 msgid "First" -msgstr "" +msgstr "Erste" #: scoreboard/templates/scoreboard/scoreboard.html:39 msgid "Previous" -msgstr "" +msgstr "Vorherige" #: scoreboard/templates/scoreboard/scoreboard.html:43 msgid "Page " -msgstr "" +msgstr "Seite " #: scoreboard/templates/scoreboard/scoreboard.html:47 msgid "Next" -msgstr "" +msgstr "Nächste" #: scoreboard/templates/scoreboard/scoreboard.html:48 msgid "Last" -msgstr "" +msgstr "Letzte" #: templates/base.html:59 msgid "Scoreboard" -msgstr "" +msgstr "Punktestand" #: templates/base.html:66 msgid "Resources" -msgstr "" +msgstr "Ressourcen" #: templates/base.html:99 msgid "Logout" -msgstr "" +msgstr "Abmelden" #: templates/base.html:106 msgid "Sign Up" -msgstr "" +msgstr "Registrieren" #: templates/base.html:144 msgid "Become a Patron!" -msgstr "" +msgstr "Unterstützen Sie uns!" #: templates/registration/password_reset_complete.html:11 msgid "Your new password has been set." -msgstr "" +msgstr "Ihr neues Passwort wurde festgelegt." #: templates/registration/password_reset_confirm.html:20 msgid "Your password can’t be too similar to your other personal information." -msgstr "" +msgstr "Ihr Passwort can nicht zu ähnlich zu ihren persönlichen Daten sein." #: templates/registration/password_reset_confirm.html:21 msgid "Your password must contain at least 8 characters." -msgstr "" +msgstr "Ihr Passwort muss mindestens 8 Zeichen enthalten." #: templates/registration/password_reset_confirm.html:22 msgid "Your password can’t be a commonly used password." -msgstr "" +msgstr "Ihr Passwort can nicht ein häufig benutztes Passwort sein." #: templates/registration/password_reset_confirm.html:23 msgid "Your password can’t be entirely numeric." -msgstr "" +msgstr "Ihr Passwort can nicht nur Ziffern enthalten." #: templates/registration/password_reset_confirm.html:26 msgid "Confirm" -msgstr "" +msgstr "Bestätigen" #: templates/registration/password_reset_confirm.html:28 msgid "Submit" -msgstr "" +msgstr "Einreichen" #: templates/registration/password_reset_done.html:11 msgid "" "We've emailed you instructions for setting your password. You should receive " "the email shortly!" msgstr "" +"Wir haben Ihnen eine Anleitung um Ihren Passwort zurückzusetzen per Email " +"geschickt. Sie sollten sie in Kürze empfangen!" #: templates/registration/password_reset_form.html:16 msgid "Reset" -msgstr "" +msgstr "Zurücksetzen" From d8e5236bac2645f1021f3c6a33f4ebfda163e224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Hamada?= Date: Fri, 4 Feb 2022 03:30:49 +0100 Subject: [PATCH 22/29] locale: de: Update file references --- src/locale/de/LC_MESSAGES/django.po | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/locale/de/LC_MESSAGES/django.po b/src/locale/de/LC_MESSAGES/django.po index 9b3ad40..1359e99 100644 --- a/src/locale/de/LC_MESSAGES/django.po +++ b/src/locale/de/LC_MESSAGES/django.po @@ -9,14 +9,13 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-02-02 19:22+0100\n" "PO-Revision-Date: 2022-02-04 03:08+0100\n" +"Last-Translator: Clément Hamada \n" +"Language-Team: \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"Last-Translator: Clément Hamada \n" -"Language-Team: \n" -"X-Generator: Poedit 3.0\n" #: accounts/templates/accounts/delete.html:8 msgid "Delete account" @@ -102,7 +101,7 @@ msgid "Reset password" msgstr "Passwort zurücksetzen" #: accounts/templates/accounts/login.html:31 -#: accounts/templates/accounts/register.html:38 templates/base.html:103 +#: accounts/templates/accounts/register.html:38 templates/base.html:101 #: templates/registration/password_reset_complete.html:18 #: templates/registration/password_reset_confirm.html:38 #: templates/registration/password_reset_done.html:18 @@ -435,7 +434,7 @@ msgstr "Dieses Ereignis ist passwortgeschützt" msgid "You need to submit the event password to gain access to this event." msgstr "Sie müssen das Ereignispasswort eintragen um darauf zuzugreifen." -#: events/templates/events/events_list.html:6 templates/base.html:63 +#: events/templates/events/events_list.html:6 templates/base.html:61 msgid "Events" msgstr "Ereignisse" @@ -544,19 +543,19 @@ msgstr "Letzte" msgid "Scoreboard" msgstr "Punktestand" -#: templates/base.html:66 +#: templates/base.html:64 msgid "Resources" msgstr "Ressourcen" -#: templates/base.html:99 +#: templates/base.html:97 msgid "Logout" msgstr "Abmelden" -#: templates/base.html:106 +#: templates/base.html:104 msgid "Sign Up" msgstr "Registrieren" -#: templates/base.html:144 +#: templates/base.html:139 msgid "Become a Patron!" msgstr "Unterstützen Sie uns!" From cb0c2ee639368548454f095f1dae12ce621d308e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Hamada?= Date: Fri, 4 Feb 2022 03:34:01 +0100 Subject: [PATCH 23/29] resources: locale: de: Update messages --- src/resources/locale/de/LC_MESSAGES/django.po | 142 ++++++++---------- 1 file changed, 60 insertions(+), 82 deletions(-) diff --git a/src/resources/locale/de/LC_MESSAGES/django.po b/src/resources/locale/de/LC_MESSAGES/django.po index c8b56f4..02ed323 100644 --- a/src/resources/locale/de/LC_MESSAGES/django.po +++ b/src/resources/locale/de/LC_MESSAGES/django.po @@ -18,196 +18,192 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: resources/templates/resources/42ctf.html:9 -#: resources/templates/resources/resources.html:12 +#: resources/templates/resources/42ctf.html:7 msgid "What is 42CTF ?" msgstr "" -#: resources/templates/resources/42ctf.html:12 +#: resources/templates/resources/42ctf.html:10 msgid "A short introduction to CTF" msgstr "" -#: resources/templates/resources/42ctf.html:13 +#: resources/templates/resources/42ctf.html:11 msgid "" "CTF stands for Capture The Flag. It is a cybersecurity competition, where " "participants have to solve challenges of various categories to gain points " "and progress on the scoreboard." msgstr "" -#: resources/templates/resources/42ctf.html:14 +#: resources/templates/resources/42ctf.html:12 msgid "The challenges require participants to find sort of passwords called \\" msgstr "" -#: resources/templates/resources/42ctf.html:17 +#: resources/templates/resources/42ctf.html:15 msgid "Functionment of 42CTF" msgstr "" -#: resources/templates/resources/42ctf.html:18 +#: resources/templates/resources/42ctf.html:16 msgid "42CTF is what we call a permanent CTF." msgstr "" -#: resources/templates/resources/42ctf.html:19 +#: resources/templates/resources/42ctf.html:17 msgid "Except from the" msgstr "" -#: resources/templates/resources/42ctf.html:19 +#: resources/templates/resources/42ctf.html:17 msgid "events" msgstr "" -#: resources/templates/resources/42ctf.html:19 +#: resources/templates/resources/42ctf.html:17 msgid "challenges are available on the platform without time limitations." msgstr "" -#: resources/templates/resources/42ctf.html:20 +#: resources/templates/resources/42ctf.html:18 msgid "The registration on 42CTF is open to everyone, 42 students or not." msgstr "" -#: resources/templates/resources/42ctf.html:21 +#: resources/templates/resources/42ctf.html:19 msgid "" "Events may or may not be open. If you would like to organize an event on " "42CTF, feel free to contact us." msgstr "" -#: resources/templates/resources/42ctf.html:24 +#: resources/templates/resources/42ctf.html:22 msgid "42CTF Team" msgstr "" -#: resources/templates/resources/42ctf.html:25 +#: resources/templates/resources/42ctf.html:23 msgid "42CTF is managed by 42 students." msgstr "" -#: resources/templates/resources/42ctf.html:26 +#: resources/templates/resources/42ctf.html:24 msgid "You can meet the team on" msgstr "" -#: resources/templates/resources/42ctf.html:27 +#: resources/templates/resources/42ctf.html:25 msgid "" "Challenges are created by various contributors, not necessarily 42 students." msgstr "" -#: resources/templates/resources/42ctf.html:28 +#: resources/templates/resources/42ctf.html:26 msgid "" "Anyone is welcome to submit their own challenges, either on the permanent " "CTF or for a specific event." msgstr "" -#: resources/templates/resources/create_challenge.html:9 -#: resources/templates/resources/resources.html:28 +#: resources/templates/resources/create_challenge.html:7 msgid "Create new challenges" msgstr "" -#: resources/templates/resources/create_challenge.html:12 +#: resources/templates/resources/create_challenge.html:10 msgid "If you want to create new challenges for 42CTF, send us a message on " msgstr "" -#: resources/templates/resources/create_challenge.html:13 +#: resources/templates/resources/create_challenge.html:11 msgid "If your challenge is offline, then you don't have to ask us in advance." msgstr "" -#: resources/templates/resources/create_challenge.html:14 +#: resources/templates/resources/create_challenge.html:12 msgid "" "If your challenge is online (for example web or pwn), then you should give " "us a short description of what you want to do." msgstr "" -#: resources/templates/resources/create_challenge.html:15 +#: resources/templates/resources/create_challenge.html:13 msgid "" "We may be able to help you or to give you resources such as dockerfiles." msgstr "" -#: resources/templates/resources/create_challenge.html:16 +#: resources/templates/resources/create_challenge.html:14 msgid "We plan to make those resources publicly available in a near future." msgstr "" -#: resources/templates/resources/donate.html:9 -#: resources/templates/resources/resources.html:31 +#: resources/templates/resources/donate.html:7 msgid "Donate" msgstr "" -#: resources/templates/resources/donate.html:12 +#: resources/templates/resources/donate.html:10 msgid "Become a 42CTF member" msgstr "" -#: resources/templates/resources/donate.html:13 +#: resources/templates/resources/donate.html:11 msgid "" "42CTF is a non-profit organization with a legal status under the french law " "(Association loi 1901)." msgstr "" -#: resources/templates/resources/donate.html:14 +#: resources/templates/resources/donate.html:12 msgid "You can support us by becoming a member and paying a fee of 15 euros." msgstr "" -#: resources/templates/resources/donate.html:15 +#: resources/templates/resources/donate.html:13 msgid "Membership is then granted for 1 year." msgstr "" -#: resources/templates/resources/donate.html:17 +#: resources/templates/resources/donate.html:15 msgid "When you become a member, you gain the following advantages:" msgstr "" -#: resources/templates/resources/donate.html:18 +#: resources/templates/resources/donate.html:16 msgid "" "A different color for your pseudo in the scoreboard, to let everyone know " "you're a member." msgstr "" -#: resources/templates/resources/donate.html:19 +#: resources/templates/resources/donate.html:17 msgid "" "The possibility to play again past CTF, with challenges no longer available, " "in the form of private events with the people of your choice." msgstr "" -#: resources/templates/resources/donate.html:20 +#: resources/templates/resources/donate.html:18 msgid "" "Ex: you played Welcome CTF 2021, and want to play it again with your friends " "during one weekend." msgstr "" -#: resources/templates/resources/donate.html:21 +#: resources/templates/resources/donate.html:19 msgid "Or you didn't play Welcome CTF 2021 because you were not eligible." msgstr "" -#: resources/templates/resources/donate.html:24 +#: resources/templates/resources/donate.html:22 msgid "More advantages may come later, and you can submit us your ideas." msgstr "" -#: resources/templates/resources/donate.html:25 +#: resources/templates/resources/donate.html:23 msgid "" "However, we will not organize limited time CTF for members only, as this " "will be equivalent to organize paid events, and we want 42CTF to remain FREE " "for all." msgstr "" -#: resources/templates/resources/donate.html:28 +#: resources/templates/resources/donate.html:26 msgid "Donate to 42CTF" msgstr "" -#: resources/templates/resources/donate.html:29 +#: resources/templates/resources/donate.html:27 msgid "" "You can donate to 42CTF or pay your membership with the following means:" msgstr "" -#: resources/templates/resources/donate.html:43 +#: resources/templates/resources/donate.html:46 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:45 +#: resources/templates/resources/donate.html:48 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:46 +#: resources/templates/resources/donate.html:49 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/edit.html:9 -#: resources/templates/resources/resources.html:30 +#: resources/templates/resources/edit.html:7 msgid "Edit this page" msgstr "" @@ -217,101 +213,83 @@ msgid "" "request to your favorite" msgstr "" -#: resources/templates/resources/resources.html:10 -msgid "Getting started" -msgstr "" - -#: resources/templates/resources/resources.html:13 -#: resources/templates/resources/tools.html:9 +#: resources/templates/resources/tools.html:7 msgid "Recommended Tools" msgstr "" -#: resources/templates/resources/resources.html:20 -msgid "Technical documentation" -msgstr "" - -#: resources/templates/resources/resources.html:21 -msgid "No docs available, contact us if you want to write some :)" -msgstr "" - -#: resources/templates/resources/resources.html:26 -msgid "Contribute" -msgstr "" - -#: resources/templates/resources/resources.html:29 -#: resources/templates/resources/translate.html:9 -msgid "Translate 42CTF" -msgstr "" - -#: resources/templates/resources/tools.html:12 +#: resources/templates/resources/tools.html:10 msgid "To get you started, we built a VM that you can simply import in" msgstr "" -#: resources/templates/resources/tools.html:12 +#: resources/templates/resources/tools.html:10 msgid "with a bunch of useful tools." msgstr "" -#: resources/templates/resources/tools.html:13 +#: resources/templates/resources/tools.html:11 msgid "You can dowload this OVA" msgstr "" -#: resources/templates/resources/tools.html:13 +#: resources/templates/resources/tools.html:11 msgid "here" msgstr "" -#: resources/templates/resources/tools.html:15 +#: resources/templates/resources/tools.html:13 msgid "Here are the tools installed on the VM:" msgstr "" -#: resources/templates/resources/tools.html:24 +#: resources/templates/resources/tools.html:22 msgid "" "If you want to solve the challenges on your own machine, we recommend you to " "use a Linux operating system." msgstr "" -#: resources/templates/resources/tools.html:25 +#: resources/templates/resources/tools.html:23 msgid "" "Most of the reverse challenges are ELF binaries and won't run on Mac OS or " "Windows." msgstr "" -#: resources/templates/resources/tools.html:27 +#: resources/templates/resources/tools.html:25 msgid "Additionnaly, you will need the following languages interpreters:" msgstr "" -#: resources/templates/resources/translate.html:12 +#: resources/templates/resources/translate.html:7 +msgid "Translate 42CTF" +msgstr "" + +#: resources/templates/resources/translate.html:10 msgid "42CTF source code is publicly available on this" msgstr "" -#: resources/templates/resources/translate.html:13 +#: resources/templates/resources/translate.html:11 msgid "" "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." msgstr "" -#: resources/templates/resources/translate.html:14 +#: resources/templates/resources/translate.html:12 msgid "We have a" msgstr "" -#: resources/templates/resources/translate.html:14 +#: resources/templates/resources/translate.html:12 msgid "" "describing how to translate pages with the Django internalization module." msgstr "" -#: resources/templates/resources/translate.html:15 +#: resources/templates/resources/translate.html:13 msgid "" "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 ;)" msgstr "" -#: resources/templates/resources/translate.html:16 +#: resources/templates/resources/translate.html:14 msgid "" "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." msgstr "" -#: resources/templates/resources/translate.html:17 +#: resources/templates/resources/translate.html:15 msgid "Don't hesitate to reach for help on" msgstr "" From ca41f8f924e7cda8976a49af571493758c788b47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Hamada?= Date: Fri, 4 Feb 2022 05:58:07 +0100 Subject: [PATCH 24/29] locale: de: Spellcheck --- src/locale/de/LC_MESSAGES/django.po | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/locale/de/LC_MESSAGES/django.po b/src/locale/de/LC_MESSAGES/django.po index 1359e99..07ad827 100644 --- a/src/locale/de/LC_MESSAGES/django.po +++ b/src/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-02-02 19:22+0100\n" -"PO-Revision-Date: 2022-02-04 03:08+0100\n" +"PO-Revision-Date: 2022-02-04 05:56+0100\n" "Last-Translator: Clément Hamada \n" "Language-Team: \n" "Language: de\n" @@ -16,6 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 3.0\n" #: accounts/templates/accounts/delete.html:8 msgid "Delete account" @@ -27,7 +28,7 @@ msgstr "Bitte bestätigen sie ihr Passwort, um ihren Account zu löschen." #: accounts/templates/accounts/delete.html:12 msgid "Deleted accounts cannot be recovered." -msgstr "Gelöschte accounts können nicht wiederhergestellt werden." +msgstr "Gelöschte Accounts können nicht wiederhergestellt werden." #: accounts/templates/accounts/delete.html:15 msgid "Password inccorect." @@ -94,7 +95,7 @@ msgstr "Meinen Account löschen" #: accounts/templates/accounts/login.html:13 msgid "Please, verify your infos." -msgstr "Übeprüfen Sie bitte ihre Daten." +msgstr "Überprüfen Sie bitte ihre Daten." #: accounts/templates/accounts/login.html:22 msgid "Reset password" @@ -120,7 +121,7 @@ msgstr "Registrieren" #: accounts/templates/accounts/profile.html:10 msgid "Challenges Solved by" -msgstr "Challenge gelöst von" +msgstr "Herausforderung gelöst von" #: accounts/templates/accounts/profile.html:21 #: events/templates/events/team.html:20 @@ -176,7 +177,7 @@ msgstr "Willkommen!" #: accounts/templates/accounts/register.html:14 msgid "Your account has been created." -msgstr "Ihr account wurde erstellt." +msgstr "Ihr Account wurde erstellt." #: accounts/templates/accounts/register.html:25 msgid "Personal website" @@ -354,7 +355,7 @@ msgstr "Team beitreten" #: events/templates/events/create_team.html:54 #: events/templates/events/join_team.html:59 msgid "Find me a team !" -msgstr "Finde mir einen team!" +msgstr "Finde mir einen Team!" #: events/templates/events/ctf_info.html:10 msgid "Event" @@ -385,7 +386,7 @@ msgid "" "Error: you're not registered to this event, so you can't register scores, " "fucking logic." msgstr "" -"Fehler: Sie nehmen an diesem Ereiginis nicht teil, und können deshalb keinen " +"Fehler: Sie nehmen an diesem Ereignis nicht teil, und können deshalb keinen " "Punktestand registrieren." #: events/templates/events/event_info.html:20 @@ -481,7 +482,7 @@ msgstr "Kein Artikel verfügbar." #: home/templates/home/home.html:61 msgid "Latest challenges added" -msgstr "Letzte challenge hinzugefügt" +msgstr "Letzte Herausforderung hinzugefügt" #: home/templates/home/home.html:66 msgid "points" @@ -565,7 +566,7 @@ msgstr "Ihr neues Passwort wurde festgelegt." #: templates/registration/password_reset_confirm.html:20 msgid "Your password can’t be too similar to your other personal information." -msgstr "Ihr Passwort can nicht zu ähnlich zu ihren persönlichen Daten sein." +msgstr "Ihr Passwort kann nicht zu ähnlich zu ihren persönlichen Daten sein." #: templates/registration/password_reset_confirm.html:21 msgid "Your password must contain at least 8 characters." @@ -573,11 +574,11 @@ msgstr "Ihr Passwort muss mindestens 8 Zeichen enthalten." #: templates/registration/password_reset_confirm.html:22 msgid "Your password can’t be a commonly used password." -msgstr "Ihr Passwort can nicht ein häufig benutztes Passwort sein." +msgstr "Ihr Passwort kann nicht ein häufig benutztes Passwort sein." #: templates/registration/password_reset_confirm.html:23 msgid "Your password can’t be entirely numeric." -msgstr "Ihr Passwort can nicht nur Ziffern enthalten." +msgstr "Ihr Passwort kann nicht nur Ziffern enthalten." #: templates/registration/password_reset_confirm.html:26 msgid "Confirm" From 54226b89046f2c60b415e579c7651aefbb20ce16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Hamada?= Date: Fri, 4 Feb 2022 06:02:00 +0100 Subject: [PATCH 25/29] resources: locale: de: Translate all existing messages --- src/resources/locale/de/LC_MESSAGES/django.po | 185 +++++++++++------- 1 file changed, 118 insertions(+), 67 deletions(-) diff --git a/src/resources/locale/de/LC_MESSAGES/django.po b/src/resources/locale/de/LC_MESSAGES/django.po index 02ed323..aef4b10 100644 --- a/src/resources/locale/de/LC_MESSAGES/django.po +++ b/src/resources/locale/de/LC_MESSAGES/django.po @@ -3,293 +3,344 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-02-02 19:22+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" +"PO-Revision-Date: 2022-02-04 05:53+0100\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Last-Translator: Clément Hamada \n" +"Language-Team: \n" #: resources/templates/resources/42ctf.html:7 msgid "What is 42CTF ?" -msgstr "" +msgstr "Was ist 42CTF?" #: resources/templates/resources/42ctf.html:10 msgid "A short introduction to CTF" -msgstr "" +msgstr "Eine kurze Einführung zu CTF" #: resources/templates/resources/42ctf.html:11 msgid "" "CTF stands for Capture The Flag. It is a cybersecurity competition, where " -"participants have to solve challenges of various categories to gain points " -"and progress on the scoreboard." +"participants have to solve challenges of various categories to gain points and " +"progress on the scoreboard." msgstr "" +"CTF steht für Capture The Flag. Es ist ein Computersicherheitswettbewerb, indem " +"Teilnehmer Herausforderungen verschiedener Kategorien lösen müssen um die " +"meisten Punkte zu verdienen." #: resources/templates/resources/42ctf.html:12 msgid "The challenges require participants to find sort of passwords called \\" msgstr "" +"Die Herausforderungen bestehen darin eine Art Passwort zu finden: sogenannte \\" #: resources/templates/resources/42ctf.html:15 msgid "Functionment of 42CTF" -msgstr "" +msgstr "Funktionsweise von 42CTF" #: resources/templates/resources/42ctf.html:16 msgid "42CTF is what we call a permanent CTF." -msgstr "" +msgstr "42CTF ist ein sogenanntes Dauer-CTF." #: resources/templates/resources/42ctf.html:17 msgid "Except from the" -msgstr "" +msgstr "Außer bei" #: resources/templates/resources/42ctf.html:17 msgid "events" -msgstr "" +msgstr "Ereignissen" #: resources/templates/resources/42ctf.html:17 msgid "challenges are available on the platform without time limitations." -msgstr "" +msgstr "sind Herausforderungen auf der Plattform unbegrenzt zugänglich." #: resources/templates/resources/42ctf.html:18 msgid "The registration on 42CTF is open to everyone, 42 students or not." -msgstr "" +msgstr "Die Registrierung bei 42CTF ist für jeden offen, ob 42-Student oder nicht." #: resources/templates/resources/42ctf.html:19 msgid "" -"Events may or may not be open. If you would like to organize an event on " -"42CTF, feel free to contact us." +"Events may or may not be open. If you would like to organize an event on 42CTF, " +"feel free to contact us." msgstr "" +"Ereignisse können öffentlich oder privat sein. Wenn Sie ein Ereignisse bei 42CTF " +"organisieren möchten, kontaktieren Sie uns." #: resources/templates/resources/42ctf.html:22 msgid "42CTF Team" -msgstr "" +msgstr "das 42CTF Team" #: resources/templates/resources/42ctf.html:23 msgid "42CTF is managed by 42 students." -msgstr "" +msgstr "42CTF wird von 42-Studenten verwaltet." #: resources/templates/resources/42ctf.html:24 msgid "You can meet the team on" -msgstr "" +msgstr "Treffen können Sie das Team auf" #: resources/templates/resources/42ctf.html:25 msgid "" "Challenges are created by various contributors, not necessarily 42 students." msgstr "" +"Herausforderungen werden von verschiedenen Mitwirkende beigetragen, nicht " +"zwingend 42-Studenten." #: resources/templates/resources/42ctf.html:26 msgid "" -"Anyone is welcome to submit their own challenges, either on the permanent " -"CTF or for a specific event." +"Anyone is welcome to submit their own challenges, either on the permanent CTF or " +"for a specific event." msgstr "" +"Beiträge sind von jedem willkommen, entweder auf dem Dauer-CTF, oder für ein " +"bestimmtes Ereignis." #: resources/templates/resources/create_challenge.html:7 msgid "Create new challenges" -msgstr "" +msgstr "Erstelle neue Herausforderungen" #: resources/templates/resources/create_challenge.html:10 msgid "If you want to create new challenges for 42CTF, send us a message on " msgstr "" +"Falls Sie Herausforderungen für 42CTF erstellen möchten, schicken Sie uns eine " +"Nachricht auf " #: resources/templates/resources/create_challenge.html:11 msgid "If your challenge is offline, then you don't have to ask us in advance." msgstr "" +"Falls Ihre Herausforderung offline ist, müssen Sie uns nicht im voraus fragen." #: resources/templates/resources/create_challenge.html:12 msgid "" -"If your challenge is online (for example web or pwn), then you should give " -"us a short description of what you want to do." +"If your challenge is online (for example web or pwn), then you should give us a " +"short description of what you want to do." msgstr "" +"Falls Ihre Herausforderung online ist (z.B. web oder pwn), dann sollten sie uns " +"eine kurze Beschreibung von dessen was sie vorhaben geben." #: resources/templates/resources/create_challenge.html:13 -msgid "" -"We may be able to help you or to give you resources such as dockerfiles." +msgid "We may be able to help you or to give you resources such as dockerfiles." msgstr "" +"Wir können Ihnen helfen oder Ressourcen sowie Dockerfiles zur Verfügung stellen." #: resources/templates/resources/create_challenge.html:14 msgid "We plan to make those resources publicly available in a near future." -msgstr "" +msgstr "Wir haben vor diese Ressourcen in naher Zukunft zu veröffentlichen." #: resources/templates/resources/donate.html:7 msgid "Donate" -msgstr "" +msgstr "Spenden" #: resources/templates/resources/donate.html:10 msgid "Become a 42CTF member" -msgstr "" +msgstr "42CTF-Mitglied werden" #: resources/templates/resources/donate.html:11 msgid "" "42CTF is a non-profit organization with a legal status under the french law " "(Association loi 1901)." msgstr "" +"42CTF ist eine gemeinnützige Organisation mit einem Rechtsstatus nach " +"französischem Recht (Association loi 1901)." #: resources/templates/resources/donate.html:12 msgid "You can support us by becoming a member and paying a fee of 15 euros." -msgstr "" +msgstr "Sie können uns unterstützen indem Sie Mitglied werden und 15 Euro zahlen." #: resources/templates/resources/donate.html:13 msgid "Membership is then granted for 1 year." -msgstr "" +msgstr "Die Mitgliedschaft wird dann für ein Jahr gewährt." #: resources/templates/resources/donate.html:15 msgid "When you become a member, you gain the following advantages:" -msgstr "" +msgstr "Wenn sie Mitglied werden, bekommen sie folgende Vorteile:" #: resources/templates/resources/donate.html:16 msgid "" -"A different color for your pseudo in the scoreboard, to let everyone know " -"you're a member." +"A different color for your pseudo in the scoreboard, to let everyone know you're " +"a member." msgstr "" +"Eine verschiedene Farbe für Ihren Nutzernamen im Punktestand, sodass jeder weiß " +"dass Sie ein Mitglied sind." #: resources/templates/resources/donate.html:17 msgid "" -"The possibility to play again past CTF, with challenges no longer available, " -"in the form of private events with the people of your choice." +"The possibility to play again past CTF, with challenges no longer available, in " +"the form of private events with the people of your choice." msgstr "" +"Die Möglichkeit einen vergangenen CTF zu wiederholen, mit Herausforderungen die " +"nicht mehr verfügbar sind, in Form von privaten Ereignissen mit Menschen Ihrer " +"Wahl." #: resources/templates/resources/donate.html:18 msgid "" "Ex: you played Welcome CTF 2021, and want to play it again with your friends " "during one weekend." msgstr "" +"Z.B.: Sie haben am Welcome CTF 2021 teilgenommen, und wollen es mit Ihren " +"Freunden an einem Wochenende wiederholen." #: resources/templates/resources/donate.html:19 msgid "Or you didn't play Welcome CTF 2021 because you were not eligible." msgstr "" +"Oder sie haben nicht am Welcome CTF 2021 teilgenommen weil sie nicht berechtigt " +"waren." #: resources/templates/resources/donate.html:22 msgid "More advantages may come later, and you can submit us your ideas." msgstr "" +"Weitere Vorteile können später folgen, und Sie können uns Ihre Ideen mitteilen." #: resources/templates/resources/donate.html:23 msgid "" -"However, we will not organize limited time CTF for members only, as this " -"will be equivalent to organize paid events, and we want 42CTF to remain FREE " -"for all." +"However, we will not organize limited time CTF for members only, as this will be " +"equivalent to organize paid events, and we want 42CTF to remain FREE for all." msgstr "" +"Trotzdem werden wir keine zeitlich begrenzte CTFs nur für Mitglieder " +"organisieren, da diese Zahlungspflichtige Ereignissen gleichen, und wir 42CTF " +"KOSTENLOS für alle zugänglich behalten wollen." #: resources/templates/resources/donate.html:26 msgid "Donate to 42CTF" -msgstr "" +msgstr "An 42CTF spenden" #: resources/templates/resources/donate.html:27 -msgid "" -"You can donate to 42CTF or pay your membership with the following means:" +msgid "You can donate to 42CTF or pay your membership with the following means:" msgstr "" +"Folgende Zahlungsmethoden sind für eine Spende an 42CTF den Kauf einer " +"Mitgliedshaft verfügbar:" #: resources/templates/resources/donate.html:46 msgid "" "If you would like us to add another payment method or if you want to pay in " "cash, send us a message !" 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 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 "" +"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 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 "" +"Wir verwenden diese Daten nur um den Überblick über unsere Mitglieder zu " +"Behalten und ihnen Vorteile zu bieten, und werden sie niemals an einem Dritten " +"übermitteln." #: resources/templates/resources/edit.html:7 msgid "Edit this page" -msgstr "" +msgstr "Diese Seite bearbeiten" #: resources/templates/resources/edit.html:12 msgid "" "More information coming soon, but as you can guess it involves making a pull " "request to your favorite" msgstr "" +"Weitere Information wird folgen, doch sowie Sie es erraten können benötigt es " +"eine Pull Request auf ihrer lieblings" #: resources/templates/resources/tools.html:7 msgid "Recommended Tools" -msgstr "" +msgstr "Empfohlene Werkzeuge" #: resources/templates/resources/tools.html:10 msgid "To get you started, we built a VM that you can simply import in" -msgstr "" +msgstr "Zum beginnen haben wir eine VM erstellt die Sie einfach importieren können" #: resources/templates/resources/tools.html:10 msgid "with a bunch of useful tools." -msgstr "" +msgstr "mit vielen nützlichen Werkzeugen." #: resources/templates/resources/tools.html:11 msgid "You can dowload this OVA" -msgstr "" +msgstr "Herunterladen können Sie die OVA" #: resources/templates/resources/tools.html:11 msgid "here" -msgstr "" +msgstr "Hier" #: resources/templates/resources/tools.html:13 msgid "Here are the tools installed on the VM:" -msgstr "" +msgstr "Folgende Werkzeuge sind auf der VM vorinstalliert:" #: resources/templates/resources/tools.html:22 msgid "" -"If you want to solve the challenges on your own machine, we recommend you to " -"use a Linux operating system." +"If you want to solve the challenges on your own machine, we recommend you to use " +"a Linux operating system." msgstr "" +"Falls sie die Herausforderung auf Ihrer eigenen Maschine lösen möchten, " +"empfehlen wir Ihnen einen Linux Betriebssystem zu verwenden." #: resources/templates/resources/tools.html:23 msgid "" "Most of the reverse challenges are ELF binaries and won't run on Mac OS or " "Windows." msgstr "" +"Die meisten Reverse-Engineering Herausforderungen sind ELF-Binärdateien und " +"können auf macOS oder Windows nicht ausgeführt werden." #: resources/templates/resources/tools.html:25 msgid "Additionnaly, you will need the following languages interpreters:" -msgstr "" +msgstr "Zusätzlich, werden sie folgende Skript-Interpreter benötigen:" #: resources/templates/resources/translate.html:7 msgid "Translate 42CTF" -msgstr "" +msgstr "42CTF Übersetzen" #: resources/templates/resources/translate.html:10 msgid "42CTF source code is publicly available on this" -msgstr "" +msgstr "42CTF's Quellcode ist öffentlich zugänglich auf dieser" #: resources/templates/resources/translate.html:11 msgid "" "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." +"contribute if you want to help us, by making the platform always more accessible." msgstr "" +"Übersetzung benötigt keine Programmierkenntnisse und ist ein gute Möglichkeit " +"beizutragen wenn sie uns helfen möchten, indem Sie diese Plattform immer " +"zugänglicher machen." #: resources/templates/resources/translate.html:12 msgid "We have a" -msgstr "" +msgstr "Wir haben einen" +# FIXME: internalization -> internationalization #: resources/templates/resources/translate.html:12 -msgid "" -"describing how to translate pages with the Django internalization module." +msgid "describing how to translate pages with the Django internalization module." msgstr "" +"indem beschrieben wird wie man mit dem Django Internationalisierungsmodul Seiten " +"übersetzt." #: resources/templates/resources/translate.html:13 msgid "" -"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 ;)" +"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 ;)" msgstr "" +"Wir laden Sie dazu ein es zu lesen um alle Einzelheiten zur Kenntnis zu nehmen, " +"doch schrecken Sie sich nicht ab, es ist nichts mehr als Textverarbeitung, keine " +"Programmierkenntnisse sind benötigt ;)" #: resources/templates/resources/translate.html:14 msgid "" -"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." +"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." msgstr "" +"Sie müssen das git Repository forken, Ihre Änderungen tätigen, pushen, und eine " +"Pull Request eröffnen, sodass wir Ihre Beiträge in unsere Repository mergen " +"können." #: resources/templates/resources/translate.html:15 msgid "Don't hesitate to reach for help on" -msgstr "" +msgstr "Zögern Sie nicht, nach Hilfe zu bitten auf" From a5c97c4e38e6d4cbd0f1919d54407c0cf1cc7e81 Mon Sep 17 00:00:00 2001 From: Danhia Date: Fri, 4 Feb 2022 15:28:06 +0100 Subject: [PATCH 26/29] beginning of lang flag refacto --- src/statics/css/style.css | 3 ++- src/templates/base.html | 27 ++++++++++++--------------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/statics/css/style.css b/src/statics/css/style.css index a1dd296..f6e1953 100644 --- a/src/statics/css/style.css +++ b/src/statics/css/style.css @@ -55,6 +55,7 @@ pre { background-color: #1d1d1d; border: none; border-radius: 0; + min-width:inherit; } .dropdown-item { color: #d9d9d9; @@ -385,4 +386,4 @@ footer { .ctf-link:hover { color: #a9a9a9; text-decoration: none; -} \ No newline at end of file +} diff --git a/src/templates/base.html b/src/templates/base.html index e352708..63b3351 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -65,27 +65,24 @@
      - + +
    • {% get_current_language as LANGUAGE_CODE %} + +
      {% get_available_languages as languages %} {% for lang_code, lang_name in languages %} -
    • - + + flag {{ lang_name }} -
      • + + {% endfor %} +
    + {% if request.user.is_authenticated %}
  • {{ request.user.username }} From ae9a28fc8099bd2d3b1c5b205d52fe35833359ba Mon Sep 17 00:00:00 2001 From: ix <0x00fi@protonmail.com> Date: Fri, 4 Feb 2022 15:43:56 +0100 Subject: [PATCH 27/29] fix flags --- src/statics/css/style.css | 3 --- src/templates/base.html | 33 ++++++++++++++++----------------- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/src/statics/css/style.css b/src/statics/css/style.css index f6e1953..402c2e4 100644 --- a/src/statics/css/style.css +++ b/src/statics/css/style.css @@ -68,9 +68,6 @@ pre { padding-right: 15px; padding-left: 15px; } -.flag_link { - margin-right: 6px; -} .flag_img { margin-top: 10px; width: 28px; diff --git a/src/templates/base.html b/src/templates/base.html index 63b3351..bb7938d 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -65,24 +65,23 @@
    • - +
    + {% get_available_languages as languages %} + {% for lang_code, lang_name in languages %} + + + flag {{ lang_name }} + + + + {% endfor %} +
    + {% if request.user.is_authenticated %}
  • {{ request.user.username }} From 5010213a13979947854f12df0ddab892d6e53c33 Mon Sep 17 00:00:00 2001 From: Danhia Date: Fri, 4 Feb 2022 16:04:56 +0100 Subject: [PATCH 28/29] fixed centering flag vertically --- src/templates/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/templates/base.html b/src/templates/base.html index bb7938d..8e97e6d 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -68,7 +68,7 @@
  • {% get_current_language as LANGUAGE_CODE %}
    {% get_available_languages as languages %} From 09cfc722c7423ad069cadbda58d77ab68ac9eb6b Mon Sep 17 00:00:00 2001 From: ix <0x00fi@protonmail.com> Date: Fri, 4 Feb 2022 17:13:50 +0100 Subject: [PATCH 29/29] fix event html --- src/events/templates/events/create_team.html | 50 +++++++++--------- src/events/templates/events/join_team.html | 54 ++++++++++---------- 2 files changed, 54 insertions(+), 50 deletions(-) diff --git a/src/events/templates/events/create_team.html b/src/events/templates/events/create_team.html index 6ca877d..7502624 100644 --- a/src/events/templates/events/create_team.html +++ b/src/events/templates/events/create_team.html @@ -11,26 +11,26 @@
    - {% if logged == True%} + {% if logged == True%} {% if registered == False %} {% trans "You need to be registered to the event." %} {% else %} - {% if exist == True %} - {% trans "Name already taken." %} - {% endif %} + {% if exist == True %} + {% trans "Name already taken." %} + {% endif %}

    Create Team

    - {% csrf_token %} -
    -
    -
    - -
    + {% csrf_token %} +
    +
    +
    + +
    {% endif %} - {% else %} + {% else %}

    {% trans "You need to be logged to access this event." %}

    - {% endif %} + {% endif %}
    @@ -43,19 +43,21 @@ - {% if event.auto_match %} -
      -
      - {%csrf_token%} -
    • - -
      • -
      -
    - {% endif %} + + {% if event.auto_match %} +
      +
    • {% trans "No team yet ?" %}
      • +
      + {%csrf_token%} +
    • + +
      • +
      +
    + {% endif %}
    • {% endblock %} \ No newline at end of file diff --git a/src/events/templates/events/join_team.html b/src/events/templates/events/join_team.html index 005ac19..72f4f4f 100644 --- a/src/events/templates/events/join_team.html +++ b/src/events/templates/events/join_team.html @@ -11,18 +11,18 @@
    - {% if logged == True%} + {% if logged == True%} {% if registered == False %} {% trans "You need to be registered to the event." %} {% else %} - {% if notexist == True %} - {% trans "Team does not exist." %} - {% elif wrongpwd == True %} - {% trans "Wrong password submited." %} - {% elif max == True %} - {% trans "Maximum size reached." %} - {% elif exist == True %} - {% endif %} + {% if notexist == True %} + {% trans "Team does not exist." %} + {% elif wrongpwd == True %} + {% trans "Wrong password submited." %} + {% elif max == True %} + {% trans "Maximum size reached." %} + {% elif exist == True %} + {% endif %}

    Join Team

    {% csrf_token %} @@ -31,11 +31,11 @@
    - + {% endif %} - {% else %} + {% else %}

    {% trans "You need to be logged to access this event." %}

    - {% endif %} + {% endif %}
    @@ -43,24 +43,26 @@
    • {{ event.name }}
      • -
    • {% trans "Starts at" %} : {{ event.start_date | date:'H:i d-m-y' }}
      • -
    • {% trans "Ends at" %} : {{ event.end_date | date:'H:i d-m-y' }}
      • +
    • {% trans "Starts at" %} : {{ event.start_date | date:'H:i d-m-y'}}
      • +
    • {% trans "Ends at" %} : {{ event.end_date | date:'H:i d-m-y'}}
    - {% if event.auto_match %} -
      -
      - {%csrf_token%} -
    • - -
      • -
      -
    - {% endif %} + + {% if event.auto_match %} +
      +
    • {% trans "No team yet ?" %}
      • +
      + {%csrf_token%} +
    • + +
      • +
      +
    + {% endif %}
    {% endblock %} \ No newline at end of file