diff --git a/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/credentialOK.jelly b/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/credentialOK.jelly
index c4a094a..88c7cd6 100644
--- a/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/credentialOK.jelly
+++ b/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/credentialOK.jelly
@@ -23,12 +23,12 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
-  <l:layout title="${%Credential is saved}">
+  <l:layout title="${%title}">
     <l:main-panel>
       <p>
-        ${%Credential is saved}
+        ${%saved}
       </p>
       <input type="button" value="${%Close}" class="yui-button" onclick="window.close()" />
     </l:main-panel>
   </l:layout>
-</j:jelly>
\ No newline at end of file
+</j:jelly>
diff --git a/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/credentialOK.properties b/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/credentialOK.properties
new file mode 100644
index 0000000..4f5a27b
--- /dev/null
+++ b/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/credentialOK.properties
@@ -0,0 +1,2 @@
+title=Oracle JDK Credentials saved
+saved=Oracle JDK Credentials saved
diff --git a/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/credentialOK_bg.properties b/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/credentialOK_bg.properties
index c9a4c88..6a3ba38 100644
--- a/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/credentialOK_bg.properties
+++ b/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/credentialOK_bg.properties
@@ -20,7 +20,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Credential\ is\ saved=\
+title=\
+ \u0418\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f\u0442\u0430 \u0435 \u0437\u0430\u043f\u0430\u0437\u0435\u043d\u0430
+saved=\
  \u0418\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f\u0442\u0430 \u0435 \u0437\u0430\u043f\u0430\u0437\u0435\u043d\u0430
 Close=\
  \u0417\u0430\u0442\u0432\u0430\u0440\u044f\u043d\u0435
diff --git a/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/credentialOK_de.properties b/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/credentialOK_de.properties
index 655d59a..3714a36 100644
--- a/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/credentialOK_de.properties
+++ b/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/credentialOK_de.properties
@@ -1,4 +1,5 @@
 # This file is under the MIT License by authors
 
 Close=Schlie\u00DFen
-Credential\ is\ saved=Zugangsdaten gespeichert
+title=Zugangsdaten gespeichert
+saved=Zugangsdaten gespeichert
diff --git a/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/credentialOK_es.properties b/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/credentialOK_es.properties
index 67f1788..11e87c7 100644
--- a/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/credentialOK_es.properties
+++ b/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/credentialOK_es.properties
@@ -21,4 +21,5 @@
 # THE SOFTWARE.
 
 Close=Cerrar
-Credential\ is\ saved=La credencial se ha guardado
+title=La credencial se ha guardado
+saved=La credencial se ha guardado
diff --git a/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/credentialOK_it.properties b/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/credentialOK_it.properties
index 65bf7f4..a9f4862 100644
--- a/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/credentialOK_it.properties
+++ b/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/credentialOK_it.properties
@@ -20,5 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Credential\ is\ saved=Credenziali salvate
+title=Credenziali salvate
+saved=Credenziali salvate
 Close=Chiudi
diff --git a/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/credentialOK_ja.properties b/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/credentialOK_ja.properties
index 4bd382d..7854d2e 100644
--- a/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/credentialOK_ja.properties
+++ b/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/credentialOK_ja.properties
@@ -20,6 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Credential\ is\ saved=\u8a8d\u8a3c\u60c5\u5831\u3092\u4fdd\u5b58\u3057\u307e\u3057\u305f\u3002
+title=\u8a8d\u8a3c\u60c5\u5831\u3092\u4fdd\u5b58\u3057\u307e\u3057\u305f\u3002
+saved=\u8a8d\u8a3c\u60c5\u5831\u3092\u4fdd\u5b58\u3057\u307e\u3057\u305f\u3002
 Close=\u9589\u3058\u308b
 
diff --git a/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/credentialOK_pt_BR.properties b/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/credentialOK_pt_BR.properties
index 7c48f45..78c8c40 100644
--- a/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/credentialOK_pt_BR.properties
+++ b/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/credentialOK_pt_BR.properties
@@ -1,4 +1,5 @@
 # This file is under the MIT License by authors
 
 Close=Fechar
-Credential\ is\ saved=Senha est\u00E1 salva
+title=Senha est\u00E1 salva
+saved=Senha est\u00E1 salva
diff --git a/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/credentialOK_sr.properties b/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/credentialOK_sr.properties
index fef7da6..965c6de 100644
--- a/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/credentialOK_sr.properties
+++ b/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/credentialOK_sr.properties
@@ -1,4 +1,5 @@
 # This file is under the MIT License by authors
 
-Credential\ is\ saved=\u0421\u0430\u0447\u0443\u0432\u0430\u043D\u043E \u0458\u0435 \u0430\u043A\u0440\u0435\u0434\u0438\u0442\u0438\u0432\u0430\u0442
+title=\u0421\u0430\u0447\u0443\u0432\u0430\u043D\u043E \u0458\u0435 \u0430\u043A\u0440\u0435\u0434\u0438\u0442\u0438\u0432\u0430\u0442
+saved=\u0421\u0430\u0447\u0443\u0432\u0430\u043D\u043E \u0458\u0435 \u0430\u043A\u0440\u0435\u0434\u0438\u0442\u0438\u0432\u0430\u0442
 Close=\u0417\u0430\u0432\u0440\u0448\u0438
diff --git a/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/credentialOK_zh_TW.properties b/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/credentialOK_zh_TW.properties
index 6fe8c3a..6a324ef 100644
--- a/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/credentialOK_zh_TW.properties
+++ b/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/credentialOK_zh_TW.properties
@@ -20,5 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Credential\ is\ saved=\u8a8d\u8b49\u8cc7\u6599\u5df2\u5132\u5b58
+title=\u8a8d\u8b49\u8cc7\u6599\u5df2\u5132\u5b58
+saved=\u8a8d\u8b49\u8cc7\u6599\u5df2\u5132\u5b58
 Close=\u95dc\u9589
diff --git a/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/enterCredential.jelly b/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/enterCredential.jelly
index 0bd42bc..a7be521 100644
--- a/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/enterCredential.jelly
+++ b/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/enterCredential.jelly
@@ -23,12 +23,12 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <l:layout title="${%Enter Your Oracle Account}">
+  <l:layout title="${%title}">
     <l:main-panel>
 
       <h1>
         <l:icon class="icon-secure icon-xlg"/>
-        ${%Enter Your Oracle Account}
+        ${%heading}
       </h1>
       <p>
         ${%description}
diff --git a/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/enterCredential.properties b/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/enterCredential.properties
index b71d563..e6ce9e6 100644
--- a/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/enterCredential.properties
+++ b/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/enterCredential.properties
@@ -20,4 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-description=To access older versions of JDK, you need to have <a href="https://jenkins.io/redirect/oracle-account-signup">Oracle Account</a>.
\ No newline at end of file
+title=Enter Your Oracle Account
+heading=Enter Your Oracle Account
+description=To access older JDK versions, you need to have an <a href="https://jenkins.io/redirect/oracle-account-signup">Oracle Account</a>.
diff --git a/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/enterCredential_bg.properties b/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/enterCredential_bg.properties
index fa475ca..dc17995 100644
--- a/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/enterCredential_bg.properties
+++ b/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/enterCredential_bg.properties
@@ -26,7 +26,9 @@ description=\
  <a href="https://jenkins.io/redirect/oracle-account-signup">\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044f \u043a\u044a\u043c Oracle</a>.
 OK=\
  \u0414\u043e\u0431\u0440\u0435
-Enter\ Your\ Oracle\ Account=\
+title=\
+ \u0412\u044a\u0432\u0435\u0434\u0435\u0442\u0435 \u0434\u0430\u043d\u043d\u0438\u0442\u0435 \u0437\u0430 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044f\u0442\u0430 \u0432\u0438 \u043a\u044a\u043c Oracle
+heading=\
  \u0412\u044a\u0432\u0435\u0434\u0435\u0442\u0435 \u0434\u0430\u043d\u043d\u0438\u0442\u0435 \u0437\u0430 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044f\u0442\u0430 \u0432\u0438 \u043a\u044a\u043c Oracle
 Password=\
  \u041f\u0430\u0440\u043e\u043b\u0430
diff --git a/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/enterCredential_de.properties b/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/enterCredential_de.properties
index 672bfce..8574484 100644
--- a/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/enterCredential_de.properties
+++ b/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/enterCredential_de.properties
@@ -1,6 +1,7 @@
 # This file is under the MIT License by authors
 
-Enter\ Your\ Oracle\ Account=Bitte Oracle-Account eintragen
+title=Bitte Oracle-Account eintragen
+heading=Bitte Oracle-Account eintragen
 OK=Ok
 Password=Passwort
 Username=Benutzername
diff --git a/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/enterCredential_es.properties b/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/enterCredential_es.properties
index 7d6223c..f763cfb 100644
--- a/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/enterCredential_es.properties
+++ b/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/enterCredential_es.properties
@@ -24,5 +24,6 @@ Password=Contrase
 Username=Usuario
 # To access older versions of JDK, you need to have <a href="https://jenkins.io/redirect/oracle-account-signup">Oracle Account</a>.
 description=Desafortunadamente Oracle exige que para descargar antiguas versiones del JDK uses una <a href="https://jenkins.io/redirect/oracle-account-signup">Cuenta de Oracle</a>.
-Enter\ Your\ Oracle\ Account=Introduce un usuario y contraseña válidos
+title=Introduce un usuario y contraseña válidos
+heading=Introduce un usuario y contraseña válidos
 OK=Aceptar
diff --git a/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/enterCredential_it.properties b/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/enterCredential_it.properties
index bbfeef5..d4106c0 100644
--- a/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/enterCredential_it.properties
+++ b/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/enterCredential_it.properties
@@ -23,5 +23,6 @@
 Password=Password
 OK=OK
 description=Per ottenere accesso alle versioni meno recenti del JDK è necessario disporre di un <a href="https://jenkins.io/redirect/oracle-account-signup">account Oracle</a>.
-Enter\ Your\ Oracle\ Account=Inserire le credenziali del proprio account Oracle
+title=Inserire le credenziali del proprio account Oracle
+heading=Inserire le credenziali del proprio account Oracle
 Username=Nome utente
diff --git a/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/enterCredential_ja.properties b/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/enterCredential_ja.properties
index 219b0f8..3c4a155 100644
--- a/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/enterCredential_ja.properties
+++ b/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/enterCredential_ja.properties
@@ -20,7 +20,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Enter\ Your\ Oracle\ Account=Oracle\u30a2\u30ab\u30a6\u30f3\u30c8\u306e\u5165\u529b
+title=Oracle\u30a2\u30ab\u30a6\u30f3\u30c8\u306e\u5165\u529b
+heading=Oracle\u30a2\u30ab\u30a6\u30f3\u30c8\u306e\u5165\u529b
 Username=\u30e6\u30fc\u30b6\u540d
 Password=\u30d1\u30b9\u30ef\u30fc\u30c9
 description=\
diff --git a/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/enterCredential_pt_BR.properties b/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/enterCredential_pt_BR.properties
index 92d284a..0e2cbec 100644
--- a/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/enterCredential_pt_BR.properties
+++ b/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/enterCredential_pt_BR.properties
@@ -23,6 +23,7 @@
 Username=Usu\u00e1rio
 Password=Senha
 OK=OK
-Enter\ Your\ Oracle\ Account=Informe sua conta da Oracle
+title=Informe sua conta da Oracle
+heading=Informe sua conta da Oracle
 # To access older versions of JDK, you need to have <a href="https://jenkins.io/redirect/oracle-account-signup">Oracle Account</a>.
 description=Para acessar vers\u00f5es antigas do JDK, voc\u00ea deve possuir uma <a href="https://jenkins.io/redirect/oracle-account-signup">conta da Oracle</a>.
diff --git a/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/enterCredential_sr.properties b/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/enterCredential_sr.properties
index c77ad73..9016ed9 100644
--- a/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/enterCredential_sr.properties
+++ b/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/enterCredential_sr.properties
@@ -1,6 +1,7 @@
 # This file is under the MIT License by authors
 
-Enter\ Your\ Oracle\ Account=\u0423\u043D\u0435\u0441\u0438\u0442\u0435 \u0432\u0430\u0448 Oracle \u043D\u0430\u043B\u043E\u0433
+title=\u0423\u043D\u0435\u0441\u0438\u0442\u0435 \u0432\u0430\u0448 Oracle \u043D\u0430\u043B\u043E\u0433
+heading=\u0423\u043D\u0435\u0441\u0438\u0442\u0435 \u0432\u0430\u0448 Oracle \u043D\u0430\u043B\u043E\u0433
 description=\u0414\u0430 \u043F\u0440\u0438\u0441\u0442\u0443\u043F\u0438\u0442\u0435 \u0441\u0442\u0430\u0440\u0438\u0458\u0438\u043C \u0432\u0435\u0440\u0437\u0438\u0458\u0430\u043C\u0430 JDK, \u043C\u043E\u0440\u0430\u0442\u0435 \u0438\u043C\u0430\u0442\u0438 <a href="https://jenkins.io/redirect/oracle-account-signup">Oracle \u043D\u0430\u043B\u043E\u0433</a>.
 Username=\u041A\u043E\u0440\u0438\u0441\u043D\u0438\u0447\u043A\u043E \u0438\u043C\u0435
 Password=\u041B\u043E\u0437\u0438\u043D\u043A\u0430
diff --git a/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/enterCredential_zh_TW.properties b/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/enterCredential_zh_TW.properties
index a3262de..d477981 100644
--- a/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/enterCredential_zh_TW.properties
+++ b/src/main/resources/hudson/tools/JDKInstaller/DescriptorImpl/enterCredential_zh_TW.properties
@@ -20,7 +20,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Enter\ Your\ Oracle\ Account=\u8f38\u5165\u60a8\u7684 Oracle \u5e33\u865f
+title=\u8f38\u5165\u60a8\u7684 Oracle \u5e33\u865f
+heading=\u8f38\u5165\u60a8\u7684 Oracle \u5e33\u865f
 description=\u60a8\u8981\u6709 <a href="https://jenkins.io/redirect/oracle-account-signup">Oracle \u5e33\u865f</a>\u624d\u80fd\u62ff\u5230\u820a\u7248 JDK\u3002
 Username=\u4f7f\u7528\u8005\u540d\u7a31
 Password=\u5bc6\u78bc