Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r919480104e49e8c2055348b663dcb3e688cfe571 -r4a002a93eec034b0f79f414a8a3b8bff277692af
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 919480104e49e8c2055348b663dcb3e688cfe571)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 4a002a93eec034b0f79f414a8a3b8bff277692af)
@@ -93,7 +93,7 @@
 role.AUTHOR = Author
 role.AUTHOR.ADMIN = Author Admin
 role.GROUP.MANAGER = Course Manager
-role.LEARNER = Learner
+role.LEARNER = Student
 role.MONITOR = Monitor
 role.SYSADMIN = System Admin
 label.member.of = Member of
@@ -240,7 +240,7 @@
 config.cleanup.preview.older.than.days = Number of days to keep preview
 config.authoring.client.version = Authoring client version
 config.monitor.client.version = Monitoring client version
-config.learner.client.version = Learner client version
+config.learner.client.version = Student client version
 config.server.version.number = Server version number
 config.server.language = Locale
 config.server.page.direction = Locale page direction
@@ -260,7 +260,7 @@
 config.ldap.security.protocol = Security protocol
 config.ldap.truststore.path = SSL certificate path
 config.ldap.truststore.password = SSL certificate password
-config.ldap.learner.map = Learner role map
+config.ldap.learner.map = Student role map
 config.ldap.monitor.map = Monitor role map
 config.ldap.author.map = Author role map
 config.ldap.group.manager.map = Course Manager role map
@@ -276,7 +276,7 @@
 label.groups = courses
 label.subgroups = subcourses
 heading.manage.group.users = Manage Users of {0}
-label.learners = Learners
+label.learners = Students
 label.monitors = Monitors
 label.authors = Authors
 label.group.managers = Course Managers
@@ -301,7 +301,7 @@
 config.custom.tab.title = Custom tab title
 config.authoring.screen.size = Authoring screen size
 config.monitor.screen.size = Monitor screen size
-config.learner.screen.size = Learner screen size
+config.learner.screen.size = Student screen size
 config.admin.screen.size = System Admin screen size
 label.tool = Tool
 label.tool.version = Tool version
@@ -316,7 +316,7 @@
 config.header.red5 = Media server
 config.red5.server.url = Media server URL
 config.red5.recordings.url = Media server recordings URL
-admin.gradebook.learner.enable = Enable Gradebook for learners
+admin.gradebook.learner.enable = Enable Gradebook for students
 sysadmin.serverUrl = External server URL
 admin.statistics.title = Server Analytics
 admin.statistics.overall = Overall statistics
@@ -328,7 +328,7 @@
 admin.statistics.activities = Total activities:
 admin.statistics.completedActivities = Total completed activities:
 admin.statistics.title.byGroup = Statistics by course
-admin.statistics.group.learners = Total Learners:
+admin.statistics.group.learners = Total students:
 admin.statistics.group.monitors = Total Monitors:
 admin.statistics.group.authors = Total Authors:
 admin.themes.title = Theme management
@@ -355,15 +355,15 @@
 title.select.staff = Select staff
 message.add.all.monitors = Add all monitors in this course to each lesson?
 label.configure.staff = Configure staff
-title.select.learners = Select learners
-message.add.all.learners = Add all learners in this course to each lesson?
-label.configure.learners = Configure learners
+title.select.learners = Select students
+message.add.all.learners = Add all students in this course to each lesson?
+label.configure.learners = Configure students
 label.clone = Clone
 message.cloned.lessons = Cloned {0} lessons.
 message.no.lessons = There are no lessons to clone.
 message.check.to.clone.lesson = Check the box for each lesson to clone it.
 message.no.lesson.description = No lesson description
-message.no.learners = This course has no learners!  Please add some via the Add/Remove users screen.
+message.no.learners = This course has no students!  Please add some via the Add/Remove users screen.
 message.check.to.add.learner = Check the box of each learner to add to each of the new lessons.
 message.no.monitors = This course has no monitors!  Please add some via the Add/Remove users screen.
 message.check.to.add.monitor = Check the box of each monitor to add as staff to each of the new lessons.
@@ -519,7 +519,7 @@
 label.type.learner.lesson.complete = Lesson Complete
 label.type.learner.lesson.mark.submit = Mark Submitted
 label.type.activity.edit = Activity Edited
-label.type.force.complete = Learner Force Completed
+label.type.force.complete = Student Force Completed
 label.type.user.org.admin = Organisation or User Changed
 label.type.login.as = Sysadmin Logged In As
 label.type.password.change = Password Change
@@ -528,20 +528,20 @@
 label.type.notification = Notification
 label.type.mark.updated = Mark Updated
 label.type.mark.released = Mark Released
-label.type.learner.content.updated = Learner's Entry Modified
-label.type.learner.content.show.hide = Learner's Entry Shown/Hidden
+label.type.learner.content.updated = Student's Entry Modified
+label.type.learner.content.show.hide = Student's Entry Shown/Hidden
 label.type.unknown = Unknown
 label.area.lesson = Lesson
 label.area.security = Security
 label.area.notification = Notification
 label.area.marks = Marks
-label.area.learner.content = Learner Entry
+label.area.learner.content = Student Entry
 label.area.unknown = Unknown
 audit.change.made.by = Changes Made By
 audit.change.made.to = Changes Made To
 admin.delete.lessons = Delete all lessons
 msg.delete.all.lesson.confirm.1 = You are about to PERMANENTLY delete ALL lessons from course "{0}". Are you ABSOLUTELY sure that you want to do this? There will be no turning back!
-msg.delete.all.lesson.confirm.2 = ALL lessons will be deleted, including active ones with learners in them. NO lessons will be left in the course. Are you sure you want to continue?
+msg.delete.all.lesson.confirm.2 = ALL lessons will be deleted, including active ones with students in them. NO lessons will be left in the course. Are you sure you want to continue?
 msg.delete.all.lesson.error = Error while deleting course lessons
 label.delete.all.lesson.count = Number of remaining / total lessons:
 label.delete.all.lesson.progress = Deleting...
@@ -552,7 +552,7 @@
 msg.delete.organisation.delete.lessons.confirm = The course or one of its sub courses still contains lessons. They need to be permanently deleted first. You will be redirected to a page where you can do it.
 config.kumalive.enable = Enable Kumalive
 audit.remarks = Remarks
-config.allow.direct.access.for.integration.learners = Allow direct access to main LAMS page for integration learners.
+config.allow.direct.access.for.integration.learners = Allow direct access to main LAMS page for integration students.
 label.type.tool.mark.released = Tool Marks Released
 label.policy.minor.change.hint = Minor changes are meant to be wording changes that do not affect the meaning of the policy. If this option is not checked, then a new version of the policy will be created and users will be required to consent to this new policy version.
 label.select.country = Select a country
@@ -593,10 +593,10 @@
 sysadmin.lesson.gradebook.complete = Display activity scores on completion
 sysadmin.lesson.liveedit = Enable Live Edit
 sysadmin.lesson.notification = Enable lesson notifications
-sysadmin.lesson.presence = Allow learners to see who is online
+sysadmin.lesson.presence = Allow students to see who is online
 sysadmin.lesson.im = Enable Instant Messaging
-sysadmin.lesson.force.restart = Learners always start from the first activity
-sysadmin.lesson.allow.restart = Learners can restart the lesson
+sysadmin.lesson.force.restart = Students always start from the first activity
+sysadmin.lesson.allow.restart = Students can restart the lesson
 sysadmin.lesson.default = Lesson default settings
 config.enable.portrait.editing = Enable profile portrait editing
 label.search = Search...
@@ -616,7 +616,7 @@
 label.type.config.change = Configuration change
 outcome.authoring.remove.confirm = Are you sure you want to remove this learning outcome?
 config.header.privacy.settings = Privacy settings
-config.restricted.displaying.user.names.in.groupings = Groupings: only display names for learners within own group
+config.restricted.displaying.user.names.in.groupings = Groupings: only display names for students within own group
 appadmin.maintain.session.count = logged in users
 config.qb.qti.enable = Enable QTI question import/export
 config.qb.word.enable = Enable Word question import
@@ -676,14 +676,14 @@
 sysadmin.lti.advantage.tool.public.key = Public key
 sysadmin.lti.advantage.tool.private.key = Private key
 sysadmin.add.staff.to.all.lessons = On staff login add them to all lessons in course
-user.import.password.change.email.content.subject = Set up LAMS password
+user.import.password.change.email.content.subject = Your LAMS account has been created!
 user.import.password.change.email.content.start = Hi {0},
-user.import.password.change.email.content.account.created = We have created an account for you on LAMS platform. Your user name is "{0}". Please follow this link to set up your password: {1}
-user.import.password.change.email.content.link.label = SET UP LAMS PASSWORD
-user.import.password.change.email.content.end = If the link expired, please go to {0} and click "Forgot your password?" link.
+user.import.password.change.email.content.account.created = We have created an account for you on <b>LAMS</b>.
+user.import.password.change.email.content.link.label = SET UP PASSWORD
+user.import.password.change.email.content.end = If the link expires, please go to <b><a href="{0}">LAMS</a></b> and click the <i>"Forgot your password?"</i> link.
 user.import.password.change.email.content.thanks = Thank you
-user.import.password.change.email.content.footer = LAMS
-label.import.email = Email users account activation emails
+user.import.password.change.email.content.footer = LAMS Helpdesk
+label.import.email = Send user activation emails
 msg.password.generated = for user name "{0}" the following password was created: {1}
 sysadmin.cleanup = Clean up cache and files
 sysadmin.cache.clear = Clear Hibernate cache
@@ -710,5 +710,18 @@
 title.clone.course.include.manager = course manager roles
 title.clone.course.include.author = author roles
 title.clone.course.include.monitor = monitor roles
-title.clone.course.include.learner = learner roles
+title.clone.course.include.learner = students roles
 ai.persona.link = AI personas
+config.header.tiptap = Tiptap
+config.tiptap.server.url = Server URL (match hocuspocus .env file)
+config.tiptap.shared.secret = Shared secret (min. 32 chars, match hocuspocus .env file)
+config.tiptap.instance.id = Instance ID (optional)
+config.tiptap.iframely.api.key = Iframely API key (optional)
+label.export = Export
+admin.user.course.manager.user.filter = User browse filter for course managers (e.g. "admin,@lams.es,lams.sg")
+user.import.password.change.email.content.welcome = Welcome to LAMS!
+user.import.password.change.email.content.user.name = Your username is: <b>{0}</b>
+user.import.password.change.email.content.link = To get started, please set your password using the link below. This link is unique to your account.
+user.import.password.change.email.content.assistance = If you have any questions or need assistance, feel free to contact us. We are here to help.
+label.import.password.display = Display generated passwords
+admin.user.invite = Generate password and send invitation email