keycloak-uncached

diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509BrowserLoginTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509BrowserLoginTest.java
index 13de1a9..3168483 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509BrowserLoginTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509BrowserLoginTest.java
@@ -66,7 +66,6 @@ public class X509BrowserLoginTest extends AbstractX509AuthenticationTest {
 
         Assert.assertTrue(loginConfirmationPage.getSubjectDistinguishedNameText().startsWith("EMAILADDRESS=test-user@localhost"));
         Assert.assertEquals(username, loginConfirmationPage.getUsernameText());
-        Assert.assertTrue(loginConfirmationPage.getLoginDelayCounterText().startsWith("The form will be submitted"));
 
         loginConfirmationPage.confirm();
 
@@ -116,7 +115,6 @@ public class X509BrowserLoginTest extends AbstractX509AuthenticationTest {
 
         Assert.assertTrue(loginConfirmationPage.getSubjectDistinguishedNameText().startsWith("EMAILADDRESS=test-user@localhost"));
         Assert.assertEquals("test-user@localhost", loginConfirmationPage.getUsernameText());
-        Assert.assertTrue(loginConfirmationPage.getLoginDelayCounterText().startsWith("The form will be submitted"));
 
         loginConfirmationPage.ignore();
         loginPage.login("test-user@localhost", "password");
@@ -282,7 +280,6 @@ public class X509BrowserLoginTest extends AbstractX509AuthenticationTest {
 
         Assert.assertTrue(loginConfirmationPage.getSubjectDistinguishedNameText().startsWith("EMAILADDRESS=test-user@localhost"));
         Assert.assertEquals("test-user@localhost", loginConfirmationPage.getUsernameText());
-        Assert.assertTrue(loginConfirmationPage.getLoginDelayCounterText().startsWith("The form will be submitted"));
 
         loginConfirmationPage.confirm();
 

diff --git a/themes/src/main/resources/theme/base/login/login-x509-info.ftl b/themes/src/main/resources/theme/base/login/login-x509-info.ftl
index b23085a..bd8bcf4 100644
--- a/themes/src/main/resources/theme/base/login/login-x509-info.ftl
+++ b/themes/src/main/resources/theme/base/login/login-x509-info.ftl
@@ -10,7 +10,7 @@
             <div class="${properties.kcFormGroupClass!}">
 
                 <div class="${properties.kcLabelWrapperClass!}">
-                    <label for="certificate_subjectDN" class="${properties.kcLabelClass!}">X509 client certificate: </label>
+                    <label for="certificate_subjectDN" class="${properties.kcLabelClass!}">${msg("clientCertificate")}</label>
                 </div>
                 <#if subjectDN??>
                     <div class="${properties.kcLabelWrapperClass!}">
@@ -18,7 +18,7 @@
                     </div>
                 <#else>
                     <div class="${properties.kcLabelWrapperClass!}">
-                        <label id="certificate_subjectDN" class="${properties.kcLabelClass!}">[No Certificate]</label>
+                        <label id="certificate_subjectDN" class="${properties.kcLabelClass!}">${msg("noCertificate")}</label>
                     </div>
                 </#if>
            </div>
@@ -27,7 +27,7 @@
 
                     <#if isUserEnabled>
                           <div class="${properties.kcLabelWrapperClass!}">
-                             <label for="username" class="${properties.kcLabelClass!}">You will be logged in as:</label>
+                             <label for="username" class="${properties.kcLabelClass!}">${msg("doX509Login")}</label>
                           </div>
                           <div class="${properties.kcLabelWrapperClass!}">
                              <label id="username" class="${properties.kcLabelClass!}">${(username!'')}</label>
@@ -50,29 +50,8 @@
                         </#if>
                     </div>
                 </div>
-		<span id="counter">The form will be submitted in -- seconds</span>
             </div>
         </form>
-<script>
-
-var n = 10;
-function autoSubmitCountdown(){
-    var c=n;
-    setInterval(function(){
-        if(c>=0){
-    	     document.getElementById("counter").textContent = "The form will be submitted in " + c + " seconds";
-        }
-        if(c==0){
-	    document.forms[0].submit();
-        }
-        c--;
-    },1000);
-}
-
-// Start
-autoSubmitCountdown();
-
-</script>
     </#if>
 
 </@layout.registrationLayout>

diff --git a/themes/src/main/resources/theme/base/login/messages/messages_en.properties b/themes/src/main/resources/theme/base/login/messages/messages_en.properties
index 1277f77..3cd3b12 100755
--- a/themes/src/main/resources/theme/base/login/messages/messages_en.properties
+++ b/themes/src/main/resources/theme/base/login/messages/messages_en.properties
@@ -257,3 +257,7 @@ requiredAction.UPDATE_PROFILE=Update Profile
 requiredAction.VERIFY_EMAIL=Verify Email
 
 p3pPolicy=CP="This is not a P3P policy!"
+
+doX509Login=You will be logged in as\:
+clientCertificate=X509 client certificate\:
+noCertificate=[No Certificate]
\ No newline at end of file