Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rcaf5d6113a9c9d149ba883d2c25068f435be3cdc -re323adefc0ee1680382462d8bde75544167112bc
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision caf5d6113a9c9d149ba883d2c25068f435be3cdc)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision e323adefc0ee1680382462d8bde75544167112bc)
@@ -931,6 +931,7 @@
 label.qb.stats.question.description = Description
 label.qb.stats.question.feedback = Feedback
 label.qb.stats.question.mark = Mark
+label.qb.stats.options.title = Options
 label.qb.stats.option.title = Title
 label.qb.stats.option.correct = Correct?
 label.qb.stats.option.average = Average selection<br>(as first choice)
@@ -961,6 +962,10 @@
 label.qb.stats.outcomes = Learning outcomes
 label.qb.stats.outcomes.none = This question does not have any learning outcomes
 label.qb.stats.outcomes.existing = Existing outcomes
+label.qb.stats.merge.title = Merge this question with...
+label.qb.stats.merge.description = This will merge this question with the question UID you entered above. Before you do this, make sure you know what are you doing as once merging is performed this cannot be undone. 
+label.qb.stats.merge.question.uid = Question UID
+label.qb.stats.merge.now = Merge now
 label.qb.collection = Collection
 label.qb.collection.grid.title = Questions
 label.qb.collection.grid.id = ID
@@ -970,11 +975,13 @@
 label.qb.collection.grid.actions = Actions
 label.qb.collection.grid.stats = Stats
 label.qb.collection.grid.error = Error while loading grid with question collections
+label.qb.collection.name.prompt = New collection name
 label.qb.collection.name.blank.error = Name must not be blank
 label.qb.collection.name.duplicate.error = Collection with such name already exists
 label.qb.collection.action.stats = Show stats
 label.qb.collection.remove.confirm = Are you sure you want to remove "{0}" collection?
 label.qb.collection.management = Collection management
+label.qb.collection.add = Add collection
 label.qb.collection.private = Private collection
 label.qb.collection.remove = Remove collection
 label.qb.collection.xml = XML
@@ -985,6 +992,8 @@
 label.qb.collection.unshare = Unshare
 label.qb.collection.share = Share
 label.qb.collection.edit = Edit
+label.qb.collection.public.name = Public questions
+label.qb.collection.questions = questions
 error.form.validation.error = You have 1 error in a form. It has been highlighted
 error.form.validation.errors = You have {0} errors in a form. They have been highlighted
 label.authoring.choice.add.multiple.choice = Add multiple choice
@@ -1052,6 +1061,10 @@
 label.authoring.basic.option.answer = Answer
 label.authoring.basic.delete = Delete
 label.authoring.basic.none = None
+label.authoring.feeback.general = General Feedback
+label.authoring.feeback.correct = Feedback on any correct response
+label.authoring.feeback.partially.correct = Feedback on any partially correct response
+label.authoring.feeback.incorrect = Feedback on any incorrect response
 error.positive.grade.required = One of the answers should have a positive grade
 label.do.you.want.to.delete.answer = Do you want to delete this answer?
 label.choose.word.document = Choose Word file
Index: lams_central/web/qb/authoring/addmultiplechoice.jsp
===================================================================
diff -u -re423418cca5e77a3b54cb3be496b67abe01c4183 -re323adefc0ee1680382462d8bde75544167112bc
--- lams_central/web/qb/authoring/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision e423418cca5e77a3b54cb3be496b67abe01c4183)
+++ lams_central/web/qb/authoring/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision e323adefc0ee1680382462d8bde75544167112bc)
@@ -241,25 +241,25 @@
 					<!-- <h5 style="margin-top: 20px;">Feedbacks</h5> -->
 	
 					<div class="form-group">
-						<c:set var="GENERAL_FEEDBACK_LABEL">General Feedback</c:set>
+						<fmt:message key="label.authoring.feeback.general" var="GENERAL_FEEDBACK_LABEL"/>
 						<lams:CKEditor id="feedback" value="${assessmentQuestionForm.feedback}" 
 							placeholder="${GENERAL_FEEDBACK_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}" />
 					</div>
 					
 					<div class="form-group">
-						<c:set var="FEEDBACK_ON_CORRECT_LABEL">Feedback on any correct response</c:set>
+						<fmt:message key="label.authoring.feeback.correct" var="FEEDBACK_ON_CORRECT_LABEL" />
 						<lams:CKEditor id="feedbackOnCorrect" value="${assessmentQuestionForm.feedbackOnCorrect}" 
 							placeholder="${FEEDBACK_ON_CORRECT_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
 					</div>
 					
 					<div class="form-group">
-						<c:set var="FEEDBACK_ON_PARTICALLY_CORRECT_LABEL">Feedback on any partially correct response</c:set>
+						<fmt:message key="label.authoring.feeback.partially.correct" var="FEEDBACK_ON_PARTICALLY_CORRECT_LABEL" />
 						<lams:CKEditor id="feedbackOnPartiallyCorrect" value="${assessmentQuestionForm.feedbackOnPartiallyCorrect}" 
 							placeholder="${FEEDBACK_ON_PARTICALLY_CORRECT_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
 					</div>
 							
 					<div class="form-group">
-						<c:set var="FEEDBACK_ON_INCORRECT_LABEL">Feedback on any incorrect response</c:set>
+						<fmt:message key="label.authoring.feeback.incorrect" var="FEEDBACK_ON_INCORRECT_LABEL" />
 						<lams:CKEditor id="feedbackOnIncorrect" value="${assessmentQuestionForm.feedbackOnIncorrect}" 
 							placeholder="${FEEDBACK_ON_INCORRECT_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
 					</div>
Index: lams_central/web/qb/collectionList.jsp
===================================================================
diff -u -r21555f88fd0c63a4a9eb3ae288a2e1d48452aa4b -re323adefc0ee1680382462d8bde75544167112bc
--- lams_central/web/qb/collectionList.jsp	(.../collectionList.jsp)	(revision 21555f88fd0c63a4a9eb3ae288a2e1d48452aa4b)
+++ lams_central/web/qb/collectionList.jsp	(.../collectionList.jsp)	(revision e323adefc0ee1680382462d8bde75544167112bc)
@@ -117,7 +117,7 @@
 		// add a new collection
 		function addCollection() {
 			// get collection name from a pop up
-			var name = prompt("New collection name"),
+			var name = prompt('<fmt:message key="label.qb.collection.name.prompt" />'),
 				lower = name.toLowerCase();
 			// check if a collection with same name already exists
 			$('.collection-grid').each(function(){
@@ -150,16 +150,27 @@
 	<%-- This option can be switched off in sysadmin --%>
 	<c:if test="${createCollectionAllowed}">
 		<div id="add-collection-div">
-			<button id="add-collection-button" class="btn btn-primary" onClick="javascript:addCollection()">Add collection</button>
+			<button id="add-collection-button" class="btn btn-primary" onClick="javascript:addCollection()">
+				<fmt:message key="label.qb.collection.add" />
+			</button>
 		</div>
 	</c:if>
 	
 	<c:forEach var="collection" items="${collections}">
 		<div class="panel-body">
 			<%-- Build collection title with its name, question count, optional "private" flag and edit button --%>
 			<c:set var="collectionTitle">
-				<a href="<lams:LAMSURL />qb/collection/showOne.do?collectionUid=${collection.uid}"><c:out value="${collection.name}" />
-					<span class="grid-question-count">(${questionCount[collection.uid]} questions)</span>
+				<a href="<lams:LAMSURL />qb/collection/showOne.do?collectionUid=${collection.uid}">
+					<c:choose>
+						<c:when test="${empty collection.userId and not collection.personal}">
+							<fmt:message key="label.qb.collection.public.name" />
+						</c:when>
+						<c:otherwise>
+							<c:out value="${collection.name}" />
+						</c:otherwise>
+					</c:choose>
+					
+					<span class="grid-question-count">(${questionCount[collection.uid]}&nbsp;<fmt:message key="label.qb.collection.questions" />)</span>
 					<c:if test="${collection.personal}">
 						<span class="grid-collection-private"><i class="fa fa-lock"></i> <fmt:message key="label.qb.collection.private" /></span>
 					</c:if>
Index: lams_central/web/qb/stats.jsp
===================================================================
diff -u -r21555f88fd0c63a4a9eb3ae288a2e1d48452aa4b -re323adefc0ee1680382462d8bde75544167112bc
--- lams_central/web/qb/stats.jsp	(.../stats.jsp)	(revision 21555f88fd0c63a4a9eb3ae288a2e1d48452aa4b)
+++ lams_central/web/qb/stats.jsp	(.../stats.jsp)	(revision e323adefc0ee1680382462d8bde75544167112bc)
@@ -217,7 +217,7 @@
 			</div>
 
 			<c:if test="${not empty question.qbOptions}">
-				<p class="question-section-header">Options</p>
+				<p class="question-section-header"><fmt:message key="label.qb.stats.options.title" /></p>
 				<table class="table table-striped qb-stats-table">
 					<tr>
 						<th>
@@ -541,7 +541,7 @@
 	<c:if test="${managementAllowed and mergeAllowed}">
 		<div class="panel panel-default">
 			<div class="panel-heading">
-				Merge this question with...
+				<fmt:message key="label.qb.stats.merge.title" />
 			</div>
 			<div class="panel-body">
 				<c:if test="${not empty mergeErrors}">
@@ -563,22 +563,21 @@
 						<input type="hidden" name="sourceQbQuestionUid" value="${question.uid}" />
 						<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 						<div class="col-xs-0 col-md-2">
-							Question UID
+							<fmt:message key="label.qb.stats.merge.question.uid" />
 						</div>
 						<div class="col-xs-12 col-md-8 middle-cell">
 							<input type="text" name="targetQbQuestionUid" class="form-control" /> 
 						</div>
 						<div class="col-xs-0 col-md-2">
-							<button type="submit" class="btn btn-default">Merge now</button>
+							<button type="submit" class="btn btn-default"><fmt:message key="label.qb.stats.merge.now" /></button>
 						</div>
 					</form>
 				</div>
 				
 				<div class="row">
 					<div class="col-xs-0 col-md-2"></div>
 					<div class="col-xs-12 col-md-8">
-						This will merge this question with the question UID you entered above.
-						Before you do this, make sure you know what are you doing as once merging is performed this cannot be undone. 
+						<fmt:message key="label.qb.stats.merge.description" />
 					</div>
 					<div class="col-xs-0 col-md-2"></div>
 				</div>