diff --git a/.gitignore b/.gitignore
index cbe21c30..2ccc42bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,7 +44,8 @@ nosetests.xml
 coverage.xml
 
 # Translations
-*.mo
+# TODO: CTFd 4.0 We should consider generating .mo files in a Docker image instead of saving them in git
+# *.mo
 
 # Django stuff:
 *.log
diff --git a/CTFd/constants/languages.py b/CTFd/constants/languages.py
index fdc36da5..d5b058ba 100644
--- a/CTFd/constants/languages.py
+++ b/CTFd/constants/languages.py
@@ -5,12 +5,16 @@ class Languages(str, RawEnum):
     ENGLISH = "en"
     GERMAN = "de"
     POLISH = "pl"
+    SPANISH = "es"
+    CHINESE = "zh"
 
 
 LANGUAGE_NAMES = {
     "en": "English",
     "de": "Deutsch",
     "pl": "Polski",
+    "es": "Español",
+    "zh": "中文",
 }
 
 SELECT_LANGUAGE_LIST = [("", "")] + [
diff --git a/CTFd/translations/de/LC_MESSAGES/messages.mo b/CTFd/translations/de/LC_MESSAGES/messages.mo
new file mode 100644
index 00000000..910536c1
Binary files /dev/null and b/CTFd/translations/de/LC_MESSAGES/messages.mo differ
diff --git a/CTFd/translations/de/LC_MESSAGES/messages.po b/CTFd/translations/de/LC_MESSAGES/messages.po
index 73880903..a2c999fb 100644
--- a/CTFd/translations/de/LC_MESSAGES/messages.po
+++ b/CTFd/translations/de/LC_MESSAGES/messages.po
@@ -1,23 +1,12 @@
-# German translations for PROJECT.
-# Copyright (C) 2023 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2023.
-#
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2023-05-17 01:38-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language: de\n"
-"Language-Team: de <LL@li.org>\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.12.1\n"
+"X-Generator: POEditor.com\n"
+"Project-Id-Version: CTFd\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: CTFd/forms/auth.py:19 CTFd/forms/self.py:16
 #, fuzzy
@@ -52,7 +41,7 @@ msgstr "Bestätigungsmail erneut senden"
 
 #: CTFd/forms/self.py:18
 msgid "Language"
-msgstr ""
+msgstr "Sprache"
 
 #: CTFd/forms/self.py:20
 #, fuzzy
@@ -116,12 +105,8 @@ msgid "Team Mode"
 msgstr "Mannschaft"
 
 #: CTFd/forms/setup.py:31
-msgid ""
-"Controls whether users join together in teams to play (Team Mode) or play"
-" as themselves (User Mode)"
-msgstr ""
-"Legt fest, ob sich die Benutzer in Teams zusammenschließen (Team-Modus) "
-"oder alleine spielen (Benutzer-Modus)"
+msgid "Controls whether users join together in teams to play (Team Mode) or play as themselves (User Mode)"
+msgstr "Legt fest, ob sich die Benutzer in Teams zusammenschließen (Team-Modus) oder alleine spielen (Benutzer-Modus)"
 
 #: CTFd/forms/setup.py:38
 #, fuzzy
@@ -157,12 +142,8 @@ msgid "Logo"
 msgstr "Ausloggen"
 
 #: CTFd/forms/setup.py:55
-msgid ""
-"Logo to use for the website instead of a CTF name. Used as the home page "
-"button. Optional."
-msgstr ""
-"Logo zur Verwendung für die Website anstelle des CTF-Namens. Wird als "
-"Schaltfläche auf der Startseite verwendet. Optional."
+msgid "Logo to use for the website instead of a CTF name. Used as the home page button. Optional."
+msgstr "Logo zur Verwendung für die Website anstelle des CTF-Namens. Wird als Schaltfläche auf der Startseite verwendet. Optional."
 
 #: CTFd/forms/setup.py:60
 #, fuzzy
@@ -178,12 +159,8 @@ msgid "Small Icon"
 msgstr "Kleine Ikone"
 
 #: CTFd/forms/setup.py:64
-msgid ""
-"favicon used in user's browsers. Only PNGs accepted. Must be 32x32px. "
-"Optional."
-msgstr ""
-"Favicon, das in den Browsern der Benutzer verwendet wird. Nur PNGs werden"
-" akzeptiert. Muss 32x32px groß sein. Optional."
+msgid "favicon used in user's browsers. Only PNGs accepted. Must be 32x32px. Optional."
+msgstr "Favicon, das in den Browsern der Benutzer verwendet wird. Nur PNGs werden akzeptiert. Muss 32x32px groß sein. Optional."
 
 #: CTFd/forms/setup.py:69
 #, fuzzy
@@ -199,12 +176,8 @@ msgid "Theme Color"
 msgstr "Thema Farbe"
 
 #: CTFd/forms/setup.py:77
-msgid ""
-"Color used by theme to control aesthetics. Requires theme support. "
-"Optional."
-msgstr ""
-"Vom Thema verwendete Farbe zur Steuerung der Ästhetik. Erfordert Theme-"
-"Unterstützung. Optional."
+msgid "Color used by theme to control aesthetics. Requires theme support. Optional."
+msgstr "Vom Thema verwendete Farbe zur Steuerung der Ästhetik. Erfordert Theme-Unterstützung. Optional."
 
 #: CTFd/forms/setup.py:83
 msgid "Start Time"
@@ -267,18 +240,12 @@ msgid "Confirm Current Team Password"
 msgstr "Passwort zurücksetzen"
 
 #: CTFd/forms/teams.py:108
-msgid ""
-"Provide your current team password (or your password) to update your "
-"team's password"
-msgstr ""
-"Geben Sie Ihr aktuelles Team-Passwort (oder Ihr Passwort) ein, um das "
-"Passwort Ihres Teams zu aktualisieren"
+msgid "Provide your current team password (or your password) to update your team's password"
+msgstr "Geben Sie Ihr aktuelles Team-Passwort (oder Ihr Passwort) ein, um das Passwort Ihres Teams zu aktualisieren"
 
 #: CTFd/forms/teams.py:114
 msgid "Your team's affiliation publicly shown to other competitors"
-msgstr ""
-"Die Zugehörigkeit Ihres Teams wird für andere Wettbewerber öffentlich "
-"angezeigt"
+msgstr "Die Zugehörigkeit Ihres Teams wird für andere Wettbewerber öffentlich angezeigt"
 
 #: CTFd/forms/teams.py:120
 msgid "Your team's website publicly shown to other competitors"
@@ -330,32 +297,31 @@ msgstr "Suche nach passenden Benutzern"
 
 #: CTFd/themes/core-beta/templates/base.html:49
 msgid "Powered by CTFd"
-msgstr ""
+msgstr "Angetrieben von CTFd"
 
 #: CTFd/themes/core-beta/templates/challenge.html:11
 #: CTFd/themes/core-beta/templates/users/private.html:114
 #: CTFd/themes/core-beta/templates/users/public.html:113
 msgid "Challenge"
-msgstr ""
+msgstr "Herausforderung"
 
 #: CTFd/themes/core-beta/templates/challenge.html:19
-#, fuzzy, python-format
 msgid "%(num)d Solve"
 msgid_plural "%(num)d Solves"
-msgstr[0] ""
+msgstr[0] "%(num)d Lösen"
 msgstr[1] ""
 
 #: CTFd/themes/core-beta/templates/challenge.html:73
 msgid "View Hint"
-msgstr ""
+msgstr "Hinweis anzeigen"
 
 #: CTFd/themes/core-beta/templates/challenge.html:135
 msgid "Flag"
-msgstr ""
+msgstr "Flagge"
 
 #: CTFd/themes/core-beta/templates/challenge.html:167
 msgid "Next Challenge"
-msgstr ""
+msgstr "Nächste Herausforderung"
 
 #: CTFd/themes/core-beta/templates/challenge.html:186
 #: CTFd/themes/core-beta/templates/setup.html:237
@@ -367,29 +333,27 @@ msgstr "Erstellt"
 #: CTFd/themes/core-beta/templates/challenges.html:7
 #: CTFd/themes/core-beta/templates/components/navbar.html:57
 msgid "Challenges"
-msgstr ""
+msgstr "Herausforderungen"
 
 #: CTFd/themes/core-beta/templates/confirm.html:7
 msgid "Confirm"
-msgstr ""
+msgstr "Bestätigen Sie"
 
 #: CTFd/themes/core-beta/templates/confirm.html:18
 msgid "We've sent a confirmation email to your email address."
-msgstr ""
+msgstr "Wir haben eine Bestätigungs-E-Mail an Ihre E-Mail-Adresse geschickt."
 
 #: CTFd/themes/core-beta/templates/confirm.html:24
 msgid "Please click the link in that email to confirm your account."
-msgstr ""
+msgstr "Bitte klicken Sie auf den Link in dieser E-Mail, um Ihr Konto zu bestätigen."
 
 #: CTFd/themes/core-beta/templates/confirm.html:30
-msgid ""
-"If the email doesn’t arrive, check your spam folder or contact an "
-"administrator to manually verify your account."
-msgstr ""
+msgid "If the email doesn’t arrive, check your spam folder or contact an administrator to manually verify your account."
+msgstr "Wenn die E-Mail nicht ankommt, überprüfen Sie Ihren Spam-Ordner oder wenden Sie sich an einen Administrator, um Ihr Konto manuell zu verifizieren."
 
 #: CTFd/themes/core-beta/templates/confirm.html:43
 msgid "Change Email Address"
-msgstr ""
+msgstr "E-Mail Adresse ändern"
 
 #: CTFd/themes/core-beta/templates/components/navbar.html:178
 #: CTFd/themes/core-beta/templates/login.html:7
@@ -399,21 +363,21 @@ msgstr "Ausloggen"
 
 #: CTFd/themes/core-beta/templates/login.html:40
 msgid "Forgot your password?"
-msgstr ""
+msgstr "Haben Sie Ihr Passwort vergessen?"
 
 #: CTFd/themes/core-beta/templates/components/navbar.html:97
 #: CTFd/themes/core-beta/templates/notifications.html:7
 msgid "Notifications"
-msgstr ""
+msgstr "Benachrichtigungen"
 
 #: CTFd/themes/core-beta/templates/notifications.html:14
 msgid "There are no notifications yet"
-msgstr ""
+msgstr "Es liegen noch keine Benachrichtigungen vor"
 
 #: CTFd/themes/core-beta/templates/components/navbar.html:165
 #: CTFd/themes/core-beta/templates/register.html:7
 msgid "Register"
-msgstr ""
+msgstr "Register"
 
 #: CTFd/themes/core-beta/templates/register.html:35
 #, fuzzy
@@ -422,11 +386,11 @@ msgstr "Ihr Benutzername auf der Website"
 
 #: CTFd/themes/core-beta/templates/register.html:43
 msgid "Never shown to the public"
-msgstr ""
+msgstr "Nie der Öffentlichkeit gezeigt"
 
 #: CTFd/themes/core-beta/templates/register.html:51
 msgid "Password used to log into your account"
-msgstr ""
+msgstr "Passwort, mit dem Sie sich bei Ihrem Konto anmelden"
 
 #: CTFd/themes/core-beta/templates/reset_password.html:7
 #, fuzzy
@@ -434,36 +398,34 @@ msgid "Reset Password"
 msgstr "Passwort zurücksetzen"
 
 #: CTFd/themes/core-beta/templates/reset_password.html:21
-msgid ""
-"You can now reset the password for your account and log in. Please enter "
-"in a new password below."
-msgstr ""
+msgid "You can now reset the password for your account and log in. Please enter in a new password below."
+msgstr "Sie können jetzt das Passwort für Ihr Konto zurücksetzen und sich anmelden. Bitte geben Sie unten ein neues Passwort ein."
 
 #: CTFd/themes/core-beta/templates/reset_password.html:44
 msgid "Please provide the email address associated with your account below."
-msgstr ""
+msgstr "Bitte geben Sie die mit Ihrem Konto verbundene E-Mail-Adresse an."
 
 #: CTFd/themes/core-beta/templates/components/navbar.html:135
 #: CTFd/themes/core-beta/templates/settings.html:8
 msgid "Settings"
-msgstr ""
+msgstr "Einstellungen"
 
 #: CTFd/themes/core-beta/templates/components/navbar.html:123
 #: CTFd/themes/core-beta/templates/settings.html:21
 msgid "Profile"
-msgstr ""
+msgstr "Profil"
 
 #: CTFd/themes/core-beta/templates/settings.html:26
 msgid "Access Tokens"
-msgstr ""
+msgstr "Zugangstoken"
 
 #: CTFd/themes/core-beta/templates/settings.html:95
 msgid "Your profile has been updated"
-msgstr ""
+msgstr "Ihr Profil wurde aktualisiert"
 
 #: CTFd/themes/core-beta/templates/settings.html:103
 msgid "Error:"
-msgstr ""
+msgstr "Fehler:"
 
 #: CTFd/themes/core-beta/templates/settings.html:129
 #, fuzzy
@@ -472,19 +434,19 @@ msgstr "Allgemein"
 
 #: CTFd/themes/core-beta/templates/settings.html:137
 msgid "Please copy your API Key, it won't be shown again!"
-msgstr ""
+msgstr "Bitte kopieren Sie Ihren API-Schlüssel, er wird nicht mehr angezeigt!"
 
 #: CTFd/themes/core-beta/templates/settings.html:178
 msgid "Active Tokens"
-msgstr ""
+msgstr "Aktive Token"
 
 #: CTFd/themes/core-beta/templates/settings.html:190
 msgid "Delete Token"
-msgstr ""
+msgstr "Token löschen"
 
 #: CTFd/themes/core-beta/templates/settings.html:199
 msgid "Are you sure you want to delete this token?"
-msgstr ""
+msgstr "Sind Sie sicher, dass Sie dieses Token löschen wollen?"
 
 #: CTFd/themes/core-beta/templates/settings.html:219
 #, fuzzy
@@ -493,11 +455,11 @@ msgstr "Erstellt"
 
 #: CTFd/themes/core-beta/templates/settings.html:221
 msgid "Delete"
-msgstr ""
+msgstr "Löschen"
 
 #: CTFd/themes/core-beta/templates/setup.html:24
 msgid "Setup"
-msgstr ""
+msgstr "Einrichtung"
 
 #: CTFd/themes/core-beta/templates/setup.html:44
 #, fuzzy
@@ -516,11 +478,11 @@ msgstr "Zugehörigkeit"
 
 #: CTFd/themes/core-beta/templates/setup.html:53
 msgid "Style"
-msgstr ""
+msgstr "Stil"
 
 #: CTFd/themes/core-beta/templates/setup.html:56
 msgid "Date &amp; Time"
-msgstr ""
+msgstr "Datum &amp; Uhrzeit"
 
 #: CTFd/themes/core-beta/templates/setup.html:59
 #, fuzzy
@@ -529,39 +491,39 @@ msgstr "Ablauf"
 
 #: CTFd/themes/core-beta/templates/setup.html:108
 msgid "Participants register accounts and form teams"
-msgstr ""
+msgstr "Teilnehmer registrieren Konten und bilden Teams"
 
 #: CTFd/themes/core-beta/templates/setup.html:109
 msgid "If a team member solves a challenge, the entire team receives credit"
-msgstr ""
+msgstr "Wenn ein Teammitglied eine Aufgabe löst, erhält das gesamte Team eine Anerkennung."
 
 #: CTFd/themes/core-beta/templates/setup.html:111
 msgid "Easier to see which team member solved a challenge"
-msgstr ""
+msgstr "Leichter zu erkennen, welches Teammitglied eine Aufgabe gelöst hat"
 
 #: CTFd/themes/core-beta/templates/setup.html:112
 msgid "May be slightly more difficult to administer"
-msgstr ""
+msgstr "Kann etwas schwieriger zu verabreichen sein"
 
 #: CTFd/themes/core-beta/templates/setup.html:116
 msgid "Participants only register an individual account"
-msgstr ""
+msgstr "Teilnehmer registrieren nur ein individuelles Konto"
 
 #: CTFd/themes/core-beta/templates/setup.html:117
 msgid "Players can share accounts to form pseudo-teams"
-msgstr ""
+msgstr "Spieler können Konten teilen, um Pseudo-Teams zu bilden"
 
 #: CTFd/themes/core-beta/templates/setup.html:119
 msgid "Easier to organize"
-msgstr ""
+msgstr "Leichter zu organisieren"
 
 #: CTFd/themes/core-beta/templates/setup.html:120
 msgid "Difficult to attribute solutions to individual team members"
-msgstr ""
+msgstr "Es ist schwierig, Lösungen einzelnen Teammitgliedern zuzuordnen"
 
 #: CTFd/themes/core-beta/templates/setup.html:164
 msgid "Subscribe email address to the CTFd LLC Newsletter for news and updates"
-msgstr ""
+msgstr "Abonnieren Sie den Newsletter der CTFd LLC für Neuigkeiten und Updates"
 
 #: CTFd/themes/core-beta/templates/setup.html:241
 #: CTFd/themes/core-beta/templates/setup.html:262
@@ -573,7 +535,7 @@ msgstr "Zeit"
 
 #: CTFd/themes/core-beta/templates/setup.html:266
 msgid "UTC Preview"
-msgstr ""
+msgstr "UTC-Vorschau"
 
 #: CTFd/themes/core-beta/templates/components/navbar.html:34
 #: CTFd/themes/core-beta/templates/users/users.html:6
@@ -589,7 +551,7 @@ msgstr "Mannschaft"
 
 #: CTFd/themes/core-beta/templates/components/navbar.html:50
 msgid "Scoreboard"
-msgstr ""
+msgstr "Anzeiger"
 
 #: CTFd/themes/core-beta/templates/components/navbar.html:80
 #, fuzzy
@@ -615,28 +577,28 @@ msgstr "Verboten"
 
 #: CTFd/themes/core-beta/templates/errors/404.html:11
 msgid "File not found"
-msgstr ""
+msgstr "Datei nicht gefunden"
 
 #: CTFd/themes/core-beta/templates/errors/404.html:12
 msgid "Sorry about that"
-msgstr ""
+msgstr "Das tut mir leid."
 
 #: CTFd/themes/core-beta/templates/errors/429.html:11
 msgid "Too many requests"
-msgstr ""
+msgstr "Zu viele Anfragen"
 
 #: CTFd/themes/core-beta/templates/errors/429.html:12
 msgid "Please slow down!"
-msgstr ""
+msgstr "Bitte langsamer fahren!"
 
 #: CTFd/themes/core-beta/templates/errors/502.html:11
 msgid "Bad Gateway"
-msgstr ""
+msgstr "Schlechtes Tor"
 
 #: CTFd/themes/core-beta/templates/macros/forms.html:13
 #: CTFd/themes/core-beta/templates/macros/forms.html:36
 msgid "(Optional)"
-msgstr ""
+msgstr "(fakultativ)"
 
 #: CTFd/themes/core-beta/templates/teams/invite.html:6
 #: CTFd/themes/core-beta/templates/teams/join_team.html:6
@@ -648,11 +610,11 @@ msgstr "Mannschaft"
 #: CTFd/themes/core-beta/templates/teams/invite.html:15
 #: CTFd/themes/core-beta/templates/teams/team_enrollment.html:12
 msgid "Welcome to"
-msgstr ""
+msgstr "Willkommen bei"
 
 #: CTFd/themes/core-beta/templates/teams/invite.html:19
 msgid "Click the button below to join the team!"
-msgstr ""
+msgstr "Klicken Sie auf die Schaltfläche unten, um dem Team beizutreten!"
 
 #: CTFd/themes/core-beta/templates/teams/new_team.html:6
 #: CTFd/themes/core-beta/templates/teams/team_enrollment.html:39
@@ -662,54 +624,54 @@ msgstr "Erstellt"
 
 #: CTFd/themes/core-beta/templates/teams/team_enrollment.html:14
 msgid "In order to participate you must either join or create a team."
-msgstr ""
+msgstr "Um teilnehmen zu können, müssen Sie entweder einem Team beitreten oder ein Team gründen."
 
 #: CTFd/themes/core-beta/templates/teams/team_enrollment.html:22
 msgid "Play with Official Team"
-msgstr ""
+msgstr "Mit offizieller Mannschaft spielen"
 
 #: CTFd/themes/core-beta/templates/teams/team_enrollment.html:27
 msgid "Join Unofficial Team"
-msgstr ""
+msgstr "Dem inoffiziellen Team beitreten"
 
 #: CTFd/themes/core-beta/templates/teams/team_enrollment.html:30
 msgid "Create Unofficial Team"
-msgstr ""
+msgstr "Inoffizielles Team erstellen"
 
 #: CTFd/themes/core-beta/templates/teams/teams.html:124
 #: CTFd/themes/core-beta/templates/users/users.html:114
 msgid "Page"
-msgstr ""
+msgstr "Seite"
 
 #: CTFd/themes/core-beta/templates/users/private.html:21
 #: CTFd/themes/core-beta/templates/users/public.html:21
 #: CTFd/themes/core-beta/templates/users/users.html:66
 msgid "Official"
-msgstr ""
+msgstr "Offiziell"
 
 #: CTFd/themes/core-beta/templates/users/private.html:88
 #: CTFd/themes/core-beta/templates/users/public.html:88
 msgid "Awards"
-msgstr ""
+msgstr "Auszeichnungen"
 
 #: CTFd/themes/core-beta/templates/users/private.html:110
 msgid "Solves"
-msgstr ""
+msgstr "Löst"
 
 #: CTFd/themes/core-beta/templates/users/private.html:115
 #: CTFd/themes/core-beta/templates/users/public.html:114
 msgid "Category"
-msgstr ""
+msgstr "Kategorie"
 
 #: CTFd/themes/core-beta/templates/users/private.html:116
 #: CTFd/themes/core-beta/templates/users/public.html:115
 msgid "Value"
-msgstr ""
+msgstr "Wert"
 
 #: CTFd/themes/core-beta/templates/users/private.html:203
 #: CTFd/themes/core-beta/templates/users/public.html:204
 msgid "No solves yet"
-msgstr ""
+msgstr "Noch keine Lösungen"
 
 #: CTFd/themes/core-beta/templates/users/users.html:46
 #, fuzzy
diff --git a/CTFd/translations/es/LC_MESSAGES/messages.mo b/CTFd/translations/es/LC_MESSAGES/messages.mo
new file mode 100644
index 00000000..eb2cc15b
Binary files /dev/null and b/CTFd/translations/es/LC_MESSAGES/messages.mo differ
diff --git a/CTFd/translations/es/LC_MESSAGES/messages.po b/CTFd/translations/es/LC_MESSAGES/messages.po
new file mode 100644
index 00000000..db42fd34
--- /dev/null
+++ b/CTFd/translations/es/LC_MESSAGES/messages.po
@@ -0,0 +1,647 @@
+msgid ""
+msgstr ""
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: POEditor.com\n"
+"Project-Id-Version: CTFd\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: CTFd/forms/auth.py:19 CTFd/forms/self.py:16
+msgid "User Name"
+msgstr "Nombre de usuario"
+
+#: CTFd/forms/auth.py:21 CTFd/forms/auth.py:53 CTFd/forms/self.py:17
+#: CTFd/forms/teams.py:203
+msgid "Email"
+msgstr "Correo electrónico"
+
+#: CTFd/forms/auth.py:22 CTFd/forms/auth.py:43 CTFd/forms/auth.py:60
+#: CTFd/forms/self.py:19 CTFd/forms/teams.py:204
+msgid "Password"
+msgstr "Contraseña"
+
+#: CTFd/forms/auth.py:23 CTFd/forms/auth.py:44 CTFd/forms/auth.py:55
+#: CTFd/forms/auth.py:62 CTFd/forms/self.py:24 CTFd/forms/teams.py:127
+#: CTFd/forms/teams.py:210 CTFd/themes/core-beta/templates/challenge.html:147
+msgid "Submit"
+msgstr "Enviar"
+
+#: CTFd/forms/auth.py:39
+msgid "User Name or Email"
+msgstr "Nombre de usuario o correo electrónico"
+
+#: CTFd/forms/auth.py:48
+msgid "Resend Confirmation Email"
+msgstr "Reenviar correo de confirmación"
+
+#: CTFd/forms/self.py:18
+msgid "Language"
+msgstr "Idioma"
+
+#: CTFd/forms/self.py:20
+msgid "Current Password"
+msgstr "Contraseña actual"
+
+#: CTFd/forms/self.py:21 CTFd/forms/teams.py:113 CTFd/forms/teams.py:191
+#: CTFd/forms/teams.py:206 CTFd/forms/users.py:137
+#: CTFd/themes/core-beta/templates/teams/teams.html:51
+#: CTFd/themes/core-beta/templates/users/users.html:48
+msgid "Affiliation"
+msgstr "Afiliación"
+
+#: CTFd/forms/self.py:22 CTFd/forms/teams.py:119 CTFd/forms/teams.py:192
+#: CTFd/forms/teams.py:205 CTFd/forms/users.py:138
+#: CTFd/themes/core-beta/templates/teams/teams.html:50
+#: CTFd/themes/core-beta/templates/users/users.html:47
+msgid "Website"
+msgstr "Página web"
+
+#: CTFd/forms/self.py:23 CTFd/forms/teams.py:123 CTFd/forms/teams.py:207
+#: CTFd/themes/core-beta/templates/teams/teams.html:52
+#: CTFd/themes/core-beta/templates/users/users.html:49
+msgid "Country"
+msgstr "País"
+
+#: CTFd/forms/self.py:52 CTFd/themes/core-beta/templates/settings.html:220
+msgid "Expiration"
+msgstr "Caducidad"
+
+#: CTFd/forms/self.py:53
+msgid "Generate"
+msgstr "Genere"
+
+#: CTFd/forms/setup.py:22
+msgid "Event Name"
+msgstr "Nombre del evento"
+
+#: CTFd/forms/setup.py:22
+msgid "The name of your CTF event/workshop"
+msgstr "El nombre de su evento/taller CTF"
+
+#: CTFd/forms/setup.py:25
+msgid "Event Description"
+msgstr "Descripción del evento"
+
+#: CTFd/forms/setup.py:25
+msgid "Description for the CTF"
+msgstr "Descripción de la FPC"
+
+#: CTFd/forms/setup.py:28 CTFd/forms/setup.py:29
+msgid "User Mode"
+msgstr "Modo Usuario"
+
+#: CTFd/forms/setup.py:29
+msgid "Team Mode"
+msgstr "Modo equipo"
+
+#: CTFd/forms/setup.py:31
+msgid "Controls whether users join together in teams to play (Team Mode) or play as themselves (User Mode)"
+msgstr "Controla si los usuarios se unen en equipos para jugar (Modo Equipo) o juegan como ellos mismos (Modo Usuario)."
+
+#: CTFd/forms/setup.py:38
+msgid "Admin Username"
+msgstr "Nombre de usuario"
+
+#: CTFd/forms/setup.py:39
+msgid "Your username for the administration account"
+msgstr "Su nombre de usuario para la cuenta de administración"
+
+#: CTFd/forms/setup.py:43
+msgid "Admin Email"
+msgstr "Correo electrónico del administrador"
+
+#: CTFd/forms/setup.py:44
+msgid "Your email address for the administration account"
+msgstr "Su dirección de correo electrónico para la cuenta de administración"
+
+#: CTFd/forms/setup.py:48
+msgid "Admin Password"
+msgstr "Contraseña de administrador"
+
+#: CTFd/forms/setup.py:49
+msgid "Your password for the administration account"
+msgstr "Su contraseña para la cuenta de administración"
+
+#: CTFd/forms/setup.py:54
+msgid "Logo"
+msgstr "Logotipo"
+
+#: CTFd/forms/setup.py:55
+msgid "Logo to use for the website instead of a CTF name. Used as the home page button. Optional."
+msgstr "Logotipo para utilizar en el sitio web en lugar del nombre de la CTF. Se utiliza como botón de la página de inicio. Opcional."
+
+#: CTFd/forms/setup.py:60
+msgid "Banner"
+msgstr "Banner"
+
+#: CTFd/forms/setup.py:60
+msgid "Banner to use for the homepage. Optional."
+msgstr "Banner a utilizar para la página de inicio. Opcional."
+
+#: CTFd/forms/setup.py:63
+msgid "Small Icon"
+msgstr "Icono pequeño"
+
+#: CTFd/forms/setup.py:64
+msgid "favicon used in user's browsers. Only PNGs accepted. Must be 32x32px. Optional."
+msgstr "favicon utilizado en los navegadores de los usuarios. Sólo se aceptan PNG. Debe ser de 32x32px. Opcional."
+
+#: CTFd/forms/setup.py:69
+msgid "Theme"
+msgstr "Tema"
+
+#: CTFd/forms/setup.py:70
+msgid "CTFd Theme to use. Can be changed later."
+msgstr "CTFd Tema a utilizar. Se puede cambiar más tarde."
+
+#: CTFd/forms/setup.py:76
+msgid "Theme Color"
+msgstr "Tema Color"
+
+#: CTFd/forms/setup.py:77
+msgid "Color used by theme to control aesthetics. Requires theme support. Optional."
+msgstr "Color utilizado por el tema para controlar la estética. Requiere soporte de tema. Opcional."
+
+#: CTFd/forms/setup.py:83
+msgid "Start Time"
+msgstr "Hora de inicio"
+
+#: CTFd/forms/setup.py:84
+msgid "Time when your CTF is scheduled to start. Optional."
+msgstr "Hora a la que está previsto que comience tu CTF. Opcional."
+
+#: CTFd/forms/setup.py:87
+msgid "End Time"
+msgstr "Fin de los tiempos"
+
+#: CTFd/forms/setup.py:88
+msgid "Time when your CTF is scheduled to end. Optional."
+msgstr "Hora a la que está previsto que finalice tu CTF. Opcional."
+
+#: CTFd/forms/setup.py:90
+msgid "Finish"
+msgstr "Acabado"
+
+#: CTFd/forms/teams.py:76 CTFd/forms/teams.py:83 CTFd/forms/teams.py:100
+#: CTFd/forms/teams.py:202
+msgid "Team Name"
+msgstr "Nombre del equipo"
+
+#: CTFd/forms/teams.py:77 CTFd/forms/teams.py:84
+msgid "Team Password"
+msgstr "Contraseña del equipo"
+
+#: CTFd/forms/teams.py:78 CTFd/forms/teams.py:258
+msgid "Join"
+msgstr "Únete a"
+
+#: CTFd/forms/teams.py:85
+msgid "Create"
+msgstr "Cree"
+
+#: CTFd/forms/teams.py:101
+msgid "Your team's public name shown to other competitors"
+msgstr "El nombre público de tu equipo se muestra a otros competidores"
+
+#: CTFd/forms/teams.py:104
+msgid "New Team Password"
+msgstr "Nueva contraseña del equipo"
+
+#: CTFd/forms/teams.py:104
+msgid "Set a new team join password"
+msgstr "Establecer una nueva contraseña para unirse al equipo"
+
+#: CTFd/forms/teams.py:107
+msgid "Confirm Current Team Password"
+msgstr "Confirmar la contraseña actual del equipo"
+
+#: CTFd/forms/teams.py:108
+msgid "Provide your current team password (or your password) to update your team's password"
+msgstr "Proporcione la contraseña actual de su equipo (o su contraseña) para actualizar la contraseña de su equipo"
+
+#: CTFd/forms/teams.py:114
+msgid "Your team's affiliation publicly shown to other competitors"
+msgstr "La afiliación de tu equipo se muestra públicamente a otros competidores"
+
+#: CTFd/forms/teams.py:120
+msgid "Your team's website publicly shown to other competitors"
+msgstr "El sitio web de su equipo se muestra públicamente a otros competidores"
+
+#: CTFd/forms/teams.py:125
+msgid "Your team's country publicly shown to other competitors"
+msgstr "El país de tu equipo se muestra públicamente a los demás competidores"
+
+#: CTFd/forms/teams.py:165
+msgid "Team Captain"
+msgstr "Capitán del equipo"
+
+#: CTFd/forms/teams.py:188 CTFd/forms/users.py:134
+msgid "Search Field"
+msgstr "Campo de búsqueda"
+
+#: CTFd/forms/teams.py:190 CTFd/forms/users.py:136
+#: CTFd/themes/core-beta/templates/challenge.html:183
+msgid "Name"
+msgstr "Nombre"
+
+#: CTFd/forms/teams.py:197 CTFd/forms/users.py:144
+msgid "Parameter"
+msgstr "Parámetro"
+
+#: CTFd/forms/teams.py:198 CTFd/forms/users.py:148
+msgid "Search"
+msgstr "Buscar en"
+
+#: CTFd/forms/teams.py:208
+msgid "Hidden"
+msgstr "Oculto"
+
+#: CTFd/forms/teams.py:209
+msgid "Banned"
+msgstr "Prohibido"
+
+#: CTFd/forms/teams.py:254
+msgid "Invite Link"
+msgstr "Enlace de invitación"
+
+#: CTFd/forms/users.py:145
+msgid "Search for matching users"
+msgstr "Buscar usuarios coincidentes"
+
+#: CTFd/themes/core-beta/templates/base.html:49
+msgid "Powered by CTFd"
+msgstr "Desarrollado por CTFd"
+
+#: CTFd/themes/core-beta/templates/challenge.html:11
+#: CTFd/themes/core-beta/templates/users/private.html:114
+#: CTFd/themes/core-beta/templates/users/public.html:113
+msgid "Challenge"
+msgstr "Desafío"
+
+#: CTFd/themes/core-beta/templates/challenge.html:19
+msgid "%(num)d Solve"
+msgid_plural "%(num)d Solves"
+msgstr[0] "%(num)d Resolver"
+msgstr[1] ""
+
+#: CTFd/themes/core-beta/templates/challenge.html:73
+msgid "View Hint"
+msgstr "Ver pista"
+
+#: CTFd/themes/core-beta/templates/challenge.html:135
+msgid "Flag"
+msgstr "Bandera"
+
+#: CTFd/themes/core-beta/templates/challenge.html:167
+msgid "Next Challenge"
+msgstr "Próximo reto"
+
+#: CTFd/themes/core-beta/templates/challenge.html:186
+#: CTFd/themes/core-beta/templates/setup.html:237
+#: CTFd/themes/core-beta/templates/setup.html:258
+msgid "Date"
+msgstr "Fecha"
+
+#: CTFd/themes/core-beta/templates/challenges.html:7
+#: CTFd/themes/core-beta/templates/components/navbar.html:57
+msgid "Challenges"
+msgstr "Desafíos"
+
+#: CTFd/themes/core-beta/templates/confirm.html:7
+msgid "Confirm"
+msgstr "Confirme"
+
+#: CTFd/themes/core-beta/templates/confirm.html:18
+msgid "We've sent a confirmation email to your email address."
+msgstr "Hemos enviado un mensaje de confirmación a tu dirección de correo electrónico."
+
+#: CTFd/themes/core-beta/templates/confirm.html:24
+msgid "Please click the link in that email to confirm your account."
+msgstr "Haga clic en el enlace de ese correo electrónico para confirmar su cuenta."
+
+#: CTFd/themes/core-beta/templates/confirm.html:30
+msgid "If the email doesn’t arrive, check your spam folder or contact an administrator to manually verify your account."
+msgstr "Si el correo electrónico no llega, compruebe su carpeta de correo no deseado o póngase en contacto con un administrador para verificar manualmente su cuenta."
+
+#: CTFd/themes/core-beta/templates/confirm.html:43
+msgid "Change Email Address"
+msgstr "Cambiar la dirección de correo electrónico"
+
+#: CTFd/themes/core-beta/templates/components/navbar.html:178
+#: CTFd/themes/core-beta/templates/login.html:7
+msgid "Login"
+msgstr "Inicio de sesión"
+
+#: CTFd/themes/core-beta/templates/login.html:40
+msgid "Forgot your password?"
+msgstr "¿Ha olvidado su contraseña?"
+
+#: CTFd/themes/core-beta/templates/components/navbar.html:97
+#: CTFd/themes/core-beta/templates/notifications.html:7
+msgid "Notifications"
+msgstr "Notificaciones"
+
+#: CTFd/themes/core-beta/templates/notifications.html:14
+msgid "There are no notifications yet"
+msgstr "Aún no hay notificaciones"
+
+#: CTFd/themes/core-beta/templates/components/navbar.html:165
+#: CTFd/themes/core-beta/templates/register.html:7
+msgid "Register"
+msgstr "Regístrese en"
+
+#: CTFd/themes/core-beta/templates/register.html:35
+msgid "Your username on the site"
+msgstr "Su nombre de usuario en el sitio"
+
+#: CTFd/themes/core-beta/templates/register.html:43
+msgid "Never shown to the public"
+msgstr "Nunca se muestra al público"
+
+#: CTFd/themes/core-beta/templates/register.html:51
+msgid "Password used to log into your account"
+msgstr "Contraseña utilizada para acceder a su cuenta"
+
+#: CTFd/themes/core-beta/templates/reset_password.html:7
+msgid "Reset Password"
+msgstr "Restablecer contraseña"
+
+#: CTFd/themes/core-beta/templates/reset_password.html:21
+msgid "You can now reset the password for your account and log in. Please enter in a new password below."
+msgstr "Ahora puede restablecer la contraseña de su cuenta e iniciar sesión. Introduzca una nueva contraseña a continuación."
+
+#: CTFd/themes/core-beta/templates/reset_password.html:44
+msgid "Please provide the email address associated with your account below."
+msgstr "Indique a continuación la dirección de correo electrónico asociada a su cuenta."
+
+#: CTFd/themes/core-beta/templates/components/navbar.html:135
+#: CTFd/themes/core-beta/templates/settings.html:8
+msgid "Settings"
+msgstr "Ajustes"
+
+#: CTFd/themes/core-beta/templates/components/navbar.html:123
+#: CTFd/themes/core-beta/templates/settings.html:21
+msgid "Profile"
+msgstr "Perfil"
+
+#: CTFd/themes/core-beta/templates/settings.html:26
+msgid "Access Tokens"
+msgstr "Fichas de acceso"
+
+#: CTFd/themes/core-beta/templates/settings.html:95
+msgid "Your profile has been updated"
+msgstr "Su perfil ha sido actualizado"
+
+#: CTFd/themes/core-beta/templates/settings.html:103
+msgid "Error:"
+msgstr "Error:"
+
+#: CTFd/themes/core-beta/templates/settings.html:129
+msgid "API Key Generated"
+msgstr "Clave API generada"
+
+#: CTFd/themes/core-beta/templates/settings.html:137
+msgid "Please copy your API Key, it won't be shown again!"
+msgstr "Por favor, copie su clave API, ¡no se volverá a mostrar!"
+
+#: CTFd/themes/core-beta/templates/settings.html:178
+msgid "Active Tokens"
+msgstr "Fichas activas"
+
+#: CTFd/themes/core-beta/templates/settings.html:190
+msgid "Delete Token"
+msgstr "Borrar token"
+
+#: CTFd/themes/core-beta/templates/settings.html:199
+msgid "Are you sure you want to delete this token?"
+msgstr "¿Estás seguro de que quieres borrar este token?"
+
+#: CTFd/themes/core-beta/templates/settings.html:219
+msgid "Created"
+msgstr "Creado"
+
+#: CTFd/themes/core-beta/templates/settings.html:221
+msgid "Delete"
+msgstr "Borrar"
+
+#: CTFd/themes/core-beta/templates/setup.html:24
+msgid "Setup"
+msgstr "Configurar"
+
+#: CTFd/themes/core-beta/templates/setup.html:44
+msgid "General"
+msgstr "General"
+
+#: CTFd/themes/core-beta/templates/setup.html:47
+msgid "Mode"
+msgstr "Modo"
+
+#: CTFd/themes/core-beta/templates/setup.html:50
+msgid "Administration"
+msgstr "Administración"
+
+#: CTFd/themes/core-beta/templates/setup.html:53
+msgid "Style"
+msgstr "Estilo"
+
+#: CTFd/themes/core-beta/templates/setup.html:56
+msgid "Date &amp; Time"
+msgstr "Fecha &amp; Hora"
+
+#: CTFd/themes/core-beta/templates/setup.html:59
+msgid "Integrations"
+msgstr "Integraciones"
+
+#: CTFd/themes/core-beta/templates/setup.html:108
+msgid "Participants register accounts and form teams"
+msgstr "Los participantes registran sus cuentas y forman equipos"
+
+#: CTFd/themes/core-beta/templates/setup.html:109
+msgid "If a team member solves a challenge, the entire team receives credit"
+msgstr "Si un miembro del equipo resuelve un reto, todo el equipo recibe créditos"
+
+#: CTFd/themes/core-beta/templates/setup.html:111
+msgid "Easier to see which team member solved a challenge"
+msgstr "Es más fácil ver qué miembro del equipo ha resuelto un reto"
+
+#: CTFd/themes/core-beta/templates/setup.html:112
+msgid "May be slightly more difficult to administer"
+msgstr "Puede ser ligeramente más difícil de administrar"
+
+#: CTFd/themes/core-beta/templates/setup.html:116
+msgid "Participants only register an individual account"
+msgstr "Los participantes sólo registran una cuenta individual"
+
+#: CTFd/themes/core-beta/templates/setup.html:117
+msgid "Players can share accounts to form pseudo-teams"
+msgstr "Los jugadores pueden compartir cuentas para formar pseudoequipos"
+
+#: CTFd/themes/core-beta/templates/setup.html:119
+msgid "Easier to organize"
+msgstr "Más fácil de organizar"
+
+#: CTFd/themes/core-beta/templates/setup.html:120
+msgid "Difficult to attribute solutions to individual team members"
+msgstr "Dificultad para atribuir soluciones a miembros individuales del equipo"
+
+#: CTFd/themes/core-beta/templates/setup.html:164
+msgid "Subscribe email address to the CTFd LLC Newsletter for news and updates"
+msgstr "Suscriba su dirección de correo electrónico al boletín de CTFd LLC para recibir noticias y actualizaciones"
+
+#: CTFd/themes/core-beta/templates/setup.html:241
+#: CTFd/themes/core-beta/templates/setup.html:262
+#: CTFd/themes/core-beta/templates/users/private.html:117
+#: CTFd/themes/core-beta/templates/users/public.html:116
+msgid "Time"
+msgstr "Tiempo"
+
+#: CTFd/themes/core-beta/templates/setup.html:266
+msgid "UTC Preview"
+msgstr "Avance de la UTC"
+
+#: CTFd/themes/core-beta/templates/components/navbar.html:34
+#: CTFd/themes/core-beta/templates/users/users.html:6
+msgid "Users"
+msgstr "Usuarios"
+
+#: CTFd/themes/core-beta/templates/components/navbar.html:41
+#: CTFd/themes/core-beta/templates/teams/teams.html:6
+msgid "Teams"
+msgstr "Equipos"
+
+#: CTFd/themes/core-beta/templates/components/navbar.html:50
+msgid "Scoreboard"
+msgstr "Marcador"
+
+#: CTFd/themes/core-beta/templates/components/navbar.html:80
+msgid "Admin Panel"
+msgstr "Panel de administración"
+
+#: CTFd/themes/core-beta/templates/components/navbar.html:110
+#: CTFd/themes/core-beta/templates/teams/team_enrollment.html:6
+#: CTFd/themes/core-beta/templates/teams/teams.html:49
+msgid "Team"
+msgstr "Equipo"
+
+#: CTFd/themes/core-beta/templates/components/navbar.html:147
+msgid "Logout"
+msgstr "Cierre de sesión"
+
+#: CTFd/themes/core-beta/templates/errors/403.html:9
+msgid "Forbidden"
+msgstr "Prohibido"
+
+#: CTFd/themes/core-beta/templates/errors/404.html:11
+msgid "File not found"
+msgstr "Archivo no encontrado"
+
+#: CTFd/themes/core-beta/templates/errors/404.html:12
+msgid "Sorry about that"
+msgstr "Lo siento."
+
+#: CTFd/themes/core-beta/templates/errors/429.html:11
+msgid "Too many requests"
+msgstr "Demasiadas solicitudes"
+
+#: CTFd/themes/core-beta/templates/errors/429.html:12
+msgid "Please slow down!"
+msgstr "¡Por favor, más despacio!"
+
+#: CTFd/themes/core-beta/templates/errors/502.html:11
+msgid "Bad Gateway"
+msgstr "Puerta mala"
+
+#: CTFd/themes/core-beta/templates/macros/forms.html:13
+#: CTFd/themes/core-beta/templates/macros/forms.html:36
+msgid "(Optional)"
+msgstr "(Opcional)"
+
+#: CTFd/themes/core-beta/templates/teams/invite.html:6
+#: CTFd/themes/core-beta/templates/teams/join_team.html:6
+#: CTFd/themes/core-beta/templates/teams/team_enrollment.html:36
+msgid "Join Team"
+msgstr "Únete al equipo"
+
+#: CTFd/themes/core-beta/templates/teams/invite.html:15
+#: CTFd/themes/core-beta/templates/teams/team_enrollment.html:12
+msgid "Welcome to"
+msgstr "Bienvenido a"
+
+#: CTFd/themes/core-beta/templates/teams/invite.html:19
+msgid "Click the button below to join the team!"
+msgstr "Haga clic en el botón de abajo para unirse al equipo."
+
+#: CTFd/themes/core-beta/templates/teams/new_team.html:6
+#: CTFd/themes/core-beta/templates/teams/team_enrollment.html:39
+msgid "Create Team"
+msgstr "Crear equipo"
+
+#: CTFd/themes/core-beta/templates/teams/team_enrollment.html:14
+msgid "In order to participate you must either join or create a team."
+msgstr "Para participar debes unirte o crear un equipo."
+
+#: CTFd/themes/core-beta/templates/teams/team_enrollment.html:22
+msgid "Play with Official Team"
+msgstr "Jugar con el equipo oficial"
+
+#: CTFd/themes/core-beta/templates/teams/team_enrollment.html:27
+msgid "Join Unofficial Team"
+msgstr "Únete al equipo no oficial"
+
+#: CTFd/themes/core-beta/templates/teams/team_enrollment.html:30
+msgid "Create Unofficial Team"
+msgstr "Crear equipo no oficial"
+
+#: CTFd/themes/core-beta/templates/teams/teams.html:124
+#: CTFd/themes/core-beta/templates/users/users.html:114
+msgid "Page"
+msgstr "Página"
+
+#: CTFd/themes/core-beta/templates/users/private.html:21
+#: CTFd/themes/core-beta/templates/users/public.html:21
+#: CTFd/themes/core-beta/templates/users/users.html:66
+msgid "Official"
+msgstr "Oficial"
+
+#: CTFd/themes/core-beta/templates/users/private.html:88
+#: CTFd/themes/core-beta/templates/users/public.html:88
+msgid "Awards"
+msgstr "Premios"
+
+#: CTFd/themes/core-beta/templates/users/private.html:110
+msgid "Solves"
+msgstr "Resuelve"
+
+#: CTFd/themes/core-beta/templates/users/private.html:115
+#: CTFd/themes/core-beta/templates/users/public.html:114
+msgid "Category"
+msgstr "Categoría"
+
+#: CTFd/themes/core-beta/templates/users/private.html:116
+#: CTFd/themes/core-beta/templates/users/public.html:115
+msgid "Value"
+msgstr "Valor"
+
+#: CTFd/themes/core-beta/templates/users/private.html:203
+#: CTFd/themes/core-beta/templates/users/public.html:204
+msgid "No solves yet"
+msgstr "Aún no hay soluciones"
+
+#: CTFd/themes/core-beta/templates/users/users.html:46
+msgid "User"
+msgstr "Usuario"
+
+#: CTFd/utils/modes/__init__.py:35
+msgid "user"
+msgid_plural "users"
+msgstr[0] "usuario"
+msgstr[1] ""
+
+#: CTFd/utils/modes/__init__.py:37
+msgid "team"
+msgid_plural "teams"
+msgstr[0] "equipo"
+msgstr[1] ""
+
diff --git a/CTFd/translations/pl/LC_MESSAGES/messages.mo b/CTFd/translations/pl/LC_MESSAGES/messages.mo
new file mode 100644
index 00000000..4a21774f
Binary files /dev/null and b/CTFd/translations/pl/LC_MESSAGES/messages.mo differ
diff --git a/CTFd/translations/pl/LC_MESSAGES/messages.po b/CTFd/translations/pl/LC_MESSAGES/messages.po
index 6722c262..628ceaca 100644
--- a/CTFd/translations/pl/LC_MESSAGES/messages.po
+++ b/CTFd/translations/pl/LC_MESSAGES/messages.po
@@ -1,24 +1,12 @@
-# Polish translations for PROJECT.
-# Copyright (C) 2023 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2023.
-#
 msgid ""
 msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2023-05-17 01:38-0400\n"
-"PO-Revision-Date: 2023-05-17 01:52-0400\n"
-"Last-Translator: \n"
-"Language-Team: pl <LL@li.org>\n"
-"Language: pl\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
-"Generated-By: Babel 2.12.1\n"
-"X-Generator: Poedit 3.3.1\n"
+"X-Generator: POEditor.com\n"
+"Project-Id-Version: CTFd\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: CTFd/forms/auth.py:19 CTFd/forms/self.py:16
 msgid "User Name"
@@ -109,12 +97,8 @@ msgid "Team Mode"
 msgstr "Tryb zespołowy"
 
 #: CTFd/forms/setup.py:31
-msgid ""
-"Controls whether users join together in teams to play (Team Mode) or play as "
-"themselves (User Mode)"
-msgstr ""
-"Kontroluje czy użytkownicy grają razem w zespołach (Tryb zespołowy) czy "
-"samodzielnie (Tryb indywidualny)"
+msgid "Controls whether users join together in teams to play (Team Mode) or play as themselves (User Mode)"
+msgstr "Kontroluje czy użytkownicy grają razem w zespołach (Tryb zespołowy) czy samodzielnie (Tryb indywidualny)"
 
 #: CTFd/forms/setup.py:38
 msgid "Admin Username"
@@ -145,12 +129,8 @@ msgid "Logo"
 msgstr "Logo"
 
 #: CTFd/forms/setup.py:55
-msgid ""
-"Logo to use for the website instead of a CTF name. Used as the home page "
-"button. Optional."
-msgstr ""
-"Logo do wyświetlania na stronie, zamiast nazwy CTFa. Funkcjonuje jako "
-"przycisk strony głównej. Opcjonalne."
+msgid "Logo to use for the website instead of a CTF name. Used as the home page button. Optional."
+msgstr "Logo do wyświetlania na stronie, zamiast nazwy CTFa. Funkcjonuje jako przycisk strony głównej. Opcjonalne."
 
 #: CTFd/forms/setup.py:60
 msgid "Banner"
@@ -165,12 +145,8 @@ msgid "Small Icon"
 msgstr "Mała Ikona"
 
 #: CTFd/forms/setup.py:64
-msgid ""
-"favicon used in user's browsers. Only PNGs accepted. Must be 32x32px. "
-"Optional."
-msgstr ""
-"favikona używana w przeglądace. Tylko pliki PNG. Musi mieć wymiary 32x32 "
-"piksele. Opcjonalna."
+msgid "favicon used in user's browsers. Only PNGs accepted. Must be 32x32px. Optional."
+msgstr "favikona używana w przeglądace. Tylko pliki PNG. Musi mieć wymiary 32x32 piksele. Opcjonalna."
 
 #: CTFd/forms/setup.py:69
 msgid "Theme"
@@ -185,11 +161,8 @@ msgid "Theme Color"
 msgstr "Kolor motywu"
 
 #: CTFd/forms/setup.py:77
-msgid ""
-"Color used by theme to control aesthetics. Requires theme support. Optional."
-msgstr ""
-"Kolor używany przez motyw do zmiany estetyki. Wymaga wsparcia ze strony "
-"motywu. Opcjonalny."
+msgid "Color used by theme to control aesthetics. Requires theme support. Optional."
+msgstr "Kolor używany przez motyw do zmiany estetyki. Wymaga wsparcia ze strony motywu. Opcjonalny."
 
 #: CTFd/forms/setup.py:83
 msgid "Start Time"
@@ -245,9 +218,7 @@ msgid "Confirm Current Team Password"
 msgstr "Potwierdź aktualne hasło zespołu"
 
 #: CTFd/forms/teams.py:108
-msgid ""
-"Provide your current team password (or your password) to update your team's "
-"password"
+msgid "Provide your current team password (or your password) to update your team's password"
 msgstr "Podaj obecne hasło zespołu (lub swoje hasło) aby zmienić hasło zespołu"
 
 #: CTFd/forms/teams.py:114
@@ -310,12 +281,12 @@ msgid "Challenge"
 msgstr "Wyzwanie"
 
 #: CTFd/themes/core-beta/templates/challenge.html:19
-#, python-format
 msgid "%(num)d Solve"
 msgid_plural "%(num)d Solves"
 msgstr[0] "%(num)d Rozwiąż"
 msgstr[1] "%(num)d Rozwiązania"
 msgstr[2] "%(num)d Rozwiązań"
+msgstr[3] ""
 
 #: CTFd/themes/core-beta/templates/challenge.html:73
 msgid "View Hint"
@@ -353,12 +324,8 @@ msgid "Please click the link in that email to confirm your account."
 msgstr "Kliknij link w tym e-mailu, aby potwierdzić swoje konto."
 
 #: CTFd/themes/core-beta/templates/confirm.html:30
-msgid ""
-"If the email doesn’t arrive, check your spam folder or contact an "
-"administrator to manually verify your account."
-msgstr ""
-"Jeśli wiadomość e-mail nie dotrze, sprawdź folder ze spamem lub skontaktuj "
-"się z administratorem, aby ręcznie zweryfikować konto."
+msgid "If the email doesn’t arrive, check your spam folder or contact an administrator to manually verify your account."
+msgstr "Jeśli wiadomość e-mail nie dotrze, sprawdź folder ze spamem lub skontaktuj się z administratorem, aby ręcznie zweryfikować konto."
 
 #: CTFd/themes/core-beta/templates/confirm.html:43
 msgid "Change Email Address"
@@ -404,12 +371,8 @@ msgid "Reset Password"
 msgstr "Zresetuj hasło"
 
 #: CTFd/themes/core-beta/templates/reset_password.html:21
-msgid ""
-"You can now reset the password for your account and log in. Please enter in "
-"a new password below."
-msgstr ""
-"Możesz teraz zresetować hasło do swojego konta i zalogować się. Wprowadź "
-"nowe hasło poniżej."
+msgid "You can now reset the password for your account and log in. Please enter in a new password below."
+msgstr "Możesz teraz zresetować hasło do swojego konta i zalogować się. Wprowadź nowe hasło poniżej."
 
 #: CTFd/themes/core-beta/templates/reset_password.html:44
 msgid "Please provide the email address associated with your account below."
@@ -527,9 +490,7 @@ msgstr "Trudno przypisać rozwiązania poszczególnym członkom zespołu"
 
 #: CTFd/themes/core-beta/templates/setup.html:164
 msgid "Subscribe email address to the CTFd LLC Newsletter for news and updates"
-msgstr ""
-"Subskrybuj adres e-mail biuletynu CTFd LLC, aby otrzymywać wiadomości i "
-"aktualizacje"
+msgstr "Subskrybuj adres e-mail biuletynu CTFd LLC, aby otrzymywać wiadomości i aktualizacje"
 
 #: CTFd/themes/core-beta/templates/setup.html:241
 #: CTFd/themes/core-beta/templates/setup.html:262
@@ -680,6 +641,7 @@ msgid_plural "users"
 msgstr[0] "użytkownik"
 msgstr[1] "użytkowników"
 msgstr[2] "użytkowników"
+msgstr[3] ""
 
 #: CTFd/utils/modes/__init__.py:37
 msgid "team"
@@ -687,3 +649,5 @@ msgid_plural "teams"
 msgstr[0] "zespół"
 msgstr[1] "drużyny"
 msgstr[2] "drużyn"
+msgstr[3] ""
+
diff --git a/CTFd/translations/zh/LC_MESSAGES/messages.mo b/CTFd/translations/zh/LC_MESSAGES/messages.mo
new file mode 100644
index 00000000..49759402
Binary files /dev/null and b/CTFd/translations/zh/LC_MESSAGES/messages.mo differ
diff --git a/CTFd/translations/zh/LC_MESSAGES/messages.po b/CTFd/translations/zh/LC_MESSAGES/messages.po
new file mode 100644
index 00000000..b159237b
--- /dev/null
+++ b/CTFd/translations/zh/LC_MESSAGES/messages.po
@@ -0,0 +1,644 @@
+msgid ""
+msgstr ""
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: POEditor.com\n"
+"Project-Id-Version: CTFd\n"
+"Language: zh-CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: CTFd/forms/auth.py:19 CTFd/forms/self.py:16
+msgid "User Name"
+msgstr "用户名"
+
+#: CTFd/forms/auth.py:21 CTFd/forms/auth.py:53 CTFd/forms/self.py:17
+#: CTFd/forms/teams.py:203
+msgid "Email"
+msgstr "电子邮件"
+
+#: CTFd/forms/auth.py:22 CTFd/forms/auth.py:43 CTFd/forms/auth.py:60
+#: CTFd/forms/self.py:19 CTFd/forms/teams.py:204
+msgid "Password"
+msgstr "密码"
+
+#: CTFd/forms/auth.py:23 CTFd/forms/auth.py:44 CTFd/forms/auth.py:55
+#: CTFd/forms/auth.py:62 CTFd/forms/self.py:24 CTFd/forms/teams.py:127
+#: CTFd/forms/teams.py:210 CTFd/themes/core-beta/templates/challenge.html:147
+msgid "Submit"
+msgstr "提交"
+
+#: CTFd/forms/auth.py:39
+msgid "User Name or Email"
+msgstr "用户名或电子邮件"
+
+#: CTFd/forms/auth.py:48
+msgid "Resend Confirmation Email"
+msgstr "重新发送确认电子邮件"
+
+#: CTFd/forms/self.py:18
+msgid "Language"
+msgstr "语言"
+
+#: CTFd/forms/self.py:20
+msgid "Current Password"
+msgstr "当前密码"
+
+#: CTFd/forms/self.py:21 CTFd/forms/teams.py:113 CTFd/forms/teams.py:191
+#: CTFd/forms/teams.py:206 CTFd/forms/users.py:137
+#: CTFd/themes/core-beta/templates/teams/teams.html:51
+#: CTFd/themes/core-beta/templates/users/users.html:48
+msgid "Affiliation"
+msgstr "隶属关系"
+
+#: CTFd/forms/self.py:22 CTFd/forms/teams.py:119 CTFd/forms/teams.py:192
+#: CTFd/forms/teams.py:205 CTFd/forms/users.py:138
+#: CTFd/themes/core-beta/templates/teams/teams.html:50
+#: CTFd/themes/core-beta/templates/users/users.html:47
+msgid "Website"
+msgstr "网站"
+
+#: CTFd/forms/self.py:23 CTFd/forms/teams.py:123 CTFd/forms/teams.py:207
+#: CTFd/themes/core-beta/templates/teams/teams.html:52
+#: CTFd/themes/core-beta/templates/users/users.html:49
+msgid "Country"
+msgstr "国家"
+
+#: CTFd/forms/self.py:52 CTFd/themes/core-beta/templates/settings.html:220
+msgid "Expiration"
+msgstr "到期日"
+
+#: CTFd/forms/self.py:53
+msgid "Generate"
+msgstr "生成"
+
+#: CTFd/forms/setup.py:22
+msgid "Event Name"
+msgstr "活动名称"
+
+#: CTFd/forms/setup.py:22
+msgid "The name of your CTF event/workshop"
+msgstr "您的CTF活动/研讨会名称"
+
+#: CTFd/forms/setup.py:25
+msgid "Event Description"
+msgstr "事件描述"
+
+#: CTFd/forms/setup.py:25
+msgid "Description for the CTF"
+msgstr "CTF说明"
+
+#: CTFd/forms/setup.py:28 CTFd/forms/setup.py:29
+msgid "User Mode"
+msgstr "用户模式"
+
+#: CTFd/forms/setup.py:29
+msgid "Team Mode"
+msgstr "团队模式"
+
+#: CTFd/forms/setup.py:31
+msgid "Controls whether users join together in teams to play (Team Mode) or play as themselves (User Mode)"
+msgstr "控制用户是组队游戏（团队模式）还是自己玩（用户模式）"
+
+#: CTFd/forms/setup.py:38
+msgid "Admin Username"
+msgstr "管理员用户名"
+
+#: CTFd/forms/setup.py:39
+msgid "Your username for the administration account"
+msgstr "管理帐户的用户名"
+
+#: CTFd/forms/setup.py:43
+msgid "Admin Email"
+msgstr "管理员电子邮件"
+
+#: CTFd/forms/setup.py:44
+msgid "Your email address for the administration account"
+msgstr "您的管理帐户电子邮件地址"
+
+#: CTFd/forms/setup.py:48
+msgid "Admin Password"
+msgstr "管理员密码"
+
+#: CTFd/forms/setup.py:49
+msgid "Your password for the administration account"
+msgstr "您的管理帐户密码"
+
+#: CTFd/forms/setup.py:54
+msgid "Logo"
+msgstr "徽标"
+
+#: CTFd/forms/setup.py:55
+msgid "Logo to use for the website instead of a CTF name. Used as the home page button. Optional."
+msgstr "用于网站的标志，而不是CTF名称。用作主页按钮。可选。"
+
+#: CTFd/forms/setup.py:60
+msgid "Banner"
+msgstr "横幅"
+
+#: CTFd/forms/setup.py:60
+msgid "Banner to use for the homepage. Optional."
+msgstr "用于主页的横幅。可选。"
+
+#: CTFd/forms/setup.py:63
+msgid "Small Icon"
+msgstr "小图标"
+
+#: CTFd/forms/setup.py:64
+msgid "favicon used in user's browsers. Only PNGs accepted. Must be 32x32px. Optional."
+msgstr "用户浏览器中使用的图标。仅接受PNG。必须为32x32px。可选。"
+
+#: CTFd/forms/setup.py:69
+msgid "Theme"
+msgstr "主题"
+
+#: CTFd/forms/setup.py:70
+msgid "CTFd Theme to use. Can be changed later."
+msgstr "使用CTFd主题。可稍后更改。"
+
+#: CTFd/forms/setup.py:76
+msgid "Theme Color"
+msgstr "主题颜色"
+
+#: CTFd/forms/setup.py:77
+msgid "Color used by theme to control aesthetics. Requires theme support. Optional."
+msgstr "由主题控制美观的颜色。需要主题支持。可选。"
+
+#: CTFd/forms/setup.py:83
+msgid "Start Time"
+msgstr "开始时间"
+
+#: CTFd/forms/setup.py:84
+msgid "Time when your CTF is scheduled to start. Optional."
+msgstr "CTF计划开始的时间。可选。"
+
+#: CTFd/forms/setup.py:87
+msgid "End Time"
+msgstr "结束时间"
+
+#: CTFd/forms/setup.py:88
+msgid "Time when your CTF is scheduled to end. Optional."
+msgstr "您的CTF计划结束的时间。可选。"
+
+#: CTFd/forms/setup.py:90
+msgid "Finish"
+msgstr "完成"
+
+#: CTFd/forms/teams.py:76 CTFd/forms/teams.py:83 CTFd/forms/teams.py:100
+#: CTFd/forms/teams.py:202
+msgid "Team Name"
+msgstr "团队名称"
+
+#: CTFd/forms/teams.py:77 CTFd/forms/teams.py:84
+msgid "Team Password"
+msgstr "团队密码"
+
+#: CTFd/forms/teams.py:78 CTFd/forms/teams.py:258
+msgid "Join"
+msgstr "加入我们"
+
+#: CTFd/forms/teams.py:85
+msgid "Create"
+msgstr "创建"
+
+#: CTFd/forms/teams.py:101
+msgid "Your team's public name shown to other competitors"
+msgstr "您的团队的公开名称显示给其他竞争对手"
+
+#: CTFd/forms/teams.py:104
+msgid "New Team Password"
+msgstr "新团队密码"
+
+#: CTFd/forms/teams.py:104
+msgid "Set a new team join password"
+msgstr "设置新团队加入密码"
+
+#: CTFd/forms/teams.py:107
+msgid "Confirm Current Team Password"
+msgstr "确认当前团队密码"
+
+#: CTFd/forms/teams.py:108
+msgid "Provide your current team password (or your password) to update your team's password"
+msgstr "提供您当前的团队密码（或您的密码）以更新您团队的密码"
+
+#: CTFd/forms/teams.py:114
+msgid "Your team's affiliation publicly shown to other competitors"
+msgstr "向其他竞争者公开展示您的团队隶属关系"
+
+#: CTFd/forms/teams.py:120
+msgid "Your team's website publicly shown to other competitors"
+msgstr "向其他竞争对手公开展示您的团队网站"
+
+#: CTFd/forms/teams.py:125
+msgid "Your team's country publicly shown to other competitors"
+msgstr "向其他参赛者公开展示您所在的国家"
+
+#: CTFd/forms/teams.py:165
+msgid "Team Captain"
+msgstr "队长"
+
+#: CTFd/forms/teams.py:188 CTFd/forms/users.py:134
+msgid "Search Field"
+msgstr "搜索栏"
+
+#: CTFd/forms/teams.py:190 CTFd/forms/users.py:136
+#: CTFd/themes/core-beta/templates/challenge.html:183
+msgid "Name"
+msgstr "名称"
+
+#: CTFd/forms/teams.py:197 CTFd/forms/users.py:144
+msgid "Parameter"
+msgstr "参数"
+
+#: CTFd/forms/teams.py:198 CTFd/forms/users.py:148
+msgid "Search"
+msgstr "搜索"
+
+#: CTFd/forms/teams.py:208
+msgid "Hidden"
+msgstr "隐藏式"
+
+#: CTFd/forms/teams.py:209
+msgid "Banned"
+msgstr "禁用"
+
+#: CTFd/forms/teams.py:254
+msgid "Invite Link"
+msgstr "邀请链接"
+
+#: CTFd/forms/users.py:145
+msgid "Search for matching users"
+msgstr "搜索匹配用户"
+
+#: CTFd/themes/core-beta/templates/base.html:49
+msgid "Powered by CTFd"
+msgstr "由CTFd提供"
+
+#: CTFd/themes/core-beta/templates/challenge.html:11
+#: CTFd/themes/core-beta/templates/users/private.html:114
+#: CTFd/themes/core-beta/templates/users/public.html:113
+msgid "Challenge"
+msgstr "挑战"
+
+#: CTFd/themes/core-beta/templates/challenge.html:19
+msgid "%(num)d Solve"
+msgid_plural "%(num)d Solves"
+msgstr[0] "求解"
+
+#: CTFd/themes/core-beta/templates/challenge.html:73
+msgid "View Hint"
+msgstr "查看提示"
+
+#: CTFd/themes/core-beta/templates/challenge.html:135
+msgid "Flag"
+msgstr "旗帜"
+
+#: CTFd/themes/core-beta/templates/challenge.html:167
+msgid "Next Challenge"
+msgstr "下一个挑战"
+
+#: CTFd/themes/core-beta/templates/challenge.html:186
+#: CTFd/themes/core-beta/templates/setup.html:237
+#: CTFd/themes/core-beta/templates/setup.html:258
+msgid "Date"
+msgstr "日期"
+
+#: CTFd/themes/core-beta/templates/challenges.html:7
+#: CTFd/themes/core-beta/templates/components/navbar.html:57
+msgid "Challenges"
+msgstr "挑战"
+
+#: CTFd/themes/core-beta/templates/confirm.html:7
+msgid "Confirm"
+msgstr "确认"
+
+#: CTFd/themes/core-beta/templates/confirm.html:18
+msgid "We've sent a confirmation email to your email address."
+msgstr "我们已经向您的电子邮箱发送了确认邮件。"
+
+#: CTFd/themes/core-beta/templates/confirm.html:24
+msgid "Please click the link in that email to confirm your account."
+msgstr "请点击电子邮件中的链接确认您的帐户。"
+
+#: CTFd/themes/core-beta/templates/confirm.html:30
+msgid "If the email doesn’t arrive, check your spam folder or contact an administrator to manually verify your account."
+msgstr "如果电子邮件没有到达，请检查您的垃圾邮件文件夹或联系管理员手动验证您的帐户。"
+
+#: CTFd/themes/core-beta/templates/confirm.html:43
+msgid "Change Email Address"
+msgstr "更改电子邮件地址"
+
+#: CTFd/themes/core-beta/templates/components/navbar.html:178
+#: CTFd/themes/core-beta/templates/login.html:7
+msgid "Login"
+msgstr "登录"
+
+#: CTFd/themes/core-beta/templates/login.html:40
+msgid "Forgot your password?"
+msgstr "忘记密码？"
+
+#: CTFd/themes/core-beta/templates/components/navbar.html:97
+#: CTFd/themes/core-beta/templates/notifications.html:7
+msgid "Notifications"
+msgstr "通知"
+
+#: CTFd/themes/core-beta/templates/notifications.html:14
+msgid "There are no notifications yet"
+msgstr "还没有通知"
+
+#: CTFd/themes/core-beta/templates/components/navbar.html:165
+#: CTFd/themes/core-beta/templates/register.html:7
+msgid "Register"
+msgstr "注册"
+
+#: CTFd/themes/core-beta/templates/register.html:35
+msgid "Your username on the site"
+msgstr "您在网站上的用户名"
+
+#: CTFd/themes/core-beta/templates/register.html:43
+msgid "Never shown to the public"
+msgstr "从未向公众展示"
+
+#: CTFd/themes/core-beta/templates/register.html:51
+msgid "Password used to log into your account"
+msgstr "用于登录您账户的密码"
+
+#: CTFd/themes/core-beta/templates/reset_password.html:7
+msgid "Reset Password"
+msgstr "重置密码"
+
+#: CTFd/themes/core-beta/templates/reset_password.html:21
+msgid "You can now reset the password for your account and log in. Please enter in a new password below."
+msgstr "您现在可以重新设置您的帐户密码并登录。请在下面输入新密码。"
+
+#: CTFd/themes/core-beta/templates/reset_password.html:44
+msgid "Please provide the email address associated with your account below."
+msgstr "请在下面提供与您的帐户相关联的电子邮件地址。"
+
+#: CTFd/themes/core-beta/templates/components/navbar.html:135
+#: CTFd/themes/core-beta/templates/settings.html:8
+msgid "Settings"
+msgstr "设置"
+
+#: CTFd/themes/core-beta/templates/components/navbar.html:123
+#: CTFd/themes/core-beta/templates/settings.html:21
+msgid "Profile"
+msgstr "公司简介"
+
+#: CTFd/themes/core-beta/templates/settings.html:26
+msgid "Access Tokens"
+msgstr "访问令牌"
+
+#: CTFd/themes/core-beta/templates/settings.html:95
+msgid "Your profile has been updated"
+msgstr "您的个人资料已更新"
+
+#: CTFd/themes/core-beta/templates/settings.html:103
+msgid "Error:"
+msgstr "错误："
+
+#: CTFd/themes/core-beta/templates/settings.html:129
+msgid "API Key Generated"
+msgstr "生成的API密钥"
+
+#: CTFd/themes/core-beta/templates/settings.html:137
+msgid "Please copy your API Key, it won't be shown again!"
+msgstr "请复制您的API Key，它将不会再次显示！"
+
+#: CTFd/themes/core-beta/templates/settings.html:178
+msgid "Active Tokens"
+msgstr "活动代币"
+
+#: CTFd/themes/core-beta/templates/settings.html:190
+msgid "Delete Token"
+msgstr "删除令牌"
+
+#: CTFd/themes/core-beta/templates/settings.html:199
+msgid "Are you sure you want to delete this token?"
+msgstr "您确定要删除此令牌吗？"
+
+#: CTFd/themes/core-beta/templates/settings.html:219
+msgid "Created"
+msgstr "创建"
+
+#: CTFd/themes/core-beta/templates/settings.html:221
+msgid "Delete"
+msgstr "删除"
+
+#: CTFd/themes/core-beta/templates/setup.html:24
+msgid "Setup"
+msgstr "设置"
+
+#: CTFd/themes/core-beta/templates/setup.html:44
+msgid "General"
+msgstr "通用"
+
+#: CTFd/themes/core-beta/templates/setup.html:47
+msgid "Mode"
+msgstr "模式"
+
+#: CTFd/themes/core-beta/templates/setup.html:50
+msgid "Administration"
+msgstr "行政部门"
+
+#: CTFd/themes/core-beta/templates/setup.html:53
+msgid "Style"
+msgstr "风格"
+
+#: CTFd/themes/core-beta/templates/setup.html:56
+msgid "Date &amp; Time"
+msgstr "日期和时间"
+
+#: CTFd/themes/core-beta/templates/setup.html:59
+msgid "Integrations"
+msgstr "集成"
+
+#: CTFd/themes/core-beta/templates/setup.html:108
+msgid "Participants register accounts and form teams"
+msgstr "参与者注册账户并组成团队"
+
+#: CTFd/themes/core-beta/templates/setup.html:109
+msgid "If a team member solves a challenge, the entire team receives credit"
+msgstr "如果一个团队成员解决了一个挑战，整个团队将获得奖励"
+
+#: CTFd/themes/core-beta/templates/setup.html:111
+msgid "Easier to see which team member solved a challenge"
+msgstr "更容易看到哪个团队成员解决了难题"
+
+#: CTFd/themes/core-beta/templates/setup.html:112
+msgid "May be slightly more difficult to administer"
+msgstr "可能稍难管理"
+
+#: CTFd/themes/core-beta/templates/setup.html:116
+msgid "Participants only register an individual account"
+msgstr "参与者只能注册一个个人账户"
+
+#: CTFd/themes/core-beta/templates/setup.html:117
+msgid "Players can share accounts to form pseudo-teams"
+msgstr "玩家可以共享账号组成伪团队"
+
+#: CTFd/themes/core-beta/templates/setup.html:119
+msgid "Easier to organize"
+msgstr "更易于组织"
+
+#: CTFd/themes/core-beta/templates/setup.html:120
+msgid "Difficult to attribute solutions to individual team members"
+msgstr "难以将解决方案归功于团队成员个人"
+
+#: CTFd/themes/core-beta/templates/setup.html:164
+msgid "Subscribe email address to the CTFd LLC Newsletter for news and updates"
+msgstr "订阅CTFd LLC新闻简报和更新的电子邮件地址"
+
+#: CTFd/themes/core-beta/templates/setup.html:241
+#: CTFd/themes/core-beta/templates/setup.html:262
+#: CTFd/themes/core-beta/templates/users/private.html:117
+#: CTFd/themes/core-beta/templates/users/public.html:116
+msgid "Time"
+msgstr "时间"
+
+#: CTFd/themes/core-beta/templates/setup.html:266
+msgid "UTC Preview"
+msgstr "UTC预览"
+
+#: CTFd/themes/core-beta/templates/components/navbar.html:34
+#: CTFd/themes/core-beta/templates/users/users.html:6
+msgid "Users"
+msgstr "用户"
+
+#: CTFd/themes/core-beta/templates/components/navbar.html:41
+#: CTFd/themes/core-beta/templates/teams/teams.html:6
+msgid "Teams"
+msgstr "团队"
+
+#: CTFd/themes/core-beta/templates/components/navbar.html:50
+msgid "Scoreboard"
+msgstr "记分牌"
+
+#: CTFd/themes/core-beta/templates/components/navbar.html:80
+msgid "Admin Panel"
+msgstr "管理面板"
+
+#: CTFd/themes/core-beta/templates/components/navbar.html:110
+#: CTFd/themes/core-beta/templates/teams/team_enrollment.html:6
+#: CTFd/themes/core-beta/templates/teams/teams.html:49
+msgid "Team"
+msgstr "团队"
+
+#: CTFd/themes/core-beta/templates/components/navbar.html:147
+msgid "Logout"
+msgstr "注销"
+
+#: CTFd/themes/core-beta/templates/errors/403.html:9
+msgid "Forbidden"
+msgstr "禁用"
+
+#: CTFd/themes/core-beta/templates/errors/404.html:11
+msgid "File not found"
+msgstr "未找到文件"
+
+#: CTFd/themes/core-beta/templates/errors/404.html:12
+msgid "Sorry about that"
+msgstr "对不起"
+
+#: CTFd/themes/core-beta/templates/errors/429.html:11
+msgid "Too many requests"
+msgstr "要求过多"
+
+#: CTFd/themes/core-beta/templates/errors/429.html:12
+msgid "Please slow down!"
+msgstr "请慢行！"
+
+#: CTFd/themes/core-beta/templates/errors/502.html:11
+msgid "Bad Gateway"
+msgstr "不良网关"
+
+#: CTFd/themes/core-beta/templates/macros/forms.html:13
+#: CTFd/themes/core-beta/templates/macros/forms.html:36
+msgid "(Optional)"
+msgstr "可选"
+
+#: CTFd/themes/core-beta/templates/teams/invite.html:6
+#: CTFd/themes/core-beta/templates/teams/join_team.html:6
+#: CTFd/themes/core-beta/templates/teams/team_enrollment.html:36
+msgid "Join Team"
+msgstr "加入团队"
+
+#: CTFd/themes/core-beta/templates/teams/invite.html:15
+#: CTFd/themes/core-beta/templates/teams/team_enrollment.html:12
+msgid "Welcome to"
+msgstr "欢迎光临"
+
+#: CTFd/themes/core-beta/templates/teams/invite.html:19
+msgid "Click the button below to join the team!"
+msgstr "点击下面的按钮加入我们的团队！"
+
+#: CTFd/themes/core-beta/templates/teams/new_team.html:6
+#: CTFd/themes/core-beta/templates/teams/team_enrollment.html:39
+msgid "Create Team"
+msgstr "创建团队"
+
+#: CTFd/themes/core-beta/templates/teams/team_enrollment.html:14
+msgid "In order to participate you must either join or create a team."
+msgstr "要参加比赛，您必须加入或创建一个团队。"
+
+#: CTFd/themes/core-beta/templates/teams/team_enrollment.html:22
+msgid "Play with Official Team"
+msgstr "与官方团队一起游戏"
+
+#: CTFd/themes/core-beta/templates/teams/team_enrollment.html:27
+msgid "Join Unofficial Team"
+msgstr "加入非官方团队"
+
+#: CTFd/themes/core-beta/templates/teams/team_enrollment.html:30
+msgid "Create Unofficial Team"
+msgstr "创建非官方团队"
+
+#: CTFd/themes/core-beta/templates/teams/teams.html:124
+#: CTFd/themes/core-beta/templates/users/users.html:114
+msgid "Page"
+msgstr "页码"
+
+#: CTFd/themes/core-beta/templates/users/private.html:21
+#: CTFd/themes/core-beta/templates/users/public.html:21
+#: CTFd/themes/core-beta/templates/users/users.html:66
+msgid "Official"
+msgstr "官方"
+
+#: CTFd/themes/core-beta/templates/users/private.html:88
+#: CTFd/themes/core-beta/templates/users/public.html:88
+msgid "Awards"
+msgstr "获奖情况"
+
+#: CTFd/themes/core-beta/templates/users/private.html:110
+msgid "Solves"
+msgstr "解决方案"
+
+#: CTFd/themes/core-beta/templates/users/private.html:115
+#: CTFd/themes/core-beta/templates/users/public.html:114
+msgid "Category"
+msgstr "类别"
+
+#: CTFd/themes/core-beta/templates/users/private.html:116
+#: CTFd/themes/core-beta/templates/users/public.html:115
+msgid "Value"
+msgstr "价值"
+
+#: CTFd/themes/core-beta/templates/users/private.html:203
+#: CTFd/themes/core-beta/templates/users/public.html:204
+msgid "No solves yet"
+msgstr "尚无解决方案"
+
+#: CTFd/themes/core-beta/templates/users/users.html:46
+msgid "User"
+msgstr "用户"
+
+#: CTFd/utils/modes/__init__.py:35
+msgid "user"
+msgid_plural "users"
+msgstr[0] "用户"
+
+#: CTFd/utils/modes/__init__.py:37
+msgid "team"
+msgid_plural "teams"
+msgstr[0] "团队"
+
diff --git a/Makefile b/Makefile
index a3466525..bfe31dd2 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ shell:
 	python manage.py shell
 
 translations-init:
-	pybabel init -i messages.pot -d CTFd/translations -l de
+	pybabel init -i messages.pot -d CTFd/translations -l $(lang)
 
 translations-extract:
 	pybabel extract -F babel.cfg -k lazy_gettext -k _l -o messages.pot .