Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r7cf4da03e4f448f3dd5d5abf8de533c56263e74c -r9091ed8c9bae9a48f88622c0c5031af2a39772dc
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 7cf4da03e4f448f3dd5d5abf8de533c56263e74c)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 9091ed8c9bae9a48f88622c0c5031af2a39772dc)
@@ -231,8 +231,6 @@
 config.header.features  =Features
 config.header.look.feel  =Look and feel
 config.header.versions  =Versions
-config.header.antivirus =Antivirus
-config.header.qb =Question bank
 config.server.url  =Server URL
 config.server.url.context.path  =Server URL context path
 config.version  =Version
@@ -634,23 +632,36 @@
 outcome.authoring.input  =Search and select by outcome name or code
 outcome.authoring.existing  =Added outcomes
 outcome.authoring.existing.none  =none
-outcome.authoring.remove.confirm  =Are you sure you want to remove this learning outcome?
 sysadmin.maintain.session.name  =Name
-congfig.header.antivirus  =Antivirus
-config.av.enable =Enable antivirus scanning on file upload
-config.av.host =ClamAV server host
-config.av.port =ClamAV server port
+config.header.antivirus  =Antivirus
+config.av.enable  =Enable antivirus scanning on files upload
+config.av.host  =ClamAV server host
+config.av.port  =ClamAV server port
 label.type.login  =User login
 label.type.logout  =User logout
 label.type.config.change  =Configuration change
+outcome.authoring.remove.confirm  =Are you sure you want to remove this learning outcome?
+sysadmin.alternative.user.id.name  =Use alternative parameter name "lis_person_sourcedid" to get user id
+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
+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
+config.qb.collections.transfer.enable  =Allow question transfer between collections
+config.qb.monitors.read.only  =Force read-only access for monitors
+config.qb.stats.min.participants  =Minimum test participant number to calculate question indexes
+config.qb.stats.group.size  =Percent of participants in top/bottom performers group (default: 27)
+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:
+config.enable.collapsing.subcourses  =Enable collapsing of subcourses
 config.learning.outcome.add.enable  =Enable quick add of learning outcomes in authoring
-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
-config.qb.collections.transfer.enable =Allow question transfer between collections
-config.qb.monitors.read.only =Force read-only access for monitors
-config.qb.stats.min.participants =Minimum test participant number to calculate question indexes
-config.qb.stats.group.size =Percent of participants in top/bottom performers group (default: 27)
+label.type.questions.merged  =Questions merged
+label.area.question.bank  =Question bank
+
 admin.workflow.automation.module.management =Module and blueprint management
 workflow.automation.title =Workflow Automation