From e218ec1289581372b3b6368e973e6a24f00b8b46 Mon Sep 17 00:00:00 2001
From: DominikSLK <74055080+DominikSLK@users.noreply.github.com>
Date: Tue, 2 May 2023 22:03:56 +0200
Subject: [PATCH 01/45] Fix AuthMe enabled value (#3349)

---
 modules/Core/pages/panel/minecraft_authme.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/Core/pages/panel/minecraft_authme.php b/modules/Core/pages/panel/minecraft_authme.php
index b16ce5872d..46e0a9f113 100644
--- a/modules/Core/pages/panel/minecraft_authme.php
+++ b/modules/Core/pages/panel/minecraft_authme.php
@@ -137,7 +137,7 @@
     'AUTHME_INFO' => $language->get('admin', 'authme_integration_info'),
     'INFO' => $language->get('general', 'info'),
     'ENABLE_AUTHME' => $language->get('admin', 'enable_authme'),
-    'ENABLE_AUTHME_VALUE' => ($authme_enabled == '1'),
+    'ENABLE_AUTHME_VALUE' => (Util::getSetting('authme') == '1'),
     'AUTHME' => $language->get('admin', 'authme_integration'),
     'MINECRAFT_LINK' => URL::build('/panel/minecraft')
 ]);

From 4146284cfcdde6e760208bae9ef84eb932981f7d Mon Sep 17 00:00:00 2001
From: PadowYT2 <me@padow.ru>
Date: Wed, 3 May 2023 22:43:02 +0300
Subject: [PATCH 02/45] Add all missing languages to the Members module (#3350)

---
 modules/Members/language/cs_CZ.json  | 1 +
 modules/Members/language/da_DK.json  | 1 +
 modules/Members/language/de_DE.json  | 1 +
 modules/Members/language/el_GR.json  | 1 +
 modules/Members/language/en_US.json  | 1 +
 modules/Members/language/es_419.json | 1 +
 modules/Members/language/es_ES.json  | 1 +
 modules/Members/language/fi_FI.json  | 1 +
 modules/Members/language/fr_FR.json  | 1 +
 modules/Members/language/hr_HR.json  | 1 +
 modules/Members/language/hu_HU.json  | 1 +
 modules/Members/language/id_ID.json  | 1 +
 modules/Members/language/it_IT.json  | 1 +
 modules/Members/language/ja_JP.json  | 1 +
 modules/Members/language/ko_KR.json  | 1 +
 modules/Members/language/lt_LT.json  | 1 +
 modules/Members/language/lv_LV.json  | 1 +
 modules/Members/language/nl_NL.json  | 1 +
 modules/Members/language/no_NO.json  | 1 +
 modules/Members/language/pl_PL.json  | 1 +
 modules/Members/language/pt_BR.json  | 1 +
 modules/Members/language/ro_RO.json  | 1 +
 modules/Members/language/ru_RU.json  | 1 +
 modules/Members/language/sk_SK.json  | 1 +
 modules/Members/language/sq_AL.json  | 1 +
 modules/Members/language/sv_SE.json  | 1 +
 modules/Members/language/th_TH.json  | 1 +
 modules/Members/language/tr_TR.json  | 1 +
 modules/Members/language/uk_UA.json  | 1 +
 modules/Members/language/vi_VN.json  | 1 +
 modules/Members/language/zh_CN.json  | 1 +
 modules/Members/language/zh_TW.json  | 1 +
 32 files changed, 32 insertions(+)
 create mode 100644 modules/Members/language/cs_CZ.json
 create mode 100644 modules/Members/language/da_DK.json
 create mode 100644 modules/Members/language/de_DE.json
 create mode 100644 modules/Members/language/el_GR.json
 create mode 100644 modules/Members/language/en_US.json
 create mode 100644 modules/Members/language/es_419.json
 create mode 100644 modules/Members/language/es_ES.json
 create mode 100644 modules/Members/language/fi_FI.json
 create mode 100644 modules/Members/language/fr_FR.json
 create mode 100644 modules/Members/language/hr_HR.json
 create mode 100644 modules/Members/language/hu_HU.json
 create mode 100644 modules/Members/language/id_ID.json
 create mode 100644 modules/Members/language/it_IT.json
 create mode 100644 modules/Members/language/ja_JP.json
 create mode 100644 modules/Members/language/ko_KR.json
 create mode 100644 modules/Members/language/lt_LT.json
 create mode 100644 modules/Members/language/lv_LV.json
 create mode 100644 modules/Members/language/nl_NL.json
 create mode 100644 modules/Members/language/no_NO.json
 create mode 100644 modules/Members/language/pl_PL.json
 create mode 100644 modules/Members/language/pt_BR.json
 create mode 100644 modules/Members/language/ro_RO.json
 create mode 100644 modules/Members/language/ru_RU.json
 create mode 100644 modules/Members/language/sk_SK.json
 create mode 100644 modules/Members/language/sq_AL.json
 create mode 100644 modules/Members/language/sv_SE.json
 create mode 100644 modules/Members/language/th_TH.json
 create mode 100644 modules/Members/language/tr_TR.json
 create mode 100644 modules/Members/language/uk_UA.json
 create mode 100644 modules/Members/language/vi_VN.json
 create mode 100644 modules/Members/language/zh_CN.json
 create mode 100644 modules/Members/language/zh_TW.json

diff --git a/modules/Members/language/cs_CZ.json b/modules/Members/language/cs_CZ.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Members/language/cs_CZ.json
@@ -0,0 +1 @@
+{}
diff --git a/modules/Members/language/da_DK.json b/modules/Members/language/da_DK.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Members/language/da_DK.json
@@ -0,0 +1 @@
+{}
diff --git a/modules/Members/language/de_DE.json b/modules/Members/language/de_DE.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Members/language/de_DE.json
@@ -0,0 +1 @@
+{}
diff --git a/modules/Members/language/el_GR.json b/modules/Members/language/el_GR.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Members/language/el_GR.json
@@ -0,0 +1 @@
+{}
diff --git a/modules/Members/language/en_US.json b/modules/Members/language/en_US.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Members/language/en_US.json
@@ -0,0 +1 @@
+{}
diff --git a/modules/Members/language/es_419.json b/modules/Members/language/es_419.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Members/language/es_419.json
@@ -0,0 +1 @@
+{}
diff --git a/modules/Members/language/es_ES.json b/modules/Members/language/es_ES.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Members/language/es_ES.json
@@ -0,0 +1 @@
+{}
diff --git a/modules/Members/language/fi_FI.json b/modules/Members/language/fi_FI.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Members/language/fi_FI.json
@@ -0,0 +1 @@
+{}
diff --git a/modules/Members/language/fr_FR.json b/modules/Members/language/fr_FR.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Members/language/fr_FR.json
@@ -0,0 +1 @@
+{}
diff --git a/modules/Members/language/hr_HR.json b/modules/Members/language/hr_HR.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Members/language/hr_HR.json
@@ -0,0 +1 @@
+{}
diff --git a/modules/Members/language/hu_HU.json b/modules/Members/language/hu_HU.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Members/language/hu_HU.json
@@ -0,0 +1 @@
+{}
diff --git a/modules/Members/language/id_ID.json b/modules/Members/language/id_ID.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Members/language/id_ID.json
@@ -0,0 +1 @@
+{}
diff --git a/modules/Members/language/it_IT.json b/modules/Members/language/it_IT.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Members/language/it_IT.json
@@ -0,0 +1 @@
+{}
diff --git a/modules/Members/language/ja_JP.json b/modules/Members/language/ja_JP.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Members/language/ja_JP.json
@@ -0,0 +1 @@
+{}
diff --git a/modules/Members/language/ko_KR.json b/modules/Members/language/ko_KR.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Members/language/ko_KR.json
@@ -0,0 +1 @@
+{}
diff --git a/modules/Members/language/lt_LT.json b/modules/Members/language/lt_LT.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Members/language/lt_LT.json
@@ -0,0 +1 @@
+{}
diff --git a/modules/Members/language/lv_LV.json b/modules/Members/language/lv_LV.json
new file mode 100644
index 0000000000..69a88e3b65
--- /dev/null
+++ b/modules/Members/language/lv_LV.json
@@ -0,0 +1 @@
+{}
diff --git a/modules/Members/language/nl_NL.json b/modules/Members/language/nl_NL.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Members/language/nl_NL.json
@@ -0,0 +1 @@
+{}
diff --git a/modules/Members/language/no_NO.json b/modules/Members/language/no_NO.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Members/language/no_NO.json
@@ -0,0 +1 @@
+{}
diff --git a/modules/Members/language/pl_PL.json b/modules/Members/language/pl_PL.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Members/language/pl_PL.json
@@ -0,0 +1 @@
+{}
diff --git a/modules/Members/language/pt_BR.json b/modules/Members/language/pt_BR.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Members/language/pt_BR.json
@@ -0,0 +1 @@
+{}
diff --git a/modules/Members/language/ro_RO.json b/modules/Members/language/ro_RO.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Members/language/ro_RO.json
@@ -0,0 +1 @@
+{}
diff --git a/modules/Members/language/ru_RU.json b/modules/Members/language/ru_RU.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Members/language/ru_RU.json
@@ -0,0 +1 @@
+{}
diff --git a/modules/Members/language/sk_SK.json b/modules/Members/language/sk_SK.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Members/language/sk_SK.json
@@ -0,0 +1 @@
+{}
diff --git a/modules/Members/language/sq_AL.json b/modules/Members/language/sq_AL.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Members/language/sq_AL.json
@@ -0,0 +1 @@
+{}
diff --git a/modules/Members/language/sv_SE.json b/modules/Members/language/sv_SE.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Members/language/sv_SE.json
@@ -0,0 +1 @@
+{}
diff --git a/modules/Members/language/th_TH.json b/modules/Members/language/th_TH.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Members/language/th_TH.json
@@ -0,0 +1 @@
+{}
diff --git a/modules/Members/language/tr_TR.json b/modules/Members/language/tr_TR.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Members/language/tr_TR.json
@@ -0,0 +1 @@
+{}
diff --git a/modules/Members/language/uk_UA.json b/modules/Members/language/uk_UA.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Members/language/uk_UA.json
@@ -0,0 +1 @@
+{}
diff --git a/modules/Members/language/vi_VN.json b/modules/Members/language/vi_VN.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Members/language/vi_VN.json
@@ -0,0 +1 @@
+{}
diff --git a/modules/Members/language/zh_CN.json b/modules/Members/language/zh_CN.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Members/language/zh_CN.json
@@ -0,0 +1 @@
+{}
diff --git a/modules/Members/language/zh_TW.json b/modules/Members/language/zh_TW.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Members/language/zh_TW.json
@@ -0,0 +1 @@
+{}

From f37eb40b6ef890d51b55e86afbbceba262fa13e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Knapp=20B=C3=A1lint?= <favorit5503@gmail.com>
Date: Wed, 3 May 2023 10:13:22 +0000
Subject: [PATCH 03/45] Translated using translate.namelessmc.com
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Knapp Bálint <favorit5503@gmail.com>
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/hu/
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-forum/hu/
Translation: NamelessMC/Website - Core
Translation: NamelessMC/Website - Forum
---
 custom/languages/hu_HU.json       | 2 +-
 modules/Forum/language/hu_HU.json | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/custom/languages/hu_HU.json b/custom/languages/hu_HU.json
index eb9a94479a..7d59f7d449 100644
--- a/custom/languages/hu_HU.json
+++ b/custom/languages/hu_HU.json
@@ -473,7 +473,7 @@
     "admin/authme_db_connection_failed": "Csatlakozás sikertelen",
     "admin/group_sync_server": "Válassz egy Minecraft szervert a csoportszinkronizáláshoz",
     "admin/query_type_help": "Ha az alapértelmezett belső szerver lekérdezés nem működik, próbálkozz egy másik lehetőséggel.",
-    "general/sql_query": "SQL Lekérdezés",
+    "general/sql_query": "Lekérdezés",
     "admin/query_type": "Lekérdezés típusa",
     "admin/internal": "Belső",
     "admin/external": "Külső",
diff --git a/modules/Forum/language/hu_HU.json b/modules/Forum/language/hu_HU.json
index de95f7f970..f9b6ad5340 100644
--- a/modules/Forum/language/hu_HU.json
+++ b/modules/Forum/language/hu_HU.json
@@ -179,5 +179,9 @@
     "forum/latest_posts_limit": "A legújabb bejegyzések korlátja",
     "forum/highest_reaction_scores": "A legmagasabb reakciópontszámok",
     "forum/most_posts": "Legtöbb poszt",
-    "forum/reaction_score": "Reakciópontszám"
+    "forum/reaction_score": "Reakciópontszám",
+    "forum/news_items_max": "A hírek száma maximum {{max}} legyen",
+    "forum/news_items_min": "A hírek száma minimum {{min}} legyen",
+    "forum/news_items_front_page_limit": "A címlapon megjelenítendő hírek száma",
+    "forum/no_posts_found": "Nem található bejegyzés."
 }

From 81f63ba327aeac4c2cae1a878d143c51ae6660d9 Mon Sep 17 00:00:00 2001
From: Dominik Roman <dominikslk9@gmail.com>
Date: Wed, 3 May 2023 10:13:22 +0000
Subject: [PATCH 04/45] Translated using translate.namelessmc.com

Co-authored-by: Dominik Roman <dominikslk9@gmail.com>
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/sk/
Translation: NamelessMC/Website - Core
---
 custom/languages/sk_SK.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/custom/languages/sk_SK.json b/custom/languages/sk_SK.json
index 62e53c292c..246c0bab63 100644
--- a/custom/languages/sk_SK.json
+++ b/custom/languages/sk_SK.json
@@ -1319,5 +1319,6 @@
     "admin/queue_task_output": "Výstup úlohy",
     "admin/queue_task_invalid_status_to_cancel": "Úloha nie je v platnom stavu pre jej zrušenie",
     "admin/queue_task_status": "Stav",
-    "admin/reset_og_image": "Resetovať OG image"
+    "admin/reset_og_image": "Resetovať OG image",
+    "general/registration_disabled_message_fallback": "Registrácia je momentálne zakázaná."
 }

From daefcdff1cdaf8b84e5c4e45bf18abdce3f62c81 Mon Sep 17 00:00:00 2001
From: Wgis <bywgis@gmail.com>
Date: Wed, 3 May 2023 10:13:22 +0000
Subject: [PATCH 05/45] Translated using translate.namelessmc.com

Co-authored-by: Wgis <bywgis@gmail.com>
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/ru/
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-discord-integration/ru/
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-forum/ru/
Translation: NamelessMC/Website - Core
Translation: NamelessMC/Website - Discord Integration
Translation: NamelessMC/Website - Forum
---
 custom/languages/ru_RU.json                   | 66 ++++++++++++++++---
 .../Discord Integration/language/ru_RU.json   |  4 +-
 modules/Forum/language/ru_RU.json             |  5 +-
 3 files changed, 64 insertions(+), 11 deletions(-)

diff --git a/custom/languages/ru_RU.json b/custom/languages/ru_RU.json
index 58ff674dc1..6832278db4 100644
--- a/custom/languages/ru_RU.json
+++ b/custom/languages/ru_RU.json
@@ -711,7 +711,7 @@
     "general/search": "Поиск",
     "general/server_offline": "Сервер выключен.",
     "general/server_status": "Статус сервера",
-    "general/sign_in": "Войти",
+    "general/sign_in": "Вход",
     "general/social": "Социальных сети",
     "general/spoiler": "Спойлер",
     "general/statistics": "Статистика",
@@ -881,15 +881,15 @@
     "table/page_x_of_y": "Отображена страница _PAGE_ из _PAGES_",
     "time/1_day": "1 день назад",
     "time/1_minute": "1 минуту назад",
-    "time/_days": "{{count}} день назад|{{count}} дня назад|{{count}} дней назад",
-    "time/_hours": "{{count}} час назад|{{count}} часа назад|{{count}} часов назад",
-    "time/_minutes": "{{count}} минуту назад|{{count}} минуты назад|{{count}} минут назад",
-    "time/_months": "{{count}} месяц назад|{{count}} месяца назад|{{count}} месяцев назад",
+    "time/_days": "{{count}} дн. назад",
+    "time/_hours": "{{count}} ч. назад",
+    "time/_minutes": "{{count}} мин. назад",
+    "time/_months": "{{count}} мес. назад",
     "time/about_1_hour": "около часа назад",
     "time/about_1_month": "около месяца назад",
     "time/about_1_year": "около года назад",
     "time/less_than_a_minute": "меньше минуты назад",
-    "time/over_x_years": "более {{count}} года назад|более {{count}} лет назад|более {{count}} лет назад",
+    "time/over_x_years": "более {{count}} г. назад",
     "user/1_new_alert": "У вас 1 новое уведомление",
     "user/1_new_message": "У вас {{count}} новых сообщений",
     "user/1_reaction": "1 реакция",
@@ -1147,8 +1147,8 @@
     "general/grey": "Серый",
     "admin/custom_content": "Кастомный Контент",
     "admin/homepage_news": "Новости",
-    "admin/user_group_added_hook_info": "Группа Пользователя Добавлена",
-    "admin/user_group_removed_hook_info": "Группа Пользователя Удалена",
+    "admin/user_group_added_hook_info": "Пользовательская группа добавлена",
+    "admin/user_group_removed_hook_info": "Пользовательская группа удалена",
     "admin/api_disabled": "API выключен",
     "admin/page_url_contains_nameless_path": "Ваша кастомная страница перезаписала бы NamelessMC страницу.",
     "user/no_providers_admin": "Нет OAuth провайдеров которые были настроены администраторами сайта.",
@@ -1272,5 +1272,53 @@
     "admin/authme_db_test_connection": "Проверить Соединение",
     "admin/authme_db_connection_success": "Соединение успешное",
     "admin/authme_db_connection_failed": "Ошибка соединения",
-    "admin/confirm_delete_placeholder": "Вы уверены что хотите удалить этот плейсхолдер?"
+    "admin/confirm_delete_placeholder": "Вы уверены что хотите удалить этот плейсхолдер?",
+    "general/registration_disabled_message_fallback": "В настоящее время регистрация отключена.",
+    "admin/queue": "Очередь",
+    "admin/queue_cancel_task": "Отменить задачу",
+    "admin/queue_cancel_task_confirm": "Вы уверены, что хотите отменить эту задачу?",
+    "admin/queue_interval": "Интервал очереди (минуты)",
+    "admin/queue_interval_required": "Пожалуйста, введите интервал очереди",
+    "admin/queue_interval_at_least_x": "Укажите интервал ожидания не менее {{x}} минут",
+    "admin/queue_requeue_task": "Поставить задачу в очередь",
+    "admin/queue_requeue_task_confirm": "Вы уверены, что хотите повторно поставить эту задачу в очередь?",
+    "admin/queue_retry_task": "Повторить задачу",
+    "admin/queue_runner_ajax": "AJAX",
+    "admin/queue_runner": "Обработчик очереди",
+    "user/log_in_with": "Войти с помощью {{provider}}",
+    "user/continue_with": "Продолжить с помощью {{provider}}",
+    "admin/event_supports_discord": "Это событие поддерживает вебхуки Discord и имеет настраиваемое встраивание.",
+    "admin/queue_info": "Очередь позволяет планировать задачи и выполнять их в фоновом режиме. Чтобы использовать средство запуска очереди cron, создайте задачу cron для доступа к указанному ниже URL-адресу через определенный интервал.",
+    "admin/queue_runner_cron": "Cron",
+    "admin/queue_runner_one_of": "Выберите допустимое значение для обработчика очереди",
+    "admin/render_profile_post_hook_info": "Отображение поста профиля",
+    "admin/queue_task_action_invalid": "Недопустимое действие задачи",
+    "admin/queue_task_fragment": "Задача фрагментирована?",
+    "admin/queue_task_invalid_status_to_cancel": "Задача не находится в допустимом состоянии для ее отмены",
+    "admin/queue_task_scheduled_at": "Запланировано в",
+    "admin/discord_hook": "Discord",
+    "admin/event_supports_normal": "Это событие поддерживает обычные вебхуки.",
+    "admin/queue_status": "Статус очереди",
+    "admin/queue_status_cancelled": "Отменена",
+    "admin/queue_status_completed": "Завершена",
+    "admin/queue_status_error": "Ошибка",
+    "admin/queue_status_failed": "Неудача",
+    "admin/queue_status_in_progress": "Выполняется",
+    "admin/queue_status_ready": "Готова",
+    "admin/queue_task": "Задача",
+    "admin/queue_task_attempts": "Попытки",
+    "admin/queue_task_cancelled_successfully": "Задача успешно отменена.",
+    "admin/queue_task_data": "Данные задачи",
+    "admin/queue_task_entity": "Сущность задачи",
+    "admin/queue_task_entity_id": "ID сущности",
+    "admin/queue_task_executed_at": "Выполнено в",
+    "admin/queue_task_fragment_next": "Следующее смещение фрагмента задачи",
+    "admin/queue_task_invalid_status_to_requeue": "Задача не находится в допустимом состоянии для повторной постановки в очередь",
+    "admin/queue_task_requeued_successfully": "Задача успешно отправлена в очередь.",
+    "admin/queue_task_triggered_by": "Задача инициирована",
+    "admin/queue_task_name": "Наименование",
+    "admin/queue_task_output": "Вывод задачи",
+    "admin/queue_task_scheduled_for": "Запланировано для",
+    "admin/queue_task_status": "Состояние",
+    "admin/queue_task_fragment_total": "Информация о фрагменте задачи"
 }
diff --git a/modules/Discord Integration/language/ru_RU.json b/modules/Discord Integration/language/ru_RU.json
index 0932b21605..034af307f9 100644
--- a/modules/Discord Integration/language/ru_RU.json	
+++ b/modules/Discord Integration/language/ru_RU.json	
@@ -18,5 +18,7 @@
     "discord_integration/discord_widget_theme": "Тема для виджета",
     "discord_integration/enable_discord_integration": "Включить интеграцию?",
     "discord_integration/discord_widget_error": "Произошла ошибка при Discord виджете: {{error}}.",
-    "discord_integration/discord_id_required": "Введите ваш Дискорд Сервер ID."
+    "discord_integration/discord_id_required": "Введите ваш Дискорд Сервер ID.",
+    "discord_integration/discord_bot": "Discord бот",
+    "discord_integration/link_method": "Метод подключения"
 }
diff --git a/modules/Forum/language/ru_RU.json b/modules/Forum/language/ru_RU.json
index c75414e277..a3269f793a 100644
--- a/modules/Forum/language/ru_RU.json
+++ b/modules/Forum/language/ru_RU.json
@@ -180,5 +180,8 @@
     "forum/most_posts": "Большинство постов",
     "forum/no_posts_found": "Посты не найдены.",
     "forum/highest_reaction_scores": "Самые высокие оценки реакции",
-    "forum/reaction_score": "Оценка реакции"
+    "forum/reaction_score": "Оценка реакции",
+    "forum/news_items_max": "Количество новостей должно быть не больше {{max}}",
+    "forum/news_items_front_page_limit": "Количество новостей для отображения на главной странице",
+    "forum/news_items_min": "Количество новостей должно быть не менее {{min}}"
 }

From 15c05448bf22e06df55fb337055f56394f24c4c9 Mon Sep 17 00:00:00 2001
From: Partydragen <adrian_kili@outlook.com>
Date: Fri, 5 May 2023 20:46:39 +0200
Subject: [PATCH 06/45] Make sure Minecraft Integration is enabled (#3356)

---
 .../includes/endpoints/ServerInfoEndpoint.php | 22 ++++++++++---------
 .../endpoints/UpdateGroupsEndpoint.php        |  2 +-
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/modules/Core/includes/endpoints/ServerInfoEndpoint.php b/modules/Core/includes/endpoints/ServerInfoEndpoint.php
index 1b70984e9b..214086de1a 100644
--- a/modules/Core/includes/endpoints/ServerInfoEndpoint.php
+++ b/modules/Core/includes/endpoints/ServerInfoEndpoint.php
@@ -64,21 +64,23 @@ public function execute(Nameless2API $api): void {
             $api->throwError(CoreApiErrors::ERROR_UNABLE_TO_UPDATE_SERVER_INFO, $e->getMessage(), 500);
         }
 
-        try {
-            $integration = Integrations::getInstance()->getIntegration('Minecraft');
+        if (Util::getSetting('mc_integration')) {
+            try {
+                $integration = Integrations::getInstance()->getIntegration('Minecraft');
 
-            foreach ($_POST['players'] as $uuid => $player) {
-                $integrationUser = new IntegrationUser($integration, $uuid, 'identifier');
-                if ($integrationUser->exists()) {
-                    $this->updateUsername($integrationUser, $player);
+                foreach ($_POST['players'] as $uuid => $player) {
+                    $integrationUser = new IntegrationUser($integration, $uuid, 'identifier');
+                    if ($integrationUser->exists()) {
+                        $this->updateUsername($integrationUser, $player);
 
-                    if (isset($player['placeholders']) && count($player['placeholders'])) {
-                        $this->updatePlaceholders($integrationUser->getUser(), $player);
+                        if (isset($player['placeholders']) && count($player['placeholders'])) {
+                            $this->updatePlaceholders($integrationUser->getUser(), $player);
+                        }
                     }
                 }
+            } catch (Exception $e) {
+                $api->throwError(CoreApiErrors::ERROR_UNABLE_TO_UPDATE_SERVER_INFO, $e->getMessage(), 500);
             }
-        } catch (Exception $e) {
-            $api->throwError(CoreApiErrors::ERROR_UNABLE_TO_UPDATE_SERVER_INFO, $e->getMessage(), 500);
         }
 
         // Server query
diff --git a/modules/Core/includes/endpoints/UpdateGroupsEndpoint.php b/modules/Core/includes/endpoints/UpdateGroupsEndpoint.php
index 86d9c63eca..279a1ee57f 100644
--- a/modules/Core/includes/endpoints/UpdateGroupsEndpoint.php
+++ b/modules/Core/includes/endpoints/UpdateGroupsEndpoint.php
@@ -15,7 +15,7 @@ public function execute(Nameless2API $api): void {
         $server_id = $_POST['server_id'];
         $group_sync_log = [];
 
-        if ($server_id == Util::getSetting('group_sync_mc_server')) {
+        if (Util::getSetting('mc_integration') && $server_id == Util::getSetting('group_sync_mc_server')) {
             try {
                 $integration = Integrations::getInstance()->getIntegration('Minecraft');
 

From 2f397804dd6d7e79d2debbdc8fdd03ecc07e6998 Mon Sep 17 00:00:00 2001
From: Robin <robin+git@rkslot.nl>
Date: Sat, 6 May 2023 11:06:42 +0200
Subject: [PATCH 07/45] Add Russian translation (#3352)

Contributed by @Wgis in a github comment: https://github.com/NamelessMC/Nameless/pull/3350#issuecomment-1532655703

Co-authored-by: Ilya Finogenov <20740613+wgis@users.noreply.github.com>
---
 modules/Members/language/ru_RU.json | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/modules/Members/language/ru_RU.json b/modules/Members/language/ru_RU.json
index 0967ef424b..1ba89566c8 100644
--- a/modules/Members/language/ru_RU.json
+++ b/modules/Members/language/ru_RU.json
@@ -1 +1,19 @@
-{}
+{
+    "members/members": "Пользователи",
+    "members/new_members": "Новые пользователи",
+    "members/no_members": "Пользователей нет.",
+    "members/member_lists": "Списки пользователей",
+    "members/member_list_hide_banned_users": "Спрятать забанненых?",
+    "members/member_list_toggled_enabled": "Включен {{list}} список.",
+    "members/member_list_toggled_disabled": "Выключен {{list}} список.",
+    "members/view_all": "Просмотр всех",
+    "members/find_member": "Найти пользователя",
+    "members/name": "Имя...",
+    "members/view_group": "Просмотр группы",
+    "members/group": "Группа...",
+    "members/viewable_groups": "Просматриваемые группы",
+    "members/no_results_header": "Нет результатов",
+    "members/no_results_text": "Не удалось ничего найти",
+    "members/no_overview_lists_enabled": "Обзорные списки не включены.",
+    "members/settings_updated_successfully": "Настройки успешно обновлены."
+}

From 73d61a41d6aff8323b9cd554a852404d8da63d44 Mon Sep 17 00:00:00 2001
From: NamelessMC Translations <robin+weblate@rkslot.nl>
Date: Fri, 5 May 2023 18:46:45 +0000
Subject: [PATCH 08/45] Translated using translate.namelessmc.com

Co-authored-by: NamelessMC Translations <robin+weblate@rkslot.nl>
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/nl/
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-members-module/nl/
Translation: NamelessMC/Website - Core
Translation: NamelessMC/Website - Members module
---
 custom/languages/nl_NL.json         | 16 +++++++++++++++-
 modules/Members/language/nl_NL.json | 20 +++++++++++++++++++-
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/custom/languages/nl_NL.json b/custom/languages/nl_NL.json
index a6b947b790..bd0095ac24 100644
--- a/custom/languages/nl_NL.json
+++ b/custom/languages/nl_NL.json
@@ -1223,5 +1223,19 @@
     "admin/authme_db_connection_failed": "Connectie gefaald",
     "admin/sent_mass_message": "Succesvol een massabericht gestuurd.",
     "api/groups_updates_successfully": "Groepen geüpdatet",
-    "user/banned_from_registering": "Je IP is verbannen, je kunt je niet registreren."
+    "user/banned_from_registering": "Je IP is verbannen, je kunt je niet registreren.",
+    "admin/user_warned_webhook": "{{punished}} is gewaarschuwd door {{punisher}}.",
+    "admin/auto_language_help": "Indien ingeschakeld, kunnen gasten en uitgelogde gebruikers de website automatisch hun voorkeurstaal laten detecteren.",
+    "admin/clone_group": "Maak kopie van groep",
+    "admin/enable_auto_language": "Automatische taaldetectie aanzetten?",
+    "admin/query_type": "Querytype",
+    "admin/internal": "Intern",
+    "admin/external": "Extern",
+    "admin/plugin": "Plug-in",
+    "admin/emoji_style": "Emoji-stijl",
+    "admin/emoji_native": "Browser's eigen",
+    "admin/emoji_joypixels": "JoyPixels",
+    "admin/confirm_delete_placeholder": "Weet je zeker dat je deze placeholder wilt verwijderen?",
+    "admin/discord_hook": "Discord",
+    "admin/emoji_twemoji": "Twemoji"
 }
diff --git a/modules/Members/language/nl_NL.json b/modules/Members/language/nl_NL.json
index 0967ef424b..2fe6d6c2bb 100644
--- a/modules/Members/language/nl_NL.json
+++ b/modules/Members/language/nl_NL.json
@@ -1 +1,19 @@
-{}
+{
+    "members/members": "Leden",
+    "members/no_members": "Geen leden gevonden.",
+    "members/member_list_toggled_disabled": "{{list}} lijst met succes uitgeschakeld.",
+    "members/new_members": "Nieuwe leden",
+    "members/member_lists": "Ledenlijsten",
+    "members/member_list_hide_banned_users": "Verbannen gebruikers verbergen?",
+    "members/member_list_toggled_enabled": "{{list}} lijst succesvol ingeschakeld.",
+    "members/view_all": "Alles weergeven",
+    "members/find_member": "Vind lid",
+    "members/name": "Naam...",
+    "members/view_group": "Toon groep",
+    "members/group": "Groep...",
+    "members/viewable_groups": "Zichtbare groepen",
+    "members/no_results_header": "Geen resultaten gevonden",
+    "members/no_results_text": "Je zoekopdracht heeft geen resultaten opgeleverd",
+    "members/no_overview_lists_enabled": "Er zijn geen overzichtslijsten ingeschakeld.",
+    "members/settings_updated_successfully": "Instellingen bijgewerkt."
+}

From 8daffaa6b9cbaf8aec3a241d475854a8b09134e8 Mon Sep 17 00:00:00 2001
From: Dominik Roman <dominikslk9@gmail.com>
Date: Fri, 5 May 2023 18:46:45 +0000
Subject: [PATCH 09/45] Translated using translate.namelessmc.com

Co-authored-by: Dominik Roman <dominikslk9@gmail.com>
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-members-module/sk/
Translation: NamelessMC/Website - Members module
---
 modules/Members/language/sk_SK.json | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/modules/Members/language/sk_SK.json b/modules/Members/language/sk_SK.json
index 0967ef424b..1d138bc795 100644
--- a/modules/Members/language/sk_SK.json
+++ b/modules/Members/language/sk_SK.json
@@ -1 +1,19 @@
-{}
+{
+    "members/members": "Užívatelia",
+    "members/new_members": "Noví užívatelia",
+    "members/member_list_toggled_enabled": "List {{list}} bol úspešne povolený.",
+    "members/no_results_header": "Neboli nájdené žiadne výsledky",
+    "members/no_members": "Žiadny užívatelia neboli nájdení.",
+    "members/member_lists": "List užívateľov",
+    "members/member_list_hide_banned_users": "Skryť zabanovaných užívateľov?",
+    "members/member_list_toggled_disabled": "List {{list}} bol úspešne zakázaný.",
+    "members/view_all": "Zobraziť všetko",
+    "members/find_member": "Hľadať užívateľa",
+    "members/name": "Meno...",
+    "members/view_group": "Zobraziť skupinu",
+    "members/group": "Skupina...",
+    "members/viewable_groups": "Viditeľné skupiny",
+    "members/no_results_text": "Vaše hľadanie nevrátilo žiadne výsledky",
+    "members/no_overview_lists_enabled": "Nie sú povolené žiadne prehľadové zoznamy.",
+    "members/settings_updated_successfully": "Nastavenia boli úspešne aktualizované."
+}

From 3726cedf7814bbb4f23c5c0b32217115f7be5305 Mon Sep 17 00:00:00 2001
From: enno123 <admin@enno123.de>
Date: Fri, 5 May 2023 18:46:45 +0000
Subject: [PATCH 10/45] Translated using translate.namelessmc.com

Co-authored-by: enno123 <admin@enno123.de>
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-members-module/de/
Translation: NamelessMC/Website - Members module
---
 modules/Members/language/de_DE.json | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/modules/Members/language/de_DE.json b/modules/Members/language/de_DE.json
index 0967ef424b..2822fb23e7 100644
--- a/modules/Members/language/de_DE.json
+++ b/modules/Members/language/de_DE.json
@@ -1 +1,19 @@
-{}
+{
+    "members/members": "Mitglieder",
+    "members/member_lists": "Mitgliederlisten",
+    "members/find_member": "Mitglied suchen",
+    "members/no_results_text": "Deine Suche ergab keine Ergebnisse",
+    "members/new_members": "Neue Mitglieder",
+    "members/no_members": "Keine Mitglieder gefunden.",
+    "members/member_list_hide_banned_users": "Gesperrte Benutzer ausblenden?",
+    "members/member_list_toggled_enabled": "Erfolgreich die Liste {{list}} aktiviert.",
+    "members/member_list_toggled_disabled": "Die Liste {{list}} wurde erfolgreich deaktiviert.",
+    "members/view_all": "Alle anzeigen",
+    "members/name": "Name...",
+    "members/view_group": "Gruppe anzeigen",
+    "members/group": "Gruppe...",
+    "members/viewable_groups": "Sichtbare Gruppen",
+    "members/no_results_header": "Keine Ergebnisse gefunden",
+    "members/no_overview_lists_enabled": "Es sind keine Übersichtslisten aktiviert.",
+    "members/settings_updated_successfully": "Einstellungen erfolgreich aktualisiert."
+}

From 70cdde4bef6170627e6a2c3f343bd0506d6035d1 Mon Sep 17 00:00:00 2001
From: Marcos <marckos03br@gmail.com>
Date: Sun, 7 May 2023 14:13:23 +0000
Subject: [PATCH 11/45] Translated using translate.namelessmc.com

Co-authored-by: Marcos <marckos03br@gmail.com>
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/es/
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-members-module/es/
Translation: NamelessMC/Website - Core
Translation: NamelessMC/Website - Members module
---
 custom/languages/es_ES.json         | 41 +++++++++++++++++++++++++++--
 modules/Members/language/es_ES.json | 20 +++++++++++++-
 2 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/custom/languages/es_ES.json b/custom/languages/es_ES.json
index 81ed56e64e..4c59f31ca4 100644
--- a/custom/languages/es_ES.json
+++ b/custom/languages/es_ES.json
@@ -752,7 +752,7 @@
     "installer/install": "Instalar",
     "installer/installer_information": "El instalador le guiará a través del proceso de instalación.",
     "installer/installer_now_initialising_database": "El instalador está ahora inicializando la base de datos. Esto puede tardar un poco...",
-    "installer/installer_welcome": "Bienvenido a la versión 2.0 de NamelessMC",
+    "installer/installer_welcome": "Bienvenido a la versión 2 de NamelessMC",
     "installer/language": "Idioma",
     "installer/no": "No",
     "installer/no_converters_available": "No hay convertidores disponibles.",
@@ -1283,5 +1283,42 @@
     "admin/queue_runner": "Administrador de cola",
     "admin/queue_runner_ajax": "AJAX",
     "admin/queue_runner_cron": "Cron",
-    "admin/queue_runner_one_of": "Por favor, selecciona un valor válido para el administrador de cola"
+    "admin/queue_runner_one_of": "Por favor, selecciona un valor válido para el administrador de cola",
+    "admin/queue_status_in_progress": "En curso",
+    "admin/queue_task_executed_at": "Ejecutado a las",
+    "admin/queue_task_invalid_status_to_cancel": "La tarea no se encuentra en un estado válido para ser cancelada",
+    "installer/username_min_max": "Por favor, asegúrate de que tu nombre de usuario tenga entre {{minUsername}} y {{maxUsername}} caracteres de longitud.",
+    "general/registration_disabled_message_fallback": "El registro está actualmente desactivado.",
+    "installer/username_required": "Por favor, introduce un nombre de usuario válido.",
+    "installer/email_min_max": "Por favor, asegúrate de que tu dirección de correo electrónico tenga entre {{minEmail}} y {{maxEmail}} caracteres de longitud.",
+    "installer/email_required": "Por favor, introduce un correo electrónico válido.",
+    "installer/password_min_max": "Por favor, asegúrate de que tu contraseña tenga entre {{minPassword}} y {{maxPassword}} caracteres de longitud.",
+    "installer/password_required": "Por favor, introduce una contraseña válida.",
+    "user/continue_with": "Continuar con {{provider}}",
+    "user/log_in_with": "Iniciar sesión con {{provider}}",
+    "admin/render_profile_post_hook_info": "Publicación de perfil renderizada",
+    "admin/queue_status_failed": "Fallido",
+    "admin/queue_status": "Estado de la cola",
+    "admin/queue_status_cancelled": "Cancelado",
+    "admin/queue_status_completed": "Completado",
+    "admin/queue_status_error": "Error",
+    "admin/queue_status_ready": "Listo",
+    "admin/queue_task": "Tarea",
+    "admin/queue_task_attempts": "Intentos",
+    "admin/queue_task_action_invalid": "Acción no válida para la tarea",
+    "admin/queue_task_cancelled_successfully": "Tarea cancelada exitosamente.",
+    "admin/queue_task_data": "Datos de la tarea",
+    "admin/queue_task_entity": "Entidad de tarea",
+    "admin/queue_task_entity_id": "ID de la entidad",
+    "admin/queue_task_fragment": "¿Tarea fragmentada?",
+    "admin/queue_task_fragment_next": "Próximo desplazamiento del fragmento de tarea",
+    "admin/queue_task_fragment_total": "Total de fragmentos de tarea",
+    "admin/queue_task_invalid_status_to_requeue": "La tarea no se encuentra en un estado válido para volver a ponerse en cola",
+    "admin/queue_task_requeued_successfully": "La tarea ha sido puesta en cola exitosamente.",
+    "admin/queue_task_triggered_by": "Tarea activada por",
+    "admin/queue_task_name": "Nombre",
+    "admin/queue_task_output": "Resultado de la tarea",
+    "admin/queue_task_scheduled_at": "Programado para",
+    "admin/queue_task_scheduled_for": "Programado para",
+    "admin/queue_task_status": "Estado"
 }
diff --git a/modules/Members/language/es_ES.json b/modules/Members/language/es_ES.json
index 0967ef424b..c90db0bcfb 100644
--- a/modules/Members/language/es_ES.json
+++ b/modules/Members/language/es_ES.json
@@ -1 +1,19 @@
-{}
+{
+    "members/members": "Miembros",
+    "members/member_list_hide_banned_users": "¿Ocultar usuarios baneados?",
+    "members/no_results_header": "No se encontraron resultados",
+    "members/settings_updated_successfully": "La configuración se actualizó exitosamente.",
+    "members/new_members": "Nuevos miembros",
+    "members/no_members": "No se encontraron miembros.",
+    "members/member_lists": "Listas de miembros",
+    "members/member_list_toggled_enabled": "Habilitada con éxito la lista {{list}}.",
+    "members/member_list_toggled_disabled": "Desactivada con éxito la lista {{list}}.",
+    "members/view_all": "Ver todo",
+    "members/find_member": "Buscar miembro",
+    "members/name": "Nombre...",
+    "members/view_group": "Ver grupo",
+    "members/group": "Grupo...",
+    "members/viewable_groups": "Grupos visibles",
+    "members/no_results_text": "Tu búsqueda no arrojó resultados",
+    "members/no_overview_lists_enabled": "No se han habilitado listas de resumen."
+}

From c0ba33811a1bd90d78517e3b04a9b9981fa49e5a Mon Sep 17 00:00:00 2001
From: Fjuro <ifjuro@proton.me>
Date: Sun, 7 May 2023 14:13:23 +0000
Subject: [PATCH 12/45] Translated using translate.namelessmc.com

Co-authored-by: Fjuro <ifjuro@proton.me>
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-members-module/cs/
Translation: NamelessMC/Website - Members module
---
 modules/Members/language/cs_CZ.json | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/modules/Members/language/cs_CZ.json b/modules/Members/language/cs_CZ.json
index 0967ef424b..af0fa3c43c 100644
--- a/modules/Members/language/cs_CZ.json
+++ b/modules/Members/language/cs_CZ.json
@@ -1 +1,19 @@
-{}
+{
+    "members/members": "Členové",
+    "members/new_members": "Noví členové",
+    "members/no_members": "Nenalezeni žádní členové.",
+    "members/member_lists": "Seznam členů",
+    "members/member_list_hide_banned_users": "Skrýt zabanované uživatele?",
+    "members/member_list_toggled_enabled": "Seznam {{list}} úspěšně povolen.",
+    "members/member_list_toggled_disabled": "Seznam {{list}} úspěšně zakázán.",
+    "members/view_all": "Zobrazit vše",
+    "members/find_member": "Najít člena",
+    "members/name": "Jméno...",
+    "members/view_group": "Zobrazit skupinu",
+    "members/group": "Skupina...",
+    "members/viewable_groups": "Zobrazitelné skupiny",
+    "members/no_results_header": "Nenalezeny žádné výsledky",
+    "members/no_results_text": "Na váš dotaz nebyly nalezeny žádné výsledky",
+    "members/no_overview_lists_enabled": "Nejsou povoleny žádné seznamy přehledu.",
+    "members/settings_updated_successfully": "Nastavení úspěšně aktualizována."
+}

From e5e3e6a850b5a86b8c7211d4d4f10d0011600f23 Mon Sep 17 00:00:00 2001
From: Robin <robin+git@rkslot.nl>
Date: Mon, 8 May 2023 22:05:56 +0200
Subject: [PATCH 13/45] Include .htaccess file in release zip (#3362)

---
 dev/scripts/release.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/scripts/release.py b/dev/scripts/release.py
index 9b5c50b966..8ba212a632 100644
--- a/dev/scripts/release.py
+++ b/dev/scripts/release.py
@@ -18,6 +18,7 @@
 ]
 
 INCLUDE_FILES = [
+    '.htaccess',
     '403.php',
     '404.php',
     'index.php',

From 104c524a0ee27e4393bf8ea244870fc821dcacf6 Mon Sep 17 00:00:00 2001
From: Partydragen <adrian_kili@outlook.com>
Date: Tue, 9 May 2023 20:05:29 +0200
Subject: [PATCH 14/45] Fix missing cache settings (#3361)

---
 core/classes/Database/DatabaseInitialiser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/classes/Database/DatabaseInitialiser.php b/core/classes/Database/DatabaseInitialiser.php
index 47bdb084ab..55845eea9f 100644
--- a/core/classes/Database/DatabaseInitialiser.php
+++ b/core/classes/Database/DatabaseInitialiser.php
@@ -7,7 +7,7 @@ class DatabaseInitialiser {
 
     private function __construct() {
         $this->_db = DB::getInstance();
-        $this->_cache = new Cache();
+        $this->_cache = new Cache(['name' => 'nameless', 'extension' => '.cache', 'path' => ROOT_PATH . '/cache/']);
     }
 
     public static function runPreUser() {

From d984af2614faa9c8bb44c62688c750c3d9387a3b Mon Sep 17 00:00:00 2001
From: Partydragen <adrian_kili@outlook.com>
Date: Wed, 10 May 2023 13:00:07 +0200
Subject: [PATCH 15/45] Fix user group isssue (#3365)

Closes https://github.com/NamelessMC/Nameless/issues/3363
---
 core/classes/Core/User.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/classes/Core/User.php b/core/classes/Core/User.php
index 0d2faef8c0..b689b32dc5 100644
--- a/core/classes/Core/User.php
+++ b/core/classes/Core/User.php
@@ -6,7 +6,7 @@
  * @author Samerton
  * @author Partydragen
  * @author Aberdeener
- * @version 2.0.2
+ * @version 2.1.1
  * @license MIT
  */
 class User {
@@ -130,7 +130,7 @@ private function find(string $value, string $field = 'id'): bool {
      * @return bool True on success, false if they already have it.
      */
     public function addGroup(int $group_id, int $expire = 0): bool {
-        if (array_key_exists($group_id, $this->_groups ?? [])) {
+        if (array_key_exists($group_id, $this->getGroups())) {
             return false;
         }
 
@@ -545,6 +545,7 @@ public function getGroups(): array {
             $default_group = Group::find(1, 'default_group');
             $default_group_id = $default_group->id ?? 1;
 
+            $this->_groups = [];
             $this->addGroup($default_group_id);
         }
 

From 44902cfd6c5ca729a8fc4495ea3d2974699561b4 Mon Sep 17 00:00:00 2001
From: Sam <samerton@users.noreply.github.com>
Date: Wed, 10 May 2023 12:00:50 +0100
Subject: [PATCH 16/45] Fix forum title/description encoding on edit (#3359)

---
 modules/Forum/pages/panel/forums.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/Forum/pages/panel/forums.php b/modules/Forum/pages/panel/forums.php
index 8667c67857..74f06c9255 100644
--- a/modules/Forum/pages/panel/forums.php
+++ b/modules/Forum/pages/panel/forums.php
@@ -537,13 +537,13 @@
 
                                 // Update the forum
                                 $to_update = [
-                                    'forum_title' => Output::getClean(Input::get('title')),
-                                    'forum_description' => Output::getClean(Input::get('description')),
+                                    'forum_title' => Input::get('title'),
+                                    'forum_description' => Input::get('description'),
                                     'news' => Input::get('display'),
                                     'parent' => $parent,
                                     'redirect_forum' => $redirect,
                                     'icon' => Input::get('icon'),
-                                    'forum_type' => Output::getClean(Input::get('forum_type')),
+                                    'forum_type' => Input::get('forum_type'),
                                     'topic_placeholder' => Input::get('topic_placeholder'),
                                     'hooks' => $hooks,
                                     'default_labels' => $default_labels

From 571200fc24a9b4b81a0520d2ec60d98ab30f0813 Mon Sep 17 00:00:00 2001
From: Robin <robin+git@rkslot.nl>
Date: Wed, 10 May 2023 14:52:32 +0000
Subject: [PATCH 17/45] Remove unable to update groups catch (#3360)

---
 modules/Core/classes/Misc/CoreApiErrors.php   |  1 -
 .../endpoints/UpdateGroupsEndpoint.php        | 20 ++++++++-----------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/modules/Core/classes/Misc/CoreApiErrors.php b/modules/Core/classes/Misc/CoreApiErrors.php
index 9b0cb5ab7b..a5b1d0c40b 100644
--- a/modules/Core/classes/Misc/CoreApiErrors.php
+++ b/modules/Core/classes/Misc/CoreApiErrors.php
@@ -36,7 +36,6 @@ class CoreApiErrors {
     public const ERROR_USER_ALREADY_ACTIVE = 'core:user_already_active';
 
     public const ERROR_UNABLE_TO_UPDATE_USERNAME = 'core:unable_to_update_username';
-    public const ERROR_UNABLE_TO_UPDATE_GROUPS = 'core:unable_to_update_groups';
 
     public const ERROR_INTEGRATION_IDENTIFIER_ERRORS = 'core:integration_identifier_errors';
     public const ERROR_INTEGRATION_USERNAME_ERRORS = 'core:integration_username_errors';
diff --git a/modules/Core/includes/endpoints/UpdateGroupsEndpoint.php b/modules/Core/includes/endpoints/UpdateGroupsEndpoint.php
index 279a1ee57f..4a8fe0f396 100644
--- a/modules/Core/includes/endpoints/UpdateGroupsEndpoint.php
+++ b/modules/Core/includes/endpoints/UpdateGroupsEndpoint.php
@@ -16,20 +16,16 @@ public function execute(Nameless2API $api): void {
         $group_sync_log = [];
 
         if (Util::getSetting('mc_integration') && $server_id == Util::getSetting('group_sync_mc_server')) {
-            try {
-                $integration = Integrations::getInstance()->getIntegration('Minecraft');
-
-                foreach ($_POST['player_groups'] as $uuid => $groups) {
-                    $integrationUser = new IntegrationUser($integration, str_replace('-', '', $uuid), 'identifier');
-                    if ($integrationUser->exists()) {
-                        $log = $this->updateGroups($integrationUser, $groups['groups']);
-                        if (count($log)) {
-                            $group_sync_log[] = $log;
-                        }
+            $integration = Integrations::getInstance()->getIntegration('Minecraft');
+
+            foreach ($_POST['player_groups'] as $uuid => $groups) {
+                $integrationUser = new IntegrationUser($integration, str_replace('-', '', $uuid), 'identifier');
+                if ($integrationUser->exists()) {
+                    $log = $this->updateGroups($integrationUser, $groups['groups']);
+                    if (count($log)) {
+                        $group_sync_log[] = $log;
                     }
                 }
-            } catch (Exception $e) {
-                $api->throwError(CoreApiErrors::ERROR_UNABLE_TO_UPDATE_GROUPS, $e->getMessage(), 500);
             }
 
             $api->returnArray(array_merge(['message' => $api->getLanguage()->get('api', 'groups_updates_successfully')], ['log' => $group_sync_log]));

From d5fd6be14cdae265a409ae3b48360a98f7181534 Mon Sep 17 00:00:00 2001
From: David Morales <davidmolv16@gmail.com>
Date: Wed, 10 May 2023 13:13:21 +0000
Subject: [PATCH 18/45] Translated using translate.namelessmc.com

Co-authored-by: David Morales <davidmolv16@gmail.com>
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-members-module/es_419/
Translation: NamelessMC/Website - Members module
---
 modules/Members/language/es_419.json | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/modules/Members/language/es_419.json b/modules/Members/language/es_419.json
index 0967ef424b..c4eb19d9f1 100644
--- a/modules/Members/language/es_419.json
+++ b/modules/Members/language/es_419.json
@@ -1 +1,19 @@
-{}
+{
+    "members/members": "Miembros",
+    "members/new_members": "Nuevos miembros",
+    "members/no_members": "No se encontraron miembros.",
+    "members/member_lists": "Lista de miembros",
+    "members/member_list_hide_banned_users": "Ocultar miembros baneados?",
+    "members/member_list_toggled_enabled": "La lista {{list}} se ha activado correctamente.",
+    "members/member_list_toggled_disabled": "La lista {{list}} se ha desactivado correctamente.",
+    "members/view_all": "Ver todo",
+    "members/find_member": "Buscar miembro",
+    "members/name": "Nombre...",
+    "members/view_group": "Ver grupo",
+    "members/group": "Grupo...",
+    "members/viewable_groups": "Grupos disponibles",
+    "members/no_results_header": "No se han encontrado resultados",
+    "members/no_results_text": "Tu búsqueda no devolvió resultados",
+    "members/no_overview_lists_enabled": "No se han habilitado listas de resumen.",
+    "members/settings_updated_successfully": "La configuración se actualizó exitosamente."
+}

From 8b8fce119e733d439c62bd8fa5d0c3afccbdedf8 Mon Sep 17 00:00:00 2001
From: Robin <robin+git@rkslot.nl>
Date: Thu, 11 May 2023 19:09:05 +0000
Subject: [PATCH 19/45] Remove placeholder from singular message (#3369)

---
 custom/languages/en_UK.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/custom/languages/en_UK.json b/custom/languages/en_UK.json
index 53623c0441..f5fb9939d4 100644
--- a/custom/languages/en_UK.json
+++ b/custom/languages/en_UK.json
@@ -1100,7 +1100,7 @@
     "time/less_than_a_minute": "less than a minute ago",
     "time/over_x_years": "over {{count}} years ago",
     "user/1_new_alert": "You have 1 new alert",
-    "user/1_new_message": "You have {{count}} new message",
+    "user/1_new_message": "You have 1 new message",
     "user/1_reaction": "1 reaction",
     "user/1_reply": "1 reply",
     "user/about": "About",

From 1d2827c04c211b4d1b15625de0993affcb244acf Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Sat, 13 May 2023 14:58:34 -0600
Subject: [PATCH 20/45] Fix not being able to see Members page in Navigation
 settings (#3372)

---
 modules/Members/module.php | 68 ++++++++++++++++++--------------------
 1 file changed, 33 insertions(+), 35 deletions(-)

diff --git a/modules/Members/module.php b/modules/Members/module.php
index a8cd59a1df..ac5dcd7ea8 100644
--- a/modules/Members/module.php
+++ b/modules/Members/module.php
@@ -56,44 +56,42 @@ public function onPageLoad(User $user, Pages $pages, Cache $cache, Smarty $smart
             'admincp.members' => $this->_members_language->get('members', 'member_lists')
         ]);
 
-        if (defined('FRONT_END')) {
-            $cache->setCache('navbar_order');
-            if (!$cache->isCached('members_order')) {
-                $members_order = 5;
-                $cache->store('members_order', 5);
-            } else {
-                $members_order = $cache->retrieve('members_order');
-            }
+        $cache->setCache('navbar_order');
+        if (!$cache->isCached('members_order')) {
+            $members_order = 5;
+            $cache->store('members_order', 5);
+        } else {
+            $members_order = $cache->retrieve('members_order');
+        }
 
-            $cache->setCache('navbar_icons');
-            if (!$cache->isCached('members_icon')) {
-                $members_icon = '';
-            } else {
-                $members_icon = $cache->retrieve('members_icon');
-            }
+        $cache->setCache('navbar_icons');
+        if (!$cache->isCached('members_icon')) {
+            $members_icon = '';
+        } else {
+            $members_icon = $cache->retrieve('members_icon');
+        }
 
-            $cache->setCache('nav_location');
-            if (!$cache->isCached('members_location')) {
-                $link_location = 1;
-                $cache->store('members_location', 1);
-            } else {
-                $link_location = $cache->retrieve('members_location');
-            }
+        $cache->setCache('nav_location');
+        if (!$cache->isCached('members_location')) {
+            $link_location = 1;
+            $cache->store('members_location', 1);
+        } else {
+            $link_location = $cache->retrieve('members_location');
+        }
 
-            switch ($link_location) {
-                case 1:
-                    // Navbar
-                    $navs[0]->add('members', $this->_members_language->get('members', 'members'), URL::build('/members'), 'top', null, $members_order, $members_icon);
-                    break;
-                case 2:
-                    // "More" dropdown
-                    $navs[0]->addItemToDropdown('more_dropdown', 'members', $this->_members_language->get('members', 'members'), URL::build('/members'), 'top', null, $members_icon, $members_order);
-                    break;
-                case 3:
-                    // Footer
-                    $navs[0]->add('members', $this->_members_language->get('members', 'members'), URL::build('/members'), 'footer', null, $members_order, $members_icon);
-                    break;
-            }
+        switch ($link_location) {
+            case 1:
+                // Navbar
+                $navs[0]->add('members', $this->_members_language->get('members', 'members'), URL::build('/members'), 'top', null, $members_order, $members_icon);
+                break;
+            case 2:
+                // "More" dropdown
+                $navs[0]->addItemToDropdown('more_dropdown', 'members', $this->_members_language->get('members', 'members'), URL::build('/members'), 'top', null, $members_icon, $members_order);
+                break;
+            case 3:
+                // Footer
+                $navs[0]->add('members', $this->_members_language->get('members', 'members'), URL::build('/members'), 'footer', null, $members_order, $members_icon);
+                break;
         }
 
         if (defined('BACK_END')) {

From c57c416411ab2094bec4430223e72152f844cf8a Mon Sep 17 00:00:00 2001
From: enno123 <admin@enno123.de>
Date: Fri, 12 May 2023 22:13:21 +0000
Subject: [PATCH 21/45] Translated using translate.namelessmc.com

Co-authored-by: enno123 <admin@enno123.de>
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/de/
Translation: NamelessMC/Website - Core
---
 custom/languages/de_DE.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/custom/languages/de_DE.json b/custom/languages/de_DE.json
index 866f96cfb0..4e55ce601d 100644
--- a/custom/languages/de_DE.json
+++ b/custom/languages/de_DE.json
@@ -847,7 +847,7 @@
     "time/less_than_a_minute": "vor weniger als einer Minute",
     "time/over_x_years": "über {{count}} Jahre her",
     "user/1_new_alert": "Du hast 1 neue Benachrichtigung",
-    "user/1_new_message": "Du hast {{count}} neue Nachrichten",
+    "user/1_new_message": "Du hast 1 neue Nachrichten",
     "user/1_reaction": "1 Reaktion",
     "user/1_reply": "1 Antwort",
     "user/about": "Über Mich",

From 5806ee1c28ea954b0719fdafc31367b5ce28780b Mon Sep 17 00:00:00 2001
From: Fjuro <ifjuro@proton.me>
Date: Mon, 15 May 2023 11:13:25 +0000
Subject: [PATCH 22/45] Translated using translate.namelessmc.com

Co-authored-by: Fjuro <ifjuro@proton.me>
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/cs/
Translation: NamelessMC/Website - Core
---
 custom/languages/cs_CZ.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/custom/languages/cs_CZ.json b/custom/languages/cs_CZ.json
index fe1aa6aefd..db22d1e7c0 100644
--- a/custom/languages/cs_CZ.json
+++ b/custom/languages/cs_CZ.json
@@ -875,7 +875,7 @@
     "time/less_than_a_minute": "před méně než minutou",
     "time/over_x_years": "před {{count}} lety",
     "user/1_new_alert": "Máte 1 nové upozornění",
-    "user/1_new_message": "Máte {{count}} novou zprávu",
+    "user/1_new_message": "Máte 1 novou zprávu",
     "user/1_reaction": "1 reakce",
     "user/1_reply": "1 odpověď",
     "user/about": "O uživateli",

From 1e7c0186555403d5ebbc793b7cb444371bf2982f Mon Sep 17 00:00:00 2001
From: Edouard DUCHESNES <edouard@duchesnes.fr>
Date: Mon, 15 May 2023 11:13:25 +0000
Subject: [PATCH 23/45] Translated using translate.namelessmc.com

Co-authored-by: Edouard DUCHESNES <edouard@duchesnes.fr>
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/fr/
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-discord-integration/fr/
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-members-module/fr/
Translation: NamelessMC/Website - Core
Translation: NamelessMC/Website - Discord Integration
Translation: NamelessMC/Website - Members module
---
 custom/languages/fr_FR.json                   | 32 +++++++++++++++++--
 .../Discord Integration/language/fr_FR.json   | 10 +++---
 modules/Members/language/fr_FR.json           | 20 +++++++++++-
 3 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/custom/languages/fr_FR.json b/custom/languages/fr_FR.json
index fac03024f1..c0e9011141 100644
--- a/custom/languages/fr_FR.json
+++ b/custom/languages/fr_FR.json
@@ -339,7 +339,7 @@
     "admin/placeholders": "Espace réservé",
     "admin/placeholders_friendly_name": "Nom amical",
     "admin/placeholders_friendly_name_info": "Utilisez cette option pour attribuer un 'surnom\\’ à cet espace réservé. Le nom amical sera utilisé à la place du nom brut.",
-    "admin/placeholders_info": "Les espaces réservés permettent au plugin NamelessMC Spigot d'envoyer des statistiques sur chaque joueur à votre site web afin qu'il puisse les afficher sur son profil et dans les messages du forum.",
+    "admin/placeholders_info": "Les espaces réservés permettent au plugin NamelessMC d'envoyer des statistiques sur chaque joueur à votre site web afin qu'il puisse les afficher sur son profil et dans les messages du forum.",
     "admin/placeholders_last_updated": "Dernière mise à jour",
     "admin/placeholders_name": "Nom",
     "admin/placeholders_none": "Il n'y a pas d'espace réservé.",
@@ -1040,5 +1040,33 @@
     "admin/new_hook": "Nouveau Webhook",
     "admin/group_sync_server": "Sélectionnez un serveur Minecraft à utiliser pour la synchronisation des groupe",
     "admin/client_id": "ID du client",
-    "admin/client_secret": "Secret du client"
+    "admin/client_secret": "Secret du client",
+    "admin/user_warned_webhook": "{{punished}} a été averti par {{punisher}}.",
+    "admin/image": "Image",
+    "admin/user_banned_webhook": "{{punished}} a été banni du site internet par {{punisher}}.",
+    "admin/auto_language_help": "Si activé, les invités et les utilisateurs déconnectés pourront laisser le site internet détecter automatiquement leur langue préférée.",
+    "admin/enable_auto_language": "Activer la détection automatique des langues ?",
+    "admin/event_supports_discord": "Cet événement prend en charge les webhooks Discord et dispose d'une intégration personnalisée.",
+    "admin/query_type_help": "Si le serveur query interne par défaut ne fonctionne pas, essayez une autre option.",
+    "admin/no_item_selected": "Aucun élément sélectionné",
+    "admin/pages": "Pages",
+    "admin/oauth": "OAuth",
+    "admin/oauth_info": "Configurez les fournisseurs OAuth pour permettre aux utilisateurs de se connecter avec leurs comptes de réseaux sociaux. {{docLinkStart}}Consultez notre documentation pour obtenir de l'aide{{docLinkEnd}}.",
+    "admin/placeholders_score": "Score",
+    "admin/not_linked": "Non lié",
+    "admin/not_set": "Non défini",
+    "admin/mass_email_failed_check_logs": "L'envoi d'un ou plusieurs courriels a échoué. Veuillez consulter le journal des courriels pour plus d'informations.",
+    "admin/no_hooks_yet": "Il n'y a pas encore de webhooks.",
+    "admin/panel_template_third_party": "Le modèle {{name}} est un modèle tiers. Veuillez noter que la compatibilité des versions n'est pas garantie entre les mises à jour mineures de NamelessMC, et que les problèmes doivent être redirigés vers l'auteur du modèle.",
+    "admin/authme_db_connection_success": "Connexion réussie",
+    "admin/authme_db_connection_failed": "Connexion échouée",
+    "admin/authme_db_test_connection": "Test de connexion",
+    "admin/page_url_contains_nameless_path": "Votre page personnalisée écraserait une page NamelessMC.",
+    "admin/queue": "File d'attente",
+    "admin/queue_cancel_task": "Annuler la tâche",
+    "admin/discord_hook": "Discord",
+    "admin/event_supports_normal": "Cet événement prend en charge les webhooks normaux.",
+    "admin/placeholders_last_updated_time": "Dernière mise à jour : {{time}}",
+    "admin/placeholders_player": "Joueur",
+    "admin/queue_cancel_task_confirm": "Êtes-vous sûr de vouloir annuler cette tâche ?"
 }
diff --git a/modules/Discord Integration/language/fr_FR.json b/modules/Discord Integration/language/fr_FR.json
index 22e3b50c67..267c7cb66c 100644
--- a/modules/Discord Integration/language/fr_FR.json	
+++ b/modules/Discord Integration/language/fr_FR.json	
@@ -9,14 +9,16 @@
     "discord_integration/discord_widget_theme": "Thème Discord Widget",
     "discord_integration/discord_widget_error": "Une erreur s'est produite lors de l'obtention du widget Discord : {{error}}.",
     "discord_integration/discord_id_required": "Veuillez entrer votre ID de serveur Discord.",
-    "discord_integration/discord_id_confirm": "Veuillez exécuter la commande \"/verify {{token}}\" dans Discord pour terminer la liaison de votre compte Discord.",
-    "discord_integration/discord_id_length": "Veuillez vous assurer que votre ID de serveur Discord comporte 18 caractères.",
+    "discord_integration/discord_id_confirm": "Veuillez exécuter la commande \"/verify token:{{token}}\" dans Discord pour terminer la liaison de votre compte Discord.",
+    "discord_integration/discord_id_length": "Veuillez vous assurer que votre ID de serveur Discord est compris entre {{min}} et {{max}} chiffres.",
     "discord_integration/discord_role_id": "Discord Role ID",
     "discord_integration/discord": "Discord",
     "discord_integration/discord_id_numeric": "Veuillez vous assurer que votre ID de serveur Discord est numérique (uniquement des chiffres).",
     "discord_integration/discord_invite_info": "Pour inviter le bot Nameless Link sur votre serveur Discord, cliquez sur {{inviteLinkStart}} ici{{inviteLinkEnd}}. Ensuite, exécutez la commande {{command}} pour lier le robot à votre site Web. Vous pouvez également {{selfHostLinkStart}} héberger le robot vous-même{{selfHostLinkEnd}}.",
-    "discord_integration/discord_role_id_length": "L'identifiant de rôle Discord doit comporter 18 chiffres.",
+    "discord_integration/discord_role_id_length": "L'ID du rôle Discord doit être compris entre {{min}} et {{max}} chiffres.",
     "discord_integration/discord_role_id_numeric": "L'ID de rôle Discord doit être numérique.",
     "discord_integration/discord_widget_disabled": "Le widget est désactivé pour le serveur Discord spécifié. Veuillez accéder à l'onglet \"Widget\" dans les paramètres de votre serveur Discord, et assurez-vous que le widget Discord est activé et que l'ID est correct.",
-    "discord_integration/enable_discord_integration": "Activer l'intégration de Discord ?"
+    "discord_integration/enable_discord_integration": "Activer l'intégration de Discord ?",
+    "discord_integration/discord_bot": "Bot Discord",
+    "discord_integration/link_method": "Méthode de liaison"
 }
diff --git a/modules/Members/language/fr_FR.json b/modules/Members/language/fr_FR.json
index 0967ef424b..cabb51c4b2 100644
--- a/modules/Members/language/fr_FR.json
+++ b/modules/Members/language/fr_FR.json
@@ -1 +1,19 @@
-{}
+{
+    "members/members": "Membres",
+    "members/new_members": "Nouveaux membres",
+    "members/no_members": "Aucun membre trouvé.",
+    "members/member_list_hide_banned_users": "Masquer les utilisateurs bannis ?",
+    "members/member_list_toggled_enabled": "Liste {{list}} activée avec succès.",
+    "members/member_list_toggled_disabled": "Liste {{list}} désactivée avec succès.",
+    "members/view_all": "Tout voir",
+    "members/find_member": "Trouver un membre",
+    "members/name": "Nom...",
+    "members/group": "Groupe...",
+    "members/viewable_groups": "Groupes visibles",
+    "members/no_results_header": "Aucun résultat trouvé",
+    "members/no_results_text": "Votre recherche n'a donné aucun résultat",
+    "members/settings_updated_successfully": "Paramètres mis à jour avec succès.",
+    "members/member_lists": "Listes des membres",
+    "members/view_group": "Afficher les groupes",
+    "members/no_overview_lists_enabled": "Aucune liste d'aperçu n'est activée."
+}

From 13e6e7a48114e60d867417fee304a31cdf92a2de Mon Sep 17 00:00:00 2001
From: Marcos <marckos03br@gmail.com>
Date: Mon, 22 May 2023 19:13:31 +0000
Subject: [PATCH 24/45] Translated using translate.namelessmc.com

Co-authored-by: Marcos <marckos03br@gmail.com>
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/es/
Translation: NamelessMC/Website - Core
---
 custom/languages/es_ES.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/custom/languages/es_ES.json b/custom/languages/es_ES.json
index 4c59f31ca4..1ede6ec454 100644
--- a/custom/languages/es_ES.json
+++ b/custom/languages/es_ES.json
@@ -875,7 +875,7 @@
     "time/less_than_a_minute": "hace menos de un minuto",
     "time/over_x_years": "hace más de {{count}} años",
     "user/1_new_alert": "Tienes un nuevo aviso",
-    "user/1_new_message": "Tienes {{count}} nuevos mensajes",
+    "user/1_new_message": "Tienes un nuevo mensaje",
     "user/1_reaction": "1 reacción",
     "user/1_reply": "1 respuesta",
     "user/about": "Acerca de",

From 3ba527fb36796dead0249c2dbee29829b9bb20bb Mon Sep 17 00:00:00 2001
From: Mesutcan Yavuz <mesutcan.yavuz@hotmail.com>
Date: Mon, 22 May 2023 19:13:31 +0000
Subject: [PATCH 25/45] Translated using translate.namelessmc.com

Co-authored-by: Mesutcan Yavuz <mesutcan.yavuz@hotmail.com>
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/cookie-consent/tr/
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/tr/
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-discord-integration/tr/
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-forum/tr/
Translation: NamelessMC/Website - Cookie Consent
Translation: NamelessMC/Website - Core
Translation: NamelessMC/Website - Discord Integration
Translation: NamelessMC/Website - Forum
---
 custom/languages/tr_TR.json                   | 28 ++++++---
 modules/Cookie Consent/language/tr_TR.json    | 14 ++++-
 .../Discord Integration/language/tr_TR.json   | 22 ++++++-
 modules/Forum/language/tr_TR.json             | 57 ++++++++++++-------
 4 files changed, 90 insertions(+), 31 deletions(-)

diff --git a/custom/languages/tr_TR.json b/custom/languages/tr_TR.json
index d898fb4af0..1cf2122edf 100644
--- a/custom/languages/tr_TR.json
+++ b/custom/languages/tr_TR.json
@@ -581,7 +581,7 @@
     "general/total_online_users": "Toplam aktif üye: {{count}}",
     "general/total_posts": "Mesajlar",
     "general/total_threads": "Konular",
-    "general/unlink": "Unlink",
+    "general/unlink": "Bağlantıyı kes",
     "general/url": "URL",
     "general/users_registered": "Kullanıcılar",
     "general/version": "Sürüm: {{version}}",
@@ -718,11 +718,11 @@
     "moderator/when": "Tarih",
     "moderator/x_closed_report": "{{user}} bu raporu kapattı.",
     "moderator/x_reopened_report": "{{user}} bu raporu tekrar açtı.",
-    "table/display_records_per_page": "Display _MENU_ records per page",
-    "table/filtered": "(filtered from _MAX_ total records)",
+    "table/display_records_per_page": "Sayfa başına _MENU_ kaydı görüntüle",
+    "table/filtered": "(toplam _MAX_ kayıttan filtrelendi)",
     "table/no_records": "Kayıt Yok",
     "table/nothing_found": "Sonuş Bulunamadı",
-    "table/page_x_of_y": "Showing page _PAGE_ of _PAGES_",
+    "table/page_x_of_y": "_PAGES_ sayfadan _PAGE_ sayfası gösteriliyor",
     "time/1_day": "1 gün önce",
     "time/1_minute": "1 dakika önce",
     "time/_days": "{{count}} gün önce",
@@ -735,7 +735,7 @@
     "time/less_than_a_minute": "1 dakikadan az bir süre önce",
     "time/over_x_years": "{{count}} yıldan uzun bir süre önce",
     "user/1_new_alert": "1 yeni bildiriminiz var",
-    "user/1_new_message": "{{count}} yeni mesajınız var",
+    "user/1_new_message": "1 yeni mesajınız var",
     "user/1_reaction": "1 reaksiyon",
     "user/1_reply": "1 cevap",
     "user/about": "Hakkında",
@@ -896,7 +896,7 @@
     "user/users_to_required": "Lütfen bazı mesaj alıcıları girin",
     "user/validate_account_command": "Kaydı tamamlamak için lütfen {{command}} oyun adı komutunu yürütün.",
     "user/validation_complete": "Hesabınız doğrulandı, şimdi giriş yapabilirsiniz.",
-    "user/validation_error": "Hesabınız doğrulanırken bilinmeyen bir hata oluştu, lütfen bir web sitesi yöneticisine başvurun..",
+    "user/validation_error": "Geçersiz doğrulama kodu, kullanıcı zaten doğrulandı mı?",
     "user/view_alerts": "Uyarıları görüntüle",
     "user/view_messages": "Mesajları görüntüle",
     "user/views": "Profilin görüntülenme sayısı:",
@@ -940,7 +940,7 @@
     "admin/email_message_message": "Mesaj",
     "admin/email_message_thanks": "Teşekkürler",
     "admin/email_port_invalid": "Lütfen geçerli bir e-posta portu girin.",
-    "admin/email_message_subject": "Subject",
+    "admin/email_message_subject": "Ders",
     "admin/email_preview_popup": "Ön izleme",
     "user/integration_unlinked": "{{integration}} hesabınızın bağlantısını başarıyla kaldırdınız.",
     "user/integration_required_to_continue": "Lütfen bu web sitesini kullanmaya devam etmeden önce bağlanın ve gerekli bağlantıları doğrulayın.",
@@ -1113,7 +1113,7 @@
     "admin/editing_hook": "Wobhook düzenleme",
     "admin/editing_language": "Dil Düzenleme",
     "admin/editing_messages": "Mesajları Düzenleme",
-    "admin/debug_link_toast": "Hata ayıklama bağlantısı panonuza kopyalandı!<br>Hata ayıklama günlüğünü görüntüleyin: {{linkStart}}buradan{{linkEnd}}",
+    "admin/debug_link_toast": "Hata ayıklama bağlantısını görmek için {{linkStart}}buraya tıklayın.{{linkEnd}}",
     "admin/debug_link_info": "Önemli - bu bağlantıyı yalnızca güvendiğiniz kişilerle paylaşın!",
     "admin/editing_integration_for_x": "{{user}} için {{integration}} entegrasyonunu düzenleme",
     "admin/editing_integration_x": "{{integration}} entegrasyonu düzenleniyor",
@@ -1189,5 +1189,15 @@
     "general/log_out_click": "Çıkış yapmak için buraya tıkla",
     "general/log_out_complete": "Çıkış başarılı. Devam etmek için {{linkStart}} ve {{linkEnd}} buraya tıkla.",
     "general/rate_limit": "Lütfen {{expires}} saniye sonra tekrar deneyiniz",
-    "user/tfa_disabled": "İki faktörlü doğrulama devre dışı."
+    "user/tfa_disabled": "İki faktörlü doğrulama devre dışı.",
+    "admin/authme_db_test_connection": "Deneme Bağlantısı",
+    "admin/authme_db_connection_success": "Bağlantı başarılı",
+    "admin/authme_db_connection_failed": "Bağlantı başarısız",
+    "user/avatar_removed_successfully": "Avatar başarıyla kaldırıldı",
+    "admin/auto_language_help": "Etkinleştirilirse, konuklar ve oturumu kapatan kullanıcılar, web sitesinin tercih ettikleri dili otomatik olarak algılamasına izin verebilir.",
+    "admin/user_banned_webhook": "{{punished}} isimli kullanıcı {{punisher}} tarafından siteden yasaklandı.",
+    "admin/user_warned_webhook": "{{punished}}, {{punisher}} tarafından uyarıldı.",
+    "user/remove_avatar": "Avatarı kaldır",
+    "user/username_already_exists": "Seçtiğiniz kullanıcı adı zaten var.",
+    "user/continue_with": "{{provider}} ile devam et"
 }
diff --git a/modules/Cookie Consent/language/tr_TR.json b/modules/Cookie Consent/language/tr_TR.json
index 0967ef424b..4ef0daa2c3 100644
--- a/modules/Cookie Consent/language/tr_TR.json	
+++ b/modules/Cookie Consent/language/tr_TR.json	
@@ -1 +1,13 @@
-{}
+{
+    "cookie/configure_cookies": "Çerezleri Yönet",
+    "cookie/cookie_notice_success": "Çerez bildirimi başarıyla güncellendi.",
+    "cookie/cookie_notice": "Çerez Bildirimi",
+    "cookie/cookie_notice_error": "Lütfen en fazla 10.000 karakterlik bir çerez bildirimi girin.",
+    "cookie/cookie_notice_info": "Bu widget çerez gerektirir",
+    "cookie/cookie_popup": "Bu web sitesi, tarama deneyiminizi geliştirmek için çerezleri kullanır.",
+    "cookie/cookie_popup_allow": "Çerezlere izin ver",
+    "cookie/cookie_popup_disallow": "Çerezlere izin verme",
+    "cookie/cookie_popup_more_info": "Daha fazla bilgi",
+    "cookie/cookies": "Çerezler",
+    "cookie/update_settings": "Çerez Açılır Penceresini Göster"
+}
diff --git a/modules/Discord Integration/language/tr_TR.json b/modules/Discord Integration/language/tr_TR.json
index 0967ef424b..388ddc43e6 100644
--- a/modules/Discord Integration/language/tr_TR.json	
+++ b/modules/Discord Integration/language/tr_TR.json	
@@ -1 +1,21 @@
-{}
+{
+    "discord_integration/discord_id_length": "Lütfen Discord Sunucu ID'nizin {{min}} ile {{max}} hane uzunluğunda olduğundan emin olun.",
+    "discord_integration/discord_role_id_length": "Discord Rol ID'si, {{min}} ile {{max}} basamak uzunluğunda olmalıdır.",
+    "discord_integration/discord_bot": "Discord Botu",
+    "discord_integration/discord_bot_setup": "Bot kuruldu mu?",
+    "discord_integration/discord_bot_must_be_setup": "Botu kurana kadar Discord Entegrasyonu etkinleştirilemez. Bilgi için lütfen {{linkStart}}buraya{{linkEnd}} tıklayın.",
+    "discord_integration/discord_guild_id": "Discord Sunucu ID",
+    "discord_integration/discord_id_confirm": "Discord hesabınızı bağlamayı tamamlamak için lütfen Discord'da \"/verify token:{{token}}\" komutunu çalıştırın.",
+    "discord_integration/discord_id_help": "Discord ID'i nerede bulacağınız hakkında bilgi için lütfen {{linkStart}}bunu{{linkEnd}} okuyun",
+    "discord_integration/discord_role_id_numeric": "Discord Rol ID'si sayısal olmalıdır.",
+    "discord_integration/discord": "Discord",
+    "discord_integration/discord_id_numeric": "Lütfen Discord Sunucu ID'nizin sayısal olduğundan emin olun (yalnızca sayılar).",
+    "discord_integration/discord_role_id": "Discord Rol ID",
+    "discord_integration/discord_settings_updated": "Discord ayarları başarıyla güncellendi",
+    "discord_integration/discord_usernames_updated": "Discord kullanıcı adı başarıyla güncellendi",
+    "discord_integration/discord_widget_error": "Discord widget'ı alınırken bir hata oluştu: {{error}}.",
+    "discord_integration/discord_widget_theme": "Discord Widget Teması",
+    "discord_integration/enable_discord_integration": "Discord entegrasyonu etkinleştirilsin mi?",
+    "discord_integration/discord_widget_disabled": "Widget, belirtilen Discord sunucusu için devre dışı bırakıldı. Lütfen Discord sunucu ayarlarınızdaki 'Widget' sekmesine gidin ve Discord widget'ının etkinleştirildiğinden ve id'sinin olduğundan emin olun.",
+    "discord_integration/link_method": "Bağlantı yöntemi"
+}
diff --git a/modules/Forum/language/tr_TR.json b/modules/Forum/language/tr_TR.json
index a6b995d184..9d8bbda8c6 100644
--- a/modules/Forum/language/tr_TR.json
+++ b/modules/Forum/language/tr_TR.json
@@ -17,10 +17,10 @@
     "forum/creating_label_type": "Yeni etiket türü oluşturma",
     "forum/creating_topic_in_x": "{{forum}} içinde konu oluşturuluyor",
     "forum/default_labels": "Default Labels",
-    "forum/default_labels_info": "These will be assigned to a new topic in the forum unless overridden during topic creation. Ctrl+Click to select multiple",
+    "forum/default_labels_info": "Bunlar, konu oluşturma sırasında geçersiz kılınmadığı sürece forumdaki yeni bir konuya atanacaktır. Birden çok seçmek için Ctrl+Tıkla",
     "forum/delete_forum": "Forumu sil",
     "forum/delete_topic": "Konuyu sil",
-    "forum/delete_topics_and_posts": "Konuları ve mesajları silme",
+    "forum/delete_topics_and_posts": "Konuları ve mesajları sil",
     "forum/discussion": "Tartışma",
     "forum/display_topics_as_news": "Konular ön sayfada haber olarak gösterilsin mi?",
     "forum/edit": "Düzenle",
@@ -53,8 +53,8 @@
     "forum/input_forum_title": "Lütfen bir forum başlığı girin.",
     "forum/insert_quotes": "Teklif Ekle",
     "forum/invalid_action": "Geçersiz eylem",
-    "forum/invalid_redirect_url": "Forum yönlendirmesini etkinleştirdiniz, ancak 1 ile 512 karakter arasında geçerli bir URL girmediniz.",
-    "forum/invalid_search_query": "Lütfen 3 ila 128 karakter uzunluğunda bir arama sorgusu girin.",
+    "forum/invalid_redirect_url": "Forum yönlendirmesini etkinleştirdiniz, ancak {{min}} ile {{max}} karakter arasında geçerli bir URL girmediniz.",
+    "forum/invalid_search_query": "Lütfen {{min}} ile {{max}} karakter uzunluğunda bir arama sorgusu girin.",
     "forum/label": "Etiket",
     "forum/label_creation_error": "Etiket oluşturma hatası. Lütfen adın 32 karakterden uzun olmadığından ve bir tür belirttiğinizden emin olun.",
     "forum/label_creation_success": "Etiket başarıyla oluşturuldu.",
@@ -86,18 +86,18 @@
     "forum/mod_actions": "Moderasyon",
     "forum/move_topic": "Konuyu taşı",
     "forum/move_topic_to": "Konuyu şuraya taşı:",
-    "forum/move_topics_and_posts_to": "Konuları ve mesajları şuraya taşı:",
-    "forum/new_forum": "<i class=\"fa fa-plus-circle\"></i> Forum ekle",
-    "forum/new_label": "<i class=\"fa fa-plus-circle\"></i> Etiket ekle",
-    "forum/new_label_type": "<i class=\"fa fa-plus-circle\"></i> Etiket türü ekle",
+    "forum/move_topics_and_posts_to": "Konuları ve mesajları şuraya taşı",
+    "forum/new_forum": "Yeni Forum",
+    "forum/new_label": "Yeni Etiket",
+    "forum/new_label_type": "Yeni Etiket Türü",
     "forum/new_reply": "Yeni Cevap",
     "forum/new_reply_in_topic": "{{author}}, {{topic}} konusunu yanıtladı",
     "forum/new_search": "Yeni Arama",
-    "forum/new_topic": "Yeni Konu Aç..",
-    "forum/new_topic_text": "{{forum}} tarafından {{author}} tarafından oluşturulan konu",
-    "forum/no_forums": "Forum Yok",
-    "forum/no_label_types_defined": "Henüz hiçbir etiket türü eklenmedi!",
-    "forum/no_labels_defined": "Henüz hiçbir etiket eklenmedi!",
+    "forum/new_topic": "Yeni Konu",
+    "forum/new_topic_text": "Konu, {{forum}} içerisinde {{author}} tarafından oluşturuldu",
+    "forum/no_forums": "Forum yok",
+    "forum/no_label_types_defined": "Henüz etiket türü tanımlanmadı.",
+    "forum/no_labels_defined": "Henüz etiket tanımlanmadı.",
     "forum/no_longer_following_topic": "Artık bu konuyu takip etmiyorsunuz ve yeni yanıtlardan haberdar edilmeyeceksiniz.",
     "forum/no_results_found": "Sonuç bulunamadı.",
     "forum/no_topics": "Henüz hiç konu oluşturulmadı.",
@@ -108,14 +108,14 @@
     "forum/parent_forum": "Ana Forum",
     "forum/parent_forum_x": "Ana Forum: {{forum}}",
     "forum/post_already_reported": "Bu gönderiyi zaten bildirdin!",
-    "forum/post_edited_successfully": "Gönderi başarıyla düzenlendi!",
+    "forum/post_edited_successfully": "Gönderi başarıyla düzenlendi.",
     "forum/post_successful": "Gönderi başarılı.",
     "forum/posts": "Mesaj",
     "forum/posts_title": "Mesajlar",
     "forum/quote": "Alıntı",
-    "forum/quoted_post": "Konu, alıntı konulara eklendi.",
+    "forum/quoted_post": "Gönderi alıntılandı",
     "forum/re": "RE: ",
-    "forum/read_full_post": "Konunun tamamını oku",
+    "forum/read_full_post": "Yazının tamamını oku",
     "forum/recent_posts": "Yakın Zamanda Gönderilenler",
     "forum/recent_topics": "Son Konular",
     "forum/redirect_forum": "Forum yeni sekmede açılsın mı?",
@@ -129,7 +129,7 @@
     "forum/share_facebook": "Facebook ile paylaş",
     "forum/share_twitter": "Twitter ile paylaş",
     "forum/spam_wait": "Lütfen tekrar göndermeden önce {{count}} saniye bekleyin.",
-    "forum/started_by_x": "{{author}} tarafından başlatıldı!",
+    "forum/started_by_x": "{{author}} tarafından başlatıldı",
     "forum/stats": "İstatistik",
     "forum/stick_topic": "Konuyu sabitle",
     "forum/sticky_topics": "Sabit Konular",
@@ -141,9 +141,9 @@
     "forum/topic_locked": "Konu Kilitlendi",
     "forum/topic_locked_notice": "Bu konu kilitli, ancak izinleriniz bir yanıt oluşturmanıza izin veriyor.",
     "forum/topic_placeholder": "Konu yer tutucusu",
-    "forum/topic_stuck": "Konu sabitlendi!",
+    "forum/topic_stuck": "Konu sabitlendi.",
     "forum/topic_title": "Konu Başlığı",
-    "forum/topic_unstuck": "Konu sabit konulardan kaldırıldı!",
+    "forum/topic_unstuck": "Konu sabit konulardan kaldırıldı.",
     "forum/topics": "Konu",
     "forum/topics_title": "Konular",
     "forum/total_posts": "Toplam konu sayısı",
@@ -157,5 +157,22 @@
     "forum/views": "Görüntüleme",
     "forum/x_posts": "{{count}} Mesaj",
     "forum/x_topics": "{{count}} Konu",
-    "forum/your_posts": "Mesaj sayınız"
+    "forum/your_posts": "Mesaj sayınız",
+    "forum/news_items_front_page_limit": "Ön sayfada görüntülenecek haber sayısı",
+    "forum/news_items_max": "Haber sayısı en az {{max}} olmalıdır",
+    "forum/news_items_min": "Haber sayısı en az {{min}} olmalıdır",
+    "forum/no_news": "Haber gönderisi yok.",
+    "forum/all_topics_unfollowed": "Tüm konular takipten çıkarıldı.",
+    "forum/available_hooks": "Mevcut Hook'lar",
+    "forum/include_in_hook": "Bu forumdaki etkinlikler webhooks'a dahil edilsin mi?",
+    "forum/confirm_unfollow_all_topics": "Tüm konuları takip etmeyi bırakmak istediğinizden emin misiniz?",
+    "forum/topic_reply": "Konu yanıtı",
+    "forum/label_type_in_use": "Etiket tipi kullanılıyor, silinemez.",
+    "forum/no_posts_found": "Gönderi bulunamadı.",
+    "forum/highest_reaction_scores": "En yüksek tepki puanları",
+    "forum/most_posts": "En iyi gönderiler",
+    "forum/not_following_any_topics": "Herhangi bir konuyu takip etmiyorsunuz.",
+    "forum/following_topics": "Takip edilen konular",
+    "forum/reaction_score": "Tepki puanı",
+    "forum/post_id": "Gönderi ID"
 }

From d322554e5ac2a7f0944197d45a0088fe09ccbf06 Mon Sep 17 00:00:00 2001
From: Mesutcan Yavuz <mesutcan.yavuz@hotmail.com>
Date: Thu, 25 May 2023 16:13:22 +0000
Subject: [PATCH 26/45] Translated using translate.namelessmc.com

Co-authored-by: Mesutcan Yavuz <mesutcan.yavuz@hotmail.com>
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/tr/
Translation: NamelessMC/Website - Core
---
 custom/languages/tr_TR.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/custom/languages/tr_TR.json b/custom/languages/tr_TR.json
index 1cf2122edf..40c4577881 100644
--- a/custom/languages/tr_TR.json
+++ b/custom/languages/tr_TR.json
@@ -1199,5 +1199,6 @@
     "admin/user_warned_webhook": "{{punished}}, {{punisher}} tarafından uyarıldı.",
     "user/remove_avatar": "Avatarı kaldır",
     "user/username_already_exists": "Seçtiğiniz kullanıcı adı zaten var.",
-    "user/continue_with": "{{provider}} ile devam et"
+    "user/continue_with": "{{provider}} ile devam et",
+    "admin/clone_group": "Grubu klonla"
 }

From 1d2057fb0aecc6fd45958fbf0ad8d150031be69e Mon Sep 17 00:00:00 2001
From: Maiu <maiuxd77@gmail.com>
Date: Thu, 25 May 2023 16:13:22 +0000
Subject: [PATCH 27/45] Translated using translate.namelessmc.com

Co-authored-by: Maiu <maiuxd77@gmail.com>
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/nb_NO/
Translation: NamelessMC/Website - Core
---
 custom/languages/no_NO.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/custom/languages/no_NO.json b/custom/languages/no_NO.json
index c988fbe0b6..62c620184e 100644
--- a/custom/languages/no_NO.json
+++ b/custom/languages/no_NO.json
@@ -1014,5 +1014,10 @@
     "admin/captcha_general": "Aktiver Captcha på registreringssiden?",
     "admin/captcha_login": "Aktiver Captcha på påloggingssiden?",
     "admin/dashboard": "Dashboard",
-    "admin/debug_link": "Feilsøkingslenke"
+    "admin/debug_link": "Feilsøkingslenke",
+    "admin/user_banned_webhook": "{{punished}} har blitt utestengt fra nettsiden av {{punisher}}.",
+    "admin/user_warned_webhook": "{{punished}} har fått en advarsel av {{punisher}}.",
+    "admin/authme_db_test_connection": "Test tilkobling",
+    "admin/authme_db_connection_success": "Tilkobling vellykket",
+    "admin/authme_db_connection_failed": "Tilkobling mislykket"
 }

From b01611d9edc825f38703b59d08cc7b23f4f25786 Mon Sep 17 00:00:00 2001
From: Dominik Roman <dominikslk9@gmail.com>
Date: Thu, 25 May 2023 16:13:22 +0000
Subject: [PATCH 28/45] Translated using translate.namelessmc.com

Co-authored-by: Dominik Roman <dominikslk9@gmail.com>
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/sk/
Translation: NamelessMC/Website - Core
---
 custom/languages/sk_SK.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/custom/languages/sk_SK.json b/custom/languages/sk_SK.json
index 246c0bab63..c1a9f7312e 100644
--- a/custom/languages/sk_SK.json
+++ b/custom/languages/sk_SK.json
@@ -885,7 +885,7 @@
     "time/less_than_a_minute": "pred menej ako minútou",
     "time/over_x_years": "pred viac ako {{count}} rokmi",
     "user/1_new_alert": "Máte 1 nové upozornenie",
-    "user/1_new_message": "Máte {{count}} novú správu",
+    "user/1_new_message": "Máte 1 novú správu",
     "user/1_reaction": "1 reakcia",
     "user/1_reply": "1 odpoveď",
     "user/about": "O užívateľovi",

From 609a33b64161124293b1d080053fa7c3ae8338e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?andreas=20phillip=20s=C3=B8ndergaard=20andersen?=
 <andreas.andersen1410@gmail.com>
Date: Thu, 25 May 2023 16:13:22 +0000
Subject: [PATCH 29/45] Translated using translate.namelessmc.com
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: andreas phillip søndergaard andersen <andreas.andersen1410@gmail.com>
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-forum/da/
Translation: NamelessMC/Website - Forum
---
 modules/Forum/language/da_DK.json | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/modules/Forum/language/da_DK.json b/modules/Forum/language/da_DK.json
index 0967ef424b..700733a6db 100644
--- a/modules/Forum/language/da_DK.json
+++ b/modules/Forum/language/da_DK.json
@@ -1 +1,16 @@
-{}
+{
+    "forum/all_topics_unfollowed": "Alle emner bliver ikke flugt mere",
+    "forum/available_hooks": "Ledig Hooks",
+    "forum/topic_reply": "emne svar",
+    "forum/can_create_topic": "kan oprette emner?",
+    "forum/can_post_reply": "kan svar?",
+    "forum/can_view_forum": "kan se forum?",
+    "forum/confirm_delete_post": "Er du sikker på at du vil slette dette opslag?",
+    "forum/confirm_delete_topic": "Er du sikker på du vil slette dette emne?",
+    "forum/by": "ved",
+    "forum/can_edit_topic": "kan redigere deres emne?",
+    "forum/edit": "Redigere",
+    "forum/delete_topic": "slet emne",
+    "forum/delete_forum": "Slet forum",
+    "forum/delete_topics_and_posts": "Slet enme og opslag"
+}

From dacb3cdf7125dd4dd7f802b4a5e1850e8a0d7f3d Mon Sep 17 00:00:00 2001
From: Supercrafter100 <58982133+supercrafter100@users.noreply.github.com>
Date: Thu, 1 Jun 2023 22:08:25 +0200
Subject: [PATCH 30/45] Fix multi query (#3383)

* Add id to default server

* Fix multiquery
---
 core/classes/Minecraft/PluginQuery.php | 9 +++++----
 modules/Core/module.php                | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/core/classes/Minecraft/PluginQuery.php b/core/classes/Minecraft/PluginQuery.php
index b7ea6656c9..18ca8d3d31 100644
--- a/core/classes/Minecraft/PluginQuery.php
+++ b/core/classes/Minecraft/PluginQuery.php
@@ -63,17 +63,18 @@ public static function multiQuery(array $servers, Language $language, bool $accu
         $cache->setCache('latest_query');
 
         foreach ($servers as $server) {
-            $server_id = $server->id;
-            $data = $cache->retrieve($server_id);
+            $server_id = $server['id'];
+          
             if (!$cache->isCached($server_id) && $accumulate === true) {
                 $to_return[] = [
-                    'name' => Output::getClean($data['name']),
+                    'name' => Output::getClean($server['name']),
                     'status_value' => 0,
                     'status' => $language->get('general', 'offline'),
                     'server_offline' => $language->get('general', 'server_offline')
                 ];
             } else {
                 // Server is online
+                $data = $cache->retrieve($server_id);
                 if ($accumulate === false) {
                     $to_return[] = [
                         'name' => Output::getClean($server['name']),
@@ -107,4 +108,4 @@ public static function multiQuery(array $servers, Language $language, bool $accu
 
         return $to_return;
     }
-}
\ No newline at end of file
+}
diff --git a/modules/Core/module.php b/modules/Core/module.php
index d49a78a287..5796311b97 100644
--- a/modules/Core/module.php
+++ b/modules/Core/module.php
@@ -834,7 +834,7 @@ public function onPageLoad(User $user, Pages $pages, Cache $cache, Smarty $smart
                     }
 
                     if (!is_null($default) && isset($default->ip)) {
-                        $full_ip = ['ip' => $default->ip . (is_null($default->port) ? '' : ':' . $default->port), 'pre' => $default->pre, 'name' => $default->name];
+                        $full_ip = ['ip' => $default->ip . (is_null($default->port) ? '' : ':' . $default->port), 'pre' => $default->pre, 'name' => $default->name, 'id' => $default->id];
 
                         // Get query type
                         $query_type = Util::getSetting('query_type', 'internal');

From 2010a6ab3ebeacaa1143f7fc8da55754b2d8eb94 Mon Sep 17 00:00:00 2001
From: PadowYT2 <me@padow.ru>
Date: Fri, 9 Jun 2023 04:06:38 +0300
Subject: [PATCH 31/45] Fix icon not being properly shown (#3377)

---
 core/classes/Misc/ErrorHandler.php | 1 +
 core/includes/error.tpl            | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/classes/Misc/ErrorHandler.php b/core/classes/Misc/ErrorHandler.php
index fa9ec37198..fd74b14342 100644
--- a/core/classes/Misc/ErrorHandler.php
+++ b/core/classes/Misc/ErrorHandler.php
@@ -142,6 +142,7 @@ public static function catchException(?Throwable $exception, ?string $error_stri
             'PRISM_CSS' => $path . 'plugins/prism/prism_light_atom.css',
             'PRISM_JS' => $path . 'plugins/prism/prism.js',
             'DETAILED_ERROR' => Debugging::canViewDetailedError(),
+            'LOGO' => $path . 'img/namelessmc_logo.png',
             'FATAL_ERROR_TITLE' => $language->get('errors', 'fatal_error_title'),
             'FATAL_ERROR_MESSAGE_ADMIN' => $language->get('errors', 'fatal_error_message_admin'),
             'FATAL_ERROR_MESSAGE_USER' => $language->get('errors', 'fatal_error_message_user'),
diff --git a/core/includes/error.tpl b/core/includes/error.tpl
index cd78d737c4..d304bf3281 100644
--- a/core/includes/error.tpl
+++ b/core/includes/error.tpl
@@ -19,7 +19,7 @@
     {if $DETAILED_ERROR}
         <div class="ui inverted borderless menu" style="border-radius: 0;">
             <span class="item">
-                <img style="width: 30px; height: 30px;" src="core/assets/img/namelessmc_logo.png" alt="Logo">&nbsp;
+                <img style="width: 30px; height: 30px;" src="{$LOGO}" alt="Logo">&nbsp;
             </span>
             <div class="right menu">
                 <a class="item" target="_blank" href="https://discord.gg/nameless">

From 6a1d395272f48e7c3d0e686839b709948f562c60 Mon Sep 17 00:00:00 2001
From: Ilya Finogenov <bywgis@gmail.com>
Date: Fri, 9 Jun 2023 04:21:10 +0300
Subject: [PATCH 32/45] Fix ghost player on status page (#3351)

Co-authored-by: Tadhg Boyle <tadhgsmboyle@gmail.com>
---
 custom/templates/DefaultRevamp/widgets/server_status.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/custom/templates/DefaultRevamp/widgets/server_status.tpl b/custom/templates/DefaultRevamp/widgets/server_status.tpl
index 7665caedf3..f3f3886783 100644
--- a/custom/templates/DefaultRevamp/widgets/server_status.tpl
+++ b/custom/templates/DefaultRevamp/widgets/server_status.tpl
@@ -16,7 +16,7 @@
                         {if $SERVER.status_value eq 1}
                         <div class="ui divider"></div>
                         <p>{$ONLINE}: <strong>{$SERVER.player_count} / {$SERVER.player_count_max}</strong></p>
-                        {if isset($SERVER.format_player_list) && count($SERVER.format_player_list)}
+                        {if isset($SERVER.format_player_list) && count($SERVER.format_player_list) && ($SERVER.player_count > 0)}
                         <p>
                             {foreach from=$SERVER.format_player_list item=player}
                             <a href="{$player.profile}" data-toggle="tooltip" data-content="{$player.username}"><img
@@ -36,4 +36,4 @@
             {/if}
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>

From 12e62fed61203243504642ebbff12c66003c2dc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?andreas=20phillip=20s=C3=B8ndergaard=20andersen?=
 <andreas.andersen1410@gmail.com>
Date: Tue, 6 Jun 2023 15:13:23 +0000
Subject: [PATCH 33/45] Translated using translate.namelessmc.com
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: andreas phillip søndergaard andersen <andreas.andersen1410@gmail.com>
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-forum/da/
Translation: NamelessMC/Website - Forum
---
 modules/Forum/language/da_DK.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/Forum/language/da_DK.json b/modules/Forum/language/da_DK.json
index 700733a6db..1d5a9ef060 100644
--- a/modules/Forum/language/da_DK.json
+++ b/modules/Forum/language/da_DK.json
@@ -1,5 +1,5 @@
 {
-    "forum/all_topics_unfollowed": "Alle emner bliver ikke flugt mere",
+    "forum/all_topics_unfollowed": "Alle emner bliver ikke flugt mere.",
     "forum/available_hooks": "Ledig Hooks",
     "forum/topic_reply": "emne svar",
     "forum/can_create_topic": "kan oprette emner?",
@@ -12,5 +12,6 @@
     "forum/edit": "Redigere",
     "forum/delete_topic": "slet emne",
     "forum/delete_forum": "Slet forum",
-    "forum/delete_topics_and_posts": "Slet enme og opslag"
+    "forum/delete_topics_and_posts": "Slet enme og opslag",
+    "forum/average_posts": "Gennemsnitligt antal brugerindlæg"
 }

From 6b2b1ccb9e3f1fcce82421ece4549b26017379b2 Mon Sep 17 00:00:00 2001
From: NamelessMC Translations <robin+weblate@rkslot.nl>
Date: Tue, 6 Jun 2023 15:13:23 +0000
Subject: [PATCH 34/45] Translated using translate.namelessmc.com

Co-authored-by: NamelessMC Translations <robin+weblate@rkslot.nl>
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/nl/
Translation: NamelessMC/Website - Core
---
 custom/languages/nl_NL.json | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/custom/languages/nl_NL.json b/custom/languages/nl_NL.json
index bd0095ac24..ab0c0950a2 100644
--- a/custom/languages/nl_NL.json
+++ b/custom/languages/nl_NL.json
@@ -388,7 +388,7 @@
     "admin/placeholders": "Placeholders",
     "admin/placeholders_friendly_name": "Vriendelijke Naam",
     "admin/placeholders_friendly_name_info": "Gebruik dit om een 'bijnaam' in te stellen op deze placeholder. De vriendelijke naam zal worden gebruikt in plaats van de onbewerkte naam.",
-    "admin/placeholders_info": "Placeholders laten de NamelessMC Spigot plugin toe om statistieken over elke speler naar uw website te sturen, zodat ze die kunnen weergeven op hun profiel en forumberichten.",
+    "admin/placeholders_info": "Placeholders laten de NamelessMC plugin statistieken over elke speler naar de website sturen, zodat ze weergeven kunnen worden op hun profiel en bij forumberichten.",
     "admin/placeholders_last_updated": "Laatst Geüpdatet",
     "admin/placeholders_name": "Naam",
     "admin/placeholders_none": "Er zijn geen placeholders.",
@@ -739,7 +739,7 @@
     "installer/install": "Installatie",
     "installer/installer_information": "Het installatieprogramma leidt je door het installatieproces.",
     "installer/installer_now_initialising_database": "De installateur is de database aan het instellen. Dit kan een tijdje duren...",
-    "installer/installer_welcome": "Welkom bij NamelessMC versie 2.0",
+    "installer/installer_welcome": "Welkom bij NamelessMC versie 2",
     "installer/language": "Taal",
     "installer/no": "Nee",
     "installer/no_converters_available": "Er zijn geen converters beschikbaar.",
@@ -862,7 +862,7 @@
     "time/less_than_a_minute": "Minder dan een minuut geleden",
     "time/over_x_years": "meer dan {{count}} jaar geleden",
     "user/1_new_alert": "U heeft 1 nieuwe melding",
-    "user/1_new_message": "Je hebt {{count}} nieuw bericht",
+    "user/1_new_message": "Je hebt 1 nieuw bericht",
     "user/1_reaction": "1 reactie",
     "user/1_reply": "1 antwoord",
     "user/about": "Over",
@@ -1026,7 +1026,7 @@
     "user/users_to_required": "Je moet minimaal 1 ontvanger invoeren",
     "user/validate_account_command": "Om de registratie te voltooien, run alstublieft het commando {{command}} in-spel.",
     "user/validation_complete": "Je account is bevestigd, je kunt nu inloggen.",
-    "user/validation_error": "Er was een onbekend probleem bij het bevestigen van je account, neem contact op met de beheerds.",
+    "user/validation_error": "Ongeldige verificatiecode, is de gebruiker al geverifieerd?",
     "user/view_alerts": "Bekijk meldingen",
     "user/view_messages": "Bekijk berichten",
     "user/views": "Profiel weergaven:",
@@ -1110,7 +1110,7 @@
     "admin/verified": "Geverifieerd",
     "api/integration_identifier_already_linked": "{{integration}} identificatie is al gekoppeld aan een andere gebruiker.",
     "general/oauth_message_continue": "Vervolg registratie met {{provider}}",
-    "installer/friendly_urls_info": "Vriendelijke URLs zorgen voor een betere leesbaarheid van URLs in je browser.<br />Bijvoorbeeld: <br /><code>example.com/index.php?route=/forum</code><br />wordt dan:<br /><code>example.com/forum</code><br /><div class=\"ui inverted orange segment\"><i class=\"exclamation circle icon\"></i><strong>Belangrijk!</strong><br />Je server moet correct geconfigureerd zijn om dit te laten werken. Je kan zien of je deze optie kunt aanzetten door <a href=\"./rewrite_test\" target=\"_blank\" style=\"color:#2185D0\">hier</a> te klikken.</div>",
+    "installer/friendly_urls_info": "Vriendelijke URLs zorgen voor een betere leesbaarheid van URLs in je browser.<br />Bijvoorbeeld: <span class=\"ui basic label\">example.com/index.php?route=/forum</span> wordt dan: <br /><span class=\"ui basic label\">example.com/forum</span><br /><div class=\"ui inverted orange segment\"><i class=\"exclamation circle icon\"></i><strong>Belangrijk!</strong><br />Je server moet correct geconfigureerd zijn om dit te laten werken. Je kan zien of je deze optie kunt aanzetten door <a href=\"./rewrite_test\" target=\"_blank\" style=\"color:#2185D0\">hier</a> te klikken.</div>",
     "installer/hostname_error": "Vul alstublieft een geldige hostnaam in zonder http:// of https://",
     "installer/support_message": "Als je hulp nodig hebt, check dan onze website {{websiteLinkStart}}hier{{websiteLinkEnd}}, of je kan ook onze {{discordLinkStart}}Discord server{{discordLinkEnd}} bezoeken of onze {{githubLinkStart}}GitHub opslagplaats{{githubLinkEnd}}.",
     "user/agree_t_and_c": "Ik heb de {{linkStart}}Termen en Voorwaarden{{linkEnd}} gelezen en ga akkoord.",
@@ -1237,5 +1237,6 @@
     "admin/emoji_joypixels": "JoyPixels",
     "admin/confirm_delete_placeholder": "Weet je zeker dat je deze placeholder wilt verwijderen?",
     "admin/discord_hook": "Discord",
-    "admin/emoji_twemoji": "Twemoji"
+    "admin/emoji_twemoji": "Twemoji",
+    "general/sql_query": "SQL-query"
 }

From 80522dd99a515ae07b7a0409afd7136ea4412435 Mon Sep 17 00:00:00 2001
From: Petr Kubinec <petrkubinec9@gmail.com>
Date: Tue, 6 Jun 2023 15:13:23 +0000
Subject: [PATCH 35/45] Translated using translate.namelessmc.com

Co-authored-by: Petr Kubinec <petrkubinec9@gmail.com>
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/en_US/
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-forum/en_US/
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-members-module/en_US/
Translation: NamelessMC/Website - Core
Translation: NamelessMC/Website - Forum
Translation: NamelessMC/Website - Members module
---
 custom/languages/en_US.json         |  9 ++++++++-
 modules/Forum/language/en_US.json   |  9 ++++++++-
 modules/Members/language/en_US.json | 18 +++++++++++++++++-
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/custom/languages/en_US.json b/custom/languages/en_US.json
index e61969b88a..5efe17c84e 100644
--- a/custom/languages/en_US.json
+++ b/custom/languages/en_US.json
@@ -1209,5 +1209,12 @@
     "admin/require_minecraft_username_on_registration": "Require Minecraft Username on registration?",
     "user/like": "Like",
     "user/profile_post_reply": "Profile Post Reply",
-    "api/webhook_added": "The webhook has been created"
+    "api/webhook_added": "The webhook has been created",
+    "admin/user_banned_webhook": "{{punished}} has been banned from the website by {{punisher}}.",
+    "admin/user_warned_webhook": "{{punished}} has been warned by {{punisher}}.",
+    "admin/clone_group": "Clone group",
+    "admin/auto_language_help": "If enabled, guests & logged out users will be able to let the website automatically detect their preferred language.",
+    "admin/authme_db_test_connection": "Test Connection",
+    "admin/authme_db_connection_success": "Connection successful",
+    "admin/authme_db_connection_failed": "Connection failed"
 }
diff --git a/modules/Forum/language/en_US.json b/modules/Forum/language/en_US.json
index 1565620be0..bfb6a44114 100644
--- a/modules/Forum/language/en_US.json
+++ b/modules/Forum/language/en_US.json
@@ -176,5 +176,12 @@
     "forum/topic_reply": "Topic reply",
     "forum/label_type_in_use": "Label type is being used, cannot be deleted.",
     "forum/latest_posts_widget_cached": "The latest posts widget is cached for one minute, your changes may not take effect immediately.",
-    "forum/latest_posts_limit": "Latest posts limit"
+    "forum/latest_posts_limit": "Latest posts limit",
+    "forum/news_items_max": "Number of news items should be at least {{max}}",
+    "forum/news_items_min": "Number of news items should be at least {{min}}",
+    "forum/news_items_front_page_limit": "Number of news items to display on front page",
+    "forum/reaction_score": "Reaction score",
+    "forum/no_posts_found": "No posts found.",
+    "forum/highest_reaction_scores": "Highest reaction scores",
+    "forum/most_posts": "Most posts"
 }
diff --git a/modules/Members/language/en_US.json b/modules/Members/language/en_US.json
index 0967ef424b..8567e72a39 100644
--- a/modules/Members/language/en_US.json
+++ b/modules/Members/language/en_US.json
@@ -1 +1,17 @@
-{}
+{
+    "members/members": "Menbers",
+    "members/new_members": "New members",
+    "members/no_members": "No members found.",
+    "members/member_lists": "Member Lists",
+    "members/member_list_hide_banned_users": "Hide banned users?",
+    "members/member_list_toggled_enabled": "Successfully enabled {{list}} list.",
+    "members/member_list_toggled_disabled": "Successfully disabled {{list}} list.",
+    "members/view_all": "View all",
+    "members/find_member": "Find member",
+    "members/name": "Name...",
+    "members/view_group": "View group",
+    "members/group": "Group...",
+    "members/no_results_header": "No results found",
+    "members/no_results_text": "Your search returned no results",
+    "members/viewable_groups": "Viewable groups"
+}

From d6814dcbe58240bc2c53ed73fdd382c6bf65cd0c Mon Sep 17 00:00:00 2001
From: untuned <untuned@teamhydra.dev>
Date: Tue, 6 Jun 2023 15:13:23 +0000
Subject: [PATCH 36/45] Translated using translate.namelessmc.com

Co-authored-by: untuned <untuned@teamhydra.dev>
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/en_US/
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-members-module/en_US/
Translation: NamelessMC/Website - Core
Translation: NamelessMC/Website - Members module
---
 custom/languages/en_US.json         | 122 ++++++++++++++++++++++++++--
 modules/Members/language/en_US.json |   4 +-
 2 files changed, 116 insertions(+), 10 deletions(-)

diff --git a/custom/languages/en_US.json b/custom/languages/en_US.json
index 5efe17c84e..5df0d28751 100644
--- a/custom/languages/en_US.json
+++ b/custom/languages/en_US.json
@@ -403,7 +403,7 @@
     "admin/placeholders": "Placeholders",
     "admin/placeholders_friendly_name": "Friendly Name",
     "admin/placeholders_friendly_name_info": "Use this to set a 'nickname' to this placeholder. The friendly name will be used instead of the raw name.",
-    "admin/placeholders_info": "Placeholders allow the NamelessMC Spigot plugin to send statistics about each player to your website so they can display them on their profile and forum posts.",
+    "admin/placeholders_info": "Placeholders allow the NamelessMC plugin to send statistics about each player to your website so they can display them on their profile and forum posts.",
     "admin/placeholders_last_updated": "Last Updated",
     "admin/placeholders_name": "Name",
     "admin/placeholders_none": "There are no placeholders.",
@@ -761,7 +761,7 @@
     "installer/finish": "Finish",
     "installer/finish_message": "Thanks for installing NamelessMC! You can now proceed to the StaffCP, where you can further configure your website.",
     "installer/friendly_urls": "Friendly URLs",
-    "installer/friendly_urls_info": "Friendly URLs will improve the readability of URLs in your browser.<br />For example: <br /><code>example.com/index.php?route=/forum</code><br />would become:<br /><code>example.com/forum</code><br /><div class=\"ui inverted orange segment\"><i class=\"exclamation circle icon\"></i><strong>Important!</strong><br />Your server must be configured correctly for this to work. You can see whether you can enable this option by clicking <a href=\"./rewrite_test\" target=\"_blank\" style=\"color:#2185D0\">here</a>.</div>",
+    "installer/friendly_urls_info": "Friendly URLs will improve the readability of URLs in your browser.<br />For example: <span class=\"ui basic label\">example.com/index.php?route=/forum</span> would become:<br /><span class=\"ui basic label\">example.com/forum</span><br /><div class=\"ui inverted orange segment\"><i class=\"exclamation circle icon\"></i><strong>Important!</strong><br />Your server must be configured correctly for this to work. You can see whether you can enable this option by clicking <a href=\"./rewrite_test\" target=\"_blank\" style=\"color:#2185D0\">here</a>.</div>",
     "installer/general_configuration": "General Configuration",
     "installer/host": "Hostname",
     "installer/host_help": "The hostname is the <strong>base URL</strong> for your website. Do not include the subfolders from the Installation Path field, or http(s):// here!",
@@ -770,7 +770,7 @@
     "installer/install": "Install",
     "installer/installer_information": "The installer will guide you through the installation process.",
     "installer/installer_now_initialising_database": "The installer is now initializing the database. This may take a while...",
-    "installer/installer_welcome": "Welcome to NamelessMC version 2.0",
+    "installer/installer_welcome": "Welcome to NamelessMC version 2",
     "installer/language": "Language",
     "installer/no": "No",
     "installer/no_converters_available": "There are no converters available.",
@@ -894,7 +894,7 @@
     "time/less_than_a_minute": "less than a minute ago",
     "time/over_x_years": "over {{count}} years ago",
     "user/1_new_alert": "You have 1 new alert",
-    "user/1_new_message": "You have {{count}} new message",
+    "user/1_new_message": "You have 1 new message",
     "user/1_reaction": "1 reaction",
     "user/1_reply": "1 reply",
     "user/about": "About",
@@ -906,10 +906,10 @@
     "user/agree_t_and_c": "I have read and accept the {{linkStart}}Terms and Conditions{{linkEnd}}.",
     "user/alerts": "Alerts",
     "user/authme_account_linked": "Account linked successfully.",
-    "user/authme_email_help_1": "Finally, please enter your email address.",
-    "user/authme_email_help_2": "Finally, please enter your email address, and also choose a display name for your account.",
+    "user/authme_email_help_1": "Finally, please enter the following details.",
+    "user/authme_email_help_2": "Finally, please enter the following details, and also choose a display name for your account.",
     "user/authme_help": "Please enter your ingame AuthMe account details. If you don't already have an account ingame, join the server now and follow the instructions provided.",
-    "user/authme_username_exists": "Your Authme account has already been connected to the website!",
+    "user/authme_username_exists": "Your AuthMe account has already been connected to the website!",
     "user/avatar": "Avatar",
     "user/block_user": "Block User",
     "user/cant_send_to_self": "You can't send a message to yourself!",
@@ -1066,7 +1066,7 @@
     "user/users_to_required": "Please input some message recipients",
     "user/validate_account_command": "To complete registration, please execute the command {{command}} ingame.",
     "user/validation_complete": "Your account has been validated, you can now log in.",
-    "user/validation_error": "There was an unknown error validating your account, please contact a website administrator.",
+    "user/validation_error": "Invalid validation code, has the user already been validated?",
     "user/view_alerts": "View alerts",
     "user/view_messages": "View messages",
     "user/views": "Profile Views:",
@@ -1216,5 +1216,109 @@
     "admin/auto_language_help": "If enabled, guests & logged out users will be able to let the website automatically detect their preferred language.",
     "admin/authme_db_test_connection": "Test Connection",
     "admin/authme_db_connection_success": "Connection successful",
-    "admin/authme_db_connection_failed": "Connection failed"
+    "admin/authme_db_connection_failed": "Connection failed",
+    "installer/step_select_modules": "Select Modules",
+    "admin/og_image_updated_successfully": "OG image updated successfully.",
+    "admin/image": "Image",
+    "installer/timezone": "Timezone",
+    "admin/unable_to_load_outdated_module": "Unable to load outdated module {{module}}.",
+    "admin/unable_to_load_module": "Error {{message}} in module {{module}}.",
+    "admin/internal": "Internal",
+    "admin/external": "External",
+    "admin/query_type": "Query type",
+    "admin/emoji_native": "Native",
+    "admin/emoji_style": "Emoji Style",
+    "admin/emoji_style_help": "Change which emoji set is used:<br>&bull; Native {{nativeExample}} <br>&bull; Twemoji {{twemojiExample}} <br>&bull; JoyPixels {{joypixelsExample}}",
+    "admin/emoji_joypixels": "JoyPixels",
+    "admin/event_supports_discord": "This event supports Discord webhooks and has a custom embed.",
+    "admin/query_type_help": "If the default internal server query does not work, try another option.",
+    "admin/mass_email_failed_check_logs": "One or more emails failed to send. Please check the email logs for more information.",
+    "admin/og_image_reset_successfully": "OG image reset successfully.",
+    "admin/fallback_og_image_x": "Fallback OG image: {{imageName}}",
+    "admin/panel_template_third_party": "Panel template {{name}} is a third party template. Please be aware that version compatibility is not guaranteed between minor NamelessMC updates, and issues should be redirected to the template author.",
+    "admin/queue_info": "The queue allows for tasks to be scheduled and performed in the background. To use the cron queue runner, create a cron job to access the below URL at the defined interval.",
+    "admin/queue_interval": "Queue Interval (minutes)",
+    "admin/queue_interval_at_least_x": "Please enter a queue interval of at least {{x}} minutes",
+    "admin/queue_task_action_invalid": "Invalid task action",
+    "admin/queue_task_fragment_next": "Task fragment next offset",
+    "admin/queue_task_invalid_status_to_requeue": "The task is not in a valid state for it to be requeued",
+    "admin/render_profile_post_hook_info": "Render profile post",
+    "general/joined": "Joined",
+    "general/oauth_email_verified_automatically": "Email will be verified automatically",
+    "general/unable_to_load_widget": "Unable to load widget",
+    "api/groups_updates_successfully": "Groups updated successfully",
+    "installer/select_modules_details": "Select the modules you would like to enable on your site. These can be toggled later on through the admin panel.",
+    "user/successful_login_synced_password": "You have successfully logged in, and your password has been synced with your AuthMe password.",
+    "general/registration_disabled_message_fallback": "Registration is currently disabled.",
+    "installer/username_min_max": "Please ensure your username is between {{minUsername}} and {{maxUsername}} characters long.",
+    "installer/username_required": "Please input a valid username.",
+    "installer/email_min_max": "Please ensure your email address is between {{minEmail}} and {{maxEmail}} characters long.",
+    "installer/email_required": "Please input a valid email.",
+    "installer/password_min_max": "Please ensure your password is between {{minPassword}} and {{maxPassword}} characters long.",
+    "installer/password_required": "Please input a valid password.",
+    "installer/module_core_description": "This module is required for NamelessMC to function correctly.",
+    "installer/module_cookie-consent_description": "Allows users to accept the use of cookies on your website.",
+    "installer/module_forum_description": "Adds a forum to your website.",
+    "installer/module_discord-integration_description": "Allows users to link their Discord account to their website account and perform various synchronization actions.",
+    "installer/module_members_description": "Adds a detailed members page and statistics to your website.",
+    "installer/select_modules": "Select Modules",
+    "user/authme_account_not_found": "That AuthMe account could not be found.",
+    "user/authme_sync_password": "Sync AuthMe Password",
+    "user/authme_sync_password_help": "You can sync your in-game password with your website password. This will allow you to log in to the forum using your in-game password.",
+    "user/authme_sync_password_setting": "Enable to sync your website password with your in-game password upon login. You will get a confirmation when the sync occurs.",
+    "user/authme_sync_password_setting_email": "Enable to sync your website password with your in-game password upon login. You will get a confirmation when the sync occurs. You may need to set your email in-game to use this feature.",
+    "user/continue_with": "Continue with {{provider}}",
+    "user/authme_not_setup": "AuthMe is not set up. Contact a site administrator.",
+    "user/authme_no_password": "An AuthMe account was found, but no password was stored. Please contact a site administrator.",
+    "general/problem_loading_widget": "There was a problem loading the widget {{widget}}",
+    "admin/queue": "Queue",
+    "admin/queue_cancel_task": "Cancel Task",
+    "admin/queue_cancel_task_confirm": "Are you sure you want to cancel this task?",
+    "admin/queue_runner_cron": "Cron",
+    "admin/queue_runner_one_of": "Please select a valid value for the queue runner",
+    "admin/queue_status": "Queue Status",
+    "admin/queue_status_cancelled": "Cancelled",
+    "admin/queue_status_completed": "Completed",
+    "admin/queue_status_error": "Error",
+    "admin/queue_status_failed": "Failed",
+    "admin/queue_task_attempts": "Attempts",
+    "admin/queue_task_fragment_total": "Task fragment total",
+    "admin/queue_task_invalid_status_to_cancel": "The task is not in a valid state for it to be cancelled",
+    "admin/sent_mass_message": "Successfully sent mass message.",
+    "user/username_already_exists": "Your chosen username already exists.",
+    "user/log_in_with": "Log In with {{provider}}",
+    "admin/confirm_delete_placeholder": "Are you sure you want to delete this placeholder?",
+    "admin/reset_og_image": "Reset OG image",
+    "admin/discord_hook": "Discord",
+    "admin/emoji_twemoji": "Twemoji",
+    "admin/enable_auto_language": "Enable automatic language detection?",
+    "admin/event_supports_normal": "This event supports normal webhooks.",
+    "admin/plugin": "Plugin",
+    "admin/player_list_limit": "Player list limit",
+    "admin/queue_interval_required": "Please enter a queue interval",
+    "admin/queue_requeue_task": "Requeue Task",
+    "admin/queue_requeue_task_confirm": "Are you sure you want to requeue this task?",
+    "admin/queue_retry_task": "Retry Task",
+    "admin/queue_runner": "Queue Runner",
+    "admin/queue_runner_ajax": "AJAX",
+    "admin/queue_status_in_progress": "In Progress",
+    "admin/queue_status_ready": "Ready",
+    "admin/queue_task": "Task",
+    "admin/queue_task_cancelled_successfully": "Task cancelled successfully.",
+    "admin/queue_task_data": "Task data",
+    "admin/queue_task_entity": "Task entity",
+    "admin/queue_task_entity_id": "Entity ID",
+    "admin/queue_task_executed_at": "Executed at",
+    "admin/queue_task_fragment": "Task fragmented?",
+    "admin/queue_task_requeued_successfully": "Task requeued successfully.",
+    "admin/queue_task_triggered_by": "Task triggered by",
+    "admin/queue_task_name": "Name",
+    "admin/queue_task_output": "Task output",
+    "admin/queue_task_scheduled_at": "Scheduled at",
+    "admin/queue_task_scheduled_for": "Scheduled for",
+    "admin/queue_task_status": "Status",
+    "general/oauth_email_not_verified_automatically": "Email will not be verified automatically",
+    "general/registered_members": "Registered members",
+    "general/staff_members": "Staff members",
+    "general/sql_query": "Query"
 }
diff --git a/modules/Members/language/en_US.json b/modules/Members/language/en_US.json
index 8567e72a39..056346e2da 100644
--- a/modules/Members/language/en_US.json
+++ b/modules/Members/language/en_US.json
@@ -13,5 +13,7 @@
     "members/group": "Group...",
     "members/no_results_header": "No results found",
     "members/no_results_text": "Your search returned no results",
-    "members/viewable_groups": "Viewable groups"
+    "members/viewable_groups": "Viewable groups",
+    "members/no_overview_lists_enabled": "No overview lists are enabled.",
+    "members/settings_updated_successfully": "Settings updated successfully."
 }

From 0f97a92856bbfe2ff64babe51e0fde9e8b325214 Mon Sep 17 00:00:00 2001
From: Mert <mert2018cinar@gmail.com>
Date: Tue, 6 Jun 2023 15:13:23 +0000
Subject: [PATCH 37/45] Translated using translate.namelessmc.com

Co-authored-by: Mert <mert2018cinar@gmail.com>
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/tr/
Translation: NamelessMC/Website - Core
---
 custom/languages/tr_TR.json | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/custom/languages/tr_TR.json b/custom/languages/tr_TR.json
index 40c4577881..fc0bcdc256 100644
--- a/custom/languages/tr_TR.json
+++ b/custom/languages/tr_TR.json
@@ -1200,5 +1200,29 @@
     "user/remove_avatar": "Avatarı kaldır",
     "user/username_already_exists": "Seçtiğiniz kullanıcı adı zaten var.",
     "user/continue_with": "{{provider}} ile devam et",
-    "admin/clone_group": "Grubu klonla"
+    "admin/clone_group": "Grubu klonla",
+    "admin/queue_retry_task": "Görevi tekrar deneyin",
+    "admin/queue_task_status": "Durum",
+    "admin/user_password_changed_successfully": "Kullanıcı şifresi başarıyla değiştirildi",
+    "admin/player_list_limit": "Oyuncu listesi limiti",
+    "admin/plugin": "Eklenti",
+    "admin/queue_cancel_task": "Görevi iptal edin",
+    "admin/queue_cancel_task_confirm": "Bu görevi iptal etmek istediğinizden emin misiniz?",
+    "admin/queue_status_cancelled": "İptal edildi",
+    "admin/queue_status_completed": "Tamamlandı",
+    "admin/queue_status_error": "Hata",
+    "admin/queue_status_failed": "Başarısız oldu",
+    "admin/queue_status_in_progress": "İşlemde",
+    "admin/queue_task_cancelled_successfully": "Görev başarıyla iptal edildi.",
+    "admin/queue_task_executed_at": "Şurada çalıştırıldı",
+    "admin/emoji_style": "Emoji Türü",
+    "admin/discord_hook": "Discord",
+    "admin/enable_auto_language": "Otomatik dil tetikleyicisini aç",
+    "admin/event_supports_discord": "Bu etkinlik discord web kancalarını ve özel gömülü mesajlarını destekliyor.",
+    "admin/event_supports_normal": "Bu etkinlik normal web kancalarını destekliyor.",
+    "admin/queue_status_ready": "Hazır",
+    "admin/queue_task": "Görev",
+    "admin/queue_task_data": "Görev bilgileri",
+    "admin/queue_task_name": "İsim",
+    "admin/queue_task_output": "Görevi çıkışı"
 }

From 6f80651c563096be13cec8416b28b0656f2b5810 Mon Sep 17 00:00:00 2001
From: Justman10000 <justmegaliga10000@gmail.com>
Date: Sat, 10 Jun 2023 00:57:29 +0000
Subject: [PATCH 38/45] Translated using translate.namelessmc.com

Co-authored-by: Justman10000 <justmegaliga10000@gmail.com>
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/de/
Translation: NamelessMC/Website - Core
---
 custom/languages/de_DE.json | 46 ++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/custom/languages/de_DE.json b/custom/languages/de_DE.json
index 4e55ce601d..ca7bfeddc7 100644
--- a/custom/languages/de_DE.json
+++ b/custom/languages/de_DE.json
@@ -12,7 +12,7 @@
     "admin/allow_custom_avatars": "Eigene Avatare erlauben?",
     "admin/announcement_hook_info": "Ankündigungs erstellung",
     "admin/announcement_icon_instructions": "Du kannst hier auch jeder Ankündigung ein Symbol hinzufügen, z. B. {{faLink}}, {{semLink}}.",
-    "admin/announcement_info": "Erstelle Ankündigungen, um eine Nachricht für bestimmte Gruppen auf bestimmten Seiten Deiner Website anzuzeigen.",
+    "admin/announcement_info": "Erstelle Ankündigungen, um eine Nachricht für bestimmte Gruppen auf bestimmten Seiten deiner Website anzuzeigen.",
     "admin/announcement_order": "Anordnung",
     "admin/announcements": "Ankündigungen",
     "admin/api": "API",
@@ -29,7 +29,7 @@
     "admin/authme_db_name": "AuthMe Datenbank Name",
     "admin/authme_db_password": "AuthMe Datenbank Passwort",
     "admin/authme_db_port": "AuthMe Datenbank Port",
-    "admin/authme_db_table": "AuthMe User Tabelle",
+    "admin/authme_db_table": "AuthMe Benutzer Tabelle",
     "admin/authme_db_user": "AuthMe Datenbank Username",
     "admin/authme_hash_algorithm": "AuthMe Hash Algorithmus",
     "admin/authme_integration": "AuthMe Integration",
@@ -85,7 +85,7 @@
     "admin/creating_announcement_success": "Ankündigung erfolgreich erstellt.",
     "admin/creating_group": "Neue Gruppe erstellen",
     "admin/creating_new_hook": "Neuen Webhook erstellen",
-    "admin/creating_new_page": "Erstelle Seite",
+    "admin/creating_new_page": "Seite erstellen",
     "admin/creating_profile_field": "Erstelle Profilfeld",
     "admin/creating_reaction": "Erstelle Reaktion",
     "admin/current_version_x": "Aktuelle Version: {{version}}",
@@ -99,7 +99,7 @@
     "admin/debugging_settings_updated_successfully": "Debugging Einstellungen wurden gespeichert.",
     "admin/default": "Standard",
     "admin/default_avatar": "Standard Avatar",
-    "admin/default_group": "Ist diese Gruppe die Standard Gruppe (Für neue User)??",
+    "admin/default_group": "Ist diese Gruppe die Standard Gruppe (Für neue Benutzer)??",
     "admin/default_language": "Standardsprache",
     "admin/default_language_help": "Die Benutzer können aus allen installierten Sprachen wählen. {{docLinkStart}}Weiterlesen \"{{docLinkEnd}}",
     "admin/default_server": "Standardserver",
@@ -110,7 +110,7 @@
     "admin/delete_group": "Gruppe löschen",
     "admin/delete_hook": "Bist du sicher, dass du diesen Haken löschen willst?",
     "admin/delete_hook_info": "Benutzer Löschung",
-    "admin/delete_user": "User Löschen",
+    "admin/delete_user": "Benutzer löschen",
     "admin/deleted_announcement_success": "Ankündigung erfolgreich gelöscht.",
     "admin/description": "Beschreibung",
     "admin/description_max_500": "Die Beschreibung darf höchstens 500 Zeichen lang sein.",
@@ -250,8 +250,8 @@
     "admin/icon": "Icon",
     "admin/identifier": "Kennung",
     "admin/images": "Bilder",
-    "admin/include_in_sitemap": "In Sitemap aufnehmen?",
-    "admin/include_staff_in_user_widget": "Teammitglieder in User-Widget aufnehmen?",
+    "admin/include_in_sitemap": "In die Sitemap aufnehmen?",
+    "admin/include_staff_in_user_widget": "Teammitglieder in Benutzer-Widget aufnehmen?",
     "admin/ingame_group_maximum": "Bitte stelle sicher, dass Dein Gruppenname maximal 64 Zeichen lang ist.",
     "admin/install": "Installieren",
     "admin/install_confirm": "Stelle sicher, dass du die Dateien zuerst hochgeladen hast!",
@@ -300,7 +300,7 @@
     "admin/module_enabled": "Modul aktiviert.",
     "admin/module_outdated": "Wir haben festgestellt, dass dieses Modul für die Nameless-Version {{intendedVersion}} gedacht ist, du jedoch die Nameless-Version {{actualVersion}} ausführst",
     "admin/module_x": "Modul: {{module}}",
-    "admin/modules": "Modul",
+    "admin/modules": "Module",
     "admin/modules_installed_successfully": "Alle neuen Module wurden erfolgreich installiert.",
     "admin/name": "Name",
     "admin/name_maximum_16": "Der Name darf nicht länger als 16 Zeichen sein",
@@ -309,7 +309,7 @@
     "admin/navbar_colour": "Navbar Farbe",
     "admin/navbar_icon": "Symbol für die Navigationsleiste",
     "admin/navbar_icon_instructions": "Du kannst hier auch jedem Navigationsleistenelement ein Symbol hinzufügen, z. B. mithilfe von {{faLink}}, {{semLink}}.",
-    "admin/navbar_order": "Navbar Ordnen",
+    "admin/navbar_order": "Navigationsleistenposition",
     "admin/navbar_order_instructions": "Jedem Element kann eine positive Nummer zugewiesen werden, wobei die niedrigste Nummer zuerst in der Navigationsleiste erscheint und höhere Nummern danach folgen.",
     "admin/navigation": "Navigation",
     "admin/navigation_settings_updated_successfully": "Navigations Einstellungen wurden gespeichert.",
@@ -483,7 +483,7 @@
     "admin/stats": "Stats",
     "admin/status_page": "Status Seite aktivieren?",
     "admin/status_query_help": "Wenn dies aktiviert ist, zeigt die Statusseite diesen Server als online oder offline an.",
-    "admin/styles": "Styles",
+    "admin/styles": "Stile",
     "admin/successfully_updated": "Erfolgreich geupdatet",
     "admin/support": "Support",
     "admin/template": "Template",
@@ -523,10 +523,10 @@
     "admin/unable_to_retrieve_nameless_news": "Die neuesten Nachrichten konnten nicht abgerufen werden",
     "admin/unable_to_retrieve_templates": "Templates können nicht abgerufen werden",
     "admin/unknown": "Unbekannt",
-    "admin/unlink": "Unlink",
+    "admin/unlink": "Entlinken",
     "admin/unlink_account_confirm": "Bist du sicher, dass du diesen Anbieter zwangsweise von diesem Benutzer trennen willst?",
     "admin/unlink_account_success": "Erfolgreich ihr Konto von {{provider}} entkoppelt.",
-    "admin/unsafe_html": "Erlaube unsicheres HTML?",
+    "admin/unsafe_html": "Unsicheres HTML zulassen?",
     "admin/unsafe_html_warning": "Wenn du diese Option aktivierst, kann jeder HTML-Code auf der Seite verwendet werden, auch potenziell gefährliches JavaScript. Aktiviere diese Option nur, wenn du sicher bist, dass dein HTML sicher ist.",
     "admin/up_to_date": "Deine NamelessMC Version ist aktuell!",
     "admin/update": "Update",
@@ -537,7 +537,7 @@
     "admin/upload_new_image": "Neues Bild hochladen",
     "admin/use_friendly_urls": "Benutzerfreundliche URLs",
     "admin/use_friendly_urls_help": "Wenn diese Funktion aktiviert ist, werden sauberer aussehende Webadressen verwendet. Du musst die Verwendung von mod_rewrite und .htaccess-Dateien erlauben, damit dies funktioniert. {{docLinkStart}}Weiterlesen \"{{docLinkEnd}}",
-    "admin/user": "Nutzer",
+    "admin/user": "Benutzer",
     "admin/user_deleted": "Benutzer wurde erfolgreich gelöscht.",
     "admin/user_management": "Benutzerverwaltung",
     "admin/user_updated_successfully": "Benutzer erfolgreich aktualisiert.",
@@ -641,7 +641,7 @@
     "general/no": "Nein",
     "general/no_default_server": "Es existiert kein Standardserver. Bitte wähle einen in der Registerkarte StaffCP -> Integrationen -> Minecraft aus.",
     "general/no_online_staff": "Derzeit sind keine Teammitglieder online.",
-    "general/no_online_users": "Es sind keine User online.",
+    "general/no_online_users": "Es sind keine Benutzer online.",
     "general/no_players_online": "Es sind keine Spieler Online.",
     "general/no_servers": "Es existieren keine Server, die angezeigt werden können. Der Website-Administrator kann einen Minecraft-Server unter StaffCP > Integrationen > Minecraft > Minecraft-Server hinzufügen.",
     "general/none": "Nichts",
@@ -650,7 +650,7 @@
     "general/online": "Online",
     "general/online_guests": "Gäste online",
     "general/online_staff": "Aktive Teammitglieder",
-    "general/online_users": "Aktive User",
+    "general/online_users": "Aktive Benutzer",
     "general/origin_api": "API",
     "general/origin_website": "Website",
     "general/page_loaded_in": "Seite wurde in {{time}} Sekunden geladen",
@@ -676,7 +676,7 @@
     "general/success": "Erfolgreich",
     "general/total_online": "Insgesamt online",
     "general/total_online_staff": "Teammitglieder online: {{count}}",
-    "general/total_online_users": "Total User online: {{count}}",
+    "general/total_online_users": "Online-Benutzer insgesamt: {{count}}",
     "general/total_posts": "Beiträge insgesamt",
     "general/total_threads": "Gesamtanzahl der Threads",
     "general/unlink": "Verknüpfung aufheben",
@@ -712,7 +712,7 @@
     "installer/email_invalid": "Deine E-Mail-Adresse ist ungültig.",
     "installer/enabled": "Aktiviert",
     "installer/enter_admin_details": "Bitte gib die Details für das Admin-Konto ein.",
-    "installer/finish": "Abschliessen",
+    "installer/finish": "Abschließen",
     "installer/finish_message": "Danke für die Installation von NamelessMC! Du kannst jetzt zum StaffCP gehen, wo du deine Website weiter konfigurieren kannst.",
     "installer/friendly_urls": "Freundliche URLs",
     "installer/friendly_urls_info": "Freundliche URLs verbessern die Lesbarkeit von URLs in deinem Browser.<br />Ein Beispiel: <span class=\"ui basic label\">beispiel.com/index.php?route=/forum</span>wäre dann:<br /><span class=\"ui basic label\">beispiel.com/forum</span><br /><div class=\"ui inverted orange segment\"><i class=\"exclamation circle icon\"></i><strong>Wichtig!</strong><br />Dein Server muss richtig konfiguriert sein, damit dies funktioniert. Du kannst sehen, ob du diese Option aktivieren kannst, indem du <a href=\"./rewrite_test\" target=\"_blank\" style=\"color:#2185D0\">hier</a> klickst.</div>",
@@ -882,7 +882,7 @@
     "user/couldnt_find_that_user": "Konnte den Benutzer nicht finden.",
     "user/create_an_account": "Erstelle einen Account",
     "user/current_password": "Aktuelles Passwort",
-    "user/delete_all": "Alle Löschen",
+    "user/delete_all": "Alle löschen",
     "user/disable": "Deaktivieren",
     "user/disabled": "Deaktiviert",
     "user/email": "Email",
@@ -1072,7 +1072,7 @@
     "admin/acp_logins": "StaffCP-Anmeldungen",
     "admin/authme_db_password_hidden": "Das Passwort der AuthMe-Datenbank ist aus Sicherheitsgründen verborgen.",
     "admin/bedrock_help": "Wähle diese Option, wenn der Server ein Bedrock-Server ist.",
-    "admin/can_unlink_integration": "Können Nutzer die Integration aufheben?",
+    "admin/can_unlink_integration": "Können Benutzer die Integration aufheben?",
     "admin/email_language_info": "Du siehst deine Sprache nicht? Vergewisser dich, dass die Sprachdatei in /custom/languages/ für deinen Webserver schreibbar ist.",
     "admin/enable_placeholders": "Platzhalter aktivieren?",
     "admin/group_order": "Gruppen Sortiertung",
@@ -1245,13 +1245,13 @@
     "admin/emoji_joypixels": "JoyPixels",
     "admin/emoji_style": "Emoji Style",
     "admin/emoji_style_help": "Ändere dein Emoji-Set verwendet wird:<br>&bull; Native {{nativeExample}} <br>&bull; Twemoji {{twemojiExample}} <br>&bull; JoyPixels {{joypixelsExample}}",
-    "admin/emoji_native": "Native",
+    "admin/emoji_native": "Nativ",
     "admin/emoji_twemoji": "Twemoji",
     "general/joined": "Beigetreten",
-    "general/registered_members": "Registrierte Mitgliedern",
+    "general/registered_members": "Registrierte Mitglieder",
     "general/staff_members": "Teammitglied",
     "installer/module_forum_description": "Füge ein Forum zu deiner Webseite hinzu.",
-    "installer/module_core_description": "Dieser Modul ist erforderlich für NamelessMC damit es korrekt funktioniert.",
+    "installer/module_core_description": "Dieses Modul ist erforderlich, damit NamelessMC korrekt funktioniert.",
     "installer/module_cookie-consent_description": "Erlaube den Nutzern die Akzeptierung von Cookies auf deiner Webseite.",
     "installer/module_discord-integration_description": "Ermöglicht es Nutzern, ihr Discord-Konto mit ihrem Website-Konto zu verknüpfen und verschiedene Synchronisierungsaktionen durchzuführen.",
     "installer/module_members_description": "Fügt eine detaillierte Mitgliederseite und Statistiken zu deiner Website hinzu.",
@@ -1300,7 +1300,7 @@
     "admin/queue_task_cancelled_successfully": "Aufgabe erfolgreich abgebrochen.",
     "admin/queue_task_data": "Daten der Aufgabe",
     "admin/queue_task_entity": "Aufgabensteller",
-    "admin/queue_task_entity_id": "Entity ID",
+    "admin/queue_task_entity_id": "Entitäts-ID",
     "admin/queue_task_executed_at": "Ausgeführt am",
     "admin/queue_task_fragment": "Aufgabe fragmentiert?",
     "admin/queue_task_fragment_next": "Nächster Offset des Aufgabenfragments",

From fcd2ebce48612fd409ff68261d2d34648253a24b Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Mon, 12 Jun 2023 10:31:01 -0600
Subject: [PATCH 39/45] Call `compileQueries` only when needed (#3386)

---
 core/classes/Database/QueryRecorder.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/core/classes/Database/QueryRecorder.php b/core/classes/Database/QueryRecorder.php
index 2d60af160d..7034cee875 100644
--- a/core/classes/Database/QueryRecorder.php
+++ b/core/classes/Database/QueryRecorder.php
@@ -19,7 +19,17 @@ class QueryRecorder extends Instanceable {
      * @return array SQL queries
      */
     public function getSqlStack(): array {
-        return array_reverse($this->_query_stack);
+        $stack = array_reverse($this->_query_stack);
+
+        // Compile queries - replace bound parameters with their values and syntax highlight
+        foreach ($stack as &$query) {
+            $query['sql_query'] = $this->compileQuery(
+                $query['sql_string'],
+                $query['sql_params']
+            );
+        }
+
+        return $stack;
     }
 
     /**
@@ -38,7 +48,8 @@ public function pushQuery(string $sql, array $params): void {
         $this->_query_stack[] = [
             'number' => $this->_query_stack_num,
             'frame' => ErrorHandler::parseFrame(null, $backtrace['file'], $backtrace['line'], $this->_query_stack_num),
-            'sql_query' => $this->compileQuery($sql, $params)
+            'sql_string' => $sql,
+            'sql_params' => $params,
         ];
 
         $this->_query_stack_num++;

From a36779dd7ce60997b1585154fa16db5ed7439449 Mon Sep 17 00:00:00 2001
From: Justman10000 <justmegaliga10000@gmail.com>
Date: Sun, 11 Jun 2023 11:57:29 +0000
Subject: [PATCH 40/45] Translated using translate.namelessmc.com

Co-authored-by: Justman10000 <justmegaliga10000@gmail.com>
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/de/
Translation: NamelessMC/Website - Core
---
 custom/languages/de_DE.json | 40 ++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/custom/languages/de_DE.json b/custom/languages/de_DE.json
index ca7bfeddc7..f16ea8ec9a 100644
--- a/custom/languages/de_DE.json
+++ b/custom/languages/de_DE.json
@@ -30,7 +30,7 @@
     "admin/authme_db_password": "AuthMe Datenbank Passwort",
     "admin/authme_db_port": "AuthMe Datenbank Port",
     "admin/authme_db_table": "AuthMe Benutzer Tabelle",
-    "admin/authme_db_user": "AuthMe Datenbank Username",
+    "admin/authme_db_user": "AuthMe Datenbank Benutzername",
     "admin/authme_hash_algorithm": "AuthMe Hash Algorithmus",
     "admin/authme_integration": "AuthMe Integration",
     "admin/authme_integration_info": "Wenn die AuthMe-Integration aktiviert ist, können Benutzer sich nur im Spiel registrieren.",
@@ -158,7 +158,7 @@
     "admin/email_resend_failed": "Das erneute Senden von E-Mails ist fehlgeschlagen. Überprüfe Deine E-Mail-Einstellungen.",
     "admin/email_resent_successfully": "E-Mail erfolgreich erneut gesendet.",
     "admin/email_settings_updated_successfully": "Die E-Mail-Einstellungen wurden erfolgreich aktualisiert.",
-    "admin/email_verification": "Email Verifikation aktivieren?",
+    "admin/email_verification": "E-Mail Verifizierung aktivieren?",
     "admin/emails": "E-Mails",
     "admin/emails_mass_message": "Massen-E-Mail-Nachricht",
     "admin/emails_mass_message_loading": "Laden ... Bitte lade die Seite nicht neu. Das kann eine Weile dauern.",
@@ -175,7 +175,7 @@
     "admin/enable_player_list": "Spielerliste aktivieren?",
     "admin/enable_registration": "Registrierung aktivieren?",
     "admin/enable_status_query": "Aktiviere Status Abfrage?",
-    "admin/enable_username_sync": "Username Synchronisation aktivieren?",
+    "admin/enable_username_sync": "Benutzername Synchronisation aktivieren?",
     "admin/enable_username_sync_info": "Wenn diese Option aktiviert ist, werden die Benutzernamen der Website aktualisiert, damit sie mit den Benutzernamen im Spiel übereinstimmen. Dies geschieht, wenn das In-Game-Plugin eine Liste von UUIDs und Benutzernamen für Online-Spieler an die Website sendet.",
     "admin/enabled": "Aktiviert",
     "admin/enter_authme_db_details": "Bitte gebe gültige Datenbank Informationen ein.",
@@ -200,7 +200,7 @@
     "admin/force_tfa_alert": "Für Deine Gruppe muss die Zwei-Faktor-Authentifizierung aktiviert sein.",
     "admin/force_tfa_warning": "Bitte vergewissere dich, dass du weißt, was das tut, sonst riskierst du, dich und alle Gruppenmitglieder auszusperren.",
     "admin/force_www": "<b>www</b> erzwingen?",
-    "admin/forgot_password_email": "Password vergessen Email",
+    "admin/forgot_password_email": "Password vergessen E-Mail",
     "admin/forum_posts": "Anzeige im Forum",
     "admin/forum_topic_reply_email": "Forum Thema Antwort",
     "admin/general_settings": "Allgemeine Einstellungen",
@@ -225,7 +225,7 @@
     "admin/group_sync_rules_updated_successfully": "Gruppensynchronisierungsregeln wurden erfolgreich aktualisiert.",
     "admin/group_updated_successfully": "Gruppe erfolgreich aktualisiert.",
     "admin/group_username_colour": "Benutzernamenfarbe der Gruppe",
-    "admin/group_username_css": "Gruppen Username CSS",
+    "admin/group_username_css": "Gruppen Benutzername CSS",
     "admin/groups": "Gruppen",
     "admin/groups_added": "Gruppen hinzugefügt",
     "admin/groups_removed": "Gruppen entfernt",
@@ -291,7 +291,7 @@
     "admin/minecraft_avatar_source": "Minecraft Avatar Quelle",
     "admin/minecraft_servers": "Minecraft Server",
     "admin/minecraft_settings_updated_successfully": "Einstellungen erfolgreich aktualisiert.",
-    "admin/missing_contact_address": "Bitte gebe eine Kontakt Email mit 3 bis 255 Zeichen an.",
+    "admin/missing_contact_address": "Bitte gebe eine Kontakt E-Mail mit 3 bis 255 Zeichen an.",
     "admin/missing_sitename": "Der Seiten-Name muss zwischen 2 und 64 Zeichen lang sein.",
     "admin/mod_dir_still_exists": "Warnung! Das Verzeichnis modules/Core/pages/mod existiert noch. Bitte entferne dieses Verzeichnis.",
     "admin/mode_toggle": "Dunkler Modus",
@@ -306,7 +306,7 @@
     "admin/name_maximum_16": "Der Name darf nicht länger als 16 Zeichen sein",
     "admin/name_required": "Ein Name ist erforderlich",
     "admin/nameless_news": "NamelessMC Neuigkeiten",
-    "admin/navbar_colour": "Navbar Farbe",
+    "admin/navbar_colour": "Farbe der Navigationsleiste",
     "admin/navbar_icon": "Symbol für die Navigationsleiste",
     "admin/navbar_icon_instructions": "Du kannst hier auch jedem Navigationsleistenelement ein Symbol hinzufügen, z. B. mithilfe von {{faLink}}, {{semLink}}.",
     "admin/navbar_order": "Navigationsleistenposition",
@@ -342,7 +342,7 @@
     "admin/oauth": "OAuth",
     "admin/oauth_info": "Konfiguriere den OAuth-Provider, damit sich die Benutzer mit ihren Konten in sozialen Netzwerken anmelden können. {{docLinkStart}}Schau dir die Dokumentation an, um Hilfe zu erhalten{{docLinkEnd}}.",
     "admin/other_log": "Andere Protokolle",
-    "admin/outgoing_email": "Ausgehende Email Addresse",
+    "admin/outgoing_email": "Ausgehende E-Mail Addresse",
     "admin/outgoing_email_info": "Dies ist die Absender Emailadresse die NamelessMC benutzt.",
     "admin/overview": "Übersicht",
     "admin/page": "Seite",
@@ -419,7 +419,7 @@
     "admin/registered": "Registriert",
     "admin/registration": "Registrierung",
     "admin/registration_disabled_message": "Registration Deaktiviert Nachricht",
-    "admin/registration_email": "Registrations Email",
+    "admin/registration_email": "Registrations E-Mail",
     "admin/registration_settings_updated": "Die Registrierungseinstellungen wurden erfolgreich aktualisiert.",
     "admin/registrations": "Anmeldungen",
     "admin/required": "Benötigt",
@@ -436,7 +436,7 @@
     "admin/select_default_avatar": "Wähle ein neues Standard Avatar:",
     "admin/select_user_group": "Du musst eine Benutzergruppe auswählen.",
     "admin/send": "Senden",
-    "admin/send_test_email": "Sende Test Email",
+    "admin/send_test_email": "Sende Test E-Mail",
     "admin/send_test_email_info": "Die folgende Schaltfläche versucht, eine E-Mail an Deine E-Mail-Adresse zu senden, {{email}}. Falls Irgendwelche Fehler, die beim Senden der E-Mail enstehen, werden angezeigt.",
     "admin/sending_mass_message": "Massennachricht senden",
     "admin/seo": "SEO",
@@ -500,7 +500,7 @@
     "admin/templates_installed_successfully": "Neue Vorlagen wurden erfolgreich installiert.",
     "admin/terms_error": "Bitte stelle sicher, dass Deine Geschäftsbedingungen nicht länger als 100000 Zeichen sind.",
     "admin/terms_updated": "Bedingungen erfolgreich aktualisiert.",
-    "admin/test_email_success": "Test Email erfolgreich versendet!",
+    "admin/test_email_success": "Test E-Mail erfolgreich versendet!",
     "admin/text": "Text",
     "admin/text_colour": "Text Farbe",
     "admin/text_colour_required": "Textfarbe ist erforderlich",
@@ -531,7 +531,7 @@
     "admin/up_to_date": "Deine NamelessMC Version ist aktuell!",
     "admin/update": "Update",
     "admin/update_user_languages": "Benutzersprache aktualisieren",
-    "admin/update_user_languages_warning": "Dadurch wird die Sprache für alle Benutzer Ihrer Website aktualisiert, auch wenn sie bereits eine Sprache ausgewählt haben!",
+    "admin/update_user_languages_warning": "Dadurch wird die Sprache für alle Benutzer/innen auf deiner Website aktualisiert, auch wenn diese bereits eine Sprache ausgewählt haben!",
     "admin/updated_user_languages": "Benutersprache aktualisiert.",
     "admin/updated_x": "Aktualisiert am: {{updatedAt}}",
     "admin/upload_new_image": "Neues Bild hochladen",
@@ -708,7 +708,7 @@
     "installer/database_port": "Datenbank Port",
     "installer/database_username": "Datenbank Benutzername",
     "installer/disabled": "Deaktiviert",
-    "installer/email_address": "Email Addresse",
+    "installer/email_address": "E-Mail Addresse",
     "installer/email_invalid": "Deine E-Mail-Adresse ist ungültig.",
     "installer/enabled": "Aktiviert",
     "installer/enter_admin_details": "Bitte gib die Details für das Admin-Konto ein.",
@@ -885,11 +885,11 @@
     "user/delete_all": "Alle löschen",
     "user/disable": "Deaktivieren",
     "user/disabled": "Deaktiviert",
-    "user/email": "Email",
-    "user/email_address": "Email Adresse",
+    "user/email": "E-Mail",
+    "user/email_address": "E-Mail Adresse",
     "user/email_already_exists": "Die E-Mail-Adresse existiert bereits.",
     "user/email_changed_successfully": "E-Mail-Adresse erfolgreich geändert.",
-    "user/email_or_username": "Email oder Username",
+    "user/email_or_username": "E-Mail oder Benutzername",
     "user/email_required": "Bitte gebe eine gültige E-Mail-Adresse an.",
     "user/enable": "Aktivieren",
     "user/enabled": "Aktiviert",
@@ -993,7 +993,7 @@
     "user/topic_updates": "Erhalte E-Mails für Themen, denen du folgst",
     "user/two_factor_auth": "Zwei-Faktor-Authentisierung",
     "user/unable_to_connect_to_authme_db": "Es konnte keine Verbindung zur AuthMe-Datenbank hergestellt werden. Wenn dieser Fehler weiterhin besteht, wende dich bitte an einen Administrator.",
-    "user/unable_to_send_forgot_password_email": "Die Email zum zurücksetzen des Passworts konnte nicht versendet werden. Bitte wende dich an einen Administrator.",
+    "user/unable_to_send_forgot_password_email": "Die E-Mail zum zurücksetzen des Passworts konnte nicht versendet werden. Bitte wende dich an einen Administrator.",
     "user/unblock_user": "Benutzer blockierung aufheben",
     "user/upload": "Hochladen",
     "user/upload_new_avatar": "Ein neues Profilbild hochladen",
@@ -1041,8 +1041,8 @@
     "admin/integration_identifier_required": "{{integration}} identifier wird benötigt.",
     "admin/integration_updated_successfully": "Die Integration wurde erfolgreich aktualisiert.",
     "admin/integration_username": "{{integration}} Benutzername",
-    "admin/integration_username_invalid": "{{integration}} Username ist ungültig.",
-    "admin/integration_username_required": "{{integration}} Username wird benötigt.",
+    "admin/integration_username_invalid": "{{integration}} Benutzername ist ungültig.",
+    "admin/integration_username_required": "{{integration}} Benutzername wird benötigt.",
     "admin/is_verified": "Ist Verifiziert?",
     "admin/layout": "Layout",
     "admin/light": "Hell",
@@ -1244,7 +1244,7 @@
     "admin/clone_group": "Gruppe klonen",
     "admin/emoji_joypixels": "JoyPixels",
     "admin/emoji_style": "Emoji Style",
-    "admin/emoji_style_help": "Ändere dein Emoji-Set verwendet wird:<br>&bull; Native {{nativeExample}} <br>&bull; Twemoji {{twemojiExample}} <br>&bull; JoyPixels {{joypixelsExample}}",
+    "admin/emoji_style_help": "Ändere, welches Emoji-Set verwendet wird:<br>&bull; Native {{nativeExample}} <br>&bull; Twemoji {{twemojiExample}} <br>&bull; JoyPixels {{joypixelsExample}}",
     "admin/emoji_native": "Nativ",
     "admin/emoji_twemoji": "Twemoji",
     "general/joined": "Beigetreten",

From 19540acc9c66a5a09c38cb86a77e2310939fdc1f Mon Sep 17 00:00:00 2001
From: Partydragen <adrian_kili@outlook.com>
Date: Tue, 13 Jun 2023 23:32:36 +0200
Subject: [PATCH 41/45] Remove Discord discriminator requirement (#3374)

---
 .../classes/DiscordIntegration.php                   | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/Discord Integration/classes/DiscordIntegration.php b/modules/Discord Integration/classes/DiscordIntegration.php
index 4fd1d49c84..b191d876b6 100644
--- a/modules/Discord Integration/classes/DiscordIntegration.php	
+++ b/modules/Discord Integration/classes/DiscordIntegration.php	
@@ -4,7 +4,7 @@
  *
  * @package Modules\Core\Integrations
  * @author Partydragen
- * @version 2.1.0
+ * @version 2.1.1
  * @license MIT
  */
 class DiscordIntegration extends IntegrationBase {
@@ -81,12 +81,14 @@ public function validateUsername(string $username, int $integration_user_id = 0)
         $validation = Validate::check(['username' => $username], [
             'username' => [
                 Validate::REQUIRED => true,
-                Validate::REGEX => '/^.{2,32}#[0-9]{4}$/'
+                Validate::MIN => 2,
+                Validate::MAX => 32
             ]
         ])->messages([
             'username' => [
                 Validate::REQUIRED => $this->_language->get('admin', 'integration_username_required', ['integration' => $this->getName()]),
-                Validate::REGEX => $this->_language->get('admin', 'integration_username_invalid', ['integration' => $this->getName()])
+                Validate::MIN => $this->_language->get('admin', 'integration_username_invalid', ['integration' => $this->getName()]),
+                Validate::MAX => $this->_language->get('admin', 'integration_username_invalid', ['integration' => $this->getName()])
             ]
         ]);
 
@@ -166,9 +168,9 @@ public function successfulRegistration(User $user) {
         // Link integration if user registered using discord oauth
         if (Session::exists('oauth_register_data')) {
             $data = json_decode(Session::get('oauth_register_data'), true);
-            if ($data['provider'] == 'discord' && isset($data['data']['username']) && isset($data['data']['discriminator'])) {
+            if ($data['provider'] == 'discord' && isset($data['data']['username'])) {
 
-                $username = $data['data']['username'] . '#' . $data['data']['discriminator'];
+                $username = $data['data']['username'];
                 $discord_id = $data['data']['id'];
                 if ($this->validateIdentifier($discord_id) && $this->validateUsername($username)) {
                     $integrationUser = new IntegrationUser($this);

From 148b500bf2acce30f00ad0f9e7f2a4e668e5254c Mon Sep 17 00:00:00 2001
From: Supercrafter100 <58982133+supercrafter100@users.noreply.github.com>
Date: Thu, 15 Jun 2023 19:47:52 +0200
Subject: [PATCH 42/45] Fix outdated event

---
 modules/Core/pages/authme_connector.php | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/modules/Core/pages/authme_connector.php b/modules/Core/pages/authme_connector.php
index acf757f8cc..0f4840196f 100644
--- a/modules/Core/pages/authme_connector.php
+++ b/modules/Core/pages/authme_connector.php
@@ -167,17 +167,9 @@
                     $user = new User($user_id);
                     $user->addGroup($default_group);
 
-                    EventHandler::executeEvent('registerUser', [
-                            'user_id' => $user_id,
-                            'username' => $user->getDisplayname(),
-                            'content' => $language->get('user', 'user_x_has_registered', [
-                                'user' => $user->getDisplayname(),
-                            ]),
-                            'avatar_url' => $user->getAvatar(128, true),
-                            'url' => URL::getSelfURL() . ltrim($user->getProfileURL(), '/'),
-                            'language' => $language,
-                        ]
-                    );
+                    EventHandler::executeEvent(new UserRegisteredEvent(
+                        $user,
+                    ));
 
                     // Link the minecraft integration
                     $integration->successfulRegistration($user);

From 28a2ada620e2e8b1535d59b3e781c56aaaf063ac Mon Sep 17 00:00:00 2001
From: Partydragen <adrian_kili@outlook.com>
Date: Thu, 15 Jun 2023 20:05:09 +0200
Subject: [PATCH 43/45] Fix oauth linking for forced integrations (#3395)

---
 core/templates/frontend_init.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/templates/frontend_init.php b/core/templates/frontend_init.php
index 6229b8bd4d..88e99b85bc 100644
--- a/core/templates/frontend_init.php
+++ b/core/templates/frontend_init.php
@@ -2,7 +2,7 @@
 /*
  *  Made by Samerton
  *  https://github.com/NamelessMC/Nameless/
- *  NamelessMC version 2.0.3
+ *  NamelessMC version 2.1.1
  *
  *  License: MIT
  *
@@ -33,7 +33,7 @@
 }
 
 // Check if any integrations is required before user can continue
-if ($user->isLoggedIn() && defined('PAGE') && PAGE != 'cc_connections') {
+if ($user->isLoggedIn() && defined('PAGE') && PAGE != 'cc_connections' && PAGE != 'oauth') {
     foreach (Integrations::getInstance()->getEnabledIntegrations() as $integration) {
         if ($integration->data()->required && $integration->allowLinking()) {
             $integrationUser = $user->getIntegration($integration->getName());

From 9d559e2d2a4a11ee0ab2622b83da1f83b945c020 Mon Sep 17 00:00:00 2001
From: Sam <samerton@users.noreply.github.com>
Date: Sat, 17 Jun 2023 10:50:12 +0100
Subject: [PATCH 44/45] Require module autoload file before module init (#3397)

* Require module autoload file before module init

* Change module loading to require once
---
 core/init.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/core/init.php b/core/init.php
index 686350d8fa..f76ac4ab70 100644
--- a/core/init.php
+++ b/core/init.php
@@ -2,7 +2,7 @@
 /*
  *  Made by Samerton
  *  https://github.com/NamelessMC/Nameless/
- *  NamelessMC version 2.0.2
+ *  NamelessMC version 2.1.1
  *
  *  License: MIT
  *
@@ -454,9 +454,17 @@
         return $a['priority'] - $b['priority'];
     });
 
+    // Load module dependencies
+    foreach ($enabled_modules as $module) {
+        if (file_exists(ROOT_PATH . '/modules/' . $module['name'] . '/autoload.php')) {
+            require_once ROOT_PATH . '/modules/' . $module['name'] . '/autoload.php';
+        }
+    }
+
+    // Load modules
     foreach ($enabled_modules as $module) {
         if (file_exists(ROOT_PATH . '/modules/' . $module['name'] . '/init.php')) {
-            require(ROOT_PATH . '/modules/' . $module['name'] . '/init.php');
+            require_once ROOT_PATH . '/modules/' . $module['name'] . '/init.php';
         }
     }
 

From 7ff744d3fa0e4874db4c068b7393b68f56ffff55 Mon Sep 17 00:00:00 2001
From: Sam <samerton@users.noreply.github.com>
Date: Sun, 18 Jun 2023 11:26:25 +0100
Subject: [PATCH 45/45] Prepare 1.1.1 release (#3399)

---
 CHANGELOG.md                                  | 28 +++++++++++-
 core/classes/Database/DatabaseInitialiser.php |  2 +-
 core/includes/updates/202.php                 | 24 -----------
 core/includes/updates/203.php                 | 43 -------------------
 core/includes/updates/{201.php => 210.php}    |  4 +-
 custom/panel_templates/Default/template.php   |  8 ++--
 custom/templates/DefaultRevamp/template.php   |  8 ++--
 modules/Cookie Consent/module.php             |  6 +--
 modules/Core/module.php                       |  6 +--
 modules/Discord Integration/module.php        |  4 +-
 modules/Forum/module.php                      |  6 +--
 modules/Members/module.php                    |  6 +--
 package.json                                  |  2 +-
 13 files changed, 52 insertions(+), 95 deletions(-)
 delete mode 100644 core/includes/updates/202.php
 delete mode 100644 core/includes/updates/203.php
 rename core/includes/updates/{201.php => 210.php} (76%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12d7752888..af6fc732ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,34 @@
 # NamelessMC v2 Changelog
 
-## [Unreleased](https://github.com/NamelessMC/Nameless/compare/v2.1.0...v2)
+## [Unreleased](https://github.com/NamelessMC/Nameless/compare/v2.1.1...v2)
 > [Milestone](https://github.com/NamelessMC/Nameless/milestone/21)
 
+## [2.1.1](https://github.com/NamelessMC/Nameless/compare/v2.1.0...v2.1.1) - 2023-06-18
+### Added
+- Add Russian translation for Members module [#3352](https://github.com/NamelessMC/Nameless/pull/3352)
+
+### Changed
+- Add all missing languages to the Members module [#3350](https://github.com/NamelessMC/Nameless/pull/3350)
+- Remove unable to update groups catch [#3360](https://github.com/NamelessMC/Nameless/pull/3360)
+- Call compileQueries only when needed [#3386](https://github.com/NamelessMC/Nameless/pull/3386)
+- Remove Discord discriminator requirement [#3374](https://github.com/NamelessMC/Nameless/pull/3374)
+- Require module autoload file before module init [#3397](https://github.com/NamelessMC/Nameless/pull/3397)
+
+### Fixed
+- Fix AuthMe enabled value [#3349](https://github.com/NamelessMC/Nameless/pull/3349)
+- Ensure Minecraft integration is enabled [#3356](https://github.com/NamelessMC/Nameless/pull/3356)
+- Include .htaccess file in release zip [#3362](https://github.com/NamelessMC/Nameless/pull/3362)
+- Fix missing cache settings [#3361](https://github.com/NamelessMC/Nameless/pull/3361)
+- Fix user group issue [#3365](https://github.com/NamelessMC/Nameless/pull/3365)
+- Fix forum title/description encoding on edit [#3359](https://github.com/NamelessMC/Nameless/pull/3359)
+- Remove placeholder from singular message [#3369](https://github.com/NamelessMC/Nameless/pull/3369)
+- Fix not being able to see Members page in Navigation settings [#3372](https://github.com/NamelessMC/Nameless/pull/3372)
+- Fix multi query [#3383](https://github.com/NamelessMC/Nameless/pull/3383)
+- Fix icon not being properly shown [#3377](https://github.com/NamelessMC/Nameless/pull/3377)
+- Fix ghost player on status page [#3351](https://github.com/NamelessMC/Nameless/pull/3351)
+- Fix outdated event [#3394](https://github.com/NamelessMC/Nameless/pull/3394)
+- Fix OAuth linking for forced integrations [#3395](https://github.com/NamelessMC/Nameless/pull/3395)
+
 ## [2.1.0](https://github.com/NamelessMC/Nameless/compare/v2.0.3...v2.1.0) - 2023-05-01
 ### Added
 - Add dark mode toggle switch [#2877](https://github.com/NamelessMC/Nameless/pull/2877)
diff --git a/core/classes/Database/DatabaseInitialiser.php b/core/classes/Database/DatabaseInitialiser.php
index 55845eea9f..568b0130f1 100644
--- a/core/classes/Database/DatabaseInitialiser.php
+++ b/core/classes/Database/DatabaseInitialiser.php
@@ -183,7 +183,7 @@ private function initialiseSettings(): void {
         Util::setSetting('recaptcha_type', 'Recaptcha3');
         Util::setSetting('recaptcha_login', '0');
         Util::setSetting('email_verification', '1');
-        Util::setSetting('nameless_version', '2.1.0');
+        Util::setSetting('nameless_version', '2.1.1');
         Util::setSetting('version_checked', date('U'));
         Util::setSetting('phpmailer', '0');
         Util::setSetting('user_avatars', '0');
diff --git a/core/includes/updates/202.php b/core/includes/updates/202.php
deleted file mode 100644
index 00cf4a3778..0000000000
--- a/core/includes/updates/202.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-return new class extends UpgradeScript {
-
-    public function run(): void {
-        $this->runMigrations();
-
-        // Move 'authme_db' json row in settings table to 'authme' section in config file
-        $authme_db = null;
-        $result = DB::getInstance()->get('settings', ['name', 'authme_db']);
-        if ($result->count()) {
-            $authme_db = $result->first()->value;
-        }
-        if ($authme_db !== null) {
-            $authme_db = (array) json_decode($authme_db);
-            unset($authme_db['sync']);
-            $authme_db['port'] = (int) $authme_db['port'];
-            Config::set('authme', $authme_db);
-            DB::getInstance()->delete('settings', ['name', 'authme_db']);
-        }
-
-        $this->setVersion('2.0.3');
-    }
-};
diff --git a/core/includes/updates/203.php b/core/includes/updates/203.php
deleted file mode 100644
index 8ef34408f5..0000000000
--- a/core/includes/updates/203.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-return new class extends UpgradeScript {
-    public function run(): void {
-        $this->runMigrations();
-
-        // Move query interval from cache to settings table
-        $cache = new Cache(['name' => 'nameless', 'extension' => '.cache', 'path' => ROOT_PATH . '/cache/']);
-        $cache->setCache('server_query_cache');
-        if ($cache->isCached('query_interval')) {
-            $query_interval = $cache->retrieve('query_interval');
-            if (is_numeric($query_interval) && $query_interval <= 60 && $query_interval >= 5) {
-                // Interval ok
-            } else {
-                // Default to 10
-                $query_interval = 10;
-            }
-            Util::setSetting('minecraft_query_interval', $query_interval);
-        }
-
-        // Replace `external_query` with `query_type`
-        Util::setSetting('query_type', Util::getSetting('external_query') == 1 ? 'external' : 'internal');
-        Util::setSetting('external_query', null);
-
-        // Forum post conversion
-        ConvertForumPostTask::schedule();
-
-        // Sitemap generation
-        GenerateSitemap::schedule(new Language('core', 'en_UK'));
-
-        // Add all groups to member list selectable groups
-        Util::setSetting('member_list_viewable_groups', json_encode(array_map(static fn (Group $group) => $group->id, Group::all())), 'Members');
-
-        Config::set('core.installed', true);
-
-        // Ensure admin group has administrator perm
-        $admin_group = DB::getInstance()->query('SELECT permissions FROM nl2_groups WHERE id = 2')->first();
-        $perms = json_decode($admin_group->permissions, true);
-        $perms['administrator'] = 1;
-        DB::getInstance()->query('UPDATE nl2_groups SET permissions = ? WHERE id = 2', [json_encode($perms)]);
-
-        $this->setVersion('2.1.0');
-    }
-};
diff --git a/core/includes/updates/201.php b/core/includes/updates/210.php
similarity index 76%
rename from core/includes/updates/201.php
rename to core/includes/updates/210.php
index eb115a8a93..f7ea670b1b 100644
--- a/core/includes/updates/201.php
+++ b/core/includes/updates/210.php
@@ -1,10 +1,8 @@
 <?php
-
 return new class extends UpgradeScript {
-
     public function run(): void {
         $this->runMigrations();
 
-        $this->setVersion('2.0.2');
+        $this->setVersion('2.1.1');
     }
 };
diff --git a/custom/panel_templates/Default/template.php b/custom/panel_templates/Default/template.php
index 247b9bf700..7c880f0054 100644
--- a/custom/panel_templates/Default/template.php
+++ b/custom/panel_templates/Default/template.php
@@ -5,7 +5,7 @@
  *
  *  For NamelessMC
  *  https://github.com/NamelessMC/Nameless/
- *  NamelessMC version 2.1.0
+ *  NamelessMC version 2.1.1
  *
  *  License: MIT
  *
@@ -24,8 +24,8 @@ public function __construct(Smarty $smarty, Language $language) {
 
             parent::__construct(
                 'Default',  // Template name
-                '2.1.0',  // Template version
-                '2.1.0',  // Nameless version template is made for
+                '2.1.1',  // Template version
+                '2.1.1',  // Nameless version template is made for
                 '<a href="https://coldfiredzn.com" target="_blank">Coldfire</a>'  // Author, you can use HTML here
             );
 
@@ -40,7 +40,7 @@ public function __construct(Smarty $smarty, Language $language) {
             $this->addCSSFiles([
                 (defined('CONFIG_PATH') ? CONFIG_PATH : '') . '/custom/panel_templates/Default/assets/css/sb-admin-2.min.css' => [],
                 'https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i' => [],
-                (defined('CONFIG_PATH') ? CONFIG_PATH : '') . '/custom/panel_templates/Default/assets/css/custom.css?v=210' => [],
+                (defined('CONFIG_PATH') ? CONFIG_PATH : '') . '/custom/panel_templates/Default/assets/css/custom.css?v=211' => [],
             ]);
 
             $this->addJSFiles([
diff --git a/custom/templates/DefaultRevamp/template.php b/custom/templates/DefaultRevamp/template.php
index 2ac3ddf288..138079d8e8 100755
--- a/custom/templates/DefaultRevamp/template.php
+++ b/custom/templates/DefaultRevamp/template.php
@@ -2,7 +2,7 @@
 /*
  *  Made by Samerton | Revamped by Xemah
  *    https://github.com/NamelessMC/Nameless/
- *    NamelessMC version 2.1.0
+ *    NamelessMC version 2.1.1
  *
  *    License: MIT
  *
@@ -25,8 +25,8 @@ class DefaultRevamp_Template extends TemplateBase {
     public function __construct($cache, $smarty, $language, $user, $pages) {
         $template = [
             'name' => 'DefaultRevamp',
-            'version' => '2.1.0',
-            'nl_version' => '2.1.0',
+            'version' => '2.1.1',
+            'nl_version' => '2.1.1',
             'author' => '<a href="https://xemah.com/" target="_blank">Xemah</a>',
         ];
 
@@ -80,7 +80,7 @@ public function onPageLoad() {
         define('PAGE_LOAD_TIME', $this->_language->get('general', 'page_loaded_in', ['time' => round($page_load, 3)]));
 
         $this->addCSSFiles([
-            $this->_template['path'] . 'css/custom.css?v=210' => []
+            $this->_template['path'] . 'css/custom.css?v=211' => []
         ]);
 
         $route = (isset($_GET['route']) ? rtrim($_GET['route'], '/') : '/');
diff --git a/modules/Cookie Consent/module.php b/modules/Cookie Consent/module.php
index f5788b4f7a..8beaac5e9c 100644
--- a/modules/Cookie Consent/module.php	
+++ b/modules/Cookie Consent/module.php	
@@ -2,7 +2,7 @@
 /*
  *  Made by Samerton
  *  https://github.com/NamelessMC/Nameless/
- *  NamelessMC version 2.1.0
+ *  NamelessMC version 2.1.1
  *
  *  License: MIT
  *
@@ -20,8 +20,8 @@ public function __construct(Language $language, Language $cookie_language, Pages
 
         $name = 'Cookie Consent';
         $author = '<a href="https://samerton.me" target="_blank" rel="nofollow noopener">Samerton</a>';
-        $module_version = '2.1.0';
-        $nameless_version = '2.1.0';
+        $module_version = '2.1.1';
+        $nameless_version = '2.1.1';
 
         parent::__construct($this, $name, $author, $module_version, $nameless_version);
 
diff --git a/modules/Core/module.php b/modules/Core/module.php
index 5796311b97..f3814fe54c 100644
--- a/modules/Core/module.php
+++ b/modules/Core/module.php
@@ -2,7 +2,7 @@
 /*
  *  Made by Samerton
  *  https://github.com/NamelessMC/Nameless/
- *  NamelessMC version 2.1.0
+ *  NamelessMC version 2.1.1
  *
  *  License: MIT
  *
@@ -21,8 +21,8 @@ public function __construct(Language $language, Pages $pages, User $user, Naviga
 
         $name = 'Core';
         $author = '<a href="https://samerton.me" target="_blank" rel="nofollow noopener">Samerton</a>';
-        $module_version = '2.1.0';
-        $nameless_version = '2.1.0';
+        $module_version = '2.1.1';
+        $nameless_version = '2.1.1';
 
         parent::__construct($this, $name, $author, $module_version, $nameless_version);
 
diff --git a/modules/Discord Integration/module.php b/modules/Discord Integration/module.php
index c0b9c2a8c7..03ad2dc7f4 100644
--- a/modules/Discord Integration/module.php	
+++ b/modules/Discord Integration/module.php	
@@ -9,8 +9,8 @@ public function __construct(Language $language, Pages $pages, Endpoints $endpoin
 
         $name = 'Discord Integration';
         $author = '<a href="https://tadhg.sh" target="_blank" rel="nofollow noopener">Aberdeener</a>';
-        $module_version = '2.1.0';
-        $nameless_version = '2.1.0';
+        $module_version = '2.1.1';
+        $nameless_version = '2.1.1';
 
         parent::__construct($this, $name, $author, $module_version, $nameless_version);
 
diff --git a/modules/Forum/module.php b/modules/Forum/module.php
index 35735b38c3..6d2ae791b1 100644
--- a/modules/Forum/module.php
+++ b/modules/Forum/module.php
@@ -2,7 +2,7 @@
 /*
  *  Made by Samerton
  *  https://github.com/NamelessMC/Nameless/
- *  NamelessMC version 2.1.0
+ *  NamelessMC version 2.1.1
  *
  *  License: MIT
  *
@@ -20,8 +20,8 @@ public function __construct(Language $language, Language $forum_language, Pages
 
         $name = 'Forum';
         $author = '<a href="https://samerton.me" target="_blank" rel="nofollow noopener">Samerton</a>';
-        $module_version = '2.1.0';
-        $nameless_version = '2.1.0';
+        $module_version = '2.1.1';
+        $nameless_version = '2.1.1';
 
         parent::__construct($this, $name, $author, $module_version, $nameless_version);
 
diff --git a/modules/Members/module.php b/modules/Members/module.php
index ac5dcd7ea8..6a2cd24b8b 100644
--- a/modules/Members/module.php
+++ b/modules/Members/module.php
@@ -2,7 +2,7 @@
 /*
  *  Made by Aberdeener
  *  https://github.com/NamelessMC/Nameless/
- *  NamelessMC version 2.1.0
+ *  NamelessMC version 2.1.1
  *
  *  License: MIT
  *
@@ -20,8 +20,8 @@ public function __construct(Language $language, Language $members_language, Page
 
         $name = 'Members';
         $author = '<a href="https://tadhg.sh" target="_blank" rel="nofollow noopener">Aberdeener</a>';
-        $module_version = '2.1.0';
-        $nameless_version = '2.1.0';
+        $module_version = '2.1.1';
+        $nameless_version = '2.1.1';
 
         parent::__construct($this, $name, $author, $module_version, $nameless_version);
 
diff --git a/package.json b/package.json
index 08c8cfe93c..d155a04f36 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nameless",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "repository": "https://github.com/NamelessMC/Nameless",
   "license": "MIT",
   "private": true,