Index: lams_admin/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -raf79204a6effce72a9c276513762d4d7f7d5ae1a -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision af79204a6effce72a9c276513762d4d7f7d5ae1a) +++ lams_admin/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -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,7 +192,7 @@ 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 import.groups.intro = Use this screen to bulk import courses and subcourses using an Excel spreadsheet. @@ -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. @@ -280,7 +280,7 @@ label.monitors = Monitors label.authors = Authors label.group.managers = Course Managers -label.sysadmins = Sysadmins +label.appadmins = Sysadmins label.author.admins = Author Administrators heading.users = Users label.number.of.users = {0} users. @@ -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 @@ -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 Index: lams_admin/conf/language/lams/ApplicationResources_cy_GB.properties =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/conf/language/lams/ApplicationResources_cy_GB.properties (.../ApplicationResources_cy_GB.properties) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_admin/conf/language/lams/ApplicationResources_cy_GB.properties (.../ApplicationResources_cy_GB.properties) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -34,7 +34,7 @@ error.oldpassword.mismatch =Nid yw'ch hen gyfrinair yn gywir. error.img.format =Nid yw'r ffeil rydych wedi'i llwytho i fyny yn edrych fel delwedd. Fel arfer mae estyniad .jpg, .gif, .png or .bmp gan ffeil ddelwedd. error.img.size =Mae maint y ffeil yn fwy na'r terfyn mwyaf sef 4096k. -error.need.sysadmin =Rhaid i chi gael r\u00f4l y gweinyddwr system i wneud hyn. +error.need.appadmin =Rhaid i chi gael r\u00f4l y gweinyddwr system i wneud hyn. error.roles.empty =Rhaid i chi neilltuo o leiaf un r\u00f4l. error.userid.invalid =ID Defnyddiwr annilys error.firstname.required =Enw cyntaf yn ofynnol @@ -144,10 +144,10 @@ admin.enable =Galluogi admin.disable =Analluogi admin.register =Cofrestru -sysadmin.maintain =Cynnal LAMS -sysadmin.maintain.loginpage =Cynnal tudalen mewngofnodi -sysadmin.maintain.external.servers =Cynnal gweinyddwyr integredig -sysadmin.maintain.server.edit =Golygu gweinydd integredig +appadmin.maintain =Cynnal LAMS +appadmin.maintain.loginpage =Cynnal tudalen mewngofnodi +appadmin.maintain.external.servers =Cynnal gweinyddwyr integredig +appadmin.maintain.server.edit =Golygu gweinydd integredig sysadmin.serverid =ID sysadmin.serverkey =Allwedd sysadmin.servername =Enw @@ -162,14 +162,14 @@ sysadmin.organisation.create =Creu un newydd sysadmin.organisation.select =Dewiswch.... sysadmin.login.logo =Llwytho i fyny logo LAMS newydd (uchder 90 a lled 186 am yr effaith orau): -sysadmin.login.text =Diweddaru'r testun dan y logo ar y dudalen mewngofnodi: +appadmin.login.text =Diweddaru'r testun dan y logo ar y dudalen mewngofnodi: sysadmin.headline =Gweinyddu System sysadmin.config.settings.edit =Golygu Gosodiadau Ffurfweddiad -sysadmin.batch.temp.file.delete =Dileu hen ffeiliau dros dro +appadmin.batch.temp.file.delete =Dileu hen ffeiliau dros dro sysadmin.job.list =Rhestr Waith sysadmin.list.job =Rhestru gwaith rhestredig yn y ciw Quartz sysadmin.register.server =Cofrestru Gweinydd -sysadmin.edit.default.tool.content =Golygu Cynnwys Offer Rhagosodedig +appadmin.edit.default.tool.content =Golygu Cynnwys Offer Rhagosodedig cache.maintain =Cynnal LAMS Cache cache.title =Rheoli Cache cache.entries.title =Nodau Cache @@ -209,7 +209,7 @@ msg.users.created ={0} defnyddiwr wedi cael ei greu'n llwyddiannus. error.no.sysadmin.priviledge =Nid oes hawl gennych wneud hyn. sysadmin.library.management =Rheolaeth Llyfrgell Ddysgu -sysadmin.library.totals =Cyfanswm llyfrgelloedd dysgu +appadmin.library.totals =Cyfanswm llyfrgelloedd dysgu sysadmin.library.activity.title =Teitl sysadmin.library.activity.description =Disgrifiad sysadmin.library.createtim =Creu amser Index: lams_admin/conf/language/lams/ApplicationResources_da_DK.properties =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/conf/language/lams/ApplicationResources_da_DK.properties (.../ApplicationResources_da_DK.properties) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_admin/conf/language/lams/ApplicationResources_da_DK.properties (.../ApplicationResources_da_DK.properties) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -10,8 +10,8 @@ msg.subgroup.organisation_id =Organisations ID for denne undergruppe er msg.remove.from.subgroups =Slettede brugere vil ogs\u00e5 blive fjernet fra undergrupper. label.global.roles =Globale roller -sysadmin.maintain.external.servers =Vedligehold integrerede servere -sysadmin.maintain.server.edit =Redig\u00e9r integreret server +appadmin.maintain.external.servers =Vedligehold integrerede servere +appadmin.maintain.server.edit =Redig\u00e9r integreret server sysadmin.serverid =ID sysadmin.serverkey =N\u00f8gle sysadmin.servername =Navn @@ -26,14 +26,14 @@ sysadmin.organisation.create =Opret ny sysadmin.organisation.select =V\u00e6lg venligst... sysadmin.login.logo =Upload nyt LAMS logo (h\u00f8jde 90 bredde 186 for bedste effekt): -sysadmin.login.text =Opdat\u00e9r tekst under logo p\u00e5 login side: +appadmin.login.text =Opdat\u00e9r tekst under logo p\u00e5 login side: sysadmin.headline =System administration sysadmin.config.settings.edit =Redig\u00e9r konfigurationsoplysninger -sysadmin.batch.temp.file.delete =Slet gamle midlertidige filer +appadmin.batch.temp.file.delete =Slet gamle midlertidige filer sysadmin.job.list =Opgaveliste sysadmin.list.job =Lav liste med opgaver i Quartz k\u00f8 sysadmin.register.server =Registr\u00e9r server -sysadmin.edit.default.tool.content =Redig\u00e9r standard v\u00e6rkt\u00f8jsindhold +appadmin.edit.default.tool.content =Redig\u00e9r standard v\u00e6rkt\u00f8jsindhold cache.maintain =Vedligehold LAMS cache cache.title =H\u00e5ndt\u00e9r cache cache.entries.title =Cache nodes @@ -130,8 +130,8 @@ admin.enable =Aktiv\u00e9r admin.disable =Deaktiv\u00e9r admin.register =Registr\u00e9r -sysadmin.maintain =Vedligehold LAMS -sysadmin.maintain.loginpage =Vedligehold login side +appadmin.maintain =Vedligehold LAMS +appadmin.maintain.loginpage =Vedligehold login side error.roles.invalid =En eller flere roller er ugyldige. {0} error.fail.add =Kunne ikke tilf\u00f8je bruger. error.authmethod.invalid =Ugyldig godkendelsesmetode. {0} @@ -157,7 +157,7 @@ error.img.format =Filen, du har uploadet, er ikke et billede. En billed-fil har som regel efternavnet .jpg, .gif, .png eller .bmp. error.img.size =Filen overskrider maksimal filst\u00f8rrelse p\u00e5 4096K. admin.delete =Slet -error.need.sysadmin =Du skal have systemadministrator-rettigheder for at g\u00f8re dette. +error.need.appadmin =Du skal have systemadministrator-rettigheder for at g\u00f8re dette. error.roles.empty =Du skal tilskrive mindst en rolle. audit.organisation.change =Har \u00e6ndret {0} for organisation: {1} fra: {2} til: {3} audit.organisation.create =Oprettet organisation: {0} af type: {1} @@ -236,20 +236,20 @@ label.login.as =Login som error.no.sysadmin.priviledge =Du har ikke rettigheder til at udf\u00f8re denne handling. sysadmin.library.management =Learning Library Management -sysadmin.library.totals =Samlet antal Learning Libraries +appadmin.library.totals =Samlet antal Learning Libraries sysadmin.library.activity.title =Titel sysadmin.library.activity.description =Beskrivelse sysadmin.library.createtim =Opret tid sysadmin.function =Funktion msg.tool.management =Indstillinger for 'V\u00e6rkt\u00f8j' -sysadmin.import.groups.title =Import\u00e9r grupper +appadmin.import.groups.title =Import\u00e9r grupper heading.import.results =Import\u00e9r resultater table.heading.organisation.id =Organisations ID import.groups.intro =Brug denne sk\u00e6rm til bulk import af grupper og undergrupper ved brug af Excel regneark. import.groups.instructions =N\u00e5r du opretter en gruppe skal du s\u00f8rge for at r\u00e6kke ovenover den er tom. N\u00e5r du skaber en undergruppe, skal du placere den direkte under dens hovedgruppe. import.groups.download =Download gruppe-skabelonen for at oprette nye grupper og undergrupper. msg.please.wait =Vent venligst... -sysadmin.tool.management =Indstillinger for 'V\u00e6rkt\u00f8j' +appadmin.tool.management =Indstillinger for 'V\u00e6rkt\u00f8j' sysadmin.ldap.configuration =LDAP konfiguration label.synchronise =Synkronis\u00e9r msg.num.ldap.users =Der er {0} LDAP brugere i LAMS Index: lams_admin/conf/language/lams/ApplicationResources_de_DE.properties =================================================================== diff -u -raf79204a6effce72a9c276513762d4d7f7d5ae1a -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/conf/language/lams/ApplicationResources_de_DE.properties (.../ApplicationResources_de_DE.properties) (revision af79204a6effce72a9c276513762d4d7f7d5ae1a) +++ lams_admin/conf/language/lams/ApplicationResources_de_DE.properties (.../ApplicationResources_de_DE.properties) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -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.sysadmin = Sie benötigen Systemverwaltungsrechte, um dies auszuführen. +error.need.appadmin = 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 -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 +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.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 ... -sysadmin.login.text = Text unter dem Logo auf der Loginseite anpassen: +appadmin.login.text = Text unter dem Logo auf der Loginseite anpassen: sysadmin.headline = Sytemadministration sysadmin.config.settings.edit = Konfiguration bearbeiten -sysadmin.batch.temp.file.delete = Alte temporäre Dateien löschen +appadmin.batch.temp.file.delete = Alte temporäre Dateien löschen sysadmin.job.list = Aufgabenliste sysadmin.list.job = Liste geplanter Aufgaben in Quartz-Reihenfolge -sysadmin.edit.default.tool.content = Voreingestellte Werkzeuginhalte bearbeiten +appadmin.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 -sysadmin.library.totals = Lernbibliotheken gesamt +appadmin.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 -sysadmin.import.groups.title = Gruppen importieren +appadmin.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 -sysadmin.tool.management = Werkzeugverwaltung +appadmin.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. @@ -280,7 +280,7 @@ label.monitors = Übersichten label.authors = Autoren label.group.managers = Gruppenmanager -label.sysadmins = Systemadministratoren +label.appadmins = Systemadministratoren label.author.admins = Autorenadministratoren heading.users = Benutzer label.number.of.users = {0} Benutzer. Index: lams_admin/conf/language/lams/ApplicationResources_el_GR.properties =================================================================== diff -u -raf79204a6effce72a9c276513762d4d7f7d5ae1a -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/conf/language/lams/ApplicationResources_el_GR.properties (.../ApplicationResources_el_GR.properties) (revision af79204a6effce72a9c276513762d4d7f7d5ae1a) +++ lams_admin/conf/language/lams/ApplicationResources_el_GR.properties (.../ApplicationResources_el_GR.properties) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -21,7 +21,7 @@ error.oldpassword.mismatch = Ο παλιός σας κωδικός δεν είναι σωστός. error.img.format = Το αρχείο που ανεβάσατε δεν φαίεται σαν αρχείο εικόνας. Ένα αρχείο εικόνας έχει συνήθως την επέκταση:jpg, .gif, .png ή .bmp error.img.size = Το μέγεθος του αρχείου ξεπερνά το όριο των 4096k -error.need.sysadmin = Πρέπει να έχετε ρόλο του διαχειριστή συστήματος για να το κάνετε αυτό. +error.need.appadmin = Πρέπει να έχετε ρόλο του διαχειριστή συστήματος για να το κάνετε αυτό. error.roles.empty = Θα πρέπει να ορίσετε τουλάχιστον έναν ρόλο. error.userid.invalid = Μη έγκυρο Όνομα Χρήστη error.firstname.required = Ονομα απαιτείται @@ -128,10 +128,10 @@ admin.search = Αναζήτηση admin.enable = Ενεργοποίηση admin.disable = Απενεργοποίηση -sysadmin.maintain = Διαχείριση LAMS -sysadmin.maintain.loginpage = Διαχείριση σελίδας πρόσβασης (login) -sysadmin.maintain.external.servers = Διαχείριση ολοκληρωμένων εξυπηρετητών -sysadmin.maintain.server.edit = Επεξεργασία ολοκληρωμένου εξυπηρετητή +appadmin.maintain = Διαχείριση LAMS +appadmin.maintain.loginpage = Διαχείριση σελίδας πρόσβασης (login) +appadmin.maintain.external.servers = Διαχείριση ολοκληρωμένων εξυπηρετητών +appadmin.maintain.server.edit = Επεξεργασία ολοκληρωμένου εξυπηρετητή sysadmin.serverid = Ταυτότητα sysadmin.serverkey = Κλειδί sysadmin.servername = Όνομα @@ -145,13 +145,13 @@ sysadmin.server.add = Προσθήκη νέου εξυπηρετητή sysadmin.organisation.create = Δημιουργία νέου sysadmin.organisation.select = Παρακαλώ επιλέξτε ... -sysadmin.login.text = Ενημέρωση του κειμένου κάτω από το λογότυπο στη σελίδα πρόσβασης (login page) +appadmin.login.text = Ενημέρωση του κειμένου κάτω από το λογότυπο στη σελίδα πρόσβασης (login page) sysadmin.headline = Διαχείριση Συστήματος sysadmin.config.settings.edit = Επεξεργασία Παραμέτρων Διαμόρφωσης -sysadmin.batch.temp.file.delete = Διαγραφή των παλιών προσωρινών αρχείων +appadmin.batch.temp.file.delete = Διαγραφή των παλιών προσωρινών αρχείων sysadmin.job.list = Κατάλογος εργασιών sysadmin.list.job = Λίστα όλων των προγραμματισμένων εργασιών χρονικά -sysadmin.edit.default.tool.content = Επεξεργασία προκαθορισμένου περιεχομένου εργαλείου. +appadmin.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 = Διαχείρηση Βιβλιοθήκης Μάθησης -sysadmin.library.totals = σύνολο βιβλιοθηκών μάθησης +appadmin.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 = Σύνδεση ως -sysadmin.import.groups.title = Εισαγωγή Ομάδων +appadmin.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 = Διαχείριση Εργαλείων -sysadmin.tool.management = Διαχείριση Εργαλείων +appadmin.tool.management = Διαχείριση Εργαλείων msg.ldap.synchronise.wait = Παρακαλώ περιμένετε γίνεται συγχρονισμός. Παρακαλώ περιμένετε μέχρι να ολοκληρωθεί ο συγχρονισμός... msg.ldap.synchronise.errors = Έχουν εμφανιστεί τα ακόλουθα λάθη: msg.num.search.results.users = Ο LDAP έχει επιστρέψει {0} χρήστες. @@ -280,7 +280,7 @@ label.monitors = Επόπτες label.authors = Συγγραφείς label.group.managers = Διαχειριστές Ομάδας -label.sysadmins = Διαχ. Συστήματος (Sysadmins) +label.appadmins = Διαχ. Συστήματος (Sysadmins) label.author.admins = Διαχειριστές Συγγραφέων heading.users = Χρήστες label.number.of.users = {0} χρήστες @@ -454,7 +454,7 @@ label.password.must.ucase = τουλάχιστον 1 κεφαλαίο γράμμα label.password.must.number = τουλάχιστον 1 αριθμό label.password.must.symbol = τουλάχιστον 1 σύμβολο -sysadmin.batch.preview.lesson.delete = Διαγράψτε την παλιά προεπισκόπηση των μαθημάτων +appadmin.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} -sysadmin.maintain.session = Συνδεδεμένοι χρήστες -sysadmin.maintain.session.login = Σύνδεση -sysadmin.maintain.session.id = Αναγνωριστικό περιόδου σύνδεσης +appadmin.maintain.session = Συνδεδεμένοι χρήστες +appadmin.maintain.session.login = Σύνδεση +appadmin.maintain.session.id = Αναγνωριστικό περιόδου σύνδεσης error.portrait.removal.failed = Δεν είναι δυνατή η διαγραφή του πορτραίτου. Δείτε το αρχείο σφαλμάτων για λεπτομέρειες. label.delete.portrait = Διαγραφή πορτραίτου -sysadmin.maintain.session.delete = Διαγραφή +appadmin.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 = κανένα -sysadmin.maintain.session.name = Ονομα +appadmin.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 = Ομαδοποιήσεις: εμφανίζονται μόνο ονόματα εκπαιδευόμενων μέσα στην ίδια ομάδα -sysadmin.maintain.session.count = συνδεδεμένοι χρήστες +appadmin.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 -sysadmin.maintain.session.access = Τελευταία πρόσβαση -sysadmin.maintain.session.created = Ξεκίνησε στις: +appadmin.maintain.session.access = Τελευταία πρόσβαση +appadmin.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 -raf79204a6effce72a9c276513762d4d7f7d5ae1a -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision af79204a6effce72a9c276513762d4d7f7d5ae1a) +++ lams_admin/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -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,7 +192,7 @@ 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 import.groups.intro = Use this screen to bulk import courses and subcourses using an Excel spreadsheet. @@ -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. @@ -280,7 +280,7 @@ label.monitors = Monitors label.authors = Authors label.group.managers = Course Managers -label.sysadmins = Sysadmins +label.appadmins = Sysadmins label.author.admins = Author Administrators heading.users = Users label.number.of.users = {0} users. @@ -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 @@ -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 Index: lams_admin/conf/language/lams/ApplicationResources_es_ES.properties =================================================================== diff -u -raf79204a6effce72a9c276513762d4d7f7d5ae1a -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/conf/language/lams/ApplicationResources_es_ES.properties (.../ApplicationResources_es_ES.properties) (revision af79204a6effce72a9c276513762d4d7f7d5ae1a) +++ lams_admin/conf/language/lams/ApplicationResources_es_ES.properties (.../ApplicationResources_es_ES.properties) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -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.sysadmin = Usted necesita ser Administrador de sistema para realizar esta tarea +error.need.appadmin = 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 -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 +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.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 -sysadmin.login.text = Actualice el texto que se visualizará en la página de entrada: +appadmin.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 -sysadmin.batch.temp.file.delete = Borrar archivos temporales antiguos +appadmin.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 -sysadmin.edit.default.tool.content = Editar el Contenido de Defecto de Herramientas +appadmin.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 -sysadmin.library.totals = Actividades totales de aprendizaje +appadmin.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 -sysadmin.import.groups.title = Importar Clases +appadmin.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 -sysadmin.tool.management = Administración de Herramientas y Actividades +appadmin.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. @@ -280,7 +280,7 @@ label.monitors = Tutores label.authors = Instructores label.group.managers = Gestionadores de Clase -label.sysadmins = Administradores del Sistema +label.appadmins = Administradores del Sistema label.author.admins = Administradores de Instructores heading.users = Usuarios label.number.of.users = {0} usuarios. @@ -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 -sysadmin.batch.preview.lesson.delete = Eliminar lecciones de vista previa +appadmin.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} -sysadmin.maintain.session = Usuarios conectados -sysadmin.maintain.session.login = Iniciar sesión -sysadmin.maintain.session.id = Nombre de sessión +appadmin.maintain.session = Usuarios conectados +appadmin.maintain.session.login = Iniciar sesión +appadmin.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 -sysadmin.maintain.session.delete = Eliminar +appadmin.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 -sysadmin.maintain.session.name = Nombre +appadmin.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. -sysadmin.maintain.session.count = usuarios conectados. +appadmin.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) -sysadmin.maintain.session.access = Último acceso -sysadmin.maintain.session.created = Comenzado en: +appadmin.maintain.session.access = Último acceso +appadmin.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_es_MX.properties =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/conf/language/lams/ApplicationResources_es_MX.properties (.../ApplicationResources_es_MX.properties) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_admin/conf/language/lams/ApplicationResources_es_MX.properties (.../ApplicationResources_es_MX.properties) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -32,7 +32,7 @@ error.oldpassword.mismatch =Su vieja contrase\u00f1a no es correcta error.img.format =El archivo que ha intentado usar no parece ser un archivo de image. Archivos de im\u00e1gen suelen tener extensiones .jpg, .gif, .png o .bmp. error.img.size =El archivo excede el maximo de 4096k de limite -error.need.sysadmin =Usted necesita ser Administrador de sistema para realizar esta tarea +error.need.appadmin =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\u00e1lido error.firstname.required =Se require Nombre @@ -142,10 +142,10 @@ admin.enable =Activado admin.disable =Desactivado admin.register =Registrar -sysadmin.maintain =Adminitraci\u00f3n de LAMS -sysadmin.maintain.loginpage =Administraci\u00f3n de p\u00e1gina de entrada -sysadmin.maintain.external.servers =Administrar servidores integrados -sysadmin.maintain.server.edit =Editar servidor integrado +appadmin.maintain =Adminitraci\u00f3n de LAMS +appadmin.maintain.loginpage =Administraci\u00f3n de p\u00e1gina de entrada +appadmin.maintain.external.servers =Administrar servidores integrados +appadmin.maintain.server.edit =Editar servidor integrado sysadmin.serverid =ID sysadmin.serverkey =Key sysadmin.servername =Nombre @@ -160,14 +160,14 @@ sysadmin.organisation.create =Crear uno nuevo sysadmin.organisation.select =Por favor seleccione sysadmin.login.logo =Subir un nuevo logo LAMS (para mejor efecto visual se recomienda 90x186 pixels): -sysadmin.login.text =Actualize el texto que se visualizar\u00e1 bajo el logo en la p\u00e1gina de entrada: +appadmin.login.text =Actualize el texto que se visualizar\u00e1 bajo el logo en la p\u00e1gina de entrada: sysadmin.headline =Administraci\u00f3n de Sistema sysadmin.config.settings.edit =Editar Configuraci\u00f3n de Sistema -sysadmin.batch.temp.file.delete =Borrar archivos temporales antiguos +appadmin.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 sysadmin.register.server =Registrar Servidor -sysadmin.edit.default.tool.content =Editar el Contenido de Defecto de Herramientas +appadmin.edit.default.tool.content =Editar el Contenido de Defecto de Herramientas cache.maintain =Mantener LAMS Cache cache.title =Administraci\u00f3n de Cache cache.entries.title =Nodos de Cache @@ -207,7 +207,7 @@ msg.users.created ={0} usuarios han sido creados. error.no.sysadmin.priviledge =No tiene suficientes privilegios para ejecutar esta acci\u00f3n. sysadmin.library.management =Administraci\u00f3n de Actividades de Ense\u00f1anza -sysadmin.library.totals =Actividades totales de aprendizaje +appadmin.library.totals =Actividades totales de aprendizaje sysadmin.library.activity.title =T\u00edtulo sysadmin.library.activity.description =Descripci\u00f3n sysadmin.library.createtim =Creada en @@ -241,7 +241,7 @@ msg.importv1.please.wait =Por favor espere mientras se crean estas clases y usuarios... msg.importv1.only.members =Solo usuarios que sean miembros de organizaciones podran ser importados. label.login.as =Iniciar sesi\u00f3n como este usuario -sysadmin.import.groups.title =Importar Clases +appadmin.import.groups.title =Importar Clases heading.import.results =Importar Resultados table.heading.organisation.id =ID de Organizaci\u00f3n import.groups.intro =Utilize esta pantalla para importar clases y grupos usando una plantilla de Excel @@ -256,7 +256,7 @@ heading.ldap.synchronise =Sincronizar con servidor LDAP msg.done =... operaci\u00f3n finalizada! msg.tool.management =Administraci\u00f3n de Herramientas y Actividades -sysadmin.tool.management =Administraci\u00f3n de Herramientas y Actividades +appadmin.tool.management =Administraci\u00f3n de Herramientas y Actividades msg.ldap.synchronise.wait =Por favor espere mientras se sincroniza. Por favor espere mientras se finaliza la sincronizaci\u00f3n... msg.ldap.synchronise.errors =Se encontraron los siguientes errores msg.num.search.results.users =El servidor LDAP regres\u00f3 {0} usuarios. @@ -337,7 +337,7 @@ label.authors =Profesores label.group.managers =Gestionadores de Clase label.group.admins =Administradores de Clase -label.sysadmins =Administradores del Sistema +label.appadmins =Administradores del Sistema label.author.admins =Administradores de Profesores heading.users =Usuarios label.number.of.users ={0} usuarios. Index: lams_admin/conf/language/lams/ApplicationResources_fr_FR.properties =================================================================== diff -u -raf79204a6effce72a9c276513762d4d7f7d5ae1a -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/conf/language/lams/ApplicationResources_fr_FR.properties (.../ApplicationResources_fr_FR.properties) (revision af79204a6effce72a9c276513762d4d7f7d5ae1a) +++ lams_admin/conf/language/lams/ApplicationResources_fr_FR.properties (.../ApplicationResources_fr_FR.properties) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -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.sysadmin = Vous devez avoir la fonction sys admin pour faire ceci. +error.need.appadmin = 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 -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é +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.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... -sysadmin.login.text = Mettre à jour le texte sous le logo sur page d'accès: +appadmin.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 -sysadmin.batch.temp.file.delete = Supprimer les anciens fichiers temporaires +appadmin.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 -sysadmin.edit.default.tool.content = Modifier le contenu par défaut de l'outil +appadmin.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 -sysadmin.library.totals = Ensemble des activités enseignées +appadmin.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 -sysadmin.import.groups.title = Importer des groupes +appadmin.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 -sysadmin.tool.management = Gestion des outils +appadmin.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). @@ -280,7 +280,7 @@ label.monitors = Enseignants/moniteurs label.authors = Auteurs label.group.managers = Gestionnaires de groupe -label.sysadmins = Administ +label.appadmins = Administ label.author.admins = Administrateurs des auteurs heading.users = Utilisateurs label.number.of.users = {0} utilisateurs Index: lams_admin/conf/language/lams/ApplicationResources_it_IT.properties =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/conf/language/lams/ApplicationResources_it_IT.properties (.../ApplicationResources_it_IT.properties) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_admin/conf/language/lams/ApplicationResources_it_IT.properties (.../ApplicationResources_it_IT.properties) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -44,7 +44,7 @@ config.ldap.security.authentication =Meccanismo di autenticazione config.ldap.security.protocol =Protocollo di sicurezza config.ldap.search.results.page.size =Dimensioni pagina dei risultati di ricerca -sysadmin.login.text =Aggiornare il testo sotto il logo alla pagina di login +appadmin.login.text =Aggiornare il testo sotto il logo alla pagina di login msg.num.updated.users =[0] account utente gi\u00e0 esistevano in LAMS e sono stati aggiornati. config.ldap.update.on.login =Aggiorna al login error.numeric =[0] accetta solo caratteri numerici @@ -64,7 +64,7 @@ sysadmin.timeoutUrl =Timeout URL sysadmin.config.settings.edit =Modifica i parametri di configurazione sysadmin.list.job =Elencare i compiti programmati in coda -sysadmin.edit.default.tool.content =Modifica il contenuto di default del Tool +appadmin.edit.default.tool.content =Modifica il contenuto di default del Tool msg.click.add.user =Cliccare su un utente per aggiungerlo msg.show.all.potential.users =Mostra tutti gli utenti potenziali audit.successful.user.import =Sono stati importati con successo [0] utenti. @@ -93,15 +93,15 @@ admin.course.manage =gestione gruppi admin.class.manage =gestione sottogruppi admin.global.roles.manage =gestione ruoli globali -sysadmin.maintain =Avvia LAMS -sysadmin.maintain.loginpage =Fai il login +appadmin.maintain =Avvia LAMS +appadmin.maintain.loginpage =Fai il login sysadmin.userinfoUrl =URL informazione utenti cache.title =Amministrazione della cache cache.entries.title =Nodi della cache admin.user.manage =Gestione utenti cache.maintain =Gestione della cache LAMS sysadmin.register.server =Registra il server -sysadmin.maintain.server.edit =Modifica i server integrati +appadmin.maintain.server.edit =Modifica i server integrati admin.disable =Disabile msg.edit.tool.content.1 =Questa pagina contiene un elenco dei tools installati msg.add.to.org =Usare per aggiungere a {0} @@ -142,7 +142,7 @@ admin.user.find =Trova utenti sysadmin.headline =Sistema di Amministrazione admin.can.change.status =Il gruppo di Amministrazione pu\u00f2 cambiare lo stato del corso -sysadmin.maintain.external.servers =Gestione dei server integrati +appadmin.maintain.external.servers =Gestione dei server integrati admin.register.server.config.title =Configurazione del server admin.reset =Resetta admin.cancel =Cancella @@ -184,7 +184,7 @@ error.oldpassword.mismatch =la tua vecchia password non \u00e8 corretta. error.img.format =Il file che stai scaricando non ha l'aspetto di una immagine. Una immagine ha solitamente estensione .jpg, .gif, .png, o .bmp. error.img.size =La misura del file eccede il limite massimo di 4096K. -error.need.sysadmin =Occorre avere il ruolo di amministratore di sistema per fare questo. +error.need.appadmin =Occorre avere il ruolo di amministratore di sistema per fare questo. error.roles.empty =Occorre assegnare almeno un ruolo audit.organisation.change =Cambiato {0} per organizzazione: {1}, per: {2}, da {3} audit.organisation.create =Organizzazione creata: {0} di tipo: {1} @@ -270,7 +270,7 @@ admin.register.server.stats.total.users =Totale # di Utenti msg.import.3 =Scarica il template ruoli per aggiungere utenti a gruppi/sottogruppi e assegnare i loro ruoli. sysadmin.library.management =Amministrazione Learning Activity -sysadmin.library.totals =Totale Learning Activity +appadmin.library.totals =Totale Learning Activity sysadmin.library.activity.title =Titolo sysadmin.library.activity.description =Descrizione sysadmin.library.createtim =Tempo @@ -300,13 +300,13 @@ msg.importv1.only.members =Possono essere importati solo utenti che sono membri delle organizzazioni/classi importate. label.login.as =Login come msg.tool.management =Amministrazione Tool -sysadmin.import.groups.title =Importa Gruppi +appadmin.import.groups.title =Importa Gruppi heading.import.results =Importa risultati table.heading.organisation.id =ID Organizzazione import.groups.instructions =Quando crei un gruppo, assicurati che la riga relativa sia vuota. Quando crei un sottogruppo, ponilo immediatamente sotto il gruppo parente. import.groups.download =SCarica il template dei gruppi per creare gruppi e sottogruppi. msg.please.wait =Attendi, prego... -sysadmin.tool.management =Amministrazione tool +appadmin.tool.management =Amministrazione tool sysadmin.ldap.configuration =Configurazione LDAP label.synchronise =Sincronizza msg.num.ldap.users =Ci sono {0} LDAP users in LAMS. @@ -315,7 +315,7 @@ heading.ldap.synchronise =Sincronizza con LDAP msg.done =...fatto! msg.disable.user.2 =L'account utente sar\u00e0 disabilitato. Le informazioni relative verranno conservate ma l'account sar\u00e0 considerato cancellato. -sysadmin.batch.temp.file.delete =Cancella i vecchi file temporanei +appadmin.batch.temp.file.delete =Cancella i vecchi file temporanei heading.users =Utenti label.users.in.system =[0] utenti nel sistema msg.ldap.synchronise.wait =Attendere il termine della sincronizzazione @@ -342,7 +342,7 @@ config.ldap.monitor.map =Monitor Role Map config.ldap.org.field =Group Field Map label.monitors =Monitor -label.sysadmins =Sysadmins +label.appadmins =Sysadmins config.learner.screen.size =Configurazione schermata Learner config.monitor.screen.size =Configurazione schermata Monitor config.admin.screen.size =Configurazione schermata System Admin Index: lams_admin/conf/language/lams/ApplicationResources_ja_JP.properties =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/conf/language/lams/ApplicationResources_ja_JP.properties (.../ApplicationResources_ja_JP.properties) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_admin/conf/language/lams/ApplicationResources_ja_JP.properties (.../ApplicationResources_ja_JP.properties) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -60,14 +60,14 @@ label.group.admins =\u30b0\u30eb\u30fc\u30d7\u7ba1\u7406\u8005 config.ldap.encrypt.password.from.browser =\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u9001\u4fe1\u3059\u308b\u524d\u306b\u6697\u53f7\u5316\u3059\u308b error.numeric ={0} \u306f\u6570\u5b57\u306e\u307f\u53d7\u3051\u5165\u308c\u307e\u3059 -label.sysadmins =\u30b7\u30b9\u30c6\u30e0\u7ba1\u7406\u8005 +label.appadmins =\u30b7\u30b9\u30c6\u30e0\u7ba1\u7406\u8005 heading.users =\u30e6\u30fc\u30b6\u30fc label.group.managers =\u30b0\u30eb\u30fc\u30d7\u30de\u30cd\u30fc\u30b8\u30e3 heading.import.results =\u30a4\u30f3\u30dd\u30fc\u30c8\u306e\u7d50\u679c label.users.in.system =\u30b7\u30b9\u30c6\u30e0\u306b {0} \u4eba\u306e\u30e6\u30fc\u30b6\u30fc\u304c\u3044\u307e\u3059\u3002 label.users.in.group =\u30b0\u30eb\u30fc\u30d7\u306b {0} \u4eba\u306e\u30e6\u30fc\u30b6\u30fc\u304c\u3044\u307e\u3059\u3002 label.show =\u8868\u793a -sysadmin.import.groups.title =\u30b0\u30eb\u30fc\u30d7\u306e\u30a4\u30f3\u30dd\u30fc\u30c8 +appadmin.import.groups.title =\u30b0\u30eb\u30fc\u30d7\u306e\u30a4\u30f3\u30dd\u30fc\u30c8 label.can.offer.joint.lessons =\u5171\u540c\u30ec\u30c3\u30b9\u30f3\u3092\u63d0\u4f9b\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059 label.cleanup.delete =\u3053\u306e\u65e5\u6570\u3088\u308a\u53e4\u3044\u4e00\u6642\u30d5\u30a1\u30a4\u30eb\u3092\u524a\u9664\u3057\u307e\u3059 table.heading.organisation.id =\u7d44\u7e54 ID @@ -103,7 +103,7 @@ heading.ldap.synchronise =LDAP \u3068\u306e\u540c\u671f msg.done =\u5b8c\u4e86\u3057\u307e\u3057\u305f msg.tool.management =\u30c4\u30fc\u30eb\u7ba1\u7406 -sysadmin.tool.management =\u30c4\u30fc\u30eb\u7ba1\u7406 +appadmin.tool.management =\u30c4\u30fc\u30eb\u7ba1\u7406 msg.ldap.synchronise.wait =\u540c\u671f\u304c\u5b8c\u4e86\u3059\u308b\u307e\u3067\u304a\u5f85\u3061\u304f\u3060\u3055\u3044... msg.ldap.synchronise.errors =\u4ee5\u4e0b\u306e\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: msg.num.search.results.users =LDAP \u30b5\u30fc\u30d0\u306f {0} \u4eba\u306e\u30e6\u30fc\u30b6\u30fc\u3092\u4fdd\u6301\u3057\u3066\u3044\u307e\u3059\u3002 @@ -141,16 +141,16 @@ msg.importv1.created ={0} \u4eba\u306e\u30e6\u30fc\u30b6\u30fc\u3068 {1} \u500b\u306e\u30b0\u30eb\u30fc\u30d7\u3092\u4f5c\u6210\u3057\u307e\u3057\u305f\u3002 msg.cleanup.files.deleted ={0} \u500b\u306e\u30d5\u30a1\u30a4\u30eb\u304c\u524a\u9664\u3055\u308c\u307e\u3057\u305f\u3002 label.imported.learning.designs =\u5b66\u7fd2\u30c7\u30b6\u30a4\u30f3\u3092\u30a4\u30f3\u30dd\u30fc\u30c8\u3057\u307e\u3057\u305f\u3002 -sysadmin.library.totals =\u5b66\u7fd2\u30e9\u30a4\u30d6\u30e9\u30ea\u306e\u5408\u8a08 +appadmin.library.totals =\u5b66\u7fd2\u30e9\u30a4\u30d6\u30e9\u30ea\u306e\u5408\u8a08 label.unknown =\u4e0d\u660e admin.can.browse.user =\u30b0\u30eb\u30fc\u30d7\u7ba1\u7406\u8005\u306f\u30b7\u30b9\u30c6\u30e0\u306e\u3059\u3079\u3066\u306e\u30e6\u30fc\u30b6\u30fc\u3092\u53c2\u7167\u3067\u304d\u308b admin.can.change.status =\u30b0\u30eb\u30fc\u30d7\u7ba1\u7406\u8005\u306f\u30b3\u30fc\u30b9\u306e\u30b9\u30c6\u30fc\u30bf\u30b9\u3092\u8ffd\u52a0\u3067\u304d\u308b admin.course =\u30b0\u30eb\u30fc\u30d7 admin.class =\u30b5\u30d6\u30b0\u30eb\u30fc\u30d7 admin.course.manage =\u30b0\u30eb\u30fc\u30d7\u306e\u7ba1\u7406 config.lams.support.email =LAMS \u30b5\u30dd\u30fc\u30c8 \u30e1\u30fc\u30eb -sysadmin.maintain.external.servers =\u7d71\u5408\u6e08\u307f\u30b5\u30fc\u30d0\u306e\u7ba1\u7406 -sysadmin.maintain.server.edit =\u7d71\u5408\u6e08\u307f\u30b5\u30fc\u30d0\u306e\u7de8\u96c6 +appadmin.maintain.external.servers =\u7d71\u5408\u6e08\u307f\u30b5\u30fc\u30d0\u306e\u7ba1\u7406 +appadmin.maintain.server.edit =\u7d71\u5408\u6e08\u307f\u30b5\u30fc\u30d0\u306e\u7de8\u96c6 sysadmin.organisation =\u7d44\u7e54 sysadmin.userinfoUrl =\u30e6\u30fc\u30b6\u30fc\u60c5\u5831 URL sysadmin.integrated.servers =: \u7d71\u5408\u6e08\u307f\u30b5\u30fc\u30d0\u306e\u5408\u8a08 @@ -159,11 +159,11 @@ sysadmin.organisation.select =\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044 sysadmin.headline =\u30b7\u30b9\u30c6\u30e0\u7ba1\u7406 sysadmin.config.settings.edit =\u69cb\u6210\u8a2d\u5b9a\u306e\u7de8\u96c6 -sysadmin.batch.temp.file.delete =\u53e4\u3044\u4e00\u6642\u30d5\u30a1\u30a4\u30eb\u306e\u524a\u9664 +appadmin.batch.temp.file.delete =\u53e4\u3044\u4e00\u6642\u30d5\u30a1\u30a4\u30eb\u306e\u524a\u9664 sysadmin.job.list =\u30b8\u30e7\u30d6\u30ea\u30b9\u30c8 sysadmin.list.job =\u8a08\u6642\u4e2d\u306e\u30b9\u30b1\u30b8\u30e5\u30fc\u30eb\u30b8\u30e7\u30d6\u306e\u30ea\u30b9\u30c8 sysadmin.register.server =\u30b5\u30fc\u30d0\u306e\u767b\u9332 -sysadmin.edit.default.tool.content =\u30c7\u30d5\u30a9\u30eb\u30c8\u30c4\u30fc\u30eb\u30b3\u30f3\u30c6\u30f3\u30c4\u306e\u7de8\u96c6 +appadmin.edit.default.tool.content =\u30c7\u30d5\u30a9\u30eb\u30c8\u30c4\u30fc\u30eb\u30b3\u30f3\u30c6\u30f3\u30c4\u306e\u7de8\u96c6 cache.title =\u30ad\u30e3\u30c3\u30b7\u30e5\u306e\u7ba1\u7406 cache.entries.title =\u30ad\u30e3\u30c3\u30b7\u30e5\u30ce\u30fc\u30c9 cache.explanation3 =\u8b66\u544a: \u30ce\u30fc\u30c9\u3092\u524a\u9664\u3059\u308b\u3068\u3001\u305d\u306e\u89aa\u30ce\u30fc\u30c9\u3068\u5b50\u30ce\u30fc\u30c9\u3001\u3059\u3079\u3066\u304c\u524a\u9664\u3055\u308c\u307e\u3059\u3002 @@ -287,7 +287,7 @@ register.error.field =\u5fc5\u9808\u9805\u76ee config.executable.extensions =\u5229\u7528\u53ef\u80fd\u306a\u30d5\u30a1\u30a4\u30eb\u306e\u7a2e\u985e config.server.url.context.path =\u30b5\u30fc\u30d0 URL \u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 -sysadmin.login.text =\u30ed\u30b0\u30a4\u30f3\u30da\u30fc\u30b8\u3067\u30ed\u30b4\u306e\u4e0b\u306b\u8868\u793a\u3055\u308c\u308b\u30c6\u30ad\u30b9\u30c8\u306e\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8: +appadmin.login.text =\u30ed\u30b0\u30a4\u30f3\u30da\u30fc\u30b8\u3067\u30ed\u30b4\u306e\u4e0b\u306b\u8868\u793a\u3055\u308c\u308b\u30c6\u30ad\u30b9\u30c8\u306e\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8: admin.user.first_name =\u540d msg.edit.tool.content.3 =\u30d5\u30a1\u30a4\u30eb\u3092\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u3057\u3066\u3001\u30c4\u30fc\u30eb\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u30b3\u30f3\u30c6\u30f3\u30c4\u306b\u4f7f\u3046\u3053\u3068\u306f\u3067\u304d\u306a\u3044\u306e\u3067\u6ce8\u610f\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u4ee3\u308f\u308a\u306b\u30c7\u30d5\u30a9\u30eb\u30c8\u30c6\u30ad\u30b9\u30c8\u3092\u7de8\u96c6\u3057\u3066\u304f\u3060\u3055\u3044\u3002 config.admin.screen.size =\u30b7\u30b9\u30c6\u30e0\u7ba1\u7406\u753b\u9762\u306e\u30b5\u30a4\u30ba @@ -327,7 +327,7 @@ sysadmin.library.createtim =\u4f5c\u6210\u6642\u523b config.ldap.search.results.page.size =\u691c\u7d22\u7d50\u679c\u30da\u30fc\u30b8\u306e\u30b5\u30a4\u30ba msg.edit.tool.content.1 =\u3053\u306e\u30da\u30fc\u30b8\u306b\u306f\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3055\u308c\u305f\u30c4\u30fc\u30eb\u306e\u30ea\u30b9\u30c8\u3082\u542b\u307e\u308c\u3066\u3044\u307e\u3059\u3002 -sysadmin.maintain.loginpage =\u30ed\u30b0\u30a4\u30f3\u30da\u30fc\u30b8\u306e\u30e1\u30f3\u30c6\u30ca\u30f3\u30b9 +appadmin.maintain.loginpage =\u30ed\u30b0\u30a4\u30f3\u30da\u30fc\u30b8\u306e\u30e1\u30f3\u30c6\u30ca\u30f3\u30b9 config.server.page.direction =\u30ed\u30b1\u30fc\u30eb\u30da\u30fc\u30b8\u306e\u30ec\u30a4\u30a2\u30a6\u30c8 label.results.per.page =\u7d50\u679c\u3092 1 \u30da\u30fc\u30b8\u306b\u8868\u793a error.required ={0} \u304c\u5fc5\u8981\u3067\u3059\u3002 @@ -336,7 +336,7 @@ error.password.required =\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u5fc5\u8981\u3067\u3059\u3002 error.lastname.required =\u59d3\u304c\u5fc5\u8981\u3067\u3059\u3002 error.firstname.required =\u540d\u304c\u5fc5\u8981\u3067\u3059\u3002 -error.need.sysadmin =\u3053\u306e\u64cd\u4f5c\u306b\u306f\u30b7\u30b9\u30c6\u30e0\u7ba1\u7406\u8005\u30ed\u30fc\u30eb\u304c\u5fc5\u8981\u3067\u3059\u3002 +error.need.appadmin =\u3053\u306e\u64cd\u4f5c\u306b\u306f\u30b7\u30b9\u30c6\u30e0\u7ba1\u7406\u8005\u30ed\u30fc\u30eb\u304c\u5fc5\u8981\u3067\u3059\u3002 config.cleanup.preview.older.than.days =\u30d7\u30ec\u30d3\u30e5\u30fc\u3092\u4fdd\u6301\u3059\u308b\u65e5\u6570 admin.register.server.config.url =\u30b5\u30fc\u30d0 URL config.server.url =\u30b5\u30fc\u30d0 URL @@ -373,7 +373,7 @@ msg.ldap.synchronise.warning =\u3053\u306e\u30d7\u30ed\u30bb\u30b9\u304c\u3001LDAP \u30c4\u30ea\u30fc\u306b\u542b\u307e\u308c\u308b\u30e6\u30fc\u30b6\u30fc\u6570\u306b\u5fdc\u3058\u3066\u6642\u9593\u304c\u304b\u304b\u308b\u3053\u3068\u306b\u6ce8\u610f\u3059\u3079\u304d\u3067\u3059\u3002LAMS \u30b5\u30fc\u30d0\u306b\u8ca0\u8377\u304c\u304b\u304b\u3063\u3066\u3044\u306a\u3044\u9593\u306b\u4f5c\u696d\u3092\u884c\u3046\u3053\u3068\u304c\u3001\u3082\u3063\u3068\u3082\u826f\u3044\u30d1\u30d5\u30a9\u30fc\u30de\u30f3\u30b9\u3092\u751f\u307f\u51fa\u3057\u307e\u3059\u3002 sysadmin.timeoutUrl =\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8 URL msg.num.updated.users =LAMS \u306b\u3059\u3067\u306b\u5b58\u5728\u3057\u305f {0} \u4eba\u306e\u30e6\u30fc\u30b6\u30fc\u3092\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u3057\u307e\u3057\u305f\u3002 -sysadmin.maintain =LAMS \u306e\u30e1\u30f3\u30c6\u30ca\u30f3\u30b9 +appadmin.maintain =LAMS \u306e\u30e1\u30f3\u30c6\u30ca\u30f3\u30b9 register.success =\u30b5\u30fc\u30d0\u30fc\u304c lamscommunity.org \u306e\u767b\u9332\u306b\u6210\u529f\u3057\u307e\u3057\u305f\u3002 admin.register.enableLamsCommunity =lamscommunity.org \u3068\u306e\u7d71\u5408\u3092\u6709\u52b9\u306b\u3059\u308b msg.ldap.synchronise.intro =\u3053\u306e\u6a5f\u80fd\u306f\u3001LAMS \u306e\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092 LDAP \u30b5\u30fc\u30d0\u30fc\u3068\u540c\u671f\u3055\u305b\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002\u3053\u308c\u306f\u65e2\u5b58\u306e\u30e6\u30fc\u30b6\u30fc\u306e\u30d7\u30ed\u30d5\u30a3\u30fc\u30eb\u306e\u66f4\u65b0\u3084\u30e6\u30fc\u30b6\u30fc\u306e\u5c5e\u6027\u3068\u4e00\u81f4\u3059\u308b LAMS \u30b0\u30eb\u30fc\u30d7\u3078\u306e\u8ffd\u52a0\u3092\u542b\u307f\u307e\u3059\u3002 Index: lams_admin/conf/language/lams/ApplicationResources_ko_KR.properties =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/conf/language/lams/ApplicationResources_ko_KR.properties (.../ApplicationResources_ko_KR.properties) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_admin/conf/language/lams/ApplicationResources_ko_KR.properties (.../ApplicationResources_ko_KR.properties) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -41,10 +41,10 @@ sysadmin.job.list =\uc791\uc5c5 \ubaa9\ub85d sysadmin.headline =\uc2dc\uc2a4\ud15c \uad00\ub9ac\uc790 sysadmin.config.settings.edit =\uc124\uc815 \ud3b8\uc9d1 -sysadmin.batch.temp.file.delete =\uc774\uc804 \uc784\uc2dc \ud30c\uc77c \uc0ad\uc81c +appadmin.batch.temp.file.delete =\uc774\uc804 \uc784\uc2dc \ud30c\uc77c \uc0ad\uc81c sysadmin.list.job =Quartz \ud050\uc5d0 \uc788\ub294 \uc608\uc815\ub41c \uc791\uc5c5 \ub098\uc5f4 sysadmin.register.server =\uc11c\ubc84 \ub4f1\ub85d -sysadmin.edit.default.tool.content =\ub514\ud3f4\ud2b8 \ub3c4\uad6c \ucee8\ud150\uce20 \ud3b8\uc9d1 +appadmin.edit.default.tool.content =\ub514\ud3f4\ud2b8 \ub3c4\uad6c \ucee8\ud150\uce20 \ud3b8\uc9d1 cache.maintain =\ub78c\uc2a4 \uce90\uc2dc \uad00\ub9ac cache.title =\uce90\uc2dc \uad00\ub9ac cache.entries.title =\uce90\uc2dc \ub178\ub4dc @@ -122,10 +122,10 @@ admin.enable =\ud65c\uc131\ud654 admin.disable =\ube44\ud65c\uc131\ud654 admin.register =\ub4f1\ub85d -sysadmin.maintain =\ub78c\uc2a4 \uc720\uc9c0\ubcf4\uc218 -sysadmin.maintain.loginpage =\ub85c\uadf8\uc778 \ud398\uc774\uc9c0 \uc720\uc9c0\ubcf4\uc218 -sysadmin.maintain.external.servers =\ud1b5\ud569 \uc11c\ubc84 \uad00\ub9ac -sysadmin.maintain.server.edit =\ud1b5\ud569 \uc11c\ubc84 \ud3b8\uc9d1 +appadmin.maintain =\ub78c\uc2a4 \uc720\uc9c0\ubcf4\uc218 +appadmin.maintain.loginpage =\ub85c\uadf8\uc778 \ud398\uc774\uc9c0 \uc720\uc9c0\ubcf4\uc218 +appadmin.maintain.external.servers =\ud1b5\ud569 \uc11c\ubc84 \uad00\ub9ac +appadmin.maintain.server.edit =\ud1b5\ud569 \uc11c\ubc84 \ud3b8\uc9d1 sysadmin.serverid =\uc544\uc774\ub514 sysadmin.serverkey =\ud0a4 sysadmin.servername =\uc774\ub984 @@ -140,7 +140,7 @@ sysadmin.organisation.create =\uc0c8 \uac83 \uc0dd\uc131 sysadmin.organisation.select =\ub2e4\uc74c\uc744 \uc120\ud0dd\ud558\uc138\uc694... sysadmin.login.logo =\uc0c8 \ub78c\uc2a4\ub85c\uace0 \uc5c5\ub85c\ub4dc(\uac00\ub85c 186 \uc138\ub85c 90 \ud53d\uc140) -sysadmin.login.text =\ub85c\uadf8\uc778 \ud398\uc774\uc9c0\uc758 \ub85c\uace0 \uc544\ub798 \ubb38\uc7a5 \uac31\uc2e0 +appadmin.login.text =\ub85c\uadf8\uc778 \ud398\uc774\uc9c0\uc758 \ub85c\uace0 \uc544\ub798 \ubb38\uc7a5 \uac31\uc2e0 audit.organisation.create ={1} \ud615\ud0dc\uc758 \uc870\uc9c1 \uc0dd\uc131: {0} audit.user.disable =\ube44\ud65c\uc131\ud654\ub41c \uc0ac\uc6a9\uc790 \uc544\uc774\ub514:{0} audit.user.delete =\uc0ad\uc81c\ub41c \uc0ac\uc6a9\uc790 \uc544\uc774\ub514:{0} @@ -214,7 +214,7 @@ error.img.format =\uc5c5\ub85c\ub4dc\ud55c \ud30c\uc77c\uc774 \uc774\ubbf8\uc9c0\uac00 \uc544\ub2cc \uac83 \uac19\uc2b5\ub2c8\ub2e4. \uc774\ubbf8\uc9c0 \ud30c\uc77c\uc740 \ubcf4\ud1b5 jpg, gif, png\ub098 bmp \ud655\uc7a5\uc790\ub97c \uac16\uc2b5\ub2c8\ub2e4. error.img.size =\ud30c\uc77c\ud06c\uae30\uac00 \ucd5c\ub300 4096k \ud55c\uacc4\ub97c \ucd08\uacfc\ud558\uc600\uc2b5\ub2c8\ub2e4. admin.delete =\uc0ad\uc81c -error.need.sysadmin =\uc774\uac83\uc744 \ud558\uae30\uc704\ud574\uc11c\ub294 \uc2dc\uc2a4\ud15c \uad00\ub9ac\uc790 \uc5ed\ud560\uc744 \uac00\uc838\uc57c \ud569\ub2c8\ub2e4. +error.need.appadmin =\uc774\uac83\uc744 \ud558\uae30\uc704\ud574\uc11c\ub294 \uc2dc\uc2a4\ud15c \uad00\ub9ac\uc790 \uc5ed\ud560\uc744 \uac00\uc838\uc57c \ud569\ub2c8\ub2e4. error.roles.empty =\uc801\uc5b4\ub3c4 \ud558\ub098\uc758 \uc5ed\ud560\uc744 \ubd80\uc5ec\ud574\uc57c \ud569\ub2c8\ub2e4. audit.organisation.change =\uc870\uc9c1 {1} \uc5d0 \ub300\ud574 {0} \ubcc0\uacbd: {2} \uc5d0\uc11c {3} \uc73c\ub85c errors.footer =

@@ -237,7 +237,7 @@ sysadmin.library.activity.title =\uc81c\ubaa9 sysadmin.library.createtim =\uc0dd\uc131 \uc2dc\uac04 sysadmin.library.management =\ud559\uc2b5 \ub77c\uc774\ube0c\ub7ec\ub9ac \uad00\ub9ac -sysadmin.library.totals =\ucd1d {0} \ud559\uc2b5\ub77c\uc774\ube0c\ub7ec\ub9ac +appadmin.library.totals =\ucd1d {0} \ud559\uc2b5\ub77c\uc774\ube0c\ub7ec\ub9ac sysadmin.library.activity.description =\uc124\uba85 sysadmin.function =\uae30\ub2a5 msg.users.created ={0} \uc0ac\uc6a9\uc790\ub4e4\uc774 \uc131\uacf5\uc801\uc73c\ub85c \uc0dd\uc131\ub418\uc5c8\uc2b5\ub2c8\ub2e4. @@ -248,7 +248,7 @@ msg.cleanup.warning =\ub78c\uc2a4 \uc784\uc2dc\ud30c\uc77c \ud06c\uae30\ub97c \uacc4\uc0b0\ud558\ub294\uac83\uc740 \ucd5c\uadfc\uc5d0 \uc815\ub9ac\ub418\uc9c0 \uc54a\uc558\ub2e4\uba74 \uc11c\ubc84 \uc131\ub2a5 \ubd80\ud558\ub97c \ucd08\ub798\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4. label.login.as =\ub85c\uadf8\uc778 \uc0ac\uc6a9\uc790 msg.please.wait =\uc7a0\uc2dc\ub9cc \uae30\ub2e4\ub824 \uc8fc\uc2ed\uc2dc\uc694 -sysadmin.import.groups.title =\uadf8\ub8f9 \uac00\uc838\uc624\uae30 +appadmin.import.groups.title =\uadf8\ub8f9 \uac00\uc838\uc624\uae30 table.heading.organisation.id =\uc870\uc9c1 \uc544\uc774\ub514 label.can.join.joint.lessons =\uc5f0\uacc4 \ud559\uc2b5\uc5d0 \ucc38\uac00\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4. label.unknown =\uc54c\uc218 \uc5c6\uc74c @@ -294,7 +294,7 @@ label.users.in.system =\uc2dc\uc2a4\ud15c\uc5d0 {0} \uc0ac\uc6a9\uc790 msg.tool.management =\ub3c4\uad6c \uad00\ub9ac config.ldap.learner.map =\ud559\uc2b5\uc790 \uc5ed\ud560 \uc9c0\ub3c4 -sysadmin.tool.management =\ub3c4\uad6c \uad00\ub9ac +appadmin.tool.management =\ub3c4\uad6c \uad00\ub9ac sysadmin.ldap.configuration =LDAP \uc124\uc815 label.synchronise =\ub3d9\uae30\ud654 msg.num.ldap.users =\ub7a8\uc2a4\uc5d0 {0} LDAP \uc0ac\uc6a9\uc790\uac00 \uc788\uc2b5\ub2c8\ub2e4. @@ -354,7 +354,7 @@ label.authors =\uc791\uc131\uc790 label.group.managers =\ubaa8\ub460 \uad00\ub9ac\uc790 label.group.admins =\ubaa8\ub460 \ucd1d\uad04\uad00\ub9ac\uc790 -label.sysadmins =\uc2dc\uc2a4\ud15c\uad00\ub9ac\uc790 +label.appadmins =\uc2dc\uc2a4\ud15c\uad00\ub9ac\uc790 label.author.admins =\uc791\uc131\uc790 \ucd1d\uad04\uad00\ub9ac\uc790 label.number.of.users ={0} \uc0ac\uc6a9\uc790 heading.potential.users =\uc7a0\uc7ac\uc801 \uc0ac\uc6a9\uc790 Index: lams_admin/conf/language/lams/ApplicationResources_mi_NZ.properties =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/conf/language/lams/ApplicationResources_mi_NZ.properties (.../ApplicationResources_mi_NZ.properties) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_admin/conf/language/lams/ApplicationResources_mi_NZ.properties (.../ApplicationResources_mi_NZ.properties) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -30,9 +30,9 @@ sysadmin.organisation.select =K\u014dwhiritia... sysadmin.headline =Kaiwhakahaere P\u016bnaha sysadmin.config.settings.edit =Whakatikaina Whiringahora -sysadmin.batch.temp.file.delete =Mukua ng\u0101 k\u014dnae rangitahi tawhito +appadmin.batch.temp.file.delete =Mukua ng\u0101 k\u014dnae rangitahi tawhito sysadmin.list.job =Whakar\u0101rangitia ng\u0101 mahi ki te t\u016btira Quartz -sysadmin.edit.default.tool.content =Whakatikaina Ihirangi Taputapu Taunoa +appadmin.edit.default.tool.content =Whakatikaina Ihirangi Taputapu Taunoa label.global.roles =T\u016bnga Wh\u0101nui admin.list.disabled.users =R\u0101rangi Kaimahi i Monokia sysadmin.register.server =T\u016bmau Rehitatia @@ -91,16 +91,16 @@ admin.cancel =Whakakore admin.search =Rapuhia admin.enable =Whakaaheitia -sysadmin.maintain =Tiakina a LAMS -sysadmin.maintain.loginpage =Tiakina te wh\u0101rangi takiuru +appadmin.maintain =Tiakina a LAMS +appadmin.maintain.loginpage =Tiakina te wh\u0101rangi takiuru sysadmin.serverid =Kait\u0101utu sysadmin.serverkey =Ki sysadmin.servername =Ingoa sysadmin.serverdesc =Whakaahuatanga sysadmin.prefix =Kuhimua sysadmin.organisation =R\u014dp\u016b sysadmin.login.logo =Tukuna atu he waitohu h\u014du m\u014d LAMS (ko te painga atu ko te teitei o 90 m\u0101 te wh\u0101nui o te 186): -sysadmin.login.text =Whakatikaina te k\u014drero kei raro i te waitohu i te wh\u0101rangi takiuru: +appadmin.login.text =Whakatikaina te k\u014drero kei raro i te waitohu i te wh\u0101rangi takiuru: sysadmin.job.list =R\u0101rangi Mahi cache.maintain =Tiakina te keteroki LAMS cache.title =Whakahaere Keteroki @@ -135,7 +135,7 @@ error.img.format =Ehara i te whakaahua te k\u014dnae i tukuna mai e koe. Ko te tikanga, he torongo.jpg, .gif, .png .bmp r\u0101nei t\u014d te whakaahua. error.img.size =Kua hipa atu te k\u014dnae i te rahinga m\u014drahi o te 4096k e whakaaetia ana. admin.delete =Whakakorea -error.need.sysadmin =Ko te tikanga, kia whakamanaia koe hei kaiwhakahaere p\u016bnaha ki te mahi i t\u0113nei. +error.need.appadmin =Ko te tikanga, kia whakamanaia koe hei kaiwhakahaere p\u016bnaha ki te mahi i t\u0113nei. error.roles.empty =Me tautapa e koe i te t\u016bnga kotahi i te itinga rawa. audit.organisation.change =I whakarerek\u0113tia {0} m\u014d te r\u014dp\u016b: {1} mai i te : {2} ki te: {3} audit.organisation.create =I hangaia he r\u014dp\u016b: {0} o te momo: {1} @@ -185,7 +185,7 @@ label.import =Kawe mai msg.import.conclusion =P\u0101whiria te ata \u0101whina hei p\u0101rongo atu an\u014d. label.results.per.page =Otinga o ia wharangi -sysadmin.maintain.server.edit =Whakatikaina t\u016bmau mahitahi +appadmin.maintain.server.edit =Whakatikaina t\u016bmau mahitahi msg.delete.user.2 =Me \u0101ta whai koe te whakakore t\u0113nei p\u016bkete? msg.edit.tool.content.1 =He rarangi whakahaere utauta kei tenei wharangi. admin.user.password.confirm =Whaka\u016bhia te Kupuhuna H\u014du @@ -196,7 +196,7 @@ admin.user.day_phone =Waea i te R\u0101 admin.user.evening_phone =Waea i te P\u014d role.GROUP.MANAGER =Kaiwhakahaere R\u014dp\u016b -sysadmin.maintain.external.servers =Tiaki t\u016bmau mahitahi +appadmin.maintain.external.servers =Tiaki t\u016bmau mahitahi msg.remove.from.subgroups =Ko ng\u0101 kaimahi kua tangohia ka tangohia mai ng\u0101 r\u014dp\u016b \u0101-roto hoki. msg.import.intro =Whakamahia t\u0113nei mata ki te tuku kaimahi maha mai me te ripanga Excel msg.import.1 =Kei te ripanga, k\u0101ore e taea ng\u0101 t\u012bwae kua tohungia me te (*) . @@ -219,7 +219,7 @@ msg.import.3 =Tiki t\u0101tauira ake ki te t\u0101piri kaimahi ki nga r\u014dp\u016b/r\u014dp\u016b \u0101-roto me te hoatu t\u016bnga. error.user.does.not.exist =K\u0101ore te kaimahi e ora {0} sysadmin.library.management =Whakahaere Puna Akoranga -sysadmin.library.totals =puna akoranga katoa +appadmin.library.totals =puna akoranga katoa sysadmin.library.createtim =W\u0101 hanga sysadmin.function =Mahinga msg.users.created ={0} ng\u0101 kaiwhakamahi kua hanga tikahia. @@ -250,13 +250,13 @@ msg.importv1.please.wait =Tatari koa kia whakaritea he kaiwhakamahi h\u014du, r\u014dp\u016b h\u014du r\u0101 an\u014d... msg.importv1.only.members =Kawea mai anake ng\u0101 kaiwhakamahi he mema r\u0101tou n\u014d ng\u0101 r\u014dp\u016b/wahanga ako kia kawea mai. label.login.as =Takiuru hei -sysadmin.import.groups.title =Kawe R\u014dp\u016b Mai +appadmin.import.groups.title =Kawe R\u014dp\u016b Mai heading.import.results =Kawe Otinga Mai table.heading.organisation.id =Tuakiri Whakahaere import.groups.intro =Whakamahia t\u0113nei mata hei kawe t\u014dp\u016b mai i ng\u0101 r\u014dp\u016b, r\u014dp\u016b \u0101-roto hoki m\u0101 t\u0113tehi ripanga Excel. import.groups.instructions =Ina hanga r\u014dp\u016b, me whakarite kia w\u0101tea te r\u0101rangi i runga ake. Ina hanga i t\u0113tehi r\u014dp\u016b \u0101-roto, whakauru tikatia ki raro i t\u014dna r\u014dp\u016b matua. import.groups.download =T\u012bkina atu te tauira r\u014dp\u016b ki te hanga r\u014dp\u016b, me ng\u0101 r\u014dp\u016b \u0101-roto. -sysadmin.tool.management =Whakahaere Utauta +appadmin.tool.management =Whakahaere Utauta sysadmin.ldap.configuration =Whakaritenga LDAP label.synchronise =Tukutahitia msg.num.ldap.users =E {0} ng\u0101 Kaiwhakamahi LDAP kei LAMS. Index: lams_admin/conf/language/lams/ApplicationResources_nl_BE.properties =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/conf/language/lams/ApplicationResources_nl_BE.properties (.../ApplicationResources_nl_BE.properties) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_admin/conf/language/lams/ApplicationResources_nl_BE.properties (.../ApplicationResources_nl_BE.properties) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -12,7 +12,7 @@ config.ldap.learner.map =Studentenrol-map import.groups.download =Download de groeptemplate om groepen en subgroepen te maken. msg.please.wait =Een ogenblik... -sysadmin.tool.management =Gereedschap-beheer +appadmin.tool.management =Gereedschap-beheer sysadmin.ldap.configuration =LDAP-configuratie label.synchronise =Synchrnoniseren msg.num.ldap.users =Er zijn {0} LDAP-gebruikers in LAMS. @@ -69,7 +69,7 @@ error.oldpassword.mismatch =Uw oude wachtwoord is niet goed. error.img.format =Het bestand dat u heeft geupload lijkt geen afbeelding. Een afbeelding heeft meestal de extensie .jpg, .gif, .png of .bmp. error.img.size =Het bestand is groter dan het maximum van 4096k. -error.need.sysadmin =U heeft de systeembeheer-rol nodig om dit te kunnen. +error.need.appadmin =U heeft de systeembeheer-rol nodig om dit te kunnen. error.roles.empty =U moet minimaal 1 rol toekennen. error.userid.invalid =Ongeldig userid. error.firstname.required =Voornaam is nodig. @@ -178,10 +178,10 @@ admin.enable =Mogelijk maken admin.disable =Onmogelijk maken admin.register =Dossier -sysadmin.maintain =LAMS onderhouden -sysadmin.maintain.loginpage =Inlogpagina onderhouden -sysadmin.maintain.external.servers =Geintegreerde servers onderhouden -sysadmin.maintain.server.edit =Geintegreerde servers wijzigen +appadmin.maintain =LAMS onderhouden +appadmin.maintain.loginpage =Inlogpagina onderhouden +appadmin.maintain.external.servers =Geintegreerde servers onderhouden +appadmin.maintain.server.edit =Geintegreerde servers wijzigen sysadmin.serverid =Id sysadmin.serverkey =Sleutel sysadmin.servername =Naam @@ -196,14 +196,14 @@ sysadmin.organisation.create =Nieuwe maken sysadmin.organisation.select =Kies... sysadmin.login.logo =Upload een nieuw logo. Gebruik een hoogte van 90 pixels en een breedte van 180 a 340 pixels voor het beste effect: -sysadmin.login.text =Wijzig de tekst onder het logo op de login-pagina: +appadmin.login.text =Wijzig de tekst onder het logo op de login-pagina: sysadmin.headline =Systeembeheer sysadmin.config.settings.edit =Configuratie-instellingen wijzigen -sysadmin.batch.temp.file.delete =Verwijder oude tijdelijke bestanden +appadmin.batch.temp.file.delete =Verwijder oude tijdelijke bestanden sysadmin.job.list =Taaklijst sysadmin.list.job =Toon de geplande taken in de Quartz-wachtrij sysadmin.register.server =Server registreren -sysadmin.edit.default.tool.content =Standaard gereedschap-inhoud wijzigen +appadmin.edit.default.tool.content =Standaard gereedschap-inhoud wijzigen cache.maintain =LAMS cache wijzigen cache.title =Cache-beheer cache.entries.title =Cache-nodes @@ -243,7 +243,7 @@ msg.users.created ={0} gebruikers zijn succesvol aangemaakt. error.no.sysadmin.priviledge =U heeft niet de juiste rechten om die actie uit te voeren. sysadmin.library.management =Leer Bibliotheek Beheer -sysadmin.library.totals =Aantal leerbibliotheken +appadmin.library.totals =Aantal leerbibliotheken sysadmin.library.activity.title =Titel sysadmin.library.activity.description =Omschrijving sysadmin.library.createtim =Aanmaaktijd @@ -277,7 +277,7 @@ msg.importv1.please.wait =Ogenblik geduld terwijl de nieuwe gebruikers en groepen worden aangemaakt. msg.importv1.only.members =Alleen gebruikers importeren die lid zijn van organisatie/sessie klassen die geimporteerd worden label.login.as =Inloggen als -sysadmin.import.groups.title =Groepen importeren +appadmin.import.groups.title =Groepen importeren heading.import.results =Resultaten importeren table.heading.organisation.id =Organisatie id import.groups.intro =Gebruik dit scherm om met een Excel-spreadsheet grote aantallen groepen en subgroepen te importeren. Index: lams_admin/conf/language/lams/ApplicationResources_no_NO.properties =================================================================== diff -u -raf79204a6effce72a9c276513762d4d7f7d5ae1a -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/conf/language/lams/ApplicationResources_no_NO.properties (.../ApplicationResources_no_NO.properties) (revision af79204a6effce72a9c276513762d4d7f7d5ae1a) +++ lams_admin/conf/language/lams/ApplicationResources_no_NO.properties (.../ApplicationResources_no_NO.properties) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -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.sysadmin = Du må ha systemadministrasjons rettighet for å utføre dette. +error.need.appadmin = 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 -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 +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.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 .... -sysadmin.login.text = Oppdater teksten på logg inn siden: +appadmin.login.text = Oppdater teksten på logg inn siden: sysadmin.headline = System administrasjon sysadmin.config.settings.edit = Endre konfigurasjons oppsett -sysadmin.batch.temp.file.delete = Slett gamle midlertidige filer +appadmin.batch.temp.file.delete = Slett gamle midlertidige filer sysadmin.job.list = Oppgave oversikt sysadmin.list.job = List planlagte jobber i Quartz kø -sysadmin.edit.default.tool.content = Rediger standard verktøy innhold +appadmin.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 -sysadmin.library.totals = totalt antall lærings bibliotek +appadmin.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 -sysadmin.import.groups.title = Importer kurs +appadmin.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 -sysadmin.tool.management = Verktøy administrasjon +appadmin.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. @@ -280,7 +280,7 @@ label.monitors = Forelesere label.authors = Forfattere label.group.managers = Kurs ledere -label.sysadmins = Systemadministrasjon +label.appadmins = Systemadministrasjon label.author.admins = Forfatter administrator heading.users = Brukere label.number.of.users = {0} brukere. @@ -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 -sysadmin.batch.preview.lesson.delete = Slett gamle forhåndsviste leksjoner +appadmin.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} -sysadmin.maintain.session = Innloggede brukere -sysadmin.maintain.session.login = Login -sysadmin.maintain.session.id = Sesjons ID +appadmin.maintain.session = Innloggede brukere +appadmin.maintain.session.login = Login +appadmin.maintain.session.id = Sesjons ID error.portrait.removal.failed = Kan ikke slette portrett. Se fil med for detaljer. label.delete.portrait = Fjern bildet -sysadmin.maintain.session.delete = Slett +appadmin.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 -sysadmin.maintain.session.name = Navn +appadmin.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 -sysadmin.maintain.session.count = innloggede brukere +appadmin.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 -sysadmin.maintain.session.access = Siste tilgang -sysadmin.maintain.session.created = Startet den: +appadmin.maintain.session.access = Siste tilgang +appadmin.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/conf/language/lams/ApplicationResources_pl_PL.properties =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/conf/language/lams/ApplicationResources_pl_PL.properties (.../ApplicationResources_pl_PL.properties) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_admin/conf/language/lams/ApplicationResources_pl_PL.properties (.../ApplicationResources_pl_PL.properties) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -69,10 +69,10 @@ admin.enable =W\u0142\u0105cz admin.disable =Wy\u0142\u0105cz admin.register =Rejestracja -sysadmin.maintain =Edycja LAMS -sysadmin.maintain.loginpage =Edycja strony logowania -sysadmin.maintain.external.servers =Edycja serwer\u00f3w -sysadmin.maintain.server.edit =Edycja serwera +appadmin.maintain =Edycja LAMS +appadmin.maintain.loginpage =Edycja strony logowania +appadmin.maintain.external.servers =Edycja serwer\u00f3w +appadmin.maintain.server.edit =Edycja serwera sysadmin.serverid =Id sysadmin.serverkey =Klucz sysadmin.servername =Nazwa @@ -86,14 +86,14 @@ sysadmin.server.add =Dodaj nowy serwer sysadmin.organisation.create =Utw\u00f3rz sysadmin.organisation.select =Wybierz... -sysadmin.login.text =Uaktualnij tekst na stronie logowania +appadmin.login.text =Uaktualnij tekst na stronie logowania sysadmin.headline =Administrator systemu sysadmin.config.settings.edit =Edycja ustawie\u0144 -sysadmin.batch.temp.file.delete =Usu\u0144 tymczasowe pliki +appadmin.batch.temp.file.delete =Usu\u0144 tymczasowe pliki sysadmin.job.list =Lista zada\u0144 sysadmin.list.job = List scheduled jobs in Quartz queue sysadmin.register.server =Rejestruj serwer -sysadmin.edit.default.tool.content =Edycja ustawie\u0144 narz\u0119dzia zawarto\u015bci +appadmin.edit.default.tool.content =Edycja ustawie\u0144 narz\u0119dzia zawarto\u015bci cache.maintain =Zarz\u0105dzaj cache'm systemu LAMS cache.title =Zarz\u0105dzanie cache'm cache.entries.title =Cache Nodes @@ -177,7 +177,7 @@ error.img.format =Za\u0142adowany plik nie jest obrazem, rozszerzenia dla obraz\u00f3w to:has .jpg, .gif, .png lub .bmp error.img.size =Zbyt du\u017cy rozmiar pliku. Maks: 4096k admin.delete =Usu\u0144 -error.need.sysadmin =Musisz mie\u0107 uprawnienia/rol\u0119 administratora systemu \u017ceby wykona\u0107 t\u0105 operacj\u0119 +error.need.appadmin =Musisz mie\u0107 uprawnienia/rol\u0119 administratora systemu \u017ceby wykona\u0107 t\u0105 operacj\u0119 error.roles.empty =Muszisz przypisa\u0107 przynajmniej jedn\u0105 rol\u0119 audit.organisation.change =Zmieniono: {0} dla organizacji: {1} z: {2} na: {3} audit.organisation.create =Utworzono organizacj\u0119: {0} o typie: {1} @@ -201,7 +201,7 @@ heading.import.results =Wyniki operacji importu import.groups.download =Pobierz szablon, aby tworzy\u0107 grupy i podgrupy. msg.tool.management =Zarz\u0105dzanie narz\u0119dziami -sysadmin.tool.management =Zarz\u0105dzanie narz\u0119dziami +appadmin.tool.management =Zarz\u0105dzanie narz\u0119dziami msg.importv1.2 =W linii komend bazy danych serwera LAMS 1 uruchom nast\u0119puj\u0105c\u0105 komend\u0119 msg.importv1.3a =Wy\u015blij heading.importv1.users =U\u017cytkownicy @@ -217,7 +217,7 @@ msg.done =... wykonano sysadmin.library.activity.description =Opis config.custom.tab.title =Tytu\u0142 -sysadmin.import.groups.title =Import grup +appadmin.import.groups.title =Import grup admin.organisation =Grupa/Podgrupa admin.number =Nr admin.register.server.stats.total.users =Ca\u0142kowita liczba # u\u017cytkownik\u00f3w @@ -236,7 +236,7 @@ label.continue =Dalej msg.importv1.found.users =Znaleziono {0} u\u017cytkownik\u00f3w LAMS 1 msg.importv1.created =Utworzono {0} u\u017cytkownik\u00f3w i {1} grup -sysadmin.library.totals =Liczba bibliotek nauczania +appadmin.library.totals =Liczba bibliotek nauczania sysadmin.library.activity.title =Tytu\u0142 msg.cleanup.files.deleted =Usuni\u0119to {0} plik\u00f3w msg.cleanup.warning =Ostrze\u017cenie: Obliczenie wielko\u015bci tymczasowych plik\u00f3w na serwerze mo\u017ce prowadzi\u0107 do b\u0142\u0119d\u00f3w je\u017celi nie usuwano tymczasowych plik\u00f3w przez d\u0142u\u017cszy czas @@ -286,7 +286,7 @@ config.ldap.only.one.org =Tylko jedna grupa config.header.system =Konfiguracja systemu label.group.admins =Grupa administrator\u00f3w -label.sysadmins =Administratorzy systemu +label.appadmins =Administratorzy systemu label.monitors =Monitors error.numeric ={0} tylko znaki numeryczne label.learners =Studenci Index: lams_admin/conf/language/lams/ApplicationResources_pt_BR.properties =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/conf/language/lams/ApplicationResources_pt_BR.properties (.../ApplicationResources_pt_BR.properties) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_admin/conf/language/lams/ApplicationResources_pt_BR.properties (.../ApplicationResources_pt_BR.properties) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -32,7 +32,7 @@ error.oldpassword.mismatch =Sua senha antiga n\u00e3o est\u00e1 correta. error.img.format =O arquivo que voc\u00ea est\u00e1 carregando aparenta n\u00e3o ser uma imagem. Arquivos de imagem usualmente possuem extens\u00e3o .jpg, .gif, .png ou .bmp. error.img.size =O tamanho do arquivo excedeu o limite m\u00e1ximo de 4096k. -error.need.sysadmin =Voc\u00ea precisa ter direitos de administrador para fazer isto. +error.need.appadmin =Voc\u00ea precisa ter direitos de administrador para fazer isto. error.roles.empty =Voc\u00ea precisa atribuir pelo menos uma regra. error.userid.invalid =Id de usu\u00e1rio inv\u00e1lido. error.firstname.required =Primeiro nome \u00e9 obrigat\u00f3rio. @@ -142,10 +142,10 @@ admin.enable =Habilitar admin.disable =Desabilitar admin.register =Registrar -sysadmin.maintain =Manute\u00e7\u00e3o LAMS -sysadmin.maintain.loginpage =Manuten\u00e7\u00e3o da p\u00e1gina de login -sysadmin.maintain.external.servers =Manute\u00e7\u00e3o dos servidores integrados -sysadmin.maintain.server.edit =Editar servidores integrados +appadmin.maintain =Manute\u00e7\u00e3o LAMS +appadmin.maintain.loginpage =Manuten\u00e7\u00e3o da p\u00e1gina de login +appadmin.maintain.external.servers =Manute\u00e7\u00e3o dos servidores integrados +appadmin.maintain.server.edit =Editar servidores integrados sysadmin.serverid =Id sysadmin.serverkey =Chave sysadmin.servername =Nome @@ -160,14 +160,14 @@ sysadmin.organisation.create =Criar novo sysadmin.organisation.select =Por favor, selecionar... sysadmin.login.logo =Carregue o novo logotipo para o LAMS (melhor efeito com 90 Pixeis de altura e 186 de largura) -sysadmin.login.text =Carregue o texto abaixo do logo na p\u00e1gina de login +appadmin.login.text =Carregue o texto abaixo do logo na p\u00e1gina de login sysadmin.headline =Administra\u00e7\u00e3o do Sistema sysadmin.config.settings.edit =editar configura\u00e7\u00f5es -sysadmin.batch.temp.file.delete =Apagar arquivos tempor\u00e1rios antigos +appadmin.batch.temp.file.delete =Apagar arquivos tempor\u00e1rios antigos sysadmin.job.list =Lista de Trabalhos sysadmin.list.job =Trabalhos agendados na fila Quartz sysadmin.register.server =Registrar servidor -sysadmin.edit.default.tool.content =edite o conte\u00fado padr\u00e3o da ferramenta +appadmin.edit.default.tool.content =edite o conte\u00fado padr\u00e3o da ferramenta cache.maintain =Manuten\u00e7\u00e3o do LAMS Cache cache.title =Gerenciamento do Cache cache.entries.title =N\u00f3s do cache @@ -207,7 +207,7 @@ msg.users.created ={0} usu\u00e1rios criados com sucesso. error.no.sysadmin.priviledge =Voc\u00ea n\u00e3o tem direitos para executar esta a\u00e7\u00e3o. sysadmin.library.management =gerenciamento de bibliotecas de aprendizado. -sysadmin.library.totals =Total de bibliotecas de aprendizado +appadmin.library.totals =Total de bibliotecas de aprendizado sysadmin.library.activity.title =T\u00edtulo sysadmin.library.activity.description =descri\u00e7\u00e3o sysadmin.library.createtim =hor\u00e1rio de cria\u00e7\u00e3o @@ -241,7 +241,7 @@ msg.importv1.please.wait =Por favor aguarde enquanto a cria\u00e7\u00e3o de novos usu\u00e1rios e cursos de ... msg.importv1.only.members =Apenas os usu\u00e1rios de importa\u00e7\u00e3o que s\u00e3o membros de organiza\u00e7\u00f5es / aulas de sess\u00e3o a ser importado label.login.as =Logar como -sysadmin.import.groups.title =Importar Grupos +appadmin.import.groups.title =Importar Grupos heading.import.results =Importar Resultados table.heading.organisation.id =Organiza\u00e7\u00e3o ID import.groups.intro =Usar essa tela para cursos de importa\u00e7\u00e3o em massa e subcourses usando uma planilha do Excel. @@ -256,7 +256,7 @@ heading.ldap.synchronise =Sincronizar com LDAP msg.done =...feito! msg.tool.management =Gerenciamento de ferramentas -sysadmin.tool.management =Gerenciamento de ferramentas +appadmin.tool.management =Gerenciamento de ferramentas msg.ldap.synchronise.wait =Por favor aguarde enquanto a sincroniza\u00e7\u00e3o completa ... msg.ldap.synchronise.errors =Os seguintes erros foram encontrados: msg.num.search.results.users =Servidor LDAP retornou {0} usu\u00e1rios. @@ -337,7 +337,7 @@ label.authors =Autores label.group.managers =Gestores do curso label.group.admins =Administradores do Curso -label.sysadmins =administradores de sistemas +label.appadmins =administradores de sistemas label.author.admins =Autor Administradores heading.users =Usu\u00e1rios label.number.of.users ={0} usu\u00e1rios. Index: lams_admin/conf/language/lams/ApplicationResources_sv_SE.properties =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/conf/language/lams/ApplicationResources_sv_SE.properties (.../ApplicationResources_sv_SE.properties) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_admin/conf/language/lams/ApplicationResources_sv_SE.properties (.../ApplicationResources_sv_SE.properties) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -34,7 +34,7 @@ error.oldpassword.mismatch =Ditt gamla l\u00f6senord \u00e4r inte korrekt. error.img.format =Den fil som du laddade upp ser inte ut att vara en bild. En bild har normalt sett ett filnamnstill\u00e4gg som t.ex. .jpg, .gif, .png, eller .bmp. error.img.size =Filen \u00e4r st\u00f6rre \u00e4n maximalt till\u00e5tna 4096kb. -error.need.sysadmin =Du m\u00e5ste ha r\u00e4ttigheter som systemadministrat\u00f6r f\u00f6r att f\u00e5 g\u00f6ra detta. +error.need.appadmin =Du m\u00e5ste ha r\u00e4ttigheter som systemadministrat\u00f6r f\u00f6r att f\u00e5 g\u00f6ra detta. error.roles.empty =Du m\u00e5ste tilldela minst en roll. error.userid.invalid =Ogiltigt anv\u00e4ndarID error.firstname.required =F\u00f6rnamn \u00e4r obligatoriskt. @@ -144,10 +144,10 @@ admin.enable =Aktivera admin.disable =Avaktivera admin.register =Registrera -sysadmin.maintain =Underh\u00e5ll av LAMS -sysadmin.maintain.loginpage =Underh\u00e5ll av sida f\u00f6r inloggning -sysadmin.maintain.external.servers =Underh\u00e5ll av integrerade servrar -sysadmin.maintain.server.edit =Redigera integrerad server +appadmin.maintain =Underh\u00e5ll av LAMS +appadmin.maintain.loginpage =Underh\u00e5ll av sida f\u00f6r inloggning +appadmin.maintain.external.servers =Underh\u00e5ll av integrerade servrar +appadmin.maintain.server.edit =Redigera integrerad server sysadmin.serverid =Id sysadmin.serverkey =Nyckel sysadmin.servername =Namn @@ -162,14 +162,14 @@ sysadmin.organisation.create =Skapa en ny sysadmin.organisation.select =Var sn\u00e4ll och v\u00e4lj... sysadmin.login.logo =Ladda upp en ny logotype f\u00f6r LAMS (h\u00f6jd 90 och bredd 186 f\u00f6r b\u00e4sta resultat): -sysadmin.login.text =Uppdatera texten under logotypen p\u00e5 sidan f\u00f6r inloggning: +appadmin.login.text =Uppdatera texten under logotypen p\u00e5 sidan f\u00f6r inloggning: sysadmin.headline =Systemadministration sysadmin.config.settings.edit =Redigera inst\u00e4llningar f\u00f6r konfiguration -sysadmin.batch.temp.file.delete =Ta bort tillf\u00e4lliga filer. +appadmin.batch.temp.file.delete =Ta bort tillf\u00e4lliga filer. sysadmin.job.list ='Att g\u00f6ra'-lista sysadmin.list.job =Lista schemalagda jobb i en Quartz-k\u00f6. sysadmin.register.server =Registrera server -sysadmin.edit.default.tool.content =Redigera det standardm\u00e4ssiga inneh\u00e5llet i verktyget. +appadmin.edit.default.tool.content =Redigera det standardm\u00e4ssiga inneh\u00e5llet i verktyget. cache.maintain =Underh\u00e5ll av LAMS cache cache.title =Administration av cache. cache.entries.title =Noder f\u00f6r cache @@ -209,7 +209,7 @@ msg.users.created ={0} anv\u00e4ndare skapades framg\u00e5ngsrikt. error.no.sysadmin.priviledge =Du har inte r\u00e4tt att genomf\u00f6ra den h\u00e4r \u00e5tg\u00e4rden. sysadmin.library.management =Administration av l\u00e4robibliotek -sysadmin.library.totals =totalt {0} l\u00e4robibliotek +appadmin.library.totals =totalt {0} l\u00e4robibliotek sysadmin.library.activity.title =Titel sysadmin.library.activity.description =Beskrivning sysadmin.library.createtim =Skapa tid Index: lams_admin/conf/language/lams/ApplicationResources_tr_TR.properties =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/conf/language/lams/ApplicationResources_tr_TR.properties (.../ApplicationResources_tr_TR.properties) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_admin/conf/language/lams/ApplicationResources_tr_TR.properties (.../ApplicationResources_tr_TR.properties) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -86,7 +86,7 @@ error.login.unique =Kullan\u0131c\u0131 ad\u0131 kullan\u0131l\u0131yor. {0} error.img.format =Y\u00fckledi\u011finiz dosya resim dosyas\u0131 de\u011fil. Jpg, gif, png veya bmp format\u0131nda y\u00fckleyiniz. error.img.size =Dosya boyutu 4096k'dan b\u00fcy\u00fck. -error.need.sysadmin =Bunu yapmak i\u00e7in sistem y\u00f6neticisi olmal\u0131s\u0131n\u0131z +error.need.appadmin =Bunu yapmak i\u00e7in sistem y\u00f6neticisi olmal\u0131s\u0131n\u0131z error.roles.empty =En az bir rol atamal\u0131s\u0131n\u0131z error.userid.invalid =Ge\u00e7ersiz kullan\u0131c\u0131 kimli\u011fi error.email.required =E-posta adresi gerekli @@ -148,9 +148,9 @@ admin.enable =Etkinle\u015ftir admin.disable =Engelle admin.register =Kay\u0131t -sysadmin.maintain.loginpage =Giri\u015f sayfas\u0131n\u0131 koru -sysadmin.maintain.external.servers =Entegre sunucular\u0131 koru -sysadmin.maintain.server.edit =Entegre sunucular\u0131 d\u00fczenle +appadmin.maintain.loginpage =Giri\u015f sayfas\u0131n\u0131 koru +appadmin.maintain.external.servers =Entegre sunucular\u0131 koru +appadmin.maintain.server.edit =Entegre sunucular\u0131 d\u00fczenle sysadmin.serverid =Kimlik sysadmin.serverkey =Anahtar sysadmin.servername =Ad @@ -162,7 +162,7 @@ sysadmin.job.list =\u0130\u015f listesi sysadmin.register.server =Sunucu kay\u0131t admin.course.add =Yeni Grup Olu\u015ftur -label.sysadmins =Sistem y\u00f6netim +label.appadmins =Sistem y\u00f6netim heading.users =Kullan\u0131c\u0131lar label.number.of.users ={0} kullan\u0131c\u0131 heading.potential.users =Potansiyel kullan\u0131c\u0131 @@ -174,11 +174,11 @@ audit.user.create ={0} olu\u015fturuldu, {1} olarak adland\u0131r\u0131ld\u0131 audit.spreadsheet.error =Hesap tablosu {0}. sat\u0131r\u0131nda hata: {1} sysadmin.integrated.servers =Toplam entegre sunucular -sysadmin.login.text =Giri\u015f sayfas\u0131ndaki metnin alt\u0131ndaki logoyu g\u00fcncelle +appadmin.login.text =Giri\u015f sayfas\u0131ndaki metnin alt\u0131ndaki logoyu g\u00fcncelle sysadmin.headline =Sistem y\u00f6netimi sysadmin.config.settings.edit =Yap\u0131land\u0131rma ayarlar\u0131n\u0131 d\u00fczenle -sysadmin.batch.temp.file.delete =Eski ge\u00e7ici dosyalar\u0131 sil -sysadmin.edit.default.tool.content =Varsay\u0131lan Ara\u00e7 i\u00e7eri\u011fini d\u00fczenle +appadmin.batch.temp.file.delete =Eski ge\u00e7ici dosyalar\u0131 sil +appadmin.edit.default.tool.content =Varsay\u0131lan Ara\u00e7 i\u00e7eri\u011fini d\u00fczenle cache.maintain =LAMS belle\u011fini koru cache.title =Bellek y\u00f6netimi cache.entries.title =Bellek nodes @@ -208,13 +208,13 @@ label.exported.learning.designs =d\u0131\u015fa aktar\u0131lan \u00f6\u011frenme tasar\u0131mlar\u0131 label.unknown =bilinmeyen label.login.as =Giri\u015f -sysadmin.import.groups.title =Grup i\u00e7e aktar +appadmin.import.groups.title =Grup i\u00e7e aktar heading.import.results =Sonu\u00e7lar\u0131 al table.heading.organisation.id =Organizasyon kimli\u011fi msg.tool.management =Ara\u00e7 y\u00f6netimi -sysadmin.tool.management =Ara\u00e7 y\u00f6netimi +appadmin.tool.management =Ara\u00e7 y\u00f6netimi admin.error =Oops! -sysadmin.maintain =LAMS'i koru +appadmin.maintain =LAMS'i koru sysadmin.userinfoUrl =Kullan\u0131c\u0131 bilgi URL sysadmin.timeoutUrl =Zaman a\u015f\u0131m\u0131 URL admin.register.heading.title =Sunucuyu LAMS toplulu\u011funa kaydet @@ -230,7 +230,7 @@ msg.users.created ={0} kulan\u0131c\u0131s\u0131 ba\u015far\u0131yla olu\u015fturuldu. error.no.sysadmin.priviledge =Bu eylemi yapmak i\u00e7in yetkiniz yok. sysadmin.library.management =\u00d6\u011frenme k\u00fct\u00fcphanesi y\u00f6netimi -sysadmin.library.totals =Toplam \u00f6\u011frenme k\u00fct\u00fcphanesi +appadmin.library.totals =Toplam \u00f6\u011frenme k\u00fct\u00fcphanesi admin.importv1.title =LAMS kullanc\u0131s\u0131 al msg.importv1.3b =A\u015fa\u011f\u0131daki formu kullan heading.importv1.account.organisations =Organizasyon hesaplar\u0131 Index: lams_admin/conf/language/lams/ApplicationResources_vi_VN.properties =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/conf/language/lams/ApplicationResources_vi_VN.properties (.../ApplicationResources_vi_VN.properties) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_admin/conf/language/lams/ApplicationResources_vi_VN.properties (.../ApplicationResources_vi_VN.properties) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -34,7 +34,7 @@ error.oldpassword.mismatch =M\u1eadt kh\u1ea9u c\u0169 c\u1ee7a b\u1ea1n kh\u00f4ng \u0111\u00fang. error.img.format =T\u1ec7p tin b\u1ea3i t\u1ea3i l\u00ean kh\u00f4ng ph\u1ea3i l\u00e0 m\u1ed9t h\u00ecnh \u1ea3nh. M\u1ed9t t\u1ec7p h\u00ecnh \u1ea3nh th\u01b0\u1eddng c\u00f3 \u0111u\u00f4i .jpg, .gif, .png ho\u1eb7c .bmp. error.img.size =T\u1ec7p tin v\u01b0\u1ee3t qu\u00e1 gi\u1edbi h\u1ea1n t\u1ed1i \u0111a 4096k. -error.need.sysadmin =B\u1ea1n c\u1ea7n c\u00f3 quy\u1ec3n qu\u1ea3n l\u00fd h\u1ec7 th\u1ed1ng \u0111\u1ec3 l\u00e0m \u0111i\u1ec1u n\u00e0y. +error.need.appadmin =B\u1ea1n c\u1ea7n c\u00f3 quy\u1ec3n qu\u1ea3n l\u00fd h\u1ec7 th\u1ed1ng \u0111\u1ec3 l\u00e0m \u0111i\u1ec1u n\u00e0y. error.roles.empty =B\u1ea1n ph\u1ea3i ch\u1ec9 \u0111\u1ecbnh \u00edt nh\u1ea5t m\u1ed9t vai tr\u00f2. error.userid.invalid =ID ng\u01b0\u1eddi d\u00f9ng kh\u00f4ng h\u1ee3p l\u1ec7 error.firstname.required =Y\u00eau c\u1ea7u t\u00ean @@ -144,10 +144,10 @@ admin.enable =C\u00f3 th\u1ec3 admin.disable =Kh\u00f4ng th\u1ec3 admin.register =\u0110\u0103ng k\u00ed -sysadmin.maintain =Qu\u1ea3n tr\u1ecb LAMS -sysadmin.maintain.loginpage =Trang \u0111\u0103ng nh\u1eadp Qu\u1ea3n tr\u1ecb -sysadmin.maintain.external.servers =Duy tr\u00ec t\u00edch h\u1ee3p c\u00e1c server -sysadmin.maintain.server.edit =S\u1eeda server t\u1ed5ng th\u1ec3 +appadmin.maintain =Qu\u1ea3n tr\u1ecb LAMS +appadmin.maintain.loginpage =Trang \u0111\u0103ng nh\u1eadp Qu\u1ea3n tr\u1ecb +appadmin.maintain.external.servers =Duy tr\u00ec t\u00edch h\u1ee3p c\u00e1c server +appadmin.maintain.server.edit =S\u1eeda server t\u1ed5ng th\u1ec3 sysadmin.serverid =ID sysadmin.serverkey =Ch\u00eca kho\u00e1 sysadmin.servername =T\u00ean @@ -162,14 +162,14 @@ sysadmin.organisation.create =T\u1ea1o m\u1edbi sysadmin.organisation.select =Xin h\u00e3y ch\u1ecdn sysadmin.login.logo =T\u1ea3i Logo m\u1edbi c\u1ee7a LAMS (cao 90 v\u00e0 r\u00f4ng 186 l\u00e0 t\u1ed1t nh\u1ea5t) -sysadmin.login.text =C\u1eadp nh\u1eadt v\u0103n b\u1ea3n d\u01b0\u1edbi logo trong trang \u0111\u0103ng nh\u1eadp +appadmin.login.text =C\u1eadp nh\u1eadt v\u0103n b\u1ea3n d\u01b0\u1edbi logo trong trang \u0111\u0103ng nh\u1eadp sysadmin.headline =Qu\u1ea3n tr\u1ecb h\u1ec7 th\u1ed1ng sysadmin.config.settings.edit =S\u1eeda ch\u1eefa nh\u1eefng c\u00e0i \u0111\u1eb7t c\u1ea5u h\u00ecnh -sysadmin.batch.temp.file.delete =Xo\u00e1 nh\u1eefng t\u1ec7p tin l\u01b0u t\u1ea1m th\u1eddi c\u0169 +appadmin.batch.temp.file.delete =Xo\u00e1 nh\u1eefng t\u1ec7p tin l\u01b0u t\u1ea1m th\u1eddi c\u0169 sysadmin.job.list =Danh s\u00e1ch vi\u1ec7c sysadmin.list.job =Danh s\u00e1ch k\u1ebf ho\u1ea1ch c\u00f4ng vi\u1ec7c sysadmin.register.server =\u0110\u0103ng k\u00ed m\u00e1y ch\u1ee7 -sysadmin.edit.default.tool.content =S\u1eeda n\u1ed9i dung c\u00f4ng c\u1ee5 m\u1eb7c \u0111\u1ecbnh +appadmin.edit.default.tool.content =S\u1eeda n\u1ed9i dung c\u00f4ng c\u1ee5 m\u1eb7c \u0111\u1ecbnh cache.maintain =Duy tr\u00ec l\u01b0u tr\u1eef LAMS cache.title =Qu\u1ea3n l\u00fd l\u01b0u gi\u1eef cache.entries.title =\u0110i\u1ec3m l\u01b0u tr\u1eef @@ -209,7 +209,7 @@ msg.users.created ={0} Ng\u01b0\u1eddi d\u00f9ng \u0111\u01b0\u1ee3c kh\u1edfi t\u1ea1o th\u00e0nh c\u00f4ng error.no.sysadmin.priviledge =B\u1ea1n kh\u00f4ng c\u00f3 \u0111\u1eadc quy\u1ec1n \u0111\u1ec3 th\u1ef1c thi thao t\u00e1c n\u00e0y sysadmin.library.management =Qu\u1ea3n l\u00fd th\u01b0 vi\u1ec7n h\u1ecdc t\u1eadp -sysadmin.library.totals =T\u1ed5ng s\u1ed1 th\u01b0 vi\u1ec7n h\u1ecdc t\u1eadp +appadmin.library.totals =T\u1ed5ng s\u1ed1 th\u01b0 vi\u1ec7n h\u1ecdc t\u1eadp sysadmin.library.activity.title =Ti\u00eau \u0111\u1ec1 sysadmin.library.activity.description =Mi\u00eau t\u1ea3 sysadmin.library.createtim =Th\u1eddi gian l\u00e0m Index: lams_admin/conf/language/lams/ApplicationResources_zh_CN.properties =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/conf/language/lams/ApplicationResources_zh_CN.properties (.../ApplicationResources_zh_CN.properties) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_admin/conf/language/lams/ApplicationResources_zh_CN.properties (.../ApplicationResources_zh_CN.properties) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -32,7 +32,7 @@ error.oldpassword.mismatch =\u60a8\u7684\u65e7\u5bc6\u7801\u4e0d\u6b63\u786e\u3002 error.img.format =\u60a8\u4e0a\u4f20\u7684\u6587\u4ef6\u4e0d\u662f\u4e00\u4e2a\u56fe\u7247\u6587\u4ef6 error.img.size =\u6587\u4ef6\u8d85\u8fc7\u4e86\u6700\u5927\u503c(4096k). -error.need.sysadmin =\u7cfb\u7edf\u7ba1\u7406\u5458\u624d\u80fd\u5b8c\u6210\u6b64\u9879\u64cd\u4f5c\u3002 +error.need.appadmin =\u7cfb\u7edf\u7ba1\u7406\u5458\u624d\u80fd\u5b8c\u6210\u6b64\u9879\u64cd\u4f5c\u3002 error.roles.empty =\u60a8\u81f3\u5c11\u8981\u9009\u62e9\u4e00\u4e2a\u89d2\u8272\u3002 error.userid.invalid =\u65e0\u6548\u7684\u7528\u6237 error.firstname.required =\u8bf7\u8f93\u5165\u540d. @@ -142,10 +142,10 @@ admin.enable =\u4f7f\u80fd\u591f admin.disable =\u4f7f\u4e0d\u80fd admin.register =\u6ce8\u518c -sysadmin.maintain =\u7ef4\u62a4 LAMS -sysadmin.maintain.loginpage =\u767b\u5f55\u9996\u9875\u7ef4\u62a4 -sysadmin.maintain.external.servers =\u96c6\u6210\u670d\u52a1\u5668\u7ef4\u62a4 -sysadmin.maintain.server.edit =\u7f16\u8f91\u96c6\u6210\u670d\u52a1\u5668 +appadmin.maintain =\u7ef4\u62a4 LAMS +appadmin.maintain.loginpage =\u767b\u5f55\u9996\u9875\u7ef4\u62a4 +appadmin.maintain.external.servers =\u96c6\u6210\u670d\u52a1\u5668\u7ef4\u62a4 +appadmin.maintain.server.edit =\u7f16\u8f91\u96c6\u6210\u670d\u52a1\u5668 sysadmin.serverid =\u7f16\u53f7 sysadmin.serverkey =\u952e sysadmin.servername =\u540d\u79f0 @@ -160,14 +160,14 @@ sysadmin.organisation.create =\u521b\u5efa\u4e00\u4e2a\u65b0\u7684 sysadmin.organisation.select =\u8bf7\u9009\u62e9... sysadmin.login.logo =\u4e0a\u4f20\u4e00\u4e2a\u65b0\u56fe\u6807\u3002\u957f\u4e3a90\u50cf\u7d20\uff0c\u5bbd\u5728180\u81f3340\u50cf\u7d20\u4e4b\u95f4\u4e3a\u4f73\u3002 -sysadmin.login.text =\u66f4\u65b0\u767b\u5f55\u9875\u9762\u4e0a\u56fe\u6807\u4e0b\u9762\u7684\u6587\u5b57\u3002 +appadmin.login.text =\u66f4\u65b0\u767b\u5f55\u9875\u9762\u4e0a\u56fe\u6807\u4e0b\u9762\u7684\u6587\u5b57\u3002 sysadmin.headline =\u7cfb\u7edf\u7ba1\u7406 sysadmin.config.settings.edit =\u7cfb\u7edf\u4e3b\u8981\u914d\u7f6e\u9879 -sysadmin.batch.temp.file.delete =\u5220\u9664\u65e7\u7684\u4e34\u65f6\u6587\u4ef6 +appadmin.batch.temp.file.delete =\u5220\u9664\u65e7\u7684\u4e34\u65f6\u6587\u4ef6 sysadmin.job.list =\u5de5\u4f5c\u5217\u8868 sysadmin.list.job =\u5217\u51fa\u5b89\u6392\u597d\u7684\u5de5\u4f5c sysadmin.register.server =\u670d\u52a1\u5668\u6ce8\u518c\u4fe1\u606f -sysadmin.edit.default.tool.content =\u7cfb\u7edf\u9ed8\u8ba4\u5de5\u5177 +appadmin.edit.default.tool.content =\u7cfb\u7edf\u9ed8\u8ba4\u5de5\u5177 cache.maintain =\u7ef4\u62a4 LAMS \u7f13\u5b58 cache.title =\u5185\u5b58\u7ba1\u7406 cache.entries.title =\u7f13\u5b58\u8282\u70b9 @@ -207,7 +207,7 @@ msg.users.created ={0} \u7528\u6237\u521b\u5efa\u6210\u529f\u3002 error.no.sysadmin.priviledge =\u60a8\u6ca1\u6709\u6240\u9700\u7684\u6743\u9650\u6765\u6267\u884c\u672c\u64cd\u4f5c\u3002 sysadmin.library.management =\u5b66\u4e60\u5e93\u7ba1\u7406 -sysadmin.library.totals =\u603b\u5171\u7684\u5b66\u4e60\u5e93 +appadmin.library.totals =\u603b\u5171\u7684\u5b66\u4e60\u5e93 sysadmin.library.activity.title =\u6807\u9898 sysadmin.library.activity.description =\u63cf\u8ff0 sysadmin.library.createtim =\u521b\u5efa\u65f6\u95f4 @@ -242,14 +242,14 @@ msg.importv1.only.members =\u4ec5\u4ec5\u7ec4\u7ec7\u6216\u8bfe\u7a0b\u7684\u6210\u5458\u5c06\u4f1a\u88ab\u5bfc\u5165 label.login.as =\u767b\u5f55\u4e3a msg.tool.management =\u5de5\u5177\u7ba1\u7406 -sysadmin.import.groups.title =\u5bfc\u5165\u7ec4 +appadmin.import.groups.title =\u5bfc\u5165\u7ec4 heading.import.results =\u5bfc\u5165\u7ed3\u679c table.heading.organisation.id =\u7ec4\u7ec7\u7f16\u53f7 import.groups.intro =\u4f7f\u7528Excel\u8868\u683c\u6210\u6279\u5bfc\u5165\u7ec4\u548c\u5b50\u7ec4\u3002 import.groups.instructions =\u5f53\u521b\u5efa\u4e00\u4e2a\u7ec4\u65f6\uff0c\u8bf7\u786e\u4fe1\u884c\u7684\u4e0a\u9762\u662f\u7a7a\u7684\u3002\u5f53\u521b\u5efa\u4e00\u4e2a\u5b50\u7ec4\u65f6\uff0c\u76f4\u63a5\u5c06\u5b83\u653e\u5230\u5176\u6bcd\u7ec4\u4e2d\u3002 import.groups.download =\u4e0b\u8f7d\u7ec4\u6a21\u677f\u6765\u521b\u5efa\u7ec4\u548c\u5b50\u7ec4\u3002 msg.please.wait =\u8bf7\u7b49\u5f85... -sysadmin.tool.management =\u5de5\u5177\u7ba1\u7406 +appadmin.tool.management =\u5de5\u5177\u7ba1\u7406 sysadmin.ldap.configuration =LDAP\u914d\u7f6e label.synchronise =\u540c\u6b65 msg.num.ldap.users =LAMS\u4e2d\u6709{0}\u4e2aLDAP\u7528\u6237\u3002 @@ -279,7 +279,7 @@ label.authors =\u521b\u4f5c\u8005 label.group.managers =\u7ec4\u7ba1\u7406\u8005 label.group.admins =\u7ec4\u7ba1\u7406\u5458 -label.sysadmins =\u7cfb\u7edf\u7ba1\u7406\u5458 +label.appadmins =\u7cfb\u7edf\u7ba1\u7406\u5458 label.author.admins =\u8bfe\u7a0b\u7ba1\u7406\u5458 label.number.of.users ={0}\u4e2a\u7528\u6237 heading.potential.users =\u6f5c\u5728\u7684\u7528\u6237 Index: lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java =================================================================== diff -u -r26a83b93c1ce8fa610895f50b57d44d6b7cc11db -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java (.../ImportService.java) (revision 26a83b93c1ce8fa610895f50b57d44d6b7cc11db) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java (.../ImportService.java) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -379,7 +379,7 @@ continue; } else { try { - saveUserRoles(isSysadmin(sessionId), login, orgId, roles, row); + saveUserRoles(isAppadmin(sessionId), login, orgId, roles, row); successful++; } catch (Exception e) { ImportService.log.error("Unable to assign roles to user: " + login, e); @@ -412,16 +412,16 @@ } // used when importing in a separate thread that doesn't have the user's DTO in session - private boolean isSysadmin(String sessionId) { + private boolean isAppadmin(String sessionId) { UserDTO userDTO = (UserDTO) SessionManager.getSession(sessionId).getAttribute(AttributeNames.USER); return service.isUserInRole(userDTO.getUserID(), service.getRootOrganisation().getOrganisationId(), - Role.SYSADMIN); + Role.APPADMIN); } /* * user must already exist */ - private void saveUserRoles(boolean isSysadmin, String login, String orgId, List roles, HSSFRow row) { + private void saveUserRoles(boolean isAppadmin, String login, String orgId, List roles, HSSFRow row) { User user = null; if (StringUtils.isNotBlank(login)) { user = service.getUserByLogin(login); @@ -439,7 +439,7 @@ if (StringUtils.isBlank(orgId) || (org == null)) { setError("error.org.invalid", "(" + orgId + ")"); } else { - if ((roles == null) || !checkValidRoles(roles, isSysadmin, org.getOrganisationType())) { + if ((roles == null) || !checkValidRoles(roles, isAppadmin, org.getOrganisationType())) { setError("error.roles.invalid", "(" + parseStringCell(row.getCell(ImportService.ROLES)) + ")"); } } @@ -723,7 +723,7 @@ } // return false if a role shouldn't be assigned in given org type - private boolean checkValidRoles(List idList, boolean isSysadmin, OrganisationType orgType) { + private boolean checkValidRoles(List idList, boolean isAppadmin, OrganisationType orgType) { // convert list of id's into list of Roles List roleList = new ArrayList<>(); for (String id : idList) { @@ -736,7 +736,7 @@ } // check they are valid - List validRoles = service.filterRoles(roleList, isSysadmin, orgType); + List validRoles = service.filterRoles(roleList, isAppadmin, orgType); for (Role r : roleList) { if (!validRoles.contains(r)) { return false; Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/AppAdminStartController.java =================================================================== diff -u --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/AppAdminStartController.java (revision 0) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/AppAdminStartController.java (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -0,0 +1,114 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + +package org.lamsfoundation.lams.admin.web.controller; + +import java.util.ArrayList; + +import javax.servlet.http.HttpServletRequest; + +import org.lamsfoundation.lams.admin.AdminConstants; +import org.lamsfoundation.lams.admin.web.dto.LinkBean; +import org.lamsfoundation.lams.usermanagement.Role; +import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; +import org.lamsfoundation.lams.util.Configuration; +import org.lamsfoundation.lams.util.ConfigurationKeys; +import org.lamsfoundation.lams.util.MessageService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +/** + * @author jliew + * + */ +@Controller +public class AppAdminStartController { + + @Autowired + private IUserManagementService userManagementService; + @Autowired + @Qualifier("adminMessageService") + private MessageService messageService; + + @RequestMapping(path = "/appadminstart") + public String execute(HttpServletRequest request) throws Exception { + ArrayList groupedLinks = new ArrayList<>(); + + if (request.isUserInRole(Role.APPADMIN)) { + ArrayList links = new ArrayList<>(); + links.add(new LinkBean("config.do", "sysadmin.config.settings.edit")); + links.add(new LinkBean("timezonemanagement/start.do", "admin.timezone.title")); + links.add(new LinkBean("loginmaintain.do", "appadmin.maintain.loginpage")); + links.add(new LinkBean("signupManagement/start.do", "admin.signup.title")); + links.add(new LinkBean("extserver/serverlist.do", "appadmin.maintain.external.servers")); + links.add(new LinkBean("ltiConsumerManagement/start.do", "label.manage.tool.consumers")); + links.add(new LinkBean("policyManagement/list.do", "admin.policies.title")); + links.add(new LinkBean("toolcontentlist/start.do", "appadmin.tool.management")); + links.add(new LinkBean("../outcome/outcomeManage.do", "admin.outcome.title")); + links.add(new LinkBean("themeManagement/start.do", "admin.themes.title")); + links.add(new LinkBean("sessionmaintain/list.do", "appadmin.maintain.session")); + groupedLinks.add(new Object[] { AdminConstants.START_CONFIG_LINKS, links }); + + links = new ArrayList<>(); + links.add(new LinkBean("logevent/start.do", "label.event.log")); + links.add(new LinkBean("cleanup/start.do", "appadmin.batch.temp.file.delete")); + links.add(new LinkBean("cleanupPreviewLessons/start.do", "appadmin.batch.preview.lesson.delete")); + links.add(new LinkBean("statistics/start.do", "admin.statistics.title")); + groupedLinks.add(new Object[] { AdminConstants.START_MONITOR_LINKS, links }); + + links = new ArrayList<>(); + links.add(new LinkBean("usersearch.do", "admin.user.find")); + links.add(new LinkBean("importgroups.do", "appadmin.import.groups.title")); + links.add(new LinkBean("importexcel.do", "admin.user.import")); + links.add(new LinkBean("disabledmanage.do", "admin.list.disabled.users")); + links.add(new LinkBean("ldap/start.do", "sysadmin.ldap.configuration")); + groupedLinks.add(new Object[] { AdminConstants.START_COURSE_LINKS, links }); + + // LKC-213 + if (Configuration.getAsBoolean(ConfigurationKeys.WORKFLOW_AUTOMATION_ENABLE)) { + links = new ArrayList<>(); + links.add(new LinkBean("../wa/blueprint/show.do", "admin.workflow.automation.module.management")); + links.add(new LinkBean("../wa/container/list.do", "admin.workflow.automation.container.list")); + groupedLinks.add(new Object[] { AdminConstants.START_WORKFLOW_AUTOMATION, links }); + } + + } else if (userManagementService.isUserGlobalGroupManager()) { + ArrayList links = new ArrayList<>(); + links.add(new LinkBean("usersearch.do", "admin.user.find")); + links.add(new LinkBean("importgroups.do", "appadmin.import.groups.title")); + links.add(new LinkBean("importexcel.do", "admin.user.import")); + links.add(new LinkBean("disabledmanage.do", "admin.list.disabled.users")); + groupedLinks.add(new Object[] { AdminConstants.START_COURSE_LINKS, links }); + + } else { + request.setAttribute("errorName", "AppAdminStartAction"); + request.setAttribute("errorMessage", messageService.getMessage("error.authorisation")); + return "error"; + } + + request.setAttribute("groupedLinks", groupedLinks); + return "appadmin"; + } + +} Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupPreviewLessonsController.java =================================================================== diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupPreviewLessonsController.java (.../CleanupPreviewLessonsController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupPreviewLessonsController.java (.../CleanupPreviewLessonsController.java) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -68,14 +68,14 @@ @RequestMapping(path = "/start") public String unspecified(HttpServletRequest request, HttpServletResponse response) throws IOException { - if (!securityService.isSysadmin(getUserID(), "display cleanup preview lessons", false)) { - response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a sysadmin"); + if (!securityService.isAppadmin(getUserID(), "display cleanup preview lessons", false)) { + response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not an appadmin"); return null; } - if (!(request.isUserInRole(Role.SYSADMIN))) { + if (!(request.isUserInRole(Role.APPADMIN))) { request.setAttribute("errorName", "CleanupPreviewLessonsController"); - request.setAttribute("errorMessage", messageService.getMessage("error.need.sysadmin")); + request.setAttribute("errorMessage", messageService.getMessage("error.need.appadmin")); return "error"; } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupTempFilesController.java =================================================================== diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupTempFilesController.java (.../CleanupTempFilesController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupTempFilesController.java (.../CleanupTempFilesController.java) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -57,10 +57,10 @@ @RequestMapping(path = "/start") public String execute(@ModelAttribute CleanupForm cleanupForm, HttpServletRequest request) throws Exception { - // check user is sysadmin - if (!(request.isUserInRole(Role.SYSADMIN))) { + // check user is appadmin + if (!(request.isUserInRole(Role.APPADMIN))) { request.setAttribute("errorName", "CleanupTempFilesAction"); - request.setAttribute("errorMessage", messageService.getMessage("error.need.sysadmin")); + request.setAttribute("errorMessage", messageService.getMessage("error.need.appadmin")); return "error"; } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CloneLessonsController.java =================================================================== diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CloneLessonsController.java (.../CloneLessonsController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CloneLessonsController.java (.../CloneLessonsController.java) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -67,7 +67,7 @@ @RequestMapping(path = "/start") public String execute(HttpServletRequest request, HttpServletResponse response) throws UserAccessDeniedException { - if (!(request.isUserInRole(Role.SYSADMIN))) { + if (!(request.isUserInRole(Role.APPADMIN))) { throw new UserAccessDeniedException(); } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ConfigController.java =================================================================== diff -u -r78b847b4a5962e1c3d0167cfdc0f95137be57e6a -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ConfigController.java (.../ConfigController.java) (revision 78b847b4a5962e1c3d0167cfdc0f95137be57e6a) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ConfigController.java (.../ConfigController.java) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -138,7 +138,7 @@ Configuration.refreshCache(); - return "redirect:/sysadminstart.do"; + return "redirect:/appadminstart.do"; } private String getRequiredError(String arg) { Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/DisabledUserManageController.java =================================================================== diff -u -r29a37489a63e5a95f42a5ef5fd8a7daeb65c53c5 -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/DisabledUserManageController.java (.../DisabledUserManageController.java) (revision 29a37489a63e5a95f42a5ef5fd8a7daeb65c53c5) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/DisabledUserManageController.java (.../DisabledUserManageController.java) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -50,9 +50,9 @@ @RequestMapping("/disabledmanage") public String execute(HttpServletRequest request) throws Exception { - if (!(request.isUserInRole(Role.SYSADMIN) || userManagementService.isUserGlobalGroupManager())) { + if (!(request.isUserInRole(Role.APPADMIN) || userManagementService.isUserGlobalGroupManager())) { request.setAttribute("errorName", "DisabledUserManageAction"); - request.setAttribute("errorMessage", adminMessageService.getMessage("error.need.sysadmin")); + request.setAttribute("errorMessage", adminMessageService.getMessage("error.need.appadmin")); return "error"; } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LogEventController.java =================================================================== diff -u -r365a2c22199a5fe2b1e55e18cbf4b6d2596f202b -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LogEventController.java (.../LogEventController.java) (revision 365a2c22199a5fe2b1e55e18cbf4b6d2596f202b) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LogEventController.java (.../LogEventController.java) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -71,7 +71,7 @@ public String unspecified(HttpServletRequest request) throws Exception { // check permission - if (!request.isUserInRole(Role.SYSADMIN)) { + if (!request.isUserInRole(Role.APPADMIN)) { request.setAttribute("errorName", "EventLogAdmin"); request.setAttribute("errorMessage", messageService.getMessage("error.authorisation")); return "error"; @@ -103,7 +103,7 @@ throws ServletException, IOException { // check permission - if (!request.isUserInRole(Role.SYSADMIN)) { + if (!request.isUserInRole(Role.APPADMIN)) { request.setAttribute("errorName", "EventLogAdmin"); request.setAttribute("errorMessage", messageService.getMessage("error.authorisation")); return "error"; Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LoginSaveController.java =================================================================== diff -u -r8d8232ae7142c30068360a2a41bbcccc065e775b -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LoginSaveController.java (.../LoginSaveController.java) (revision 8d8232ae7142c30068360a2a41bbcccc065e775b) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LoginSaveController.java (.../LoginSaveController.java) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -67,7 +67,7 @@ } } - return "redirect:/sysadminstart.do"; + return "redirect:/appadminstart.do"; } } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgManageController.java =================================================================== diff -u -r29a37489a63e5a95f42a5ef5fd8a7daeb65c53c5 -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgManageController.java (.../OrgManageController.java) (revision 29a37489a63e5a95f42a5ef5fd8a7daeb65c53c5) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgManageController.java (.../OrgManageController.java) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -95,7 +95,7 @@ } // check if user is allowed to view and edit groups - if (!request.isUserInRole(Role.SYSADMIN) && !userManagementService.isUserGlobalGroupManager() + if (!request.isUserInRole(Role.APPADMIN) && !userManagementService.isUserGlobalGroupManager() && !(isRootOrganisation ? request.isUserInRole(Role.GROUP_MANAGER) : securityService.hasOrgRole(orgId, userId, new String[] { Role.GROUP_MANAGER }, "manage courses", false))) { @@ -143,9 +143,9 @@ // let the jsp know whether to display links request.setAttribute("createGroup", - request.isUserInRole(Role.SYSADMIN) || userManagementService.isUserGlobalGroupManager()); + request.isUserInRole(Role.APPADMIN) || userManagementService.isUserGlobalGroupManager()); request.setAttribute("editGroup", true); - request.setAttribute("manageGlobalRoles", request.isUserInRole(Role.SYSADMIN)); + request.setAttribute("manageGlobalRoles", request.isUserInRole(Role.APPADMIN)); return "organisation/list"; } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgPasswordChangeController.java =================================================================== diff -u -r65ed3834599c7868a2f7948a02500b28b071b579 -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgPasswordChangeController.java (.../OrgPasswordChangeController.java) (revision 65ed3834599c7868a2f7948a02500b28b071b579) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgPasswordChangeController.java (.../OrgPasswordChangeController.java) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -114,8 +114,8 @@ UserDTO userDTO = getUserDTO(); Integer currentUserId = userDTO.getUserID(); - if (!securityService.isSysadmin(currentUserId, "get grid users for org password change", false)) { - String warning = "User " + currentUserId + " is not a sysadmin"; + if (!securityService.isAppadmin(currentUserId, "get grid users for org password change", false)) { + String warning = "User " + currentUserId + " is not an appadmin"; log.warn(warning); response.sendError(HttpServletResponse.SC_FORBIDDEN, warning); return null; @@ -178,8 +178,8 @@ UserDTO userDTO = getUserDTO(); Integer currentUserId = userDTO.getUserID(); // security check - if (!securityService.isSysadmin(currentUserId, "org password change", false)) { - String warning = "User " + currentUserId + " is not a sysadmin"; + if (!securityService.isAppadmin(currentUserId, "org password change", false)) { + String warning = "User " + currentUserId + " is not an appadmin"; log.warn(warning); response.sendError(HttpServletResponse.SC_FORBIDDEN, warning); return null; Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java =================================================================== diff -u -r1ef1213820fe7ff7c6f4a9238b3f489a25012c63 -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java (.../OrganisationController.java) (revision 1ef1213820fe7ff7c6f4a9238b3f489a25012c63) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java (.../OrganisationController.java) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -88,7 +88,7 @@ UserDTO userDto = (UserDTO) session.getAttribute(AttributeNames.USER); if (userDto != null) { Integer userId = userDto.getUserID(); - // sysadmin, global group admin, group manager, group admin can edit group + // appadmin, global group admin, group manager, group admin can edit group if (userManagementService.canEditGroup(userId, orgId)) { // edit existing organisation if (orgId != null) { @@ -113,7 +113,7 @@ request.setAttribute("courseToDeleteLessons", courseToDeleteLessons); } request.getSession().setAttribute("status", status); - if (userManagementService.isUserSysAdmin() + if (userManagementService.isUserAppAdmin() || userManagementService.isUserGlobalGroupManager()) { return "organisation/createOrEdit"; } else { @@ -131,8 +131,8 @@ throws Exception { initLocalesAndStatus(); - if (!(request.isUserInRole(Role.SYSADMIN) || userManagementService.isUserGlobalGroupManager())) { - // only sysadmins and global group admins can create groups + if (!(request.isUserInRole(Role.APPADMIN) || userManagementService.isUserGlobalGroupManager())) { + // only appadmins and global group admins can create groups if (((organisationForm.getTypeId() != null) && organisationForm.getTypeId().equals(OrganisationType.COURSE_TYPE)) || (organisationForm.getTypeId() == null)) { @@ -169,14 +169,14 @@ @RequestMapping(path = "/deleteAllLessonsInit") public String deleteAllLessonsInit(HttpServletRequest request, HttpServletResponse response) throws IOException { - if (!securityService.isSysadmin(getUserID(), "display cleanup preview lessons", false)) { - response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a sysadmin"); + if (!securityService.isAppadmin(getUserID(), "display cleanup preview lessons", false)) { + response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not an appadmin"); return null; } - if (!(request.isUserInRole(Role.SYSADMIN))) { + if (!(request.isUserInRole(Role.APPADMIN))) { request.setAttribute("errorName", "OrganisationAction"); - request.setAttribute("errorMessage", messageService.getMessage("error.need.sysadmin")); + request.setAttribute("errorMessage", messageService.getMessage("error.need.appadmin")); return "error"; } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/PortraitBatchUploadController.java =================================================================== diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/PortraitBatchUploadController.java (.../PortraitBatchUploadController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/PortraitBatchUploadController.java (.../PortraitBatchUploadController.java) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -59,8 +59,8 @@ @RequestMapping("/uploadPortraits") @ResponseBody public String execute(HttpServletRequest request, HttpServletResponse response) throws IOException { - if (!securityService.isSysadmin(getUserID(), "batch upload portraits", false)) { - response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a sysadmin"); + if (!securityService.isAppadmin(getUserID(), "batch upload portraits", false)) { + response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not an appadmin"); return null; } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SessionMaintainController.java =================================================================== diff -u -re6dc4db4137cfd6b07a4aa79711b9d12b39fb78e -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SessionMaintainController.java (.../SessionMaintainController.java) (revision e6dc4db4137cfd6b07a4aa79711b9d12b39fb78e) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SessionMaintainController.java (.../SessionMaintainController.java) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -61,7 +61,7 @@ SessionManager.removeSessionByLogin(login, true); String message = new StringBuilder("User ").append(login).append(" (").append(user.getUserId()) - .append(") got logged out by sysadmin").toString(); + .append(") got logged out by appadmin").toString(); logEventService.logEvent(LogEvent.TYPE_LOGOUT, user.getUserId(), user.getUserId(), null, null, message); } return list(request); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/StatisticsController.java =================================================================== diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/StatisticsController.java (.../StatisticsController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/StatisticsController.java (.../StatisticsController.java) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -59,7 +59,7 @@ public String unspecified(HttpServletRequest request) throws Exception { // check permission - if (!request.isUserInRole(Role.SYSADMIN)) { + if (!request.isUserInRole(Role.APPADMIN)) { request.setAttribute("errorName", "StatisticsAction"); request.setAttribute("errorMessage", messageService.getMessage("error.authorisation")); return "error"; @@ -80,7 +80,7 @@ Integer orgId = WebUtil.readIntParam(request, "orgId"); // check permission - if (!request.isUserInRole(Role.SYSADMIN)) { + if (!request.isUserInRole(Role.APPADMIN)) { request.setAttribute("errorName", "StatisticsAction"); request.setAttribute("errorMessage", messageService.getMessage("error.authorisation")); return "error"; Fisheye: Tag 5b9f590b301c276f8df06b30c26981b0eb634e69 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SysAdminStartController.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ThemeManagementController.java =================================================================== diff -u -r2c2a416960cfa22ad1882d9ef21d3f932efc26d2 -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ThemeManagementController.java (.../ThemeManagementController.java) (revision 2c2a416960cfa22ad1882d9ef21d3f932efc26d2) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ThemeManagementController.java (.../ThemeManagementController.java) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -64,7 +64,7 @@ public String unspecified(@ModelAttribute ThemeForm themeForm, HttpServletRequest request) throws Exception { // check permission - if (!request.isUserInRole(Role.SYSADMIN)) { + if (!request.isUserInRole(Role.APPADMIN)) { request.setAttribute("errorName", "ThemeManagementAction"); request.setAttribute("errorMessage", messageService.getMessage("error.authorisation")); return "error"; Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ToolContentListController.java =================================================================== diff -u -r72d525026e011d4ac75686e07377a4242c3eb09f -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ToolContentListController.java (.../ToolContentListController.java) (revision 72d525026e011d4ac75686e07377a4242c3eb09f) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ToolContentListController.java (.../ToolContentListController.java) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -71,7 +71,7 @@ @RequestMapping(path = "/start") public String execute(HttpServletRequest request) throws Exception { // check permission - if (!(request.isUserInRole(Role.SYSADMIN))) { + if (!(request.isUserInRole(Role.APPADMIN))) { request.setAttribute("errorName", "ToolContentListAction"); request.setAttribute("errorMessage", messageService.getMessage("error.authorisation")); return "error"; @@ -170,9 +170,9 @@ } private boolean checkPriviledge(HttpServletRequest request) { - if (!userManagementService.isUserSysAdmin()) { + if (!userManagementService.isUserAppAdmin()) { request.setAttribute("errorName", "ToolContentListAction"); - request.setAttribute("errorMessage", messageService.getMessage("error.no.sysadmin.priviledge")); + request.setAttribute("errorMessage", messageService.getMessage("error.no.appadmin.priviledge")); return false; } return true; Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserBasicListController.java =================================================================== diff -u -r29a37489a63e5a95f42a5ef5fd8a7daeb65c53c5 -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserBasicListController.java (.../UserBasicListController.java) (revision 29a37489a63e5a95f42a5ef5fd8a7daeb65c53c5) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserBasicListController.java (.../UserBasicListController.java) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -80,7 +80,7 @@ } // get users List users = new ArrayList(); - if (request.isUserInRole(Role.SYSADMIN) + if (request.isUserInRole(Role.APPADMIN) || userManagementService.isUserGlobalGroupManager()) { users = userManagementService.getAllUsers(org.getOrganisationId()); } else if (userManagementService.isUserInRole(userId, group.getOrganisationId(), Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java =================================================================== diff -u -r0fbf2ff50fece085171175031693134a96a7750f -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java (.../UserController.java) (revision 0fbf2ff50fece085171175031693134a96a7750f) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java (.../UserController.java) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -137,7 +137,7 @@ } } - if (!(canEdit || request.isUserInRole(Role.SYSADMIN))) { + if (!(canEdit || request.isUserInRole(Role.APPADMIN))) { request.setAttribute("errorName", "UserController"); request.setAttribute("errorMessage", messageService.getMessage("error.authorisation")); return "error"; @@ -175,7 +175,7 @@ userForm.setUserTheme(userSelectedTheme); userForm.setInitialPortraitId(user.getPortraitUuid() == null ? null : user.getPortraitUuid().toString()); - //property available for modification only to sysadmins + //property available for modification only to appadmins userForm.setTwoFactorAuthenticationEnabled(user.isTwoFactorAuthenticationEnabled()); } else { // create a user try { @@ -192,9 +192,9 @@ } userForm.setOrgId(org == null ? null : org.getOrganisationId()); - // sysadmins can mark users as required to use two-factor authentication - if (request.isUserInRole(Role.SYSADMIN)) { - request.setAttribute("isSysadmin", true); + // appadmins can mark users as required to use two-factor authentication + if (request.isUserInRole(Role.APPADMIN)) { + request.setAttribute("isAppadmin", true); } // Get all available time zones @@ -284,7 +284,7 @@ // determine whether to disable or delete user based on their lams data @RequestMapping("/remove") public String remove(HttpServletRequest request) throws Exception { - if (!(request.isUserInRole(Role.SYSADMIN) || userManagementService.isUserGlobalGroupManager())) { + if (!(request.isUserInRole(Role.APPADMIN) || userManagementService.isUserGlobalGroupManager())) { request.setAttribute("errorName", "UserAction"); request.setAttribute("errorMessage", messageService.getMessage("error.authorisation")); return "error"; @@ -304,20 +304,20 @@ @RequestMapping(path = "/disable", method = RequestMethod.POST) public String disable(HttpServletRequest request) throws Exception { - if (!(request.isUserInRole(Role.SYSADMIN) || userManagementService.isUserGlobalGroupManager())) { + if (!(request.isUserInRole(Role.APPADMIN) || userManagementService.isUserGlobalGroupManager())) { request.setAttribute("errorName", "UserController"); request.setAttribute("errorMessage", messageService.getMessage("error.authorisation")); return "error"; } - UserDTO sysadmin = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER); + UserDTO appadmin = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER); Integer orgId = WebUtil.readIntParam(request, "orgId", true); Integer userId = WebUtil.readIntParam(request, "userId"); userManagementService.disableUser(userId); String[] args = new String[1]; args[0] = userId.toString(); String message = messageService.getMessage("audit.user.disable", args); - logEventService.logEvent(LogEvent.TYPE_USER_ORG_ADMIN, sysadmin != null ? sysadmin.getUserID() : null, userId, + logEventService.logEvent(LogEvent.TYPE_USER_ORG_ADMIN, appadmin != null ? appadmin.getUserID() : null, userId, null, null, message); if ((orgId == null) || (orgId == 0)) { return "forward:../usersearch.do"; @@ -329,12 +329,12 @@ @RequestMapping(path = "/delete", method = RequestMethod.POST) public String delete(HttpServletRequest request) throws Exception { - if (!(request.isUserInRole(Role.SYSADMIN) || userManagementService.isUserGlobalGroupManager())) { + if (!(request.isUserInRole(Role.APPADMIN) || userManagementService.isUserGlobalGroupManager())) { request.setAttribute("errorName", "UserAction"); request.setAttribute("errorMessage", messageService.getMessage("error.authorisation")); return "error"; } - UserDTO sysadmin = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER); + UserDTO appadmin = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER); Integer orgId = WebUtil.readIntParam(request, "orgId", true); Integer userId = WebUtil.readIntParam(request, "userId"); @@ -348,7 +348,7 @@ String[] args = new String[1]; args[0] = userId.toString(); String message = messageService.getMessage("audit.user.delete", args); - logEventService.logEvent(LogEvent.TYPE_USER_ORG_ADMIN, sysadmin != null ? sysadmin.getUserID() : null, userId, + logEventService.logEvent(LogEvent.TYPE_USER_ORG_ADMIN, appadmin != null ? appadmin.getUserID() : null, userId, null, null, message); if ((orgId == null) || (orgId == 0)) { return "forward:/usersearch.do"; @@ -361,7 +361,7 @@ // called from disabled users screen @RequestMapping(path = "/enable", method = RequestMethod.POST) public String enable(HttpServletRequest request) throws Exception { - if (!(request.isUserInRole(Role.SYSADMIN) || userManagementService.isUserGlobalGroupManager())) { + if (!(request.isUserInRole(Role.APPADMIN) || userManagementService.isUserGlobalGroupManager())) { request.setAttribute("errorName", "UserController"); request.setAttribute("errorMessage", messageService.getMessage("error.authorisation")); return "error"; Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserManageController.java =================================================================== diff -u -r29a37489a63e5a95f42a5ef5fd8a7daeb65c53c5 -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserManageController.java (.../UserManageController.java) (revision 29a37489a63e5a95f42a5ef5fd8a7daeb65c53c5) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserManageController.java (.../UserManageController.java) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -98,7 +98,7 @@ : organisation; // check permission Integer rootOrgId = userManagementService.getRootOrganisation().getOrganisationId(); - if (request.isUserInRole(Role.SYSADMIN) + if (request.isUserInRole(Role.APPADMIN) || (userManagementService.isUserGlobalGroupManager() && !orgId.equals(rootOrgId))) { userManageForm.setCourseAdminCanAddNewUsers(true); userManageForm.setCourseAdminCanBrowseAllUsers(true); @@ -113,7 +113,7 @@ } else { return forwardError(request, "error.authorisation"); } - userManageForm.setCanResetOrgPassword(request.isUserInRole(Role.SYSADMIN)); + userManageForm.setCanResetOrgPassword(request.isUserInRole(Role.APPADMIN)); userManageForm.setOrgId(orgId); userManageForm.setOrgName(orgName); @@ -129,7 +129,7 @@ // count roles in the org HashMap roleCount = new HashMap<>(); if (orgId.equals(rootOrgId)) { - roleCount.put(Role.SYSADMIN, Role.ROLE_SYSADMIN); + roleCount.put(Role.APPADMIN, Role.ROLE_APPADMIN); roleCount.put(Role.GROUP_MANAGER, Role.ROLE_GROUP_MANAGER); } else { roleCount.put(Role.LEARNER, Role.ROLE_LEARNER); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java =================================================================== diff -u -re0dbb500c2a4fc98b9bfec440e4f07af39be5b19 -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java (.../UserOrgSaveController.java) (revision e0dbb500c2a4fc98b9bfec440e4f07af39be5b19) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java (.../UserOrgSaveController.java) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -70,11 +70,11 @@ boolean canEditRole = false; - // sysadmin, global course admins can add/change users and their roles. - // course manager can add existing users in any role except sysadmin + // appadmin, global course admins can add/change users and their roles. + // course manager can add existing users in any role except appadmin // course admin can add existing users but only as learner Integer rootOrgId = userManagementService.getRootOrganisation().getOrganisationId(); - if (request.isUserInRole(Role.SYSADMIN) + if (request.isUserInRole(Role.APPADMIN) || (userManagementService.isUserGlobalGroupManager() && !orgId.equals(rootOrgId))) { canEditRole = true; } else { @@ -166,7 +166,7 @@ return "redirect:/usermanage.do?org=" + orgId; } else { request.setAttribute("roles", userManagementService.filterRoles(rolelist, - request.isUserInRole(Role.SYSADMIN), organisation.getOrganisationType())); + request.isUserInRole(Role.APPADMIN), organisation.getOrganisationType())); request.setAttribute("newUserOrganisations", newUserOrganisations); request.setAttribute("orgId", orgId); return "forward:/userorgrole.do"; Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesController.java =================================================================== diff -u -r29a37489a63e5a95f42a5ef5fd8a7daeb65c53c5 -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesController.java (.../UserRolesController.java) (revision 29a37489a63e5a95f42a5ef5fd8a7daeb65c53c5) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesController.java (.../UserRolesController.java) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -107,13 +107,13 @@ Integer orgIdOfCourse = (orgType.getOrganisationTypeId().equals(OrganisationType.CLASS_TYPE)) ? org.getParentOrganisation().getOrganisationId() : orgId; - Boolean isSysadmin = request.isUserInRole(Role.SYSADMIN); + Boolean isAppadmin = request.isUserInRole(Role.APPADMIN); User requestor = userManagementService.getUserByLogin(request.getRemoteUser()); Integer rootOrgId = userManagementService.getRootOrganisation().getOrganisationId(); Boolean requestorHasRole = userManagementService.isUserInRole(requestor.getUserId(), orgIdOfCourse, Role.GROUP_MANAGER) || (userManagementService.isUserGlobalGroupManager() && !rootOrgId.equals(orgId)); - if (!(requestorHasRole || isSysadmin)) { + if (!(requestorHasRole || isAppadmin)) { request.setAttribute("errorName", "UserRolesController"); request.setAttribute("errorMessage", messageService.getMessage("error.authorisation")); return "error"; @@ -122,7 +122,7 @@ userRolesForm.setUserId(userId); userRolesForm.setOrgId(org.getOrganisationId()); // screen display vars - request.setAttribute("rolelist", userManagementService.filterRoles(rolelist, isSysadmin, orgType)); + request.setAttribute("rolelist", userManagementService.filterRoles(rolelist, isAppadmin, orgType)); request.setAttribute("login", user.getLogin()); request.setAttribute("fullName", user.getFullName()); request.setAttribute("orgName", org.getName()); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java =================================================================== diff -u -r3920cb7cce6c4cf2c2f8aa7eec77b0b30b3629ed -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java (.../UserRolesSaveController.java) (revision 3920cb7cce6c4cf2c2f8aa7eec77b0b30b3629ed) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java (.../UserRolesSaveController.java) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -90,7 +90,7 @@ errorMap.add("roles", messageService.getMessage("error.roles.empty")); request.setAttribute("errorMap", errorMap); request.setAttribute("rolelist", - userManagementService.filterRoles(rolelist, request.isUserInRole(Role.SYSADMIN), org.getOrganisationType())); + userManagementService.filterRoles(rolelist, request.isUserInRole(Role.APPADMIN), org.getOrganisationType())); request.setAttribute("login", user.getLogin()); request.setAttribute("fullName", user.getFullName()); return "forward:/userroles.do"; Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java =================================================================== diff -u -r65ed3834599c7868a2f7948a02500b28b071b579 -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java (.../UserSaveController.java) (revision 65ed3834599c7868a2f7948a02500b28b071b579) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java (.../UserSaveController.java) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -84,11 +84,11 @@ boolean canEditRole = false; - // sysadmin, global course admins can add/change users and their roles. + // appadmin, global course admins can add/change users and their roles. // course manager can add/change users and their roles iff CourseAdminCanAddNewUsers // course admin can add/change users but only set role to learner iff CourseAdminCanAddNewUsers Integer rootOrgId = userManagementService.getRootOrganisation().getOrganisationId(); - if (request.isUserInRole(Role.SYSADMIN) || userManagementService.isUserGlobalGroupManager()) { + if (request.isUserInRole(Role.APPADMIN) || userManagementService.isUserGlobalGroupManager()) { canEditRole = true; } else { @@ -115,7 +115,7 @@ } } - UserDTO sysadmin = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER); + UserDTO appadmin = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER); log.debug("orgId: " + orgId); Boolean edit = false; @@ -243,7 +243,7 @@ userManagementService.updatePassword(user, password); // make 'create user' audit log entry - userManagementService.logUserCreated(user, sysadmin); + userManagementService.logUserCreated(user, appadmin); log.debug("user: " + user.toString()); } @@ -289,9 +289,9 @@ userForm.setUserId(userId); Integer loggeduserId = ((UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER)).getUserID(); - // check if logged in User is Sysadmin - if (!securityService.isSysadmin(loggeduserId, "Change Password of User " + userId, true)) { - response.sendError(HttpServletResponse.SC_FORBIDDEN, "Only Sysadmin has edit permisions"); + // check if logged in User is Appadmin + if (!securityService.isAppadmin(loggeduserId, "Change Password of User " + userId, true)) { + response.sendError(HttpServletResponse.SC_FORBIDDEN, "Only Appadmin has edit permisions"); return null; } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSearchController.java =================================================================== diff -u -r29a37489a63e5a95f42a5ef5fd8a7daeb65c53c5 -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSearchController.java (.../UserSearchController.java) (revision 29a37489a63e5a95f42a5ef5fd8a7daeb65c53c5) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSearchController.java (.../UserSearchController.java) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -62,8 +62,8 @@ @RequestMapping("/usersearch") public String unspecified(HttpServletRequest request) throws Exception { - if (!(request.isUserInRole(Role.SYSADMIN) || userManagementService.isUserGlobalGroupManager())) { - log.debug("user not sysadmin or global group admin"); + if (!(request.isUserInRole(Role.APPADMIN) || userManagementService.isUserGlobalGroupManager())) { + log.debug("user not appadmin or global group admin"); request.setAttribute("errorName", "UserSearchAction authorisation"); request.setAttribute("errorMessage", messageService.getMessage("error.authorisation")); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSearchSingleTermController.java =================================================================== diff -u -r29a37489a63e5a95f42a5ef5fd8a7daeb65c53c5 -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSearchSingleTermController.java (.../UserSearchSingleTermController.java) (revision 29a37489a63e5a95f42a5ef5fd8a7daeb65c53c5) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSearchSingleTermController.java (.../UserSearchSingleTermController.java) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -75,7 +75,7 @@ group = org; } // get search results, filtered according to orgId - if (request.isUserInRole(Role.SYSADMIN) + if (request.isUserInRole(Role.APPADMIN) || userManagementService.isUserGlobalGroupManager()) { users = userManagementService.findUsers(term, orgId); } else if (userManagementService.isUserInRole(userId, group.getOrganisationId(), Index: lams_admin/web/WEB-INF/web.xml =================================================================== diff -u -r2745b0e5dc858bbe667ca6f1710aaeb644626dfb -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/web/WEB-INF/web.xml (.../web.xml) (revision 2745b0e5dc858bbe667ca6f1710aaeb644626dfb) +++ lams_admin/web/WEB-INF/web.xml (.../web.xml) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -217,7 +217,7 @@ GROUP MANAGER - SYSADMIN + APPADMIN @@ -252,7 +252,7 @@ GROUP MANAGER - LAMS System Adminstrator - SYSADMIN + LAMS Application Adminstrator + APPADMIN Index: lams_admin/web/appadmin.jsp =================================================================== diff -u --- lams_admin/web/appadmin.jsp (revision 0) +++ lams_admin/web/appadmin.jsp (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -0,0 +1,51 @@ + +<%@ include file="/taglibs.jsp"%> +<%@ page import="org.lamsfoundation.lams.util.Configuration"%> +<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%> +<%=Configuration.get(ConfigurationKeys.VERSION)%> + + + + + ${title} + + + + + + + + + +
+
+
+
+  ${serverVersion} +
+
+
+ + +
+
+
+
+
+ + + + "> + + + + +
+
+ + + + + + + Index: lams_admin/web/cleanup.jsp =================================================================== diff -u -r37bb2ae017713b44cdfd6a55cfceca28c3efab02 -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/web/cleanup.jsp (.../cleanup.jsp) (revision 37bb2ae017713b44cdfd6a55cfceca28c3efab02) +++ lams_admin/web/cleanup.jsp (.../cleanup.jsp) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -6,7 +6,7 @@ - + ${title} @@ -19,7 +19,7 @@ -

+

@@ -51,7 +51,7 @@

- + " />
Index: lams_admin/web/cleanupPreviewLessons.jsp =================================================================== diff -u -r3abaa537dbbe6a541d3bac6cb5341e58b768104a -r5b9f590b301c276f8df06b30c26981b0eb634e69 --- lams_admin/web/cleanupPreviewLessons.jsp (.../cleanupPreviewLessons.jsp) (revision 3abaa537dbbe6a541d3bac6cb5341e58b768104a) +++ lams_admin/web/cleanupPreviewLessons.jsp (.../cleanupPreviewLessons.jsp) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69) @@ -4,7 +4,7 @@ - + ${title} @@ -74,7 +74,7 @@ -

+

 ${previewCount} / ${allLessonCount}