Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r6eff730504702cb886be4c8f697bf4ee6d9c3bbd -r8a5eb613f404b4bf118cceeca6eb1c5f2c54a471
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 6eff730504702cb886be4c8f697bf4ee6d9c3bbd)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8a5eb613f404b4bf118cceeca6eb1c5f2c54a471)
@@ -21,7 +21,7 @@
 error.oldpassword.mismatch = Your old password is not correct.
 error.img.format = The file you uploaded looks not an image. An image file usually has .jpg, .gif, .png or .bmp extension.
 error.img.size = The file size exceeds the maximum 4096k limit.
-error.need.sysadmin = You need to have the sys admin role to do this.
+error.need.appadmin = You need to have the sys admin role to do this.
 error.roles.empty = You need to assign at least one role.
 error.userid.invalid = Invalid User Id.
 error.firstname.required = First name is required.
@@ -128,10 +128,10 @@
 admin.search = Search
 admin.enable = Enable
 admin.disable = Disable
-sysadmin.maintain = LAMS Admin
-sysadmin.maintain.loginpage = Maintain login page
-sysadmin.maintain.external.servers = Maintain integrated servers
-sysadmin.maintain.server.edit = Edit integrated server
+appadmin.maintain = LAMS Admin
+appadmin.maintain.loginpage = Maintain login page
+appadmin.maintain.external.servers = Maintain integrated servers
+appadmin.maintain.server.edit = Edit integrated server
 sysadmin.serverid = Id
 sysadmin.serverkey = Key
 sysadmin.servername = Name
@@ -145,13 +145,13 @@
 sysadmin.server.add = Add new server
 sysadmin.organisation.create = Create one
 sysadmin.organisation.select = Please select...
-sysadmin.login.text = Update login page text:
+appadmin.login.text = Update login page text:
 sysadmin.headline = System Administration
 sysadmin.config.settings.edit = Edit configuration settings
-sysadmin.batch.temp.file.delete = Delete old temporary files
+appadmin.batch.temp.file.delete = Delete old temporary files
 sysadmin.job.list = Job list
 sysadmin.list.job = List scheduled jobs in Quartz queue
-sysadmin.edit.default.tool.content = Edit default tool content
+appadmin.edit.default.tool.content = Edit default tool content
 cache.maintain = Maintain LAMS cache
 cache.title = Cache management
 cache.entries.title = Cache nodes
@@ -177,7 +177,7 @@
 msg.users.created = {0} users were created successfully.
 error.no.sysadmin.priviledge = You do not have the required privileges to perform this action.
 sysadmin.library.management = Learning library management
-sysadmin.library.totals = learning libraries in total
+appadmin.library.totals = learning libraries in total
 sysadmin.library.activity.title = Title
 sysadmin.library.activity.description = Description
 sysadmin.library.createtim = Create time
@@ -192,9 +192,9 @@
 label.can.offer.joint.lessons = Can offer joint lessons
 error.cant.write.login.jsp = Couldn''t write value of {0} to {1}, please check your {2} configuration.
 label.login.as = Login as
-sysadmin.import.groups.title = Import courses
+appadmin.import.groups.title = Import courses
 heading.import.results = Import results
-table.heading.organisation.id = Organisation ID
+table.heading.organisation.id = Course ID
 import.groups.intro = Use this screen to bulk import courses and subcourses using an Excel spreadsheet.
 import.groups.instructions = When creating a course, make sure the row above it is empty.  When creating a subcourse, place it directly under it's parent course.
 import.groups.download = Download the courses template to create courses and subcourse.
@@ -207,7 +207,7 @@
 heading.ldap.synchronise = Synchronise with LDAP
 msg.done = ...done!
 msg.tool.management = Tool management
-sysadmin.tool.management = Tool management
+appadmin.tool.management = Tool management
 msg.ldap.synchronise.wait = Please wait while synchronisation completes...
 msg.ldap.synchronise.errors = The following errors were encountered:
 msg.num.search.results.users = LDAP server returned {0} users.
@@ -294,7 +294,7 @@
 audit.spreadsheet.error = Error processing spreadsheet row {0}: {1}
 audit.successful.user.import = Successfully imported {0} users.
 audit.successful.role.import = Successfully imported {0} role memberships.
-audit.successful.organisation.import = Successfully imported {0} organisations.
+audit.successful.organisation.import = Successfully imported {0} courses.
 config.forgot.password.allow.email = Allow forgot password email link in front page?
 config.forgot.password.email = Email address from which the forgotten password emails will be sent
 config.custom.tab.link = Custom tab URL
@@ -454,7 +454,7 @@
 label.password.must.ucase = at least 1 upper case letter
 label.password.must.number = at least 1 number
 label.password.must.symbol = at least 1 symbol
-sysadmin.batch.preview.lesson.delete = Delete old preview lessons
+appadmin.batch.preview.lesson.delete = Delete old preview lessons
 msg.cleanup.preview.lesson.confirm = Are you sure you want to delete all preview lessons?
 msg.cleanup.preview.lesson.error = Error while deleting preview lessons
 label.cleanup.preview.lesson.count = Number of preview/all lessons:
@@ -473,12 +473,12 @@
 button.select.importfile = Select file to import
 label.upload.info = Uploaded file must be an Excel file and not exceed size of {0}
 errors.maxfilesize = Uploaded file exceeded maximum size: {0}
-sysadmin.maintain.session = Logged in users
-sysadmin.maintain.session.login = Login
-sysadmin.maintain.session.id = Session ID
+appadmin.maintain.session = Logged in users
+appadmin.maintain.session.login = Login
+appadmin.maintain.session.id = Session ID
 error.portrait.removal.failed = Unable to delete portrait. See error file for details.
 label.delete.portrait = Delete portrait
-sysadmin.maintain.session.delete = Delete
+appadmin.maintain.session.delete = Delete
 config.display.portrait = Display learner's portrait in progress bar
 config.allow.kumalive = Enable Kumalive
 admin.organisation.create.date = Creation date
@@ -545,7 +545,7 @@
 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...
-sysadmin.lesson.delete.title = Delete all lessons from course
+appadmin.lesson.delete.title = Delete all lessons from course
 label.type.live.edit = Live Edit
 label.no.data.found = No data found
 msg.delete.organisation.confirm = You are about to permanently remove a course. Are you sure want to do this?
@@ -606,7 +606,7 @@
 outcome.authoring.input = Search and select by outcome name or code
 outcome.authoring.existing = Added outcomes
 outcome.authoring.existing.none = none
-sysadmin.maintain.session.name = Name
+appadmin.maintain.session.name = Name
 config.header.antivirus = Antivirus
 config.av.enable = Enable antivirus scanning on files upload
 config.av.host = ClamAV server host
@@ -617,7 +617,7 @@
 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
-sysadmin.maintain.session.count = logged in users
+appadmin.maintain.session.count = logged in users
 config.qb.qti.enable = Enable QTI question import/export
 config.qb.word.enable = Enable Word question import
 config.qb.collections.create.enable = Allow creating custom collections
@@ -628,8 +628,8 @@
 config.qb.merge.enable = Allow question manual merging
 config.header.qb = Question bank
 sysadmin.logoutUrl = Redirect user after logout to the following URL
-sysadmin.maintain.session.access = Last access
-sysadmin.maintain.session.created = Started on:
+appadmin.maintain.session.access = Last access
+appadmin.maintain.session.created = Started on:
 config.enable.collapsing.subcourses = Enable collapsing of subcourses
 config.learning.outcome.add.enable = Enable quick add of learning outcomes in authoring
 label.type.questions.merged = Questions merged
@@ -691,3 +691,7 @@
 sysadmin.cache.cleared = Cache cleared
 sysadmin.garbage.clear = Run Garbage Collector
 sysadmin.garbage.cleared = Garbage Collector triggered
+role.APPADMIN = App Admin
+label.appadmins = Appadmins
+server.app.config.title = Application configuration
+server.sys.config.title = Server configuration
Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r6eff730504702cb886be4c8f697bf4ee6d9c3bbd -r8a5eb613f404b4bf118cceeca6eb1c5f2c54a471
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 6eff730504702cb886be4c8f697bf4ee6d9c3bbd)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8a5eb613f404b4bf118cceeca6eb1c5f2c54a471)
@@ -66,7 +66,7 @@
 index.logout = Logout
 index.refresh = Refresh
 index.myprofile = Profile
-index.sysadmin = Sys Admin
+index.appadmin = Sys Admin
 index.courseman = Course Mgt
 index.author = Author
 index.classman = Manage Subcourses
Index: lams_central/conf/language/lams/ApplicationResources_el_GR.properties
===================================================================
diff -u -r6dc96b6cea5573ab2d14ca504e719bb12a3d271c -r8a5eb613f404b4bf118cceeca6eb1c5f2c54a471
--- lams_central/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision 6dc96b6cea5573ab2d14ca504e719bb12a3d271c)
+++ lams_central/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision 8a5eb613f404b4bf118cceeca6eb1c5f2c54a471)
@@ -1051,6 +1051,7 @@
 label.do.you.want.to.delete.answer = Θέλεις να διαγράψεις αυτή την απάντηση;
 label.choose.word.document = Επιλογή εγγράφου MS Word για εισαγωγή ερωτήσεων
 label.import.word = Εισαγωγή ερωτήσεων από έγγραφο του MS-Word
+# Microsoft Word
 label.qb.collection.word = MS Word
 authoring.fla.page.prop.gate.type.password = Κωδικός πρόσβασης
 authoring.fla.page.prop.password = Κωδικός πρόσβασης
@@ -1070,6 +1071,7 @@
 label.authoring.feeback.partially.correct = Ανατροφοδότηση η οποία θα εμφανίζεται σε κάθε μερικώς σωστή απάντηση
 label.authoring.feeback.incorrect = Ανατροφοδότηση η οποία θα εμφανίζεται σε κάθε λανθασμένη απάντηση
 error.ld.zip.file = Επιτρέπονται μόνο αρχεία zip
+# MS Word file template for importing questions into LAMS
 label.download.word.template = Λήψη προτύπου "MS Word-question-import.docx"  - εισαγωγή ερωτήσεων
 authoring.tbl.import.questions.from = Εισαγωγή ερωτήσεων από
 button.save.new.version = Αποθήκευση ως νέα έκδοση
Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r6dc96b6cea5573ab2d14ca504e719bb12a3d271c -r8a5eb613f404b4bf118cceeca6eb1c5f2c54a471
--- lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 6dc96b6cea5573ab2d14ca504e719bb12a3d271c)
+++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 8a5eb613f404b4bf118cceeca6eb1c5f2c54a471)
@@ -1051,6 +1051,7 @@
 label.do.you.want.to.delete.answer = Do you want to delete this answer?
 label.choose.word.document = Choose Microsoft Word file
 label.import.word = Import questions from Microsoft Word document
+# Microsoft Word
 label.qb.collection.word = MS Word
 authoring.fla.page.prop.gate.type.password = Password
 authoring.fla.page.prop.password = Password
@@ -1070,6 +1071,7 @@
 label.authoring.feeback.partially.correct = Feedback on any partially correct response
 label.authoring.feeback.incorrect = Feedback on any incorrect response
 error.ld.zip.file = Only zip files allowed
+# MS Word file template for importing questions into LAMS
 label.download.word.template = Download Microsoft Word template
 authoring.tbl.import.questions.from = Import questions from
 button.save.new.version = Save as new version
Index: lams_central/conf/language/lams/ApplicationResources_es_ES.properties
===================================================================
diff -u -r6dc96b6cea5573ab2d14ca504e719bb12a3d271c -r8a5eb613f404b4bf118cceeca6eb1c5f2c54a471
--- lams_central/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision 6dc96b6cea5573ab2d14ca504e719bb12a3d271c)
+++ lams_central/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision 8a5eb613f404b4bf118cceeca6eb1c5f2c54a471)
@@ -1051,6 +1051,7 @@
 label.do.you.want.to.delete.answer = ¿Está seguro que desea borrar esta respuesta?
 label.choose.word.document = Elija documento de Microsoft Word
 label.import.word = Importar preguntas de documento de Microsoft Word
+# Microsoft Word
 label.qb.collection.word = MS Word
 authoring.fla.page.prop.gate.type.password = Contraseña
 authoring.fla.page.prop.password = Contraseña
@@ -1070,6 +1071,7 @@
 label.authoring.feeback.partially.correct = Retroalimentación para cualquier respuesta parcialmente correcta
 label.authoring.feeback.incorrect = Retroalimentación para cualquier respuesta incorrecta
 error.ld.zip.file = Solo se permiten archivos zip
+# MS Word file template for importing questions into LAMS
 label.download.word.template = Descargar plantilla de Microsoft Word
 authoring.tbl.import.questions.from = Importar preguntas de
 button.save.new.version = Guardar como nueva versión
Index: lams_central/conf/language/lams/ApplicationResources_no_NO.properties
===================================================================
diff -u -r6dc96b6cea5573ab2d14ca504e719bb12a3d271c -r8a5eb613f404b4bf118cceeca6eb1c5f2c54a471
--- lams_central/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision 6dc96b6cea5573ab2d14ca504e719bb12a3d271c)
+++ lams_central/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision 8a5eb613f404b4bf118cceeca6eb1c5f2c54a471)
@@ -1051,6 +1051,7 @@
 label.do.you.want.to.delete.answer = Ønsker du å slette dette svaret ?
 label.choose.word.document = Velg Word-fil
 label.import.word = Importer spørsmål fra Word-dokument
+# Microsoft Word
 label.qb.collection.word = MS Word
 authoring.fla.page.prop.gate.type.password = Passord
 authoring.fla.page.prop.password = Passord
@@ -1070,6 +1071,7 @@
 label.authoring.feeback.partially.correct = Tilbakemelding om noe delvis korrekt svar
 label.authoring.feeback.incorrect = Tilbakemelding om feil svar
 error.ld.zip.file = Bare zip-filer tillatt
+# MS Word file template for importing questions into LAMS
 label.download.word.template = Last ned Microsoft Word-mal
 authoring.tbl.import.questions.from = Importer spørsmål fra
 button.save.new.version = Legg til som ny  revisjon
Index: lams_central/conf/language/lams/ApplicationResources_zh_CN.properties
===================================================================
diff -u -r6dc96b6cea5573ab2d14ca504e719bb12a3d271c -r8a5eb613f404b4bf118cceeca6eb1c5f2c54a471
--- lams_central/conf/language/lams/ApplicationResources_zh_CN.properties	(.../ApplicationResources_zh_CN.properties)	(revision 6dc96b6cea5573ab2d14ca504e719bb12a3d271c)
+++ lams_central/conf/language/lams/ApplicationResources_zh_CN.properties	(.../ApplicationResources_zh_CN.properties)	(revision 8a5eb613f404b4bf118cceeca6eb1c5f2c54a471)
@@ -1051,6 +1051,7 @@
 label.do.you.want.to.delete.answer = 您要删除此答案吗？
 label.choose.word.document = 选择微软的Word文件
 label.import.word = 从微软Word文档中导入问题
+# Microsoft Word
 label.qb.collection.word = Word文档
 authoring.fla.page.prop.gate.type.password = 密码
 authoring.fla.page.prop.password = 密码
@@ -1070,6 +1071,7 @@
 label.authoring.feeback.partially.correct = 对部分正确回答的反馈
 label.authoring.feeback.incorrect = 对错误回答的反馈
 error.ld.zip.file = 只允许压缩文件
+# MS Word file template for importing questions into LAMS
 label.download.word.template = 下载 Microsoft Word 模板
 authoring.tbl.import.questions.from = 从以下位置导入问题
 button.save.new.version = 另存为新版本
Index: lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r6eff730504702cb886be4c8f697bf4ee6d9c3bbd -r8a5eb613f404b4bf118cceeca6eb1c5f2c54a471
--- lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 6eff730504702cb886be4c8f697bf4ee6d9c3bbd)
+++ lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 8a5eb613f404b4bf118cceeca6eb1c5f2c54a471)
@@ -532,3 +532,6 @@
 label.monitoring.burning.questions = Burning Questions
 label.monitoring.teams.question.results.question = Question
 label.monitoring.teams.question.results = Question results
+label.monitoring.learners.no.progress = No progress yet
+label.monitoring.learners.time.taken = Time taken
+label.monitoring.learners.mark = Mark
Index: lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties
===================================================================
diff -u -rf54c292e64bc98100d0bdaf34f361bb5e786bde4 -r8a5eb613f404b4bf118cceeca6eb1c5f2c54a471
--- lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision f54c292e64bc98100d0bdaf34f361bb5e786bde4)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision 8a5eb613f404b4bf118cceeca6eb1c5f2c54a471)
@@ -429,3 +429,6 @@
 label.learning.matching.pairs.chosen = Επιλογή:
 label.learning.disclose.tip = Όταν ολοκληρώσετε τη δραστηριότητα, ο/η εκπαιδευτικός μπορεί να αποκαλύψει τις απαντήσεις σας σε άλλους μαθητές.
 label.prevent.learner.autosave.mutliple.tabs = Φαίνεται ότι έχετε ανοιχτές δύο καρτέλες LAMS για αυτήν την εξέταση. Παρακαλώ κλείστε ένα από αυτά. Διαφορετικά, οι απαντήσεις δεν θα καταγραφούν σωστά και θα επηρεάσουν τη βαθμολογία σας.
+monitoring.label.all.learners = Όλοι οι εκπαιδευόμενοι
+label.authoring.preview.skip.validation = Ως εκπαιδευόμενος θα πρέπει να απαντήσετε σε όλες τις απαιτούμενες ερωτήσεις. Στη λειτουργία προεπισκόπησης μπορείτε να πατήσετε ξανά αυτό το κουμπί για να συνεχίσετε.
+label.monitoring.student.choices.none = Κανένας εκπαιδευόμενος δεν έχει απαντήσει ακόμα σε ερωτήσεις
Index: lams_tool_doku/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r1621b6daf8385b83e75f7ffde03c017b05c12487 -r8a5eb613f404b4bf118cceeca6eb1c5f2c54a471
--- lams_tool_doku/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 1621b6daf8385b83e75f7ffde03c017b05c12487)
+++ lams_tool_doku/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8a5eb613f404b4bf118cceeca6eb1c5f2c54a471)
@@ -129,14 +129,3 @@
 label.gallery.walk.state.started = started
 label.gallery.walk.state.finished = finished
 label.gallery.walk.state.learner.edit.enabled = , learners can modify answers
-monitor.summary.date.restriction = Date and time restriction
-monitor.summary.when.date.restriction.is.set = If a date and time restriction is set, learners will not be able to submit assignments after this date.
-monitor.summary.after.date = Date and time:
-monitor.summary.set.restriction = Set restriction
-monitor.summary.unset.restriction = Remove restriction
-authoring.info.teacher.set.restriction = The teacher has set a restriction for submission from {0}.
-label.sorry.the.deadline.has.passed = Sorry, the deadline to participate in this activity has passed. Please contact your teacher for further details.
-monitor.summary.notification = Notification
-monitor.summary.date.restriction.set = Date availability has been set
-monitor.summary.date.restriction.removed = Date availability has been removed
-
Index: lams_tool_whiteboard/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r1621b6daf8385b83e75f7ffde03c017b05c12487 -r8a5eb613f404b4bf118cceeca6eb1c5f2c54a471
--- lams_tool_whiteboard/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 1621b6daf8385b83e75f7ffde03c017b05c12487)
+++ lams_tool_whiteboard/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8a5eb613f404b4bf118cceeca6eb1c5f2c54a471)
@@ -126,13 +126,3 @@
 label.gallery.walk.state.started = started
 label.gallery.walk.state.finished = finished
 label.gallery.walk.state.learner.edit.enabled = , learners can modify answers
-monitor.summary.date.restriction = Date and time restriction
-monitor.summary.when.date.restriction.is.set = If a date and time restriction is set, learners will not be able to submit assignments after this date.
-monitor.summary.after.date = Date and time:
-monitor.summary.set.restriction = Set restriction
-monitor.summary.unset.restriction = Remove restriction
-authoring.info.teacher.set.restriction = The teacher has set a restriction for submission from {0}.
-label.sorry.the.deadline.has.passed = Sorry, the deadline to participate in this activity has passed. Please contact your teacher for further details.
-monitor.summary.notification = Notification
-monitor.summary.date.restriction.set = Date availability has been set
-monitor.summary.date.restriction.removed = Date availability has been removed
\ No newline at end of file