Merge branch 'main' into lunny/default_editor

Author: lunny

options/locale/locale_en-US.ini

@@ -302,7 +302,7 @@ social_register_helper_msg = Already have an account? Link it now!
 disable_register_prompt = Registration is disabled. Please contact your site administrator.
 disable_register_mail = Email confirmation for registration is disabled.
 manual_activation_only = Contact your site administrator to complete activation.
-remember_me = Remember this Device
+remember_me = Remember This Device
 forgot_password_title= Forgot Password
 forgot_password = Forgot password?
 sign_up_now = Need an account? Register now.