Restoring 'import CA certificate' functionality.

src/i18n/openfire_i18n_cs_CZ.properties

@@ -2324,16 +2324,18 @@ ssl.import.certificate.keystore.private-key=Content of Private Key file:
 ssl.import.certificate.keystore.certificate=Content of Certificate file:
 ssl.import.certificate.keystore.error.private-key=Please specify the content of the private key.
 ssl.import.certificate.keystore.error.certificate=Please specify the content of the certificate to import.
-ssl.import.certificate.keystore.error.import=There was an error one importing private key and signed certificate.
+ssl.import.certificate.keystore.error.import=There was an error while trying to import the private key and signed certificate.
 
 # Import truststore certificate page
 
-ssl.import.certificate.keystore.error.type=Type has not been specified (or is unrecognized).
-ssl.import.certificate.keystore.error.alias-missing=Please provide an alias for this certificate.
-ssl.import.certificate.keystore.error.alias-exists=A certificate is already stored using this alias. Please provide a different alias, or remove the existing certificate.
-ssl.import.certificate.keystore.c2s-intro=Use the form below to import a certificate that represents a trusted party, to be used when verifying certificates during client-to-server communication.
-ssl.import.certificate.keystore.s2s-intro=Use the form below to import a certificate that represents a trusted party, to be used when verifying certificates during server-to-server communication.
-
+ssl.import.certificate.truststore.boxtitle=Import CA Certificate
+ssl.import.certificate.truststore.error.connection-type=Connection Type has not been specified (or is unrecognized).
+ssl.import.certificate.truststore.error.alias-missing=Please provide an alias for this certificate.
+ssl.import.certificate.truststore.error.alias-exists=A certificate is already stored using this alias. Please provide a different alias, or remove the existing certificate.
+ssl.import.certificate.truststore.error.certificate=Please specify the content of the certificate to import.
+ssl.import.certificate.truststore.error.import=There was an error while trying to import the certificate.
+ssl.import.certificate.truststore.intro=Use the form below to import a certificate that represents a trusted party that can be used when verifying peer certificates while establishing encrypted communication.
+ssl.import.certificate.truststore.intro=Use the form below to import a certificate that represents a trusted party that can be used when verifying peer certificates while establishing encrypted communication.
 
 # Room Occupants Page
 

src/i18n/openfire_i18n_de.properties

@@ -2286,15 +2286,17 @@ ssl.import.certificate.keystore.private-key=Content of Private Key file:
 ssl.import.certificate.keystore.certificate=Content of Certificate file:
 ssl.import.certificate.keystore.error.private-key=Please specify the content of the private key.
 ssl.import.certificate.keystore.error.certificate=Please specify the content of the certificate to import.
-ssl.import.certificate.keystore.error.import=There was an error one importing private key and signed certificate.
+ssl.import.certificate.keystore.error.import=There was an error while trying to import the private key and signed certificate.
 
 # Import truststore certificate page
 
-ssl.import.certificate.keystore.error.type=Type has not been specified (or is unrecognized).
-ssl.import.certificate.keystore.error.alias-missing=Please provide an alias for this certificate.
-ssl.import.certificate.keystore.error.alias-exists=A certificate is already stored using this alias. Please provide a different alias, or remove the existing certificate.
-ssl.import.certificate.keystore.c2s-intro=Use the form below to import a certificate that represents a trusted party, to be used when verifying certificates during client-to-server communication.
-ssl.import.certificate.keystore.s2s-intro=Use the form below to import a certificate that represents a trusted party, to be used when verifying certificates during server-to-server communication.
+ssl.import.certificate.truststore.boxtitle=Import CA Certificate
+ssl.import.certificate.truststore.error.connection-type=Connection Type has not been specified (or is unrecognized).
+ssl.import.certificate.truststore.error.alias-missing=Please provide an alias for this certificate.
+ssl.import.certificate.truststore.error.alias-exists=A certificate is already stored using this alias. Please provide a different alias, or remove the existing certificate.
+ssl.import.certificate.truststore.error.certificate=Please specify the content of the certificate to import.
+ssl.import.certificate.truststore.error.import=There was an error while trying to import the certificate.
+ssl.import.certificate.truststore.intro=Use the form below to import a certificate that represents a trusted party that can be used when verifying peer certificates while establishing encrypted communication.
 
 # Room Occupants Page
 

src/i18n/openfire_i18n_en.properties

@@ -2341,7 +2341,7 @@ ssl.certificates.signature-algorithm-parameters=Signature Algorithm Parameters
 
 # Openfire Certificates Page
 
-ssl.certificates.keystore.title=Openfire Certificates
+ssl.certificates.keystore.title=Openfire Identity Certificate Store
 ssl.certificates.keystore.restart_server=Certificates were modified so HTTP server needs to be restarted. Click \
   {0}here{1} to restart HTTP server.
 ssl.certificates.keystore.io_error=Unable to access the certificate key store. The file may be corrupt.
@@ -2373,12 +2373,10 @@ ssl.certificates.truststore.ca-reply=Certificate Authority Reply:
 
 # Client & Server Truststore Page
 
-ssl.certificates.truststore.c2s-title=Client Truststore
-ssl.certificates.truststore.s2s-title=Server Truststore
-ssl.certificates.truststore.c2s-intro=This list contains certificates from client software that is expected to communicate with Openfire, or from Certificate Authorities that you trust to identify those clients.
-ssl.certificates.truststore.s2s-intro=This list contains certificates from other XMPP servers with which Openfire can communicate, or from Certificate Authorities that you trust to identify those servers.
-ssl.certificates.truststore.c2s-info=Certificates in this list are used when Openfire allows (or requires) clients to provide a certificate when connecting to Openfire. This is commonly referred to as mutual authentication. By default, this feature is not enabled (but can be configured {0}here{1}). Openfire does not ship with any certificates in its client truststore.
-ssl.certificates.truststore.s2s-info=Certificates in this list are used by Openfire to verify the identity of remote XMPP domains, when federation ("s2s") connections are being established in a secured fashion. By default, Openfire ships with a number certificates from commonly trusted Certificate Authorities.
+# Truststore Page
+
+ssl.certificates.truststore.title=Openfire Trust Certificate Store
+ssl.certificates.truststore.info=Certificates in this list are used by Openfire to verify the identity of remote clients and servers when encrypted connections are being established. By default, Openfire ships with a number certificates from commonly trusted Certificate Authorities.
 ssl.certificates.truststore.link-to-import=Certificates can be added to this list by using this {0}import form{1}.
 
 # Certificate details Page
@@ -3118,15 +3116,17 @@ ssl.import.certificate.keystore.private-key=Content of Private Key file:
 ssl.import.certificate.keystore.certificate=Content of Certificate file:
 ssl.import.certificate.keystore.error.private-key=Please specify the content of the private key.
 ssl.import.certificate.keystore.error.certificate=Please specify the content of the certificate to import.
-ssl.import.certificate.keystore.error.import=There was an error one importing private key and signed certificate.
+ssl.import.certificate.keystore.error.import=There was an error while trying to import the private key and signed certificate.
 
 # Import truststore certificate page
 
-ssl.import.certificate.keystore.error.type=Type has not been specified (or is unrecognized).
-ssl.import.certificate.keystore.error.alias-missing=Please provide an alias for this certificate.
-ssl.import.certificate.keystore.error.alias-exists=A certificate is already stored using this alias. Please provide a different alias, or remove the existing certificate.
-ssl.import.certificate.keystore.c2s-intro=Use the form below to import a certificate that represents a trusted party, to be used when verifying certificates during client-to-server communication.
-ssl.import.certificate.keystore.s2s-intro=Use the form below to import a certificate that represents a trusted party, to be used when verifying certificates during server-to-server communication.
+ssl.import.certificate.truststore.boxtitle=Import CA Certificate
+ssl.import.certificate.truststore.error.connection-type=Connection Type has not been specified (or is unrecognized).
+ssl.import.certificate.truststore.error.alias-missing=Please provide an alias for this certificate.
+ssl.import.certificate.truststore.error.alias-exists=A certificate is already stored using this alias. Please provide a different alias, or remove the existing certificate.
+ssl.import.certificate.truststore.error.certificate=Please specify the content of the certificate to import.
+ssl.import.certificate.truststore.error.import=There was an error while trying to import the certificate.
+ssl.import.certificate.truststore.intro=Use the form below to import a certificate that represents a trusted party that can be used when verifying peer certificates while establishing encrypted communication.
 
 # Room Occupants Page
 

src/i18n/openfire_i18n_es.properties

@@ -2335,14 +2335,15 @@ ssl.import.certificate.keystore.error.import=Un error ha ocurrido al intentar im
 
 # Import truststore certificate page
 
-ssl.import.certificate.keystore.error.type=El tipo no se ha especificado (o no se reconoce)
-ssl.import.certificate.keystore.error.alias-missing=Por favor indique un alias para este certificado.
-ssl.import.certificate.keystore.error.alias-exists=Ya existe un certificado con este alias. Por favor indique un alias \
+ssl.import.certificate.truststore.boxtitle=Import CA Certificate
+ssl.import.certificate.truststore.error.connection-type=El tipo no se ha especificado (o no se reconoce)
+ssl.import.certificate.truststore.error.alias-missing=Por favor indique un alias para este certificado.
+ssl.import.certificate.truststore.error.alias-exists=Ya existe un certificado con este alias. Por favor indique un alias \
   diferente, o elimine el certificado existente.
-ssl.import.certificate.keystore.c2s-intro=Use el siguiente formulario para importar un certificado de confianza para ser usado \
-  al verificar certificados durante la comunicaci\u00f3n de cliente a servidor.
-ssl.import.certificate.keystore.s2s-intro=Use el siguiente formulario para importar un certificado de confianza para ser usado \
-  al verificar certificados durante la comunicaci\u00f3n de servidor a servidor.
+ssl.import.certificate.truststore.error.certificate=Especifique el contenido del certificado a importar.
+ssl.import.certificate.truststore.error.import=Un error ha ocurrido al intentar importar un certificado firmado.
+ssl.import.certificate.keystore.intro=Use el siguiente formulario para importar un certificado de confianza para ser usado \
+  al verificar certificados durante la comunicaci\u00f3n.
 
 sidebar.user-roster=Lista de Contactos
 sidebar.user-roster.descr=Haga clic para ver la lista de contactos de usuarios

src/i18n/openfire_i18n_fr.properties

@@ -1900,15 +1900,17 @@ ssl.import.certificate.keystore.private-key=Content of Private Key file:
 ssl.import.certificate.keystore.certificate=Content of Certificate file:
 ssl.import.certificate.keystore.error.private-key=Please specify the content of the private key.
 ssl.import.certificate.keystore.error.certificate=Please specify the content of the certificate to import.
-ssl.import.certificate.keystore.error.import=There was an error one importing private key and signed certificate.
+ssl.import.certificate.keystore.error.import=There was an error while trying to import the private key and signed certificate.
 
 # Import truststore certificate page
 
-ssl.import.certificate.keystore.error.type=Type has not been specified (or is unrecognized).
-ssl.import.certificate.keystore.error.alias-missing=Please provide an alias for this certificate.
-ssl.import.certificate.keystore.error.alias-exists=A certificate is already stored using this alias. Please provide a different alias, or remove the existing certificate.
-ssl.import.certificate.keystore.c2s-intro=Use the form below to import a certificate that represents a trusted party, to be used when verifying certificates during client-to-server communication.
-ssl.import.certificate.keystore.s2s-intro=Use the form below to import a certificate that represents a trusted party, to be used when verifying certificates during server-to-server communication.
+ssl.import.certificate.truststore.boxtitle=Import CA Certificate
+ssl.import.certificate.truststore.error.connection-type=Connection Type has not been specified (or is unrecognized).
+ssl.import.certificate.truststore.error.alias-missing=Please provide an alias for this certificate.
+ssl.import.certificate.truststore.error.alias-exists=A certificate is already stored using this alias. Please provide a different alias, or remove the existing certificate.
+ssl.import.certificate.truststore.error.certificate=Please specify the content of the certificate to import.
+ssl.import.certificate.truststore.error.import=There was an error while trying to import the certificate.
+ssl.import.certificate.truststore.intro=Use the form below to import a certificate that represents a trusted party that can be used when verifying peer certificates while establishing encrypted communication.
 
 # Room Occupants Page
 

src/i18n/openfire_i18n_ja_JP.properties

@@ -2303,11 +2303,13 @@ ssl.import.certificate.keystore.error.import=\u79d8\u5bc6\u30ad\u30fc\u3068\u7f7
 
 # Import truststore certificate page
 
-ssl.import.certificate.keystore.error.type=Type has not been specified (or is unrecognized).
-ssl.import.certificate.keystore.error.alias-missing=Please provide an alias for this certificate.
-ssl.import.certificate.keystore.error.alias-exists=A certificate is already stored using this alias. Please provide a different alias, or remove the existing certificate.
-ssl.import.certificate.keystore.c2s-intro=Use the form below to import a certificate that represents a trusted party, to be used when verifying certificates during client-to-server communication.
-ssl.import.certificate.keystore.s2s-intro=Use the form below to import a certificate that represents a trusted party, to be used when verifying certificates during server-to-server communication.
+ssl.import.certificate.truststore.boxtitle=Import CA Certificate
+ssl.import.certificate.truststore.error.connection-type=Connection Type has not been specified (or is unrecognized).
+ssl.import.certificate.truststore.error.alias-missing=Please provide an alias for this certificate.
+ssl.import.certificate.truststore.error.alias-exists=A certificate is already stored using this alias. Please provide a different alias, or remove the existing certificate.
+ssl.import.certificate.truststore.error.certificate=Please specify the content of the certificate to import.
+ssl.import.certificate.truststore.error.import=There was an error while trying to import the certificate.
+ssl.import.certificate.truststore.intro=Use the form below to import a certificate that represents a trusted party that can be used when verifying peer certificates while establishing encrypted communication.
 
 # Room Occupants Page
 

src/i18n/openfire_i18n_nl.properties

@@ -2284,15 +2284,17 @@ ssl.import.certificate.keystore.private-key=Content of Private Key file:
 ssl.import.certificate.keystore.certificate=Content of Certificate file:
 ssl.import.certificate.keystore.error.private-key=Please specify the content of the private key.
 ssl.import.certificate.keystore.error.certificate=Please specify the content of the certificate to import.
-ssl.import.certificate.keystore.error.import=There was an error one importing private key and signed certificate.
+ssl.import.certificate.keystore.error.import=There was an error while trying to import the private key and signed certificate.
 
 # Import truststore certificate page
 
-ssl.import.certificate.keystore.error.type=Type has not been specified (or is unrecognized).
-ssl.import.certificate.keystore.error.alias-missing=Please provide an alias for this certificate.
-ssl.import.certificate.keystore.error.alias-exists=A certificate is already stored using this alias. Please provide a different alias, or remove the existing certificate.
-ssl.import.certificate.keystore.c2s-intro=Use the form below to import a certificate that represents a trusted party, to be used when verifying certificates during client-to-server communication.
-ssl.import.certificate.keystore.s2s-intro=Use the form below to import a certificate that represents a trusted party, to be used when verifying certificates during server-to-server communication.
+ssl.import.certificate.truststore.boxtitle=Import CA Certificate
+ssl.import.certificate.truststore.error.connection-type=Connection Type has not been specified (or is unrecognized).
+ssl.import.certificate.truststore.error.alias-missing=Please provide an alias for this certificate.
+ssl.import.certificate.truststore.error.alias-exists=A certificate is already stored using this alias. Please provide a different alias, or remove the existing certificate.
+ssl.import.certificate.truststore.error.certificate=Please specify the content of the certificate to import.
+ssl.import.certificate.truststore.error.import=There was an error while trying to import the certificate.
+ssl.import.certificate.truststore.intro=Use the form below to import a certificate that represents a trusted party that can be used when verifying peer certificates while establishing encrypted communication.
 
 
 # Room Occupants Page

src/i18n/openfire_i18n_pl_PL.properties

@@ -2259,15 +2259,17 @@ ssl.import.certificate.keystore.private-key=Content of Private Key file:
 ssl.import.certificate.keystore.certificate=Content of Certificate file:
 ssl.import.certificate.keystore.error.private-key=Please specify the content of the private key.
 ssl.import.certificate.keystore.error.certificate=Please specify the content of the certificate to import.
-ssl.import.certificate.keystore.error.import=There was an error one importing private key and signed certificate.
+ssl.import.certificate.keystore.error.import=There was an error while trying to import the private key and signed certificate.
 
 # Import truststore certificate page
 
-ssl.import.certificate.keystore.error.type=Type has not been specified (or is unrecognized).
-ssl.import.certificate.keystore.error.alias-missing=Please provide an alias for this certificate.
-ssl.import.certificate.keystore.error.alias-exists=A certificate is already stored using this alias. Please provide a different alias, or remove the existing certificate.
-ssl.import.certificate.keystore.c2s-intro=Use the form below to import a certificate that represents a trusted party, to be used when verifying certificates during client-to-server communication.
-ssl.import.certificate.keystore.s2s-intro=Use the form below to import a certificate that represents a trusted party, to be used when verifying certificates during server-to-server communication.
+ssl.import.certificate.truststore.boxtitle=Import CA Certificate
+ssl.import.certificate.truststore.error.connection-type=Connection Type has not been specified (or is unrecognized).
+ssl.import.certificate.truststore.error.alias-missing=Please provide an alias for this certificate.
+ssl.import.certificate.truststore.error.alias-exists=A certificate is already stored using this alias. Please provide a different alias, or remove the existing certificate.
+ssl.import.certificate.truststore.error.certificate=Please specify the content of the certificate to import.
+ssl.import.certificate.truststore.error.import=There was an error while trying to import the certificate.
+ssl.import.certificate.truststore.intro=Use the form below to import a certificate that represents a trusted party that can be used when verifying peer certificates while establishing encrypted communication.
 
 # Room Occupants Page
 

src/i18n/openfire_i18n_pt_BR.properties

@@ -2291,15 +2291,17 @@ ssl.import.certificate.keystore.private-key=Content of Private Key file:
 ssl.import.certificate.keystore.certificate=Content of Certificate file:
 ssl.import.certificate.keystore.error.private-key=Please specify the content of the private key.
 ssl.import.certificate.keystore.error.certificate=Please specify the content of the certificate to import.
-ssl.import.certificate.keystore.error.import=There was an error one importing private key and signed certificate.
+ssl.import.certificate.keystore.error.import=There was an error while trying to import the private key and signed certificate.
 
 # Import truststore certificate page
 
-ssl.import.certificate.keystore.error.type=Type has not been specified (or is unrecognized).
-ssl.import.certificate.keystore.error.alias-missing=Please provide an alias for this certificate.
-ssl.import.certificate.keystore.error.alias-exists=A certificate is already stored using this alias. Please provide a different alias, or remove the existing certificate.
-ssl.import.certificate.keystore.c2s-intro=Use the form below to import a certificate that represents a trusted party, to be used when verifying certificates during client-to-server communication.
-ssl.import.certificate.keystore.s2s-intro=Use the form below to import a certificate that represents a trusted party, to be used when verifying certificates during server-to-server communication.
+ssl.import.certificate.truststore.boxtitle=Import CA Certificate
+ssl.import.certificate.truststore.error.connection-type=Connection Type has not been specified (or is unrecognized).
+ssl.import.certificate.truststore.error.alias-missing=Please provide an alias for this certificate.
+ssl.import.certificate.truststore.error.alias-exists=A certificate is already stored using this alias. Please provide a different alias, or remove the existing certificate.
+ssl.import.certificate.truststore.error.certificate=Please specify the content of the certificate to import.
+ssl.import.certificate.truststore.error.import=There was an error while trying to import the certificate.
+ssl.import.certificate.truststore.intro=Use the form below to import a certificate that represents a trusted party that can be used when verifying peer certificates while establishing encrypted communication.
 
 # Room Occupants Page
 

src/i18n/openfire_i18n_pt_PT.properties

@@ -3018,19 +3018,29 @@ mediaproxy.summary.stopbutton = Parar Sess\u00f5es Ativas
 
 # Import signed certificate page
 
-ssl.import.certificate.title=Importar Certificado Assinado
-ssl.import.certificate.info=Utilize o formulario abaixo para importar uma chave privada e certificado fornecidos por uma \
+ssl.import.certificate.keystore.title=Importar Certificado Assinado
+ssl.import.certificate.keystore.info=Utilize o formulario abaixo para importar uma chave privada e certificado fornecidos por uma \
    Autoridade Certificadora. Certifique-se de que os certificados raiz da CA assinam os certificados que estao nos \
    certificados autorizados. Caso contrario, tera que importa-los manualmente usando a ferramenta de linha de comandos "keytool".\
    Se visualizar erros relacionadas com "tamanho da chave inv�lida" vai precisar instalar o "Java Cryptography Extension (JCE) \
   Unlimited Strength Jurisdiction Policy Files" de {0}aqui{1}.
-ssl.import.certificate.boxtitle=Importar Chave Privada e Certificado
-ssl.import.certificate.pass-phrase=Frase usada para criar a chave privada:
-ssl.import.certificate.private-key=Conteudo do ficheiro da Chave Privada:
-ssl.import.certificate.certificate=Conteudo do ficheiro do Certificado:
-ssl.import.certificate.error.private-key=Indique o conteudo da chave privada.
-ssl.import.certificate.error.certificate=Indique o conteudo do certificado para importar.
-ssl.import.certificate.error.import=Houve um erro ao importar a chave privada ou o certificado assinado.
+ssl.import.certificate.keystore.boxtitle=Importar Chave Privada e Certificado
+ssl.import.certificate.keystore.pass-phrase=Frase usada para criar a chave privada:
+ssl.import.certificate.keystore.private-key=Conteudo do ficheiro da Chave Privada:
+ssl.import.certificate.keystore.certificate=Conteudo do ficheiro do Certificado:
+ssl.import.certificate.keystore.error.private-key=Indique o conteudo da chave privada.
+ssl.import.certificate.keystore.error.certificate=Indique o conteudo do certificado para importar.
+ssl.import.certificate.keystore.error.import=Houve um erro ao importar a chave privada ou o certificado assinado.
+
+# Import truststore certificate page
+
+ssl.import.certificate.truststore.boxtitle=Import CA Certificate
+ssl.import.certificate.truststore.error.connection-type=Connection Type has not been specified (or is unrecognized).
+ssl.import.certificate.truststore.error.alias-missing=Please provide an alias for this certificate.
+ssl.import.certificate.truststore.error.alias-exists=A certificate is already stored using this alias. Please provide a different alias, or remove the existing certificate.
+ssl.import.certificate.truststore.error.certificate=Please specify the content of the certificate to import.
+ssl.import.certificate.truststore.error.import=There was an error while trying to import the certificate.
+ssl.import.certificate.truststore.intro=Use the form below to import a certificate that represents a trusted party that can be used when verifying peer certificates while establishing encrypted communication.
 
 # Room Occupants Page
 

src/i18n/openfire_i18n_ru_RU.properties

@@ -1559,11 +1559,13 @@ ssl.import.certificate.keystore.title=\u0418\u043C\u043F\u043E\u0440\u0442 \u041
 
 # Import truststore certificate page
 
-ssl.import.certificate.keystore.error.type=Type has not been specified (or is unrecognized).
-ssl.import.certificate.keystore.error.alias-missing=Please provide an alias for this certificate.
-ssl.import.certificate.keystore.error.alias-exists=A certificate is already stored using this alias. Please provide a different alias, or remove the existing certificate.
-ssl.import.certificate.keystore.c2s-intro=Use the form below to import a certificate that represents a trusted party, to be used when verifying certificates during client-to-server communication.
-ssl.import.certificate.keystore.s2s-intro=Use the form below to import a certificate that represents a trusted party, to be used when verifying certificates during server-to-server communication.
+ssl.import.certificate.truststore.boxtitle=Import CA Certificate
+ssl.import.certificate.truststore.error.connection-type=Connection Type has not been specified (or is unrecognized).
+ssl.import.certificate.truststore.error.alias-missing=Please provide an alias for this certificate.
+ssl.import.certificate.truststore.error.alias-exists=A certificate is already stored using this alias. Please provide a different alias, or remove the existing certificate.
+ssl.import.certificate.truststore.error.certificate=Please specify the content of the certificate to import.
+ssl.import.certificate.truststore.error.import=There was an error while trying to import the certificate.
+ssl.import.certificate.truststore.intro=Use the form below to import a certificate that represents a trusted party that can be used when verifying peer certificates while establishing encrypted communication.
 
 # Generic certificate-related messages
 

src/i18n/openfire_i18n_sk.properties

@@ -2228,11 +2228,13 @@ ssl.import.certificate.keystore.error.import=Pri importovan\u00ed priv\u00e1tneh
 
 # Import truststore certificate page
 
-ssl.import.certificate.keystore.error.type=Type has not been specified (or is unrecognized).
-ssl.import.certificate.keystore.error.alias-missing=Please provide an alias for this certificate.
-ssl.import.certificate.keystore.error.alias-exists=A certificate is already stored using this alias. Please provide a different alias, or remove the existing certificate.
-ssl.import.certificate.keystore.c2s-intro=Use the form below to import a certificate that represents a trusted party, to be used when verifying certificates during client-to-server communication.
-ssl.import.certificate.keystore.s2s-intro=Use the form below to import a certificate that represents a trusted party, to be used when verifying certificates during server-to-server communication.
+ssl.import.certificate.truststore.boxtitle=Import CA Certificate
+ssl.import.certificate.truststore.error.connection-type=Connection Type has not been specified (or is unrecognized).
+ssl.import.certificate.truststore.error.alias-missing=Please provide an alias for this certificate.
+ssl.import.certificate.truststore.error.alias-exists=A certificate is already stored using this alias. Please provide a different alias, or remove the existing certificate.
+ssl.import.certificate.truststore.error.certificate=Please specify the content of the certificate to import.
+ssl.import.certificate.truststore.error.import=There was an error while trying to import the certificate.
+ssl.import.certificate.truststore.intro=Use the form below to import a certificate that represents a trusted party that can be used when verifying peer certificates while establishing encrypted communication.
 
 # Room Occupants Page
 

src/i18n/openfire_i18n_zh_CN.properties

@@ -2190,11 +2190,13 @@ ssl.import.certificate.keystore.error.import=There was an error one importing pr
 
 # Import truststore certificate page
 
-ssl.import.certificate.keystore.error.type=Type has not been specified (or is unrecognized).
-ssl.import.certificate.keystore.error.alias-missing=Please provide an alias for this certificate.
-ssl.import.certificate.keystore.error.alias-exists=A certificate is already stored using this alias. Please provide a different alias, or remove the existing certificate.
-ssl.import.certificate.keystore.c2s-intro=Use the form below to import a certificate that represents a trusted party, to be used when verifying certificates during client-to-server communication.
-ssl.import.certificate.keystore.s2s-intro=Use the form below to import a certificate that represents a trusted party, to be used when verifying certificates during server-to-server communication.
+ssl.import.certificate.truststore.boxtitle=Import CA Certificate
+ssl.import.certificate.truststore.error.connection-type=Connection Type has not been specified (or is unrecognized).
+ssl.import.certificate.truststore.error.alias-missing=Please provide an alias for this certificate.
+ssl.import.certificate.truststore.error.alias-exists=A certificate is already stored using this alias. Please provide a different alias, or remove the existing certificate.
+ssl.import.certificate.truststore.error.certificate=Please specify the content of the certificate to import.
+ssl.import.certificate.truststore.error.import=There was an error while trying to import the certificate.
+ssl.import.certificate.truststore.intro=Use the form below to import a certificate that represents a trusted party that can be used when verifying peer certificates while establishing encrypted communication.
 
 # Room Occupants Page
 

src/web/import-keystore-certificate.jsp

@@ -117,7 +117,7 @@
                     <label for="passPhrase"><fmt:message key="ssl.import.certificate.keystore.pass-phrase" /></label>
                 </td>
                 <td width="99%">
-                    <input type="text" size="60" maxlength="200" name="passPhrase" id="passPhrase" value="${not empty param.passPhrase ? param.passPhrase : ''}">
+                    <input type="text" size="60" maxlength="200" name="passPhrase" id="passPhrase" value="${param.passPhrase}">
                 </td>
             </tr>
             <tr valign="top">

src/web/import-truststore-certificate.jsp

@@ -74,11 +74,11 @@
 
 <html>
 <head>
-    <title>
-        <fmt:message key="ssl.import.certificate.keystore.${connectionType}.title"/> - <fmt:message key="ssl.certificates.truststore.${param.type}-title"/>
-    </title>
+<head>
+    <title><fmt:message key="ssl.import.certificate.truststore.boxtitle"/></title>
     <meta name="pageID" content="security-certificate-store-management"/>
-    <meta name="subPageID" content="sidebar-certificate-store-${fn:toLowerCase(connectionType)}-identity-store"/>
+    <meta name="subPageID" content="sidebar-certificate-store-${fn:toLowerCase(connectionType)}-trust-store"/>
+</head>
 </head>
 <body>
 
@@ -86,24 +86,24 @@
 <c:forEach var="err" items="${errors}">
     <admin:infobox type="error">
         <c:choose>
-            <c:when test="${err.key eq 'type'}">
-                <fmt:message key="ssl.import.certificate.keystore.error.type"/>
+            <c:when test="${err.key eq 'connectionType'}">
+                <fmt:message key="ssl.import.certificate.truststore.error.connection-type"/>
             </c:when>
 
             <c:when test="${err.key eq 'missingalias'}">
-                <fmt:message key="ssl.import.certificate.keystore.error.alias-missing"/>
+                <fmt:message key="ssl.import.certificate.truststore.error.alias-missing"/>
             </c:when>
 
             <c:when test="${err.key eq 'existingalias'}">
-                <fmt:message key="ssl.import.certificate.keystore.error.alias-exists"/>
+                <fmt:message key="ssl.import.certificate.truststore.error.alias-exists"/>
             </c:when>
 
             <c:when test="${err.key eq 'certificate'}">
-                <fmt:message key="ssl.import.certificate.keystore.error.certificate"/>
+                <fmt:message key="ssl.import.certificate.truststore.error.certificate"/>
             </c:when>
 
             <c:when test="${err.key eq 'import'}">
-                <fmt:message key="ssl.import.certificate.keystore.error.import"/>
+                <fmt:message key="ssl.import.certificate.truststore.error.import"/>
                 <c:if test="${not empty err.value}">
                     <fmt:message key="admin.error"/>: <c:out value="${err.value}"/>
                 </c:if>
@@ -119,39 +119,35 @@
     </admin:infobox>
 </c:forEach>
 
-<c:if test="${not empty param.type}">
+<c:if test="${not empty connectionType}">
     <p>
-        <fmt:message key="ssl.import.certificate.keystore.${param.type}-intro"/>
+        <fmt:message key="ssl.import.certificate.truststore.intro"/>
     </p>
 
     <!-- BEGIN 'Import Certificate' -->
-    <form action="import-truststore-certificate.jsp?type=${param.type}" method="post" name="f">
-        <input type="hidden" name="connectivityType" value="${connectionType}"/>
-        <div class="jive-contentBoxHeader">
-            <fmt:message key="ssl.import.certificate.keystore.boxtitle"/>
-        </div>
-        <div class="jive-contentBox">
+    <form action="import-truststore-certificate.jsp?connectionType=${connectionType}" method="post">
+        <c:set var="title"><fmt:message key="ssl.import.certificate.truststore.boxtitle"/></c:set>
+        <admin:contentBox title="${title}">
             <table cellpadding="3" cellspacing="0" border="0">
-                <tbody>
-                    <tr valign="top">
-                        <td width="1%" nowrap class="c1">
-                            <label for="alias"><fmt:message key="ssl.signing-request.alias"/></label>
-                        </td>
-                        <td width="99%">
-                            <input type="text" size="30" maxlength="100" name="alias" id="alias" value="${param.alias}">
-                        </td>
-                    </tr>
-                    <tr valign="top">
-                        <td width="1%" nowrap class="c1">
-                            <label for="certificate"><fmt:message key="ssl.import.certificate.keystore.certificate"/></label>
-                        </td>
-                        <td width="99%">
-                            <textarea name="certificate" id="certificate" cols="80" rows="20" wrap="virtual">${param.certificate}</textarea>
-                        </td>
-                    </tr>
-                </tbody>
+                <tr valign="top">
+                    <td width="1%" nowrap class="c1">
+                        <label for="alias"><fmt:message key="ssl.signing-request.alias"/></label>
+                    </td>
+                    <td width="99%">
+                        <input type="text" size="30" maxlength="100" name="alias" id="alias" value="${param.alias}">
+                    </td>
+                </tr>
+                <tr valign="top">
+                    <td width="1%" nowrap class="c1">
+                        <label for="certificate"><fmt:message key="ssl.import.certificate.keystore.certificate"/></label>
+                    </td>
+                    <td width="99%">
+                        <textarea name="certificate" id="certificate" cols="80" rows="20" wrap="virtual"><c:if test="${not empty param.certificate}"><c:out value="${param.certificate}"/></c:if></textarea>
+                    </td>
+                </tr>
             </table>
-        </div>
+        </admin:contentBox>
+
         <input type="submit" name="save" value="<fmt:message key="global.save"/>">
     </form>
     <!-- END 'Import Certificate' -->

src/web/security-truststore.jsp

@@ -81,30 +81,9 @@
 
 <html>
     <head>
-        <title><fmt:message key="certificate-management.connectionType.${connectionType}.title"/></title>
+        <title><fmt:message key="ssl.certificates.truststore.title"/></title>
         <meta name="pageID" content="security-certificate-store-management"/>
-        <meta name="subPageID" content="sidebar-certificate-store-${fn:toLowerCase(connectionType)}-trust-store"/>
-        <style>
-            .info-header {
-                background-color: #eee;
-                font-size: 10pt;
-            }
-            .info-table {
-                margin-right: 12px;
-            }
-            .info-table .c1 {
-                text-align: right;
-                vertical-align: top;
-                color: #666;
-                font-weight: bold;
-                font-size: 9pt;
-                white-space: nowrap;
-            }
-            .info-table .c2 {
-                font-size: 9pt;
-                width: 90%;
-            }
-        </style>
+        <meta name="subPageID" content="sidebar-certificate-store-${fn:toLowerCase(connectionType)}-identity-store"/>
     </head>
     <body>
         <c:forEach var="err" items="${errors}">
@@ -136,48 +115,9 @@
 
         <c:if test="${connectionType != null}">
             <p>
-                <fmt:message key="certificate-management.connectionType.${connectionType}.description"/>
+                <fmt:message key="ssl.certificates.truststore.info"/>
             </p>
 
-            <table border="0" width="100%">
-                <tr>
-                    <td valign="top" width="60%">
-                        <table cellpadding="2" cellspacing="2" border="0" class="info-table">
-                            <thead>
-                            <tr><th colspan="2" class="info-header">Store Configuration</th></tr>
-                            </thead>
-                            <tbody>
-                            <tr>
-                                <td class="c1">File location:</td>
-                                <td class="c2"><c:out value="${trustStore.configuration.file}"/></td>
-                            </tr>
-                            <tr>
-                                <td class="c1">Type:</td>
-                                <td class="c2"><c:out value="${trustStore.configuration.type}"/></td>
-                            </tr>
-                            <tr>
-                                <td class="c1">Password:</td>
-                                <td class="c2"><c:out value="${trustStore.configuration.password}"/></td>
-                            </tr>
-                            </tbody>
-                        </table>
-                    </td>
-                    <td valign="top" width="40%">
-                        <c:if test="${not empty sameStoreConnectionTypes}">
-                            <admin:infobox type="info">
-                                This store is re-used for these additional purposes. Any changes to this store will also affect that functionality!
-                                <ul style="margin-top: 1em;">
-                                    <c:forEach var="sameStorePurpose" items="${sameStoreConnectionTypes}">
-                                        <li><fmt:message key="certificate-management.connectionType.${sameStorePurpose}.title"/></li>
-                                    </c:forEach>
-                                </ul>
-                            </admin:infobox>
-                        </c:if>
-                    </td>
-                </tr>
-            </table>
-
-
             <p>
                 <fmt:message key="ssl.certificates.truststore.link-to-import">
                     <fmt:param value="<a href='import-truststore-certificate.jsp?connectionType=${connectionType}'>"/>