Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r7194568932b229c045eb3e5c4c79e279eec66864 -r6eff730504702cb886be4c8f697bf4ee6d9c3bbd
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 7194568932b229c045eb3e5c4c79e279eec66864)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 6eff730504702cb886be4c8f697bf4ee6d9c3bbd)
@@ -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.appadmin = You need to have the sys admin role to do this.
+error.need.sysadmin = 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.
@@ -96,7 +96,6 @@
 role.LEARNER = Learner
 role.MONITOR = Monitor
 role.SYSADMIN = System Admin
-role.APPADMIN = App Admin
 label.member.of = Member of
 label.with.roles = With roles
 admin.organisation.management = Course/Subcourse management
@@ -129,10 +128,10 @@
 admin.search = Search
 admin.enable = Enable
 admin.disable = Disable
-appadmin.maintain = LAMS Administration
-appadmin.maintain.loginpage = Maintain login page
-appadmin.maintain.external.servers = Maintain integrated servers
-appadmin.maintain.server.edit = Edit integrated server
+sysadmin.maintain = LAMS Admin
+sysadmin.maintain.loginpage = Maintain login page
+sysadmin.maintain.external.servers = Maintain integrated servers
+sysadmin.maintain.server.edit = Edit integrated server
 sysadmin.serverid = Id
 sysadmin.serverkey = Key
 sysadmin.servername = Name
@@ -146,13 +145,13 @@
 sysadmin.server.add = Add new server
 sysadmin.organisation.create = Create one
 sysadmin.organisation.select = Please select...
-appadmin.login.text = Update login page text:
+sysadmin.login.text = Update login page text:
 sysadmin.headline = System Administration
 sysadmin.config.settings.edit = Edit configuration settings
-appadmin.batch.temp.file.delete = Delete old temporary files
+sysadmin.batch.temp.file.delete = Delete old temporary files
 sysadmin.job.list = Job list
 sysadmin.list.job = List scheduled jobs in Quartz queue
-appadmin.edit.default.tool.content = Edit default tool content
+sysadmin.edit.default.tool.content = Edit default tool content
 cache.maintain = Maintain LAMS cache
 cache.title = Cache management
 cache.entries.title = Cache nodes
@@ -178,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
-appadmin.library.totals = learning libraries in total
+sysadmin.library.totals = learning libraries in total
 sysadmin.library.activity.title = Title
 sysadmin.library.activity.description = Description
 sysadmin.library.createtim = Create time
@@ -193,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
-appadmin.import.groups.title = Import courses
+sysadmin.import.groups.title = Import courses
 heading.import.results = Import results
-table.heading.organisation.id  =Course ID
+table.heading.organisation.id = Organisation 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.
@@ -208,7 +207,7 @@
 heading.ldap.synchronise = Synchronise with LDAP
 msg.done = ...done!
 msg.tool.management = Tool management
-appadmin.tool.management = Tool management
+sysadmin.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.
@@ -282,7 +281,6 @@
 label.authors = Authors
 label.group.managers = Course Managers
 label.sysadmins = Sysadmins
-label.appadmins = Appadmins
 label.author.admins = Author Administrators
 heading.users = Users
 label.number.of.users = {0} users.
@@ -296,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} courses.
+audit.successful.organisation.import = Successfully imported {0} organisations.
 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
@@ -427,8 +425,7 @@
 sysadmin.login.request.ttl.enable = Enforce time limitation for integration requests
 config.live.edit = Enable live edit
 sysadmin.extGroupsUrl = External groups URL
-server.sys.config.title = Server configuration
-server.app.config.title = Application configuration
+server.config.title = Server configuration
 server.monitor.title = Server monitoring
 user.course.title = User and course configuration
 config.site.name = Site name
@@ -457,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
-appadmin.batch.preview.lesson.delete = Delete old preview lessons
+sysadmin.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:
@@ -476,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}
-appadmin.maintain.session = Logged in users
-appadmin.maintain.session.login = Login
-appadmin.maintain.session.id = Session ID
+sysadmin.maintain.session = Logged in users
+sysadmin.maintain.session.login = Login
+sysadmin.maintain.session.id = Session ID
 error.portrait.removal.failed = Unable to delete portrait. See error file for details.
 label.delete.portrait = Delete portrait
-appadmin.maintain.session.delete = Delete
+sysadmin.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
@@ -609,7 +606,7 @@
 outcome.authoring.input = Search and select by outcome name or code
 outcome.authoring.existing = Added outcomes
 outcome.authoring.existing.none = none
-appadmin.maintain.session.name = Name
+sysadmin.maintain.session.name = Name
 config.header.antivirus = Antivirus
 config.av.enable = Enable antivirus scanning on files upload
 config.av.host = ClamAV server host
@@ -620,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
-appadmin.maintain.session.count = logged in users
+sysadmin.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
@@ -631,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
-appadmin.maintain.session.access = Last access
-appadmin.maintain.session.created = Started on:
+sysadmin.maintain.session.access = Last access
+sysadmin.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
@@ -694,4 +691,3 @@
 sysadmin.cache.cleared = Cache cleared
 sysadmin.garbage.clear = Run Garbage Collector
 sysadmin.garbage.cleared = Garbage Collector triggered
-label.monitoring.logo = LAMS logo
Index: lams_admin/conf/language/lams/ApplicationResources_de_DE.properties
===================================================================
diff -u -rdd60c645ebe32ff15180cff47caa583cb41b7ee1 -r6eff730504702cb886be4c8f697bf4ee6d9c3bbd
--- lams_admin/conf/language/lams/ApplicationResources_de_DE.properties	(.../ApplicationResources_de_DE.properties)	(revision dd60c645ebe32ff15180cff47caa583cb41b7ee1)
+++ lams_admin/conf/language/lams/ApplicationResources_de_DE.properties	(.../ApplicationResources_de_DE.properties)	(revision 6eff730504702cb886be4c8f697bf4ee6d9c3bbd)
@@ -21,7 +21,7 @@
 error.oldpassword.mismatch = Ihr altes Passwort ist nicht korrekt.
 error.img.format = Die hochgeladene Datei hat kein Bildformat. Nutzen Sieeine Datei im .jpg, .gif oder .bmp-Format.
 error.img.size = Die Datei ist größer als die zulässigen 4.096 K.
-error.need.appadmin = Sie benötigen Systemverwaltungsrechte, um dies auszuführen.
+error.need.sysadmin = Sie benötigen Systemverwaltungsrechte, um dies auszuführen.
 error.roles.empty = Sie müssen mindestesn eine Rolle zuweisen.
 error.userid.invalid = Ungültige User Id.
 error.firstname.required = Vorname ist erforderlich.
@@ -128,10 +128,10 @@
 admin.search = Suche
 admin.enable = Aktivieren
 admin.disable = Deaktivieren
-appadmin.maintain = LAMS-Wartung
-appadmin.maintain.loginpage = Loginseite zur Wartung
-appadmin.maintain.external.servers = Server innerhalb der Wartung
-appadmin.maintain.server.edit = Berücksichtigte Server bearbeiten
+sysadmin.maintain = LAMS-Wartung
+sysadmin.maintain.loginpage = Loginseite zur Wartung
+sysadmin.maintain.external.servers = Server innerhalb der Wartung
+sysadmin.maintain.server.edit = Berücksichtigte Server bearbeiten
 sysadmin.serverid = Id
 sysadmin.serverkey = Key
 sysadmin.servername = Name
@@ -145,13 +145,13 @@
 sysadmin.server.add = Neuen Server hinzufügen
 sysadmin.organisation.create = Neuen anlegen
 sysadmin.organisation.select = Bitte auswählen ...
-appadmin.login.text = Text unter dem Logo auf der Loginseite anpassen:
+sysadmin.login.text = Text unter dem Logo auf der Loginseite anpassen:
 sysadmin.headline = Sytemadministration
 sysadmin.config.settings.edit = Konfiguration bearbeiten
-appadmin.batch.temp.file.delete = Alte temporäre Dateien löschen
+sysadmin.batch.temp.file.delete = Alte temporäre Dateien löschen
 sysadmin.job.list = Aufgabenliste
 sysadmin.list.job = Liste geplanter Aufgaben in Quartz-Reihenfolge
-appadmin.edit.default.tool.content = Voreingestellte Werkzeuginhalte bearbeiten
+sysadmin.edit.default.tool.content = Voreingestellte Werkzeuginhalte bearbeiten
 cache.maintain = Wartung LAMS Cache
 cache.title = Cache Management
 cache.entries.title = Cache Nodes
@@ -177,7 +177,7 @@
 msg.users.created = {0} wurden erfolgreich angelegt.
 error.no.sysadmin.priviledge = Sie haben keine aureichenden Rechte für diesen Vorgang.
 sysadmin.library.management = Lernbibliotheksverwaltung
-appadmin.library.totals = Lernbibliotheken gesamt
+sysadmin.library.totals = Lernbibliotheken gesamt
 sysadmin.library.activity.title = Titel
 sysadmin.library.activity.description = Beschreibung
 sysadmin.library.createtim = Erstellung am
@@ -192,7 +192,7 @@
 label.can.offer.joint.lessons = Kann verbunde Lektionen anbieten
 error.cant.write.login.jsp = Werte von {0} bis {1} konnten nicht geschrieben werden. Prüfen Sie die {2} Konfiguration.
 label.login.as = Login als
-appadmin.import.groups.title = Gruppen importieren
+sysadmin.import.groups.title = Gruppen importieren
 heading.import.results = Ergebnisse importieren
 table.heading.organisation.id = Organisations ID
 import.groups.intro = Verwenden Sie diese Seite zum Import von (Unter-)Gruppen miteiner Excel-Datei (Bulkimport)
@@ -207,7 +207,7 @@
 heading.ldap.synchronise = Mit LDAP synchronisieren
 msg.done = ... abgeschlossen!
 msg.tool.management = Werkzeugverwaltung
-appadmin.tool.management = Werkzeugverwaltung
+sysadmin.tool.management = Werkzeugverwaltung
 msg.ldap.synchronise.wait = Bitte warten Sie während der Synchronistation....
 msg.ldap.synchronise.errors = Folgende Fehler sind aufgetreten:
 msg.num.search.results.users = LDAP Seerver hat {0} Nutzer zurückgewiesen.
Index: lams_admin/conf/language/lams/ApplicationResources_el_GR.properties
===================================================================
diff -u -re57933d5f4b215e037a34229c3d479f707cf5156 -r6eff730504702cb886be4c8f697bf4ee6d9c3bbd
--- lams_admin/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision e57933d5f4b215e037a34229c3d479f707cf5156)
+++ lams_admin/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision 6eff730504702cb886be4c8f697bf4ee6d9c3bbd)
@@ -21,7 +21,7 @@
 error.oldpassword.mismatch = Ο παλιός σας κωδικός δεν είναι σωστός.
 error.img.format = Το αρχείο που ανεβάσατε δεν φαίεται σαν αρχείο εικόνας. Ένα αρχείο εικόνας έχει συνήθως την επέκταση:jpg, .gif, .png ή .bmp
 error.img.size = Το μέγεθος του αρχείου ξεπερνά το όριο των 4096k
-error.need.appadmin = Πρέπει να έχετε ρόλο του διαχειριστή συστήματος για να το κάνετε αυτό.
+error.need.sysadmin = Πρέπει να έχετε ρόλο του διαχειριστή συστήματος για να το κάνετε αυτό.
 error.roles.empty = Θα πρέπει να ορίσετε τουλάχιστον έναν ρόλο.
 error.userid.invalid = Μη έγκυρο Όνομα Χρήστη
 error.firstname.required = Ονομα απαιτείται
@@ -128,10 +128,10 @@
 admin.search = Αναζήτηση
 admin.enable = Ενεργοποίηση
 admin.disable = Απενεργοποίηση
-appadmin.maintain = Διαχείριση LAMS
-appadmin.maintain.loginpage = Διαχείριση σελίδας πρόσβασης (login)
-appadmin.maintain.external.servers = Διαχείριση ολοκληρωμένων εξυπηρετητών
-appadmin.maintain.server.edit = Επεξεργασία ολοκληρωμένου εξυπηρετητή
+sysadmin.maintain = Διαχείριση LAMS
+sysadmin.maintain.loginpage = Διαχείριση σελίδας πρόσβασης (login)
+sysadmin.maintain.external.servers = Διαχείριση ολοκληρωμένων εξυπηρετητών
+sysadmin.maintain.server.edit = Επεξεργασία ολοκληρωμένου εξυπηρετητή
 sysadmin.serverid = Ταυτότητα
 sysadmin.serverkey = Κλειδί
 sysadmin.servername = Όνομα
@@ -145,13 +145,13 @@
 sysadmin.server.add = Προσθήκη νέου εξυπηρετητή
 sysadmin.organisation.create = Δημιουργία νέου
 sysadmin.organisation.select = Παρακαλώ επιλέξτε ...
-appadmin.login.text = Ενημέρωση του κειμένου κάτω από το λογότυπο στη σελίδα πρόσβασης (login page)
+sysadmin.login.text = Ενημέρωση του κειμένου κάτω από το λογότυπο στη σελίδα πρόσβασης (login page)
 sysadmin.headline = Διαχείριση Συστήματος
 sysadmin.config.settings.edit = Επεξεργασία Παραμέτρων Διαμόρφωσης
-appadmin.batch.temp.file.delete = Διαγραφή των παλιών προσωρινών αρχείων
+sysadmin.batch.temp.file.delete = Διαγραφή των παλιών προσωρινών αρχείων
 sysadmin.job.list = Κατάλογος εργασιών
 sysadmin.list.job = Λίστα όλων των προγραμματισμένων εργασιών χρονικά
-appadmin.edit.default.tool.content = Επεξεργασία προκαθορισμένου περιεχομένου εργαλείου.
+sysadmin.edit.default.tool.content = Επεξεργασία προκαθορισμένου περιεχομένου εργαλείου.
 cache.maintain = Διαχείριση LAMS Cache
 cache.title = Διαχείριση Cache
 cache.entries.title = Κόμβοι Cache
@@ -177,7 +177,7 @@
 msg.users.created = {0} χρήστες δημιουργήθηκαν με επιτυχία
 error.no.sysadmin.priviledge = Δεν έχετε δικαίωμα να εκτελέσετε αυτή την ενέργεια.
 sysadmin.library.management = Διαχείρηση Βιβλιοθήκης Μάθησης
-appadmin.library.totals = σύνολο βιβλιοθηκών μάθησης
+sysadmin.library.totals = σύνολο βιβλιοθηκών μάθησης
 sysadmin.library.activity.title = Τίτλος
 sysadmin.library.activity.description = Περιγραφή
 sysadmin.library.createtim = Δημιουργία χρόνου
@@ -192,7 +192,7 @@
 label.can.offer.joint.lessons = Μπορέστε να προσφέρετε τα συνδεμένα μαθήματα
 error.cant.write.login.jsp = Δεν μπορούσε να γράψει την αξία του/της {0} {1}, παρακαλώ να ελέγξετε τη διαμόρφωσή του  {2}.
 label.login.as = Σύνδεση ως
-appadmin.import.groups.title = Εισαγωγή Ομάδων
+sysadmin.import.groups.title = Εισαγωγή Ομάδων
 heading.import.results = Εισαγωγή Αποτελεσμάτων
 table.heading.organisation.id = Κωδικός Οργανισμού
 import.groups.intro = Χρησιμοποιήστε αυτή την οθόνη, για να εισαγάγετε μαζικά ομάδες και υποομάδες χρησιμοποιώντας ένα Excel αρχείο
@@ -207,7 +207,7 @@
 heading.ldap.synchronise = Συγχρονισμός με LDAP
 msg.done = ... ολοκλήρωση!
 msg.tool.management = Διαχείριση Εργαλείων
-appadmin.tool.management = Διαχείριση Εργαλείων
+sysadmin.tool.management = Διαχείριση Εργαλείων
 msg.ldap.synchronise.wait = Παρακαλώ περιμένετε γίνεται συγχρονισμός.  Παρακαλώ περιμένετε μέχρι να ολοκληρωθεί ο συγχρονισμός...
 msg.ldap.synchronise.errors = Έχουν εμφανιστεί τα ακόλουθα λάθη:
 msg.num.search.results.users = Ο LDAP έχει επιστρέψει  {0}  χρήστες.
@@ -425,7 +425,7 @@
 sysadmin.login.request.ttl.enable = Επιβολή χρονικό περιορισμού στον απαιτούμενο χρόνος εισόδου
 config.live.edit = Ενεργοποίηση ζωντανής επεξεργασίας
 sysadmin.extGroupsUrl = URL Εξωτερικών ομάδων
-server.sys.config.title = Διαμόρφωση του εξυπηρετητή (server)
+server.config.title = Διαμόρφωση του εξυπηρετητή (server)
 server.monitor.title = Παρακολούθηση - Eλεγχος ορθής λειτουργίας server
 user.course.title = Διαμόρφωση χρήστη και μαθήματος
 config.site.name = Ονομα ιστότοπου
@@ -454,7 +454,7 @@
 label.password.must.ucase = τουλάχιστον 1 κεφαλαίο γράμμα
 label.password.must.number = τουλάχιστον 1 αριθμό
 label.password.must.symbol = τουλάχιστον 1 σύμβολο
-appadmin.batch.preview.lesson.delete = Διαγράψτε την παλιά προεπισκόπηση των μαθημάτων
+sysadmin.batch.preview.lesson.delete = Διαγράψτε την παλιά προεπισκόπηση των μαθημάτων
 msg.cleanup.preview.lesson.confirm = Είστε σίγουροι ότι θέλετε να διαγράψετε όλες προεπισκοπίσεις των μαθημάτων;
 msg.cleanup.preview.lesson.error = Σφάλμα κατά τη διαγραφή της προεπισκόπησης των μαθημάτων
 label.cleanup.preview.lesson.count = Αριθμός προεπισκοπήσεων / όλων των μαθημάτων:
@@ -473,12 +473,12 @@
 button.select.importfile = Επιλέξτε αρχείο για εισαγωγή
 label.upload.info = Το αρχείο αποστολής πρέπει να είναι αρχείο Excel και να μην υπερβαίνει το μέγεθος {0}
 errors.maxfilesize = Το αρχείο αποστολής ξεπερνά το μέγιστο μέγεθος: {0}
-appadmin.maintain.session = Συνδεδεμένοι χρήστες
-appadmin.maintain.session.login = Σύνδεση
-appadmin.maintain.session.id = Αναγνωριστικό περιόδου σύνδεσης
+sysadmin.maintain.session = Συνδεδεμένοι χρήστες
+sysadmin.maintain.session.login = Σύνδεση
+sysadmin.maintain.session.id = Αναγνωριστικό περιόδου σύνδεσης
 error.portrait.removal.failed = Δεν είναι δυνατή η διαγραφή του πορτραίτου. Δείτε το αρχείο σφαλμάτων για λεπτομέρειες.
 label.delete.portrait = Διαγραφή πορτραίτου
-appadmin.maintain.session.delete = Διαγραφή
+sysadmin.maintain.session.delete = Διαγραφή
 config.display.portrait = Προβολή πορτρέτου του εκπαιδευόμενου σε μια στήλη προόδου
 config.allow.kumalive = Ενεργοποίηση Kumalive
 admin.organisation.create.date = Ημερομηνία δημιουργίας
@@ -606,7 +606,7 @@
 outcome.authoring.input = Αναζήτηση με όνομα ή κωδικό μαθησιακού αποτελέσματος για επιλογή (είτε πληκτρολόγηση νέου για προσθήκη)
 outcome.authoring.existing = Προστέθηκαν μαθησιακά αποτελέσματα
 outcome.authoring.existing.none = κανένα
-appadmin.maintain.session.name = Ονομα
+sysadmin.maintain.session.name = Ονομα
 config.header.antivirus = Αντιϊοικό
 config.av.enable = Ενεργοποιήστε την ανίχνευση ιών κατά την αποστολή αρχείων
 config.av.host = Κεντρικός υπολογιστής ClamAV
@@ -617,7 +617,7 @@
 outcome.authoring.remove.confirm = Είστε βέβαιοι ότι θέλετε να καταργήσετε αυτό το μαθησιακό αποτέλεσμα;
 config.header.privacy.settings = Ρυθμίσεις απορρήτου
 config.restricted.displaying.user.names.in.groupings = Ομαδοποιήσεις: εμφανίζονται μόνο ονόματα εκπαιδευόμενων μέσα στην ίδια ομάδα
-appadmin.maintain.session.count = συνδεδεμένοι χρήστες
+sysadmin.maintain.session.count = συνδεδεμένοι χρήστες
 config.qb.qti.enable = Ενεργοποίηση της εισαγωγής / εξαγωγής ερωτήματος QTI
 config.qb.word.enable = Ενεργοποίηση της εισαγωγής ερωτήματος Word
 config.qb.collections.create.enable = Να επιτρέπεται η δημιουργία προσαρμοσμένων συλλογών
@@ -628,8 +628,8 @@
 config.qb.merge.enable = Να επιτρέπεται η χειροκίνητη συγχώνευση ερωτήσεων
 config.header.qb = Τράπεζα ερωτήσεων
 sysadmin.logoutUrl = Ανακατεύθυνση χρήστη μετά την αποσύνδεση στην ακόλουθη διεύθυνση URL
-appadmin.maintain.session.access = Τελευταία πρόσβαση
-appadmin.maintain.session.created = Ξεκίνησε στις:
+sysadmin.maintain.session.access = Τελευταία πρόσβαση
+sysadmin.maintain.session.created = Ξεκίνησε στις:
 config.enable.collapsing.subcourses = Ενεργοποιήστε την κατάρτηση των τμημάτων/υποομάδων
 config.learning.outcome.add.enable = Ενεργοποίση γρήγορης προσθήκης μαθησιακών αποτελεσμάτων στη συγγραφή
 label.type.questions.merged = Οι ερωτήσεις συγχωνεύθηκαν
Index: lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r85121f2d5a0394c96ef2ad1859c22b82391279b7 -r6eff730504702cb886be4c8f697bf4ee6d9c3bbd
--- lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 85121f2d5a0394c96ef2ad1859c22b82391279b7)
+++ lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 6eff730504702cb886be4c8f697bf4ee6d9c3bbd)
@@ -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.appadmin = You need to have the sys admin role to do this.
+error.need.sysadmin = 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.
@@ -96,7 +96,6 @@
 role.LEARNER = Learner
 role.MONITOR = Monitor
 role.SYSADMIN = System Admin
-role.APPADMIN = App Admin
 label.member.of = Member of
 label.with.roles = With roles
 admin.organisation.management = Course/Subcourse management
@@ -129,10 +128,10 @@
 admin.search = Search
 admin.enable = Enable
 admin.disable = Disable
-appadmin.maintain = LAMS Administration
-appadmin.maintain.loginpage = Maintain login page
-appadmin.maintain.external.servers = Maintain integrated servers
-appadmin.maintain.server.edit = Edit integrated server
+sysadmin.maintain = LAMS Admin
+sysadmin.maintain.loginpage = Maintain login page
+sysadmin.maintain.external.servers = Maintain integrated servers
+sysadmin.maintain.server.edit = Edit integrated server
 sysadmin.serverid = Id
 sysadmin.serverkey = Key
 sysadmin.servername = Name
@@ -146,13 +145,13 @@
 sysadmin.server.add = Add new server
 sysadmin.organisation.create = Create one
 sysadmin.organisation.select = Please select...
-appadmin.login.text = Update login page text:
+sysadmin.login.text = Update login page text:
 sysadmin.headline = System Administration
 sysadmin.config.settings.edit = Edit configuration settings
-appadmin.batch.temp.file.delete = Delete old temporary files
+sysadmin.batch.temp.file.delete = Delete old temporary files
 sysadmin.job.list = Job list
 sysadmin.list.job = List scheduled jobs in Quartz queue
-appadmin.edit.default.tool.content = Edit default tool content
+sysadmin.edit.default.tool.content = Edit default tool content
 cache.maintain = Maintain LAMS cache
 cache.title = Cache management
 cache.entries.title = Cache nodes
@@ -178,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
-appadmin.library.totals = learning libraries in total
+sysadmin.library.totals = learning libraries in total
 sysadmin.library.activity.title = Title
 sysadmin.library.activity.description = Description
 sysadmin.library.createtim = Create time
@@ -193,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
-appadmin.import.groups.title = Import courses
+sysadmin.import.groups.title = Import courses
 heading.import.results = Import results
-table.heading.organisation.id  =Course ID
+table.heading.organisation.id = Organisation 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.
@@ -208,7 +207,7 @@
 heading.ldap.synchronise = Synchronise with LDAP
 msg.done = ...done!
 msg.tool.management = Tool management
-appadmin.tool.management = Tool management
+sysadmin.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.
@@ -282,7 +281,6 @@
 label.authors = Authors
 label.group.managers = Course Managers
 label.sysadmins = Sysadmins
-label.appadmins = Appadmins
 label.author.admins = Author Administrators
 heading.users = Users
 label.number.of.users = {0} users.
@@ -296,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} courses.
+audit.successful.organisation.import = Successfully imported {0} organisations.
 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
@@ -427,8 +425,7 @@
 sysadmin.login.request.ttl.enable = Enforce time limitation for integration requests
 config.live.edit = Enable live edit
 sysadmin.extGroupsUrl = External groups URL
-server.sys.config.title = Server configuration
-server.app.config.title = Application configuration
+server.config.title = Server configuration
 server.monitor.title = Server monitoring
 user.course.title = User and course configuration
 config.site.name = Site name
@@ -457,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
-appadmin.batch.preview.lesson.delete = Delete old preview lessons
+sysadmin.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:
@@ -476,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}
-appadmin.maintain.session = Logged in users
-appadmin.maintain.session.login = Login
-appadmin.maintain.session.id = Session ID
+sysadmin.maintain.session = Logged in users
+sysadmin.maintain.session.login = Login
+sysadmin.maintain.session.id = Session ID
 error.portrait.removal.failed = Unable to delete portrait. See error file for details.
 label.delete.portrait = Delete portrait
-appadmin.maintain.session.delete = Delete
+sysadmin.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
@@ -609,7 +606,7 @@
 outcome.authoring.input = Search and select by outcome name or code
 outcome.authoring.existing = Added outcomes
 outcome.authoring.existing.none = none
-appadmin.maintain.session.name = Name
+sysadmin.maintain.session.name = Name
 config.header.antivirus = Antivirus
 config.av.enable = Enable antivirus scanning on files upload
 config.av.host = ClamAV server host
@@ -620,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
-appadmin.maintain.session.count = logged in users
+sysadmin.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
@@ -631,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
-appadmin.maintain.session.access = Last access
-appadmin.maintain.session.created = Started on:
+sysadmin.maintain.session.access = Last access
+sysadmin.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
Index: lams_admin/conf/language/lams/ApplicationResources_es_ES.properties
===================================================================
diff -u -r4d39e9dca40fc4b974cb775f27284fbd582c3615 -r6eff730504702cb886be4c8f697bf4ee6d9c3bbd
--- lams_admin/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision 4d39e9dca40fc4b974cb775f27284fbd582c3615)
+++ lams_admin/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision 6eff730504702cb886be4c8f697bf4ee6d9c3bbd)
@@ -21,7 +21,7 @@
 error.oldpassword.mismatch = Su vieja contraseña no es correcta
 error.img.format = El archivo que ha intentado usar no parece ser un archivo de imagen. Archivos de imagen suelen tener extensiones .jpg, .gif, .png o .bmp.
 error.img.size = El archivo excede el máximo de 4096k de limite
-error.need.appadmin = Usted necesita ser Administrador de sistema para realizar esta tarea
+error.need.sysadmin = Usted necesita ser Administrador de sistema para realizar esta tarea
 error.roles.empty = Necesita asignar por lo menos un rol
 error.userid.invalid = ID de usuario inválido
 error.firstname.required = Se requiere Nombre
@@ -128,10 +128,10 @@
 admin.search = Buscar
 admin.enable = Activado
 admin.disable = Desactivado
-appadmin.maintain = Administración de LAMS
-appadmin.maintain.loginpage = Administración de página de entrada
-appadmin.maintain.external.servers = Administrar servidores integrados
-appadmin.maintain.server.edit = Editar servidor integrado
+sysadmin.maintain = Administración de LAMS
+sysadmin.maintain.loginpage = Administración de página de entrada
+sysadmin.maintain.external.servers = Administrar servidores integrados
+sysadmin.maintain.server.edit = Editar servidor integrado
 sysadmin.serverid = ID
 sysadmin.serverkey = Key
 sysadmin.servername = Nombre
@@ -145,13 +145,13 @@
 sysadmin.server.add = Agregar Nuevo Servidor
 sysadmin.organisation.create = Crear uno nuevo
 sysadmin.organisation.select = Por favor seleccione
-appadmin.login.text =  Actualice el texto que se visualizará en la página de entrada:
+sysadmin.login.text =  Actualice el texto que se visualizará en la página de entrada:
 sysadmin.headline = Administración de Sistema
 sysadmin.config.settings.edit = Editar Configuración de Sistema
-appadmin.batch.temp.file.delete = Borrar archivos temporales antiguos
+sysadmin.batch.temp.file.delete = Borrar archivos temporales antiguos
 sysadmin.job.list = Lista de Tareas
 sysadmin.list.job = Listar tareas programadas en la cola de Quartz
-appadmin.edit.default.tool.content = Editar el Contenido de Defecto de Herramientas
+sysadmin.edit.default.tool.content = Editar el Contenido de Defecto de Herramientas
 cache.maintain = Mantener LAMS Cache
 cache.title = Administración de Cache
 cache.entries.title = Nodos de Cache
@@ -177,7 +177,7 @@
 msg.users.created = {0} usuarios han sido creados.
 error.no.sysadmin.priviledge = No tiene suficientes privilegios para ejecutar esta acción.
 sysadmin.library.management = Administración de Actividades de Enseñanza
-appadmin.library.totals = Actividades totales de aprendizaje
+sysadmin.library.totals = Actividades totales de aprendizaje
 sysadmin.library.activity.title = Título
 sysadmin.library.activity.description = Descripción
 sysadmin.library.createtim = Creada en
@@ -192,7 +192,7 @@
 label.can.offer.joint.lessons = Puede ofrecer lecciones remotas
 error.cant.write.login.jsp = No se puede escribir el valor de {0} en {1}. Por favor, verifique {2} configuración.
 label.login.as = Iniciar sesión como este usuario
-appadmin.import.groups.title = Importar Clases
+sysadmin.import.groups.title = Importar Clases
 heading.import.results = Importar Resultados
 table.heading.organisation.id = ID de Organización
 import.groups.intro = Utilice esta pantalla para importar clases y grupos usando una plantilla de Excel
@@ -207,7 +207,7 @@
 heading.ldap.synchronise = Sincronizar con servidor LDAP
 msg.done = ... operación finalizada!
 msg.tool.management = Administración de Herramientas y Actividades
-appadmin.tool.management = Administración de Herramientas y Actividades
+sysadmin.tool.management = Administración de Herramientas y Actividades
 msg.ldap.synchronise.wait = Por favor espere mientras se sincroniza. Por favor espere mientras se finaliza la sincronización...
 msg.ldap.synchronise.errors = Se encontraron los siguientes errores
 msg.num.search.results.users = El servidor LDAP devolvió {0} usuarios.
@@ -425,7 +425,7 @@
 sysadmin.login.request.ttl.enable = Utilizar parámetro de tiempo de vida para integraciones
 config.live.edit = Habilitar Edición en Vivo
 sysadmin.extGroupsUrl = URL para grupos externos
-server.sys.config.title = Configuración servidor
+server.config.title = Configuración servidor
 server.monitor.title = Monitoreo del servidor
 user.course.title = Configuración de usuarios y clases
 config.site.name = Nombre del sitio
@@ -454,7 +454,7 @@
 label.password.must.ucase = al menos 1 letra mayúscula
 label.password.must.number = al menos 1 número
 label.password.must.symbol = al menos 1 símbolo
-appadmin.batch.preview.lesson.delete = Eliminar lecciones de vista previa
+sysadmin.batch.preview.lesson.delete = Eliminar lecciones de vista previa
 msg.cleanup.preview.lesson.confirm = ¿Está seguro que quiere eliminar lecciones de vista previa?
 msg.cleanup.preview.lesson.error = Ha ocurrido un error al eliminar lecciones de vista previa
 label.cleanup.preview.lesson.count = Número de lecciones de vista previa / todas las lecciones:
@@ -473,12 +473,12 @@
 button.select.importfile = Seleccionar archivo para importar
 label.upload.info = El archivo cargado debe ser un archivo de Excel y no debe exceder el tamaño de {0}
 errors.maxfilesize = El archivo subido excedió el tamaño máximo: {0}
-appadmin.maintain.session = Usuarios conectados
-appadmin.maintain.session.login = Iniciar sesión
-appadmin.maintain.session.id = Nombre de sessión
+sysadmin.maintain.session = Usuarios conectados
+sysadmin.maintain.session.login = Iniciar sesión
+sysadmin.maintain.session.id = Nombre de sessión
 error.portrait.removal.failed = No se puede borrar el retrato. Ver el archivo de error para más detalles
 label.delete.portrait = Eliminar retrato
-appadmin.maintain.session.delete = Eliminar
+sysadmin.maintain.session.delete = Eliminar
 config.display.portrait = Muestra el retrato del estudiante en una barra de progreso
 config.allow.kumalive = Habilitar Kumalive
 admin.organisation.create.date = Fecha de creación
@@ -606,7 +606,7 @@
 outcome.authoring.input = Busque y seleccione objetivo por título o código
 outcome.authoring.existing = Objetivos añadidos
 outcome.authoring.existing.none = ninguno
-appadmin.maintain.session.name = Nombre
+sysadmin.maintain.session.name = Nombre
 config.header.antivirus = Antivirus
 config.av.enable = Habilitar el análisis antivirus en la carga de archivos
 config.av.host = Nombre o IP del servidor ClamAV
@@ -617,7 +617,7 @@
 outcome.authoring.remove.confirm = ¿Está seguro que desea eliminar?
 config.header.privacy.settings = Configuraciones de privacidad
 config.restricted.displaying.user.names.in.groupings = Grupos: solo mostrar los nombres de estudiantes que están en el mismo grupo.
-appadmin.maintain.session.count = usuarios conectados.
+sysadmin.maintain.session.count = usuarios conectados.
 config.qb.qti.enable = Activar opción para exportar e importar preguntas en formato QTI
 config.qb.word.enable = Activar opción para importar preguntas usando MS Word
 config.qb.collections.create.enable = Permitir creación de colecciones de preguntas personalizadas
@@ -628,8 +628,8 @@
 config.qb.merge.enable = Permitir fusionar preguntas manualmente
 config.header.qb = Banco de preguntas
 sysadmin.logoutUrl = URL a donde redireccionar usuario después de terminar sesión (logout)
-appadmin.maintain.session.access = Último acceso
-appadmin.maintain.session.created = Comenzado en:
+sysadmin.maintain.session.access = Último acceso
+sysadmin.maintain.session.created = Comenzado en:
 config.enable.collapsing.subcourses = Habilitar colapsar subclases
 config.learning.outcome.add.enable = Permitir creación rápida de objetivos de aprendizaje en interfaz de Autoría
 label.type.questions.merged = Preguntas fusionadas
Index: lams_admin/conf/language/lams/ApplicationResources_fr_FR.properties
===================================================================
diff -u -rdd60c645ebe32ff15180cff47caa583cb41b7ee1 -r6eff730504702cb886be4c8f697bf4ee6d9c3bbd
--- lams_admin/conf/language/lams/ApplicationResources_fr_FR.properties	(.../ApplicationResources_fr_FR.properties)	(revision dd60c645ebe32ff15180cff47caa583cb41b7ee1)
+++ lams_admin/conf/language/lams/ApplicationResources_fr_FR.properties	(.../ApplicationResources_fr_FR.properties)	(revision 6eff730504702cb886be4c8f697bf4ee6d9c3bbd)
@@ -21,7 +21,7 @@
 error.oldpassword.mismatch = Votre ancien mot de passe n'est pas correct.
 error.img.format = Le fichier déposé ne semble pas être une image. En général, celles-ci ont une extension .jpg, .gif, .png ou .bmp.
 error.img.size = La taille du fichier dépasse le maximum de 4096k.
-error.need.appadmin = Vous devez avoir la fonction sys admin pour faire ceci.
+error.need.sysadmin = Vous devez avoir la fonction sys admin pour faire ceci.
 error.roles.empty = Vous devez assigner au moins un rôle.
 error.userid.invalid = Id. d'utilisateur invalide
 error.firstname.required = Prénom requis.
@@ -128,10 +128,10 @@
 admin.search = Rechercher
 admin.enable = Activer
 admin.disable = Désactiver
-appadmin.maintain = Maintenance de LAMS
-appadmin.maintain.loginpage = Maintenance de la page d'accès
-appadmin.maintain.external.servers = Maintenance des serveurs intégrés
-appadmin.maintain.server.edit = Modifier le serveur intégré
+sysadmin.maintain = Maintenance de LAMS
+sysadmin.maintain.loginpage = Maintenance de la page d'accès
+sysadmin.maintain.external.servers = Maintenance des serveurs intégrés
+sysadmin.maintain.server.edit = Modifier le serveur intégré
 sysadmin.serverid = Id
 sysadmin.serverkey = Clé
 sysadmin.servername = Nom
@@ -145,13 +145,13 @@
 sysadmin.server.add = Ajouter un nouveau serveur
 sysadmin.organisation.create = Créer un nouveau
 sysadmin.organisation.select = Veuillez sélectionner...
-appadmin.login.text = Mettre à jour le texte sous le logo sur page d'accès:
+sysadmin.login.text = Mettre à jour le texte sous le logo sur page d'accès:
 sysadmin.headline = Administration système
 sysadmin.config.settings.edit = Modifier les paramètres de configuration
-appadmin.batch.temp.file.delete = Supprimer les anciens fichiers temporaires
+sysadmin.batch.temp.file.delete = Supprimer les anciens fichiers temporaires
 sysadmin.job.list = Liste des jobs
 sysadmin.list.job = Lister les jobs agendés dans la queue Quartz
-appadmin.edit.default.tool.content = Modifier le contenu par défaut de l'outil
+sysadmin.edit.default.tool.content = Modifier le contenu par défaut de l'outil
 cache.maintain = Maintenance du cache LAMS
 cache.title = Gestion du cache
 cache.entries.title = Noeuds du cache
@@ -177,7 +177,7 @@
 msg.users.created = utilisateurs créés avec succès
 error.no.sysadmin.priviledge = Vous ne disposez pas des droits suffisants pour exécuter cette action
 sysadmin.library.management = Administration des activités
-appadmin.library.totals = Ensemble des activités enseignées
+sysadmin.library.totals = Ensemble des activités enseignées
 sysadmin.library.activity.title = Titre
 sysadmin.library.activity.description = Description
 sysadmin.library.createtim = Date de création
@@ -192,7 +192,7 @@
 label.can.offer.joint.lessons = Il est possible de proposer des leçons attachées
 error.cant.write.login.jsp = Impossible d''écrire une valeur entre {0} et {1}, veuillez vérifier votre configuration {2}.
 label.login.as = Identifier comme
-appadmin.import.groups.title = Importer des groupes
+sysadmin.import.groups.title = Importer des groupes
 heading.import.results = Importer des résultats
 table.heading.organisation.id = Identité de l'organisation
 import.groups.intro = Utilisez cet écran pour importer des groupes et des sous-groupes en utilisant un classeur Excel.
@@ -207,7 +207,7 @@
 heading.ldap.synchronise = Synchroniser avec le LDAP
 msg.done = Effectué!
 msg.tool.management = Gestion des outils
-appadmin.tool.management = Gestion des outils
+sysadmin.tool.management = Gestion des outils
 msg.ldap.synchronise.wait = Prière de patienter pendant la synchronisation...
 msg.ldap.synchronise.errors = Les erreurs suivantes ont été rencontrées:
 msg.num.search.results.users = Le serveur LDAP a renvoyé {0} utilisateur(s).
Index: lams_admin/conf/language/lams/ApplicationResources_no_NO.properties
===================================================================
diff -u -r3f3f34c22194aeaf302e1fd332925dffd35019aa -r6eff730504702cb886be4c8f697bf4ee6d9c3bbd
--- lams_admin/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision 3f3f34c22194aeaf302e1fd332925dffd35019aa)
+++ lams_admin/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision 6eff730504702cb886be4c8f697bf4ee6d9c3bbd)
@@ -21,7 +21,7 @@
 error.oldpassword.mismatch = Ditt gamle passord er ikke riktig
 error.img.format = Filen du laster opp ser ikke ut til å være en billedfil. Billedfiler er vanligvis formater med .jpg, .gif, .png eller .bmp navn
 error.img.size = Filstørrelsen overskrider maks størrelse som er 4096k.
-error.need.appadmin = Du må ha systemadministrasjons rettighet for å utføre dette.
+error.need.sysadmin = Du må ha systemadministrasjons rettighet for å utføre dette.
 error.roles.empty = Du må minst tildele en rolle.
 error.userid.invalid = Ugyldig bruker id.
 error.firstname.required = Fornavn er påkrevet.
@@ -128,10 +128,10 @@
 admin.search = Søke
 admin.enable = Koble til
 admin.disable = Koble fra
-appadmin.maintain = Vedlikeholde LAMS
-appadmin.maintain.loginpage = Vedlikehold logg inn side
-appadmin.maintain.external.servers = Vedlikehold integrete servere
-appadmin.maintain.server.edit = Rediger integrert server
+sysadmin.maintain = Vedlikeholde LAMS
+sysadmin.maintain.loginpage = Vedlikehold logg inn side
+sysadmin.maintain.external.servers = Vedlikehold integrete servere
+sysadmin.maintain.server.edit = Rediger integrert server
 sysadmin.serverid = Id
 sysadmin.serverkey = Nøkkel
 sysadmin.servername = Navn
@@ -145,13 +145,13 @@
 sysadmin.server.add = Legg til ny server
 sysadmin.organisation.create = Lag en ny
 sysadmin.organisation.select = Vennligst velg ....
-appadmin.login.text = Oppdater teksten på logg inn siden:
+sysadmin.login.text = Oppdater teksten på logg inn siden:
 sysadmin.headline = System administrasjon
 sysadmin.config.settings.edit = Endre konfigurasjons oppsett
-appadmin.batch.temp.file.delete = Slett gamle midlertidige filer
+sysadmin.batch.temp.file.delete = Slett gamle midlertidige filer
 sysadmin.job.list = Oppgave oversikt
 sysadmin.list.job = List planlagte jobber i Quartz kø
-appadmin.edit.default.tool.content = Rediger standard verktøy innhold
+sysadmin.edit.default.tool.content = Rediger standard verktøy innhold
 cache.maintain = Vedlikehold LAMS hurtiglager
 cache.title = Hurtiglager administrasjon
 cache.entries.title = Hurtiglager noder
@@ -177,7 +177,7 @@
 msg.users.created = {0} brukere ble korrekt laget.
 error.no.sysadmin.priviledge = Du har ikke riktige rettigheter til å utføre denne operasjonen.
 sysadmin.library.management = Administrasjon av lærebibliotek
-appadmin.library.totals = totalt antall lærings bibliotek
+sysadmin.library.totals = totalt antall lærings bibliotek
 sysadmin.library.activity.title = Tittel
 sysadmin.library.activity.description = Beskrivelse
 sysadmin.library.createtim = Angi tid
@@ -192,7 +192,7 @@
 label.can.offer.joint.lessons = Kan tilby felles leksjoner
 error.cant.write.login.jsp = Kunne ikke skrive verdien av {0} til {1}, vennligst kontroller din {2} konfigurasjon.
 label.login.as = Logg inn som
-appadmin.import.groups.title = Importer kurs
+sysadmin.import.groups.title = Importer kurs
 heading.import.results = Importer resultater
 table.heading.organisation.id = Organisasjon ID
 import.groups.intro = Benytt dette skjermbildet for å importere kurs og delkurs ved hjelp av et Excel regneark
@@ -207,7 +207,7 @@
 heading.ldap.synchronise = Synkroniser med LDAP
 msg.done = ...utført !
 msg.tool.management = Verktøy administrasjon
-appadmin.tool.management = Verktøy administrasjon
+sysadmin.tool.management = Verktøy administrasjon
 msg.ldap.synchronise.wait = Synkronisering pågår. Vennligst vent til at denne er ferdig....
 msg.ldap.synchronise.errors = Følgende feil har oppstått:
 msg.num.search.results.users = LDAP serveren har returnert {0} brukere.
@@ -425,7 +425,7 @@
 sysadmin.login.request.ttl.enable = Legg inn tidsbegrensing for integrasjons forespørsler
 config.live.edit = Koble til aktive redigering
 sysadmin.extGroupsUrl = Eksterne grupper URL
-server.sys.config.title = Server konfigurering
+server.config.title = Server konfigurering
 server.monitor.title = Server kontroll modus
 user.course.title = Bruker og kurs konfigurering
 config.site.name = Steds navn
@@ -454,7 +454,7 @@
 label.password.must.ucase = minimum 1 stor bokstav
 label.password.must.number = minimum ett tall
 label.password.must.symbol = minimum ett symbol
-appadmin.batch.preview.lesson.delete = Slett gamle forhåndsviste leksjoner
+sysadmin.batch.preview.lesson.delete = Slett gamle forhåndsviste leksjoner
 msg.cleanup.preview.lesson.confirm = Er du sikker på at du vil fjerne alle forhåndsviste leksjoner ?
 msg.cleanup.preview.lesson.error = Feil under fjerning av forhåndsviste leksjoner
 label.cleanup.preview.lesson.count = Antall fårhåndsviste/total antall leksjoner
@@ -473,12 +473,12 @@
 button.select.importfile = Velg fil for import
 label.upload.info = Opplastet filmå være en Excel filog ikke overstige:{0}
 errors.maxfilesize = Opplastet fil er større enn maks filstørrelse:{0}
-appadmin.maintain.session = Innloggede brukere
-appadmin.maintain.session.login = Login
-appadmin.maintain.session.id = Sesjons ID
+sysadmin.maintain.session = Innloggede brukere
+sysadmin.maintain.session.login = Login
+sysadmin.maintain.session.id = Sesjons ID
 error.portrait.removal.failed = Kan ikke slette portrett. Se fil med for detaljer.
 label.delete.portrait = Fjern bildet
-appadmin.maintain.session.delete = Slett
+sysadmin.maintain.session.delete = Slett
 config.display.portrait = Vis elevens portrett i fremdriftslinjen
 config.allow.kumalive = Koble til Kumalive
 admin.organisation.create.date = Data for opprettelse
@@ -606,7 +606,7 @@
 outcome.authoring.input = Søk og velg etter resultat eller kode
 outcome.authoring.existing = Tilleggs mål
 outcome.authoring.existing.none = ingen
-appadmin.maintain.session.name = Navn
+sysadmin.maintain.session.name = Navn
 config.header.antivirus = Antivirus
 config.av.enable = Koble til antivirus scanning ved opplasting av filer
 config.av.host = ClamAV server host
@@ -617,7 +617,7 @@
 outcome.authoring.remove.confirm = Er du sikker på at du vil fjerne dette læreresultatet ?
 config.header.privacy.settings = Oppsett for personvern
 config.restricted.displaying.user.names.in.groupings = Gruppering: viser kun navn for studenter egen gruppe
-appadmin.maintain.session.count = innloggede brukere
+sysadmin.maintain.session.count = innloggede brukere
 config.qb.qti.enable = Koble til import/eksport av  QTI spørsmål
 config.qb.word.enable = Koble til import av Word spørsmål
 config.qb.collections.create.enable = Tillat å lage kundetilpasset samlinger
@@ -628,8 +628,8 @@
 config.qb.merge.enable = Tillat manuell sammenslåing av spørsmål
 config.header.qb = Spørsmåls bank
 sysadmin.logoutUrl = Etter utlogging så styr brukeren til den følgende URL
-appadmin.maintain.session.access = Siste tilgang
-appadmin.maintain.session.created = Startet den:
+sysadmin.maintain.session.access = Siste tilgang
+sysadmin.maintain.session.created = Startet den:
 config.enable.collapsing.subcourses = Koble til at sub-kurs skal slås sammen
 config.learning.outcome.add.enable = Legge til læremål
 label.type.questions.merged = Spørsmålene er slått sammen
Index: lams_admin/web/appadmin.jsp
===================================================================
diff -u -r85121f2d5a0394c96ef2ad1859c22b82391279b7 -r6eff730504702cb886be4c8f697bf4ee6d9c3bbd
--- lams_admin/web/appadmin.jsp	(.../appadmin.jsp)	(revision 85121f2d5a0394c96ef2ad1859c22b82391279b7)
+++ lams_admin/web/appadmin.jsp	(.../appadmin.jsp)	(revision 6eff730504702cb886be4c8f697bf4ee6d9c3bbd)
@@ -22,7 +22,7 @@
 		<div class="row"> 
 			<div class="col text-center"> 
 				<a href="/" class="lams-logo" alt="LAMS logo">
-					<img src="<lams:LAMSURL/>images/svg/lamsv5_logo.svg" alt="<fmt:message key='label.monitoring.logo' />" />
+					<img src="<lams:LAMSURL/>images/svg/lamsv5_logo.svg" alt="LAMS logo" />
 				</a>
    			</div> 
   		</div>
Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -ra40a77e307317e8038ed9e6b8699c18386286497 -r6eff730504702cb886be4c8f697bf4ee6d9c3bbd
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision a40a77e307317e8038ed9e6b8699c18386286497)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 6eff730504702cb886be4c8f697bf4ee6d9c3bbd)
@@ -66,7 +66,7 @@
 index.logout = Logout
 index.refresh = Refresh
 index.myprofile = Profile
-index.appadmin = Sys Admin
+index.sysadmin = Sys Admin
 index.courseman = Course Mgt
 index.author = Author
 index.classman = Manage Subcourses
@@ -1133,5 +1133,6 @@
 label.grouping.general.instructions.heading = General instructions:
 label.grouping.general.instructions.line1 = Choose a course grouping to use in this lesson or create a new one. You are working with copies, so any changes made here have no influence on the original course groupings. Grouping with zero groups are not listed here. Once a grouping is chosen, the only way to come back to the grouping list is to manually remove all groups.
 label.grouping.general.instructions.line2 = Place the lesson participants in their groups. Initially you can add and remove learners, but once a groups is used (that is, a participant starts an activity that uses the grouping) you will not be able to remove learners from it. Even if a group is in use you can still add learners. The changes are saved immediately.
+label.grouping.general.instructions.branching = This grouping activity is used for branching. Groups can therefore not be added or deleted.
 label.branching.general.instructions = Place the lesson participants in their branches. Initially you can add and remove learners, but once a participant starts one of the branches then you will not be able to remove learners from any branches. If you try to remove someone from a branch and they will not remove then check their progress - if they start using the branch while you are on this screen you will not get any errors but you will not be able to remove them from the branch. You will still be able to add learners to branches.
 label.grouping.popup.viewmode.message = You are presently in group view mode. Groups can not be modified.
Index: lams_central/conf/language/lams/ApplicationResources_de_DE.properties
===================================================================
diff -u -ra40a77e307317e8038ed9e6b8699c18386286497 -r6eff730504702cb886be4c8f697bf4ee6d9c3bbd
--- lams_central/conf/language/lams/ApplicationResources_de_DE.properties	(.../ApplicationResources_de_DE.properties)	(revision a40a77e307317e8038ed9e6b8699c18386286497)
+++ lams_central/conf/language/lams/ApplicationResources_de_DE.properties	(.../ApplicationResources_de_DE.properties)	(revision 6eff730504702cb886be4c8f697bf4ee6d9c3bbd)
@@ -66,7 +66,7 @@
 index.logout = Logout
 index.refresh = Aktualisieren
 index.myprofile = Mein Profil
-index.appadmin = Systemadministrator
+index.sysadmin = Systemadministrator
 index.courseman = Gruppenverwaltung
 index.author = Autor
 index.classman = Teilgruppen verwalten
Index: lams_central/conf/language/lams/ApplicationResources_el_GR.properties
===================================================================
diff -u -ra40a77e307317e8038ed9e6b8699c18386286497 -r6eff730504702cb886be4c8f697bf4ee6d9c3bbd
--- lams_central/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision a40a77e307317e8038ed9e6b8699c18386286497)
+++ lams_central/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision 6eff730504702cb886be4c8f697bf4ee6d9c3bbd)
@@ -66,7 +66,7 @@
 index.logout = Αποσύνδεση
 index.refresh = Ανανέωση
 index.myprofile = Προφίλ
-index.appadmin = Διαχ. Συστήματος
+index.sysadmin = Διαχ. Συστήματος
 index.courseman = Διαχ. Ομάδων
 index.author = Συγγραφέας
 index.classman = Διαχ. Ομαδ./Τμημ./Τάξεων Μαθημ./Χρηστών
Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -ra40a77e307317e8038ed9e6b8699c18386286497 -r6eff730504702cb886be4c8f697bf4ee6d9c3bbd
--- lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision a40a77e307317e8038ed9e6b8699c18386286497)
+++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 6eff730504702cb886be4c8f697bf4ee6d9c3bbd)
@@ -66,7 +66,7 @@
 index.logout = Logout
 index.refresh = Refresh
 index.myprofile = Profile
-index.appadmin = Sys Admin
+index.sysadmin = Sys Admin
 index.courseman = Course Mgt
 index.author = Author
 index.classman = Manage Subcourses
Index: lams_central/conf/language/lams/ApplicationResources_es_ES.properties
===================================================================
diff -u -ra40a77e307317e8038ed9e6b8699c18386286497 -r6eff730504702cb886be4c8f697bf4ee6d9c3bbd
--- lams_central/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision a40a77e307317e8038ed9e6b8699c18386286497)
+++ lams_central/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision 6eff730504702cb886be4c8f697bf4ee6d9c3bbd)
@@ -66,7 +66,7 @@
 index.logout = Cerrar sesión
 index.refresh = Actualizar
 index.myprofile = Mi Perfil
-index.appadmin = Administración de Sistema
+index.sysadmin = Administración de Sistema
 index.courseman = Adm de Cursos
 index.author = Diseñar
 index.classman = Gestión de Clases
Index: lams_central/conf/language/lams/ApplicationResources_fr_FR.properties
===================================================================
diff -u -ra40a77e307317e8038ed9e6b8699c18386286497 -r6eff730504702cb886be4c8f697bf4ee6d9c3bbd
--- lams_central/conf/language/lams/ApplicationResources_fr_FR.properties	(.../ApplicationResources_fr_FR.properties)	(revision a40a77e307317e8038ed9e6b8699c18386286497)
+++ lams_central/conf/language/lams/ApplicationResources_fr_FR.properties	(.../ApplicationResources_fr_FR.properties)	(revision 6eff730504702cb886be4c8f697bf4ee6d9c3bbd)
@@ -66,7 +66,7 @@
 index.logout = Déconnexion
 index.refresh = Rafraîchir
 index.myprofile = Mon profil
-index.appadmin = Sys Admin
+index.sysadmin = Sys Admin
 index.courseman = Gestion de groupes
 index.author = Auteur
 index.classman = Gérer les sous-groupes
Index: lams_central/conf/language/lams/ApplicationResources_no_NO.properties
===================================================================
diff -u -ra40a77e307317e8038ed9e6b8699c18386286497 -r6eff730504702cb886be4c8f697bf4ee6d9c3bbd
--- lams_central/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision a40a77e307317e8038ed9e6b8699c18386286497)
+++ lams_central/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision 6eff730504702cb886be4c8f697bf4ee6d9c3bbd)
@@ -27,7 +27,7 @@
 delete.resource.error = Kan ikke fjerne ressursen {0}
 delete.lesson.error = LAMS støtter ikke muligheten for å fjerne en leksjon ved hjelp av arbeidsområdets brukersnitt.
 delete.folder.error = Kan ikke fjerne denne mappen fordi det er en rot mappe.
-delete.learningdesign.error = Kan ikke fjerne et design med design_id {0] fordi denne har kun LESE modus.
+delete.learningdesign.error = Kan ikke fjerne et design med design_id {0} fordi denne har kun LESE modus.
 folder.delete = Mappe er fjernet: {0}
 copy.resource.error = Kan ikke kopiere ressursen: {0}
 copy.no.support = LAMS støtter ikke muligheten for å kopiere en fil i arbeidsområdets brukersnitt.
@@ -66,7 +66,7 @@
 index.logout = Logg ut
 index.refresh = Frisk opp
 index.myprofile = Profil
-index.appadmin = System administrasjon
+index.sysadmin = System administrasjon
 index.courseman = Kurs administrasjon
 index.author = Forfatter
 index.classman = Administrere delkurs
Index: lams_gradebook/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r4d39e9dca40fc4b974cb775f27284fbd582c3615 -r6eff730504702cb886be4c8f697bf4ee6d9c3bbd
--- lams_gradebook/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 4d39e9dca40fc4b974cb775f27284fbd582c3615)
+++ lams_gradebook/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 6eff730504702cb886be4c8f697bf4ee6d9c3bbd)
@@ -62,7 +62,6 @@
 gradebook.exportcourse.current.activity = Current activity: {0}
 gradebook.gridtitle.lesson.view = Lesson View
 gradebook.gridtitle.learner.view = Grades by  learner
-gradebook.grid.expand.all = Expand all
 label.button.export = Export
 label.lessons = Lessons
 label.group = Group
Index: lams_monitoring/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r6245c792ea9f8419264b518c642cffcf8c3e7fd2 -r6eff730504702cb886be4c8f697bf4ee6d9c3bbd
--- lams_monitoring/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 6245c792ea9f8419264b518c642cffcf8c3e7fd2)
+++ lams_monitoring/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 6eff730504702cb886be4c8f697bf4ee6d9c3bbd)
@@ -512,10 +512,10 @@
 label.monitoring.time.limit.disabled = Disabled
 label.monitoring.time.limit.start = Start
 label.monitoring.time.limit.cancel = Cancel
-label.monitoring.time.limit.plus.minute.1 = Plus 1 minute
-label.monitoring.time.limit.plus.minute.5 = Plus 5 minutes
-label.monitoring.time.limit.minus.minute.1 = Minus 1 minute
-label.monitoring.time.limit.minus.minute.5 = Minus 5 minutes
+label.monitoring.time.limit.plus.minute.1 = + 1 minute
+label.monitoring.time.limit.plus.minute.5 = + 5 minutes
+label.monitoring.time.limit.minus.minute.1 = - 1 minute
+label.monitoring.time.limit.minus.minute.5 = - 5 minutes
 label.monitoring.time.limit.finish.now = Finish now
 label.monitoring.time.limit.finish.now.confirm = Are you sure you want to make all learners finish their work right now?
 label.monitoring.time.limit.individual.placeholder = Type name
@@ -530,5 +530,5 @@
 label.monitoring.edit.lesson.settings = Edit lesson settings
 label.monitoring.edit = Edit
 label.monitoring.burning.questions = Burning Questions
-label.monitoring.teams.question.results = Question results
 label.monitoring.teams.question.results.question = Question
+label.monitoring.teams.question.results = Question results
Index: lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -rdecee05de5d7a90fe2aef3af04f588494262685b -r6eff730504702cb886be4c8f697bf4ee6d9c3bbd
--- lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision decee05de5d7a90fe2aef3af04f588494262685b)
+++ lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 6eff730504702cb886be4c8f697bf4ee6d9c3bbd)
@@ -512,10 +512,10 @@
 label.monitoring.time.limit.disabled = Disabled
 label.monitoring.time.limit.start = Start
 label.monitoring.time.limit.cancel = Cancel
-label.monitoring.time.limit.plus.minute.1 = Plus 1 minute
-label.monitoring.time.limit.plus.minute.5 = Plus 5 minutes
-label.monitoring.time.limit.minus.minute.1 = Minus 1 minute
-label.monitoring.time.limit.minus.minute.5 = Minus 5 minutes
+label.monitoring.time.limit.plus.minute.1 = + 1 minute
+label.monitoring.time.limit.plus.minute.5 = + 5 minutes
+label.monitoring.time.limit.minus.minute.1 = - 1 minute
+label.monitoring.time.limit.minus.minute.5 = - 5 minutes
 label.monitoring.time.limit.finish.now = Finish now
 label.monitoring.time.limit.finish.now.confirm = Are you sure you want to make all learners finish their work right now?
 label.monitoring.time.limit.individual.placeholder = Type name
Index: lams_monitoring/conf/language/lams/ApplicationResources_es_ES.properties
===================================================================
diff -u -rdecee05de5d7a90fe2aef3af04f588494262685b -r6eff730504702cb886be4c8f697bf4ee6d9c3bbd
--- lams_monitoring/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision decee05de5d7a90fe2aef3af04f588494262685b)
+++ lams_monitoring/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision 6eff730504702cb886be4c8f697bf4ee6d9c3bbd)
@@ -512,10 +512,10 @@
 label.monitoring.time.limit.disabled = Deshabilitado
 label.monitoring.time.limit.start = Comenzar
 label.monitoring.time.limit.cancel = Cancelar
-label.monitoring.time.limit.plus.minute.1 = Más 1 minuto
-label.monitoring.time.limit.plus.minute.5 = Más 5 minutos
-label.monitoring.time.limit.minus.minute.1 = Menos 1 minuto
-label.monitoring.time.limit.minus.minute.5 = Menos 5 minutos
+label.monitoring.time.limit.plus.minute.1 = + 1 minuto
+label.monitoring.time.limit.plus.minute.5 = + 5 minutos
+label.monitoring.time.limit.minus.minute.1 = - 1 minuto
+label.monitoring.time.limit.minus.minute.5 = - 5 minutos
 label.monitoring.time.limit.finish.now = Finalizar ahora
 label.monitoring.time.limit.finish.now.confirm = ¿Estás seguro de que quieres que todos los estudiantes terminen su evaluación ahora mismo?
 label.monitoring.time.limit.individual.placeholder = Escriba nombre
Index: lams_monitoring/conf/language/lams/ApplicationResources_no_NO.properties
===================================================================
diff -u -r9063be219af30ca207a7c9b337ad7834f8cdc8b0 -r6eff730504702cb886be4c8f697bf4ee6d9c3bbd
--- lams_monitoring/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision 9063be219af30ca207a7c9b337ad7834f8cdc8b0)
+++ lams_monitoring/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision 6eff730504702cb886be4c8f697bf4ee6d9c3bbd)
@@ -512,10 +512,10 @@
 label.monitoring.time.limit.disabled = Frakoblet
 label.monitoring.time.limit.start = Start
 label.monitoring.time.limit.cancel = Avbryt
-label.monitoring.time.limit.plus.minute.1 = Pluss 1 minutt
-label.monitoring.time.limit.plus.minute.5 = Pluss 5 minutter
-label.monitoring.time.limit.minus.minute.1 = Minus 1 minutt
-label.monitoring.time.limit.minus.minute.5 = Minus 5 minutter
+label.monitoring.time.limit.plus.minute.1 = + 1 minutt
+label.monitoring.time.limit.plus.minute.5 = + 5 minutter
+label.monitoring.time.limit.minus.minute.1 = - 1 minutt
+label.monitoring.time.limit.minus.minute.5 = - 5 minutter
 label.monitoring.time.limit.finish.now = Fullfør nå
 label.monitoring.time.limit.finish.now.confirm = Er du sikker på at du vil få alle studentene til å fullføre arbeidet sitt akkurat nå?
 label.monitoring.time.limit.individual.placeholder = Skriv inn navn
Index: lams_tool_zoom/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r5b9f590b301c276f8df06b30c26981b0eb634e69 -r6eff730504702cb886be4c8f697bf4ee6d9c3bbd
--- lams_tool_zoom/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 5b9f590b301c276f8df06b30c26981b0eb634e69)
+++ lams_tool_zoom/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 6eff730504702cb886be4c8f697bf4ee6d9c3bbd)
@@ -61,7 +61,7 @@
 error.api.ping = API keys for email {0} do not seem to work correctly
 error.api.none.configured = There are no Zoom API keys configured by the administrator. You are not able to create a Zoom meeting.
 error.api.reuse = All configured API keys are in use at the moment. If you decide to start your meeting, another teacher's meeting will be stopped.
-appadmin.maintain = Back to admin panel
+sysadmin.maintain = Back to admin panel
 outcome.authoring.title = Learning outcomes
 outcome.authoring.input = Search and select by outcome name or code
 outcome.authoring.existing = Added outcomes
Index: lams_tool_zoom/conf/language/lams/ApplicationResources_el_GR.properties
===================================================================
diff -u -r5b9f590b301c276f8df06b30c26981b0eb634e69 -r6eff730504702cb886be4c8f697bf4ee6d9c3bbd
--- lams_tool_zoom/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision 5b9f590b301c276f8df06b30c26981b0eb634e69)
+++ lams_tool_zoom/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision 6eff730504702cb886be4c8f697bf4ee6d9c3bbd)
@@ -61,7 +61,7 @@
 error.api.ping = Τα κλειδιά API για μηνύματα ηλεκτρονικού ταχυδρομείου {0} δεν φαίνεται να λειτουργούν σωστά
 error.api.none.configured = Δεν υπάρχουν κλειδιά API ζουμ που έχουν ρυθμιστεί από το διαχειριστή. Δεν μπορείτε να δημιουργήσετε μια σύσκεψη στο Zoom.
 error.api.reuse = Όλα τα διαμορφωμένα κλειδιά API χρησιμοποιούνται αυτήν τη στιγμή. Εάν αποφασίσετε να ξεκινήσετε τη συνάντησή σας, η συνάντηση άλλου εκπαιδευτικού θα διακοπεί.
-appadmin.maintain = Επιστροφή στον πίνακα διαχείρισης
+sysadmin.maintain = Επιστροφή στον πίνακα διαχείρισης
 outcome.authoring.title = Μαθησιακά αποτελέσματα
 outcome.authoring.input = Αναζήτηση και επιλογή κατά όνομα ή κωδικό μαθησιακού αποτελέσματος
 outcome.authoring.existing = Προστέθηκαν μαθησιακά αποτελέσματα
Index: lams_tool_zoom/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r5b9f590b301c276f8df06b30c26981b0eb634e69 -r6eff730504702cb886be4c8f697bf4ee6d9c3bbd
--- lams_tool_zoom/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 5b9f590b301c276f8df06b30c26981b0eb634e69)
+++ lams_tool_zoom/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 6eff730504702cb886be4c8f697bf4ee6d9c3bbd)
@@ -61,7 +61,7 @@
 error.api.ping = API keys for email {0} do not seem to work correctly
 error.api.none.configured = There are no Zoom API keys configured by the administrator. You are not able to create a Zoom meeting.
 error.api.reuse = All configured API keys are in use at the moment. If you decide to start your meeting, another teacher's meeting will be stopped.
-appadmin.maintain = Back to admin panel
+sysadmin.maintain = Back to admin panel
 outcome.authoring.title = Learning outcomes
 outcome.authoring.input = Search and select by outcome name or code
 outcome.authoring.existing = Added outcomes
Index: lams_tool_zoom/conf/language/lams/ApplicationResources_es_ES.properties
===================================================================
diff -u -r5b9f590b301c276f8df06b30c26981b0eb634e69 -r6eff730504702cb886be4c8f697bf4ee6d9c3bbd
--- lams_tool_zoom/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision 5b9f590b301c276f8df06b30c26981b0eb634e69)
+++ lams_tool_zoom/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision 6eff730504702cb886be4c8f697bf4ee6d9c3bbd)
@@ -61,7 +61,7 @@
 error.api.ping = Las claves API para el correo electrónico {0} no parecen funcionar correctamente
 error.api.none.configured = No hay claves API de Zoom configuradas por el administrador. No puede crear una reunión de Zoom.
 error.api.reuse = Todas las claves API configuradas están en uso en este momento. Si decide comenzar su reunión, se detendrá la reunión de otro instructor.
-appadmin.maintain = Volver al panel de administración
+sysadmin.maintain = Volver al panel de administración
 outcome.authoring.title = Objetivos de aprendizaje
 outcome.authoring.input = Busque y seleccione objetivo por título o código
 outcome.authoring.existing = Objetivos añadidos
Index: lams_tool_zoom/conf/language/lams/ApplicationResources_no_NO.properties
===================================================================
diff -u -r5b9f590b301c276f8df06b30c26981b0eb634e69 -r6eff730504702cb886be4c8f697bf4ee6d9c3bbd
--- lams_tool_zoom/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision 5b9f590b301c276f8df06b30c26981b0eb634e69)
+++ lams_tool_zoom/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision 6eff730504702cb886be4c8f697bf4ee6d9c3bbd)
@@ -61,7 +61,7 @@
 error.api.ping = API-nøkler for e-post {0} ser ikke ut til å fungere riktig
 error.api.none.configured = Det er ingen zoom API-nøkler konfigurert av administratoren. Du kan ikke opprette et Zoom-møte.
 error.api.reuse = Alle konfigurerte API-nøkler er i bruk for øyeblikket. Hvis du bestemmer deg for å starte møtet ditt, vil en annen lærers møte bli stoppet.
-appadmin.maintain = Tilbake til administratorpanelet
+sysadmin.maintain = Tilbake til administratorpanelet
 outcome.authoring.title = Læringsutbytte
 outcome.authoring.input = Søk og velg mål med navn eller kode
 outcome.authoring.existing = Tilleggs mål