Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.100.2.19 -r1.100.2.20
--- lams_admin/conf/language/lams/ApplicationResources.properties	28 Nov 2016 01:19:15 -0000	1.100.2.19
+++ lams_admin/conf/language/lams/ApplicationResources.properties	29 Nov 2016 09:14:51 -0000	1.100.2.20
@@ -525,6 +525,8 @@
 config.password.minimum.characters  =Minimum number of characters
 config.password.uppercase  =Must contain uppercase letter(s)
 config.password.lowercase  =Must contain lowercase letter(s)
+config.failed.attempts  =Failed Attempts
+config.lock.out.time  =Lock out time
 config.header.password.policy  =Password policy
 config.password.numerics  =Must contain at least a number
 config.password.symbols  =Must contain at least one symbol(s)
Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java,v
diff -u -r1.53.2.13 -r1.53.2.14
--- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	14 Nov 2016 08:18:16 -0000	1.53.2.13
+++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	29 Nov 2016 09:20:06 -0000	1.53.2.14
@@ -274,7 +274,12 @@
     
     public static String PASSWORD_POLICY_SYMBOLS = "PasswordPolicySymbols";
     
- // LDEV-4049 Option for not displaying stacktraces in config settings
+    // LDEV-4049 Option for not displaying stacktraces in config settings
     public static String ERROR_STACK_TRACE = "ErrorStackTrace";
+    
+    // LDEV-4030 Disable login for a few minutes after X number of attempts
+    public static String FAILED_ATTEMPTS = "FailedAttempts";
+    
+    public static String LOCK_OUT_TIME = "LockOutTime";
 
 }