accurator/commit

fixed merged conflicts. Login and Register modal localisation

diff --cc web/js/accurator_utilities.js
index 59b5439,6716d1a..f4ccae7
--- a/web/js/accurator_utilities.js
+++ b/web/js/accurator_utilities.js
@@@ -478,12 -478,12 +478,13 @@@ function registerModal(onDismissal) 
  
  function initRegisterModalLabels(labels) {
  	// Add retrieved labels to html elements
- 	$("#mdlTitleRegister").html(labels.mdlTitleRegister);
- 	$("#mdlFrmFullNameRegister").html(labels.mdlFrmFullNameRegister);
- 	$("#loginLblUsernameRegister").html(labels.loginLblUsernameRegister);
- 	$("#loginLblPasswordRegister").html(labels.loginLblPasswordRegister);
- 	$("#loginLblPasswordRepeatRegister").html(labels.loginLblPasswordRepeatRegister);
- 	$("#mdlBtnRegister").html(labels.mdlBtnRegister);
+ 	$("#registerHdrTitle").html(labels.registerHdrTitle);
+ 	$("#registerLblFullName").html(labels.registerLblFullName);
+ 	$("#registerLblUsername").html(labels.registerLblUsername);
+ 	$("#registerLblPassword").html(labels.registerLblPassword);
+ 	$("#registerLblPasswordRepeat").html(labels.registerLblPasswordRepeat);
+ 	$("#registerBtnRegister").html(labels.registerBtnRegister);
++
  	// Set text variables for possible later use
  	lblRegistrationFailed = labels.lblRegistrationFailed;
  	lblUsernameFail = labels.lblUsernameFail;