From f56ca830cf20d0b9469313cf27bb6ab8e77fbb5d Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Fri, 31 May 2024 17:26:57 +0800 Subject: [PATCH] [ci skip] Update messages_en.yml --- src/main/resources/messages/messages_en.yml | 70 +++++++++++---------- src/main/resources/plugin.yml | 2 +- 2 files changed, 37 insertions(+), 35 deletions(-) diff --git a/src/main/resources/messages/messages_en.yml b/src/main/resources/messages/messages_en.yml index 286a0fc5..61565e7d 100644 --- a/src/main/resources/messages/messages_en.yml +++ b/src/main/resources/messages/messages_en.yml @@ -5,13 +5,13 @@ # Registration registration: - register_request: '&3Please, register to the server with the command: /register ' - command_usage: '&cUsage: /register ' - reg_only: '&4Only registered users can join the server! Please visit http://example.com to register yourself!' - kicked_admin_registered: 'An admin just registered you; please log in again.' - success: '&2Successfully registered!' disabled: '&cIn-game registration is disabled!' name_taken: '&cYou already have registered this username!' + register_request: '&3Please, register to the server with the command: /register ' + command_usage: '&cUsage: /register ' + reg_only: '&4Only registered users can join the server! Please visit https://example.com to register yourself!' + success: '&2Successfully registered!' + kicked_admin_registered: 'An admin just registered you; please log in again.' # Password errors on registration password: @@ -32,17 +32,17 @@ login: # Errors error: - unregistered_user: '&cThis user isn''t registered!' denied_command: '&cIn order to use this command you must be authenticated!' denied_chat: '&cIn order to chat you must be authenticated!' + unregistered_user: '&cThis user isn''t registered!' not_logged_in: '&cYou''re not logged in!' - tempban_max_logins: '&cYou have been temporarily banned for failing to log in too many times.' - max_registration: '&cYou have exceeded the maximum number of registrations (%reg_count/%max_acc %reg_names) for your connection!' no_permission: '&4You don''t have the permission to perform this action!' unexpected_error: '&4An unexpected error occurred, please contact an administrator!' - kick_for_vip: '&3A VIP player has joined the server when it was full!' + max_registration: '&cYou have exceeded the maximum number of registrations (%reg_count/%max_acc %reg_names) for your connection!' logged_in: '&cYou''re already logged in!' + kick_for_vip: '&3A VIP player has joined the server when it was full!' kick_unresolved_hostname: '&cAn error occurred: unresolved player hostname!' + tempban_max_logins: '&cYou have been temporarily banned for failing to log in too many times.' # AntiBot antibot: @@ -50,19 +50,21 @@ antibot: auto_enabled: '&4[AntiBotService] AntiBot enabled due to the huge number of connections!' auto_disabled: '&2[AntiBotService] AntiBot disabled after %m minutes!' +# Unregister unregister: success: '&cSuccessfully unregistered!' command_usage: '&cUsage: /unregister ' # Other messages misc: - accounts_owned_self: 'You own %count accounts:' - accounts_owned_other: 'The player %name has %count accounts:' account_not_activated: '&cYour account isn''t activated yet, please check your emails!' + not_activated: '&cAccount not activated, please register and activate it before trying again.' password_changed: '&2Password changed successfully!' logout: '&2Logged out successfully!' reload: '&2Configuration and database have been reloaded correctly!' usage_change_password: '&cUsage: /changepassword ' + accounts_owned_self: 'You own %count accounts:' + accounts_owned_other: 'The player %name has %count accounts:' # Session messages session: @@ -71,36 +73,36 @@ session: # Error messages when joining on_join_validation: + same_ip_online: 'A player with the same IP is already in game!' + same_nick_online: '&4The same username is already playing on the server!' name_length: '&4Your username is either too short or too long!' characters_in_name: '&4Your username contains illegal characters. Allowed chars: %valid_chars' + kick_full_server: '&4The server is full, try again later!' country_banned: '&4Your country is banned from this server!' not_owner_error: 'You are not the owner of this account. Please choose another name!' - kick_full_server: '&4The server is full, try again later!' - same_nick_online: '&4The same username is already playing on the server!' invalid_name_case: 'You should join using username %valid, not %invalid.' - same_ip_online: 'A player with the same IP is already in game!' quick_command: 'You used a command too fast! Please, join the server again and wait more before using any command.' # Email email: + add_email_request: '&3Please add your email to your account with the command: /email add ' usage_email_add: '&cUsage: /email add ' usage_email_change: '&cUsage: /email change ' new_email_invalid: '&cInvalid new email, try again!' old_email_invalid: '&cInvalid old email, try again!' invalid: '&cInvalid email address, try again!' added: '&2Email address successfully added to your account!' + add_not_allowed: '&cAdding email was not allowed.' request_confirmation: '&cPlease confirm your email address!' changed: '&2Email address changed correctly!' + change_not_allowed: '&cChanging email was not allowed.' email_show: '&2Your current email address is: &f%email' - incomplete_settings: 'Error: not all required settings are set for sending emails. Please contact an admin.' - already_used: '&4The email address is already being used' - send_failure: 'The email could not be sent. Please contact an administrator.' no_email_for_account: '&2You currently don''t have email address associated with this account.' - add_email_request: '&3Please add your email to your account with the command: /email add ' + already_used: '&4The email address is already being used' + incomplete_settings: 'Error: not all required settings are set for sending emails. Please contact an admin.' + send_failure: 'The email could not be sent. Please contact an administrator.' change_password_expired: 'You cannot change your password using this command anymore.' email_cooldown_error: '&cAn email was already sent recently. You must wait %time before you can send a new one.' - add_not_allowed: '&cAdding email was not allowed.' - change_not_allowed: '&cChanging email was not allowed.' # Password recovery by email recovery: @@ -132,6 +134,17 @@ verification: code_expired: '&3Your code has expired! Execute another sensitive command to get a new code!' email_needed: '&3To verify your identity you need to link an email address with your account!!' +# Time units +time: + second: 'second' + seconds: 'seconds' + minute: 'minute' + minutes: 'minutes' + hour: 'hour' + hours: 'hours' + day: 'day' + days: 'days' + # Two-factor authentication two_factor: code_created: '&2Your secret code is %code. You can scan it from here %url' @@ -145,17 +158,6 @@ two_factor: removed_success: 'Successfully removed two-factor auth from your account' invalid_code: 'Invalid code!' -# Time units -time: - second: 'second' - seconds: 'seconds' - minute: 'minute' - minutes: 'minutes' - hour: 'hour' - hours: 'hours' - day: 'day' - days: 'days' - # 3rd party features: GUI Captcha gui_captcha: success: '&aVerification success!' @@ -173,9 +175,9 @@ bedrock_auto_login: # 3rd party features: Login Location Fix login_location_fix: - fix_portal: '&aYou are stuck in portal during Login.' - fix_underground: '&aYou are stuck underground during Login.' - cannot_fix_underground: '&aYou are stuck underground during Login, but we cant fix it.' + fix_portal: '&aYou are stuck in portal during login.' + fix_underground: '&aYou are stuck underground during login.' + cannot_fix_underground: '&aYou are stuck underground during login, but we cant fix it.' # 3rd party features: Double Login Fix double_login_fix: diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 6fe940f6..0b735f5f 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: ${pluginDescription.name} authors: [${pluginDescription.authors}] -website: http://github.com/HaHaWTH/AuthMeReReloaded/ +website: https://github.com/HaHaWTH/AuthMeReReloaded/ description: A fork of AuthMeReloaded that contains bug fixes main: ${pluginDescription.main} folia-supported: true