Replaced c2s and s2s config pages, removed ssl-config. Made all i18n files...

Replaced c2s and s2s config pages, removed ssl-config. Made all i18n files have the same line-ending.

src/i18n/openfire_i18n_cs_CZ.properties

@@ -2242,18 +2242,19 @@ ports.port=Port
 ports.type=Typ
 ports.description=Popis
 ports.all_ports=V\u0161echny adresy
+ports.plaintext.desc=On this port plain-text connections are established, which, depending on configurable {0}security settings{1}, can (or must) be upgraded to encrypted connections.
+ports.legacymode.desc=Connections established on this port are established using a pre-encrypted connection. This type of connectivity is commonly referred to as the "old-style" or "legacy" method of establishing encrypted connections. Configuration details can be modified in the {0}security settings{1}.
 ports.client_to_server=Klient-server
-ports.client_to_server.desc=Standardn\u00ed port pro p\u0159ipojen\u00ed klient\u016f k serveru. Spojen\u00ed mohou, ale nemus\u00ed b\u00fdt \
-  \u0161ifrov\u00e1na. M\u016f\u017eete zm\u011bnit {0}nastaven\u00ed zabezpe\u010den\u00ed{1} pro tento port.
-ports.client_to_server.desc_old_ssl=Port pou\u017e\u00edvan\u00fd klienty pro p\u0159ipojen\u00ed k serveru pou\u017eit\u00edm star\u00e9ho SSL zp\u016fsobu. \
-  Star\u00fd zp\u016fsob SSL nen\u00ed standardn\u00edm XMPP zp\u016fsobem a bude v budoucnu zru\u0161en.  M\u016f\u017eete zm\u011bnit \
-  {0}nastaven\u00ed zabezpe\u010den\u00ed{1} pro tento port.
+ports.client_to_server.desc=Standardn\u00ed port pro p\u0159ipojen\u00ed klient\u016f k serveru.
+ports.client_to_server.desc_old_ssl=Port pou\u017e\u00edvan\u00fd klienty pro p\u0159ipojen\u00ed k serveru pou\u017eit\u00edm star\u00e9ho SSL zp\u016fsobu.
 ports.server_to_server=Server-server
-ports.server_to_server.desc=Port pou\u017e\u00edvan\u00fd {0}vzd\u00e1len\u00fdmi servery{1} pro p\u0159ipojen\u00ed k tomuto serveru.
+ports.server_to_server.desc=Port pou\u017e\u00edvan\u00fd vzd\u00e1len\u00fdmi servery pro p\u0159ipojen\u00ed k tomuto serveru.
 ports.connection_manager=Spr\u00e1vce p\u0159ipojen\u00ed
-ports.connection_manager.desc=Port pou\u017e\u00edvan\u00fd {0}spr\u00e1vci p\u0159ipojen\u00ed{1} pro p\u0159ipojen\u00ed k serveru.
+ports.connection_manager.desc=Port pou\u017e\u00edvan\u00fd spr\u00e1vci p\u0159ipojen\u00ed pro p\u0159ipojen\u00ed k serveru.
+ports.connection_manager.desc_old_ssl=The port used for connection managers to the server using the old SSL/TLS method.
 ports.external_components=Extern\u00ed komponenty
-ports.external_components.desc=Port pou\u017e\u00edvan\u00fd  {0}extern\u00edmi komponentami{1} pro p\u0159ipojen\u00ed k serveru.
+ports.external_components.desc=Port pou\u017e\u00edvan\u00fd extern\u00edmi komponentami pro p\u0159ipojen\u00ed k serveru.
+ports.external_components.desc_old_ssl=The port used for external components to the server using the old SSL/TLS method.
 ports.admin_console=Administr\u00e1torsk\u00e1 konzole
 ports.admin_console.desc_unsecured=Port pou\u017e\u00edvan\u00fd pro nezabezpe\u010den\u00fd p\u0159\u00edstup k administr\u00e1torsk\u00e9 konzoli.
 ports.admin_console.desc_secured=Port pou\u017e\u00edvan\u00fd pro zabezpe\u010den\u00fd p\u0159\u00edstup k administr\u00e1torsk\u00e9 konzoli.

src/i18n/openfire_i18n_de.properties

@@ -2128,18 +2128,19 @@ ports.port=Port
 ports.type=Type
 ports.description=Description
 ports.all_ports=All addresses
+ports.plaintext.desc=On this port plain-text connections are established, which, depending on configurable {0}security settings{1}, can (or must) be upgraded to encrypted connections.
+ports.legacymode.desc=Connections established on this port are established using a pre-encrypted connection. This type of connectivity is commonly referred to as the "old-style" or "legacy" method of establishing encrypted connections. Configuration details can be modified in the {0}security settings{1}.
 ports.client_to_server=Client to server
-ports.client_to_server.desc=The standard port for clients to connect to the server. Connections may or may not be \
-  encrypted. You can update the {0}security settings{1} for this port.
-ports.client_to_server.desc_old_ssl=The port used for clients to connect to the server using the old SSL method. \
-  The old SSL method is not an XMPP standard method and will be deprecated in the future.  You can update the \
-  {0}security  settings{1} for this port.
+ports.client_to_server.desc=The standard port for clients to connect to the server.
+ports.client_to_server.desc_old_ssl=The port used for clients to connect to the server using the old SSL/TLS method.
 ports.server_to_server=Server to Server
-ports.server_to_server.desc=The port used for {0}remote servers{1} to connect to this server.
+ports.server_to_server.desc=The port used for remote servers to connect to this server.
 ports.connection_manager=Connection Manager
-ports.connection_manager.desc=The port used for {0}connection managers{1} to connect to the server.
+ports.connection_manager.desc=The port used for connection managers to connect to the server.
+ports.connection_manager.desc_old_ssl=The port used for connection managers to the server using the old SSL/TLS method.
 ports.external_components=External Components
-ports.external_components.desc=The port used for {0}external components{1} to connect to the server.
+ports.external_components.desc=The port used for external components to connect to the server.
+ports.external_components.desc_old_ssl=The port used for external components to the server using the old SSL/TLS method.
 ports.admin_console=Admin Console
 ports.admin_console.desc_unsecured=The port used for unsecured Admin Console access.
 ports.admin_console.desc_secured=The port used for secured Admin Console access.

src/i18n/openfire_i18n_es.properties

@@ -2219,18 +2219,19 @@ ports.port=Puerto
 ports.type=Tipo
 ports.description=Descripci\u00f3n
 ports.all_ports=Todas direcciones
+ports.plaintext.desc=On this port plain-text connections are established, which, depending on configurable {0}security settings{1}, can (or must) be upgraded to encrypted connections.
+ports.legacymode.desc=Connections established on this port are established using a pre-encrypted connection. This type of connectivity is commonly referred to as the "old-style" or "legacy" method of establishing encrypted connections. Configuration details can be modified in the {0}security settings{1}.
 ports.client_to_server=Cliente-Servidor
-ports.client_to_server.desc=El puerto estandar utilizado por clientes para conectarse al servidor. Conexiones pueden \
-  o no estar encriptadas. Puede modificar la {0}configuraci\u00f3n{1} para este puerto.
-ports.client_to_server.desc_old_ssl=El puerto utilizado por clientes para conectarse al servidor usando el viejo \
-  m\u00e9todo de SSL. El m\u00e9todo de SSL no es un m\u00e9todo estandar y ser\u00e1 removido en el futuro.  Puede \
-  modificar la {0}configuraci\u00f3n{1} para este puerto
+ports.client_to_server.desc=El puerto estandar utilizado por clientes para conectarse al servidor.
+ports.client_to_server.desc_old_ssl=El puerto utilizado por clientes para conectarse al servidor usando el viejo m\u00e9todo de SSL.
 ports.server_to_server=Servidor-Servidor
-ports.server_to_server.desc=Puerto utilizado por {0}servidores remotos{1} para conectarse al servidor.
+ports.server_to_server.desc=Puerto utilizado por servidores remotos para conectarse al servidor.
 ports.connection_manager=Administrador de Conexiones
-ports.connection_manager.desc=Puerto utilizado por {0}administradores de conexiones{1} para conectarse al servidor.
+ports.connection_manager.desc=Puerto utilizado por administradores de conexiones para conectarse al servidor.
+ports.connection_manager.desc_old_ssl=The port used for connection managers to the server using the old SSL/TLS method.
 ports.external_components=Componentes externos
-ports.external_components.desc=Puerto utilizado por {0}componentes externos{1} para conectarse al servidor.
+ports.external_components.desc=Puerto utilizado por componentes externos para conectarse al servidor.
+ports.external_components.desc_old_ssl=The port used for external components to the server using the old SSL/TLS method.
 ports.admin_console=Consola de Administraci\u00f3n
 ports.admin_console.desc_unsecured=Puerto utilizado para conexiones inseguras a la consola de administraci\u00f3n.
 ports.admin_console.desc_secured=Puerto utilizado para conexiones seguras a la consola de administraci\u00f3n.

src/i18n/openfire_i18n_fr.properties

@@ -1797,18 +1797,19 @@ ports.port=Port
 ports.type=Type
 ports.description=Description
 ports.all_ports=All addresses
+ports.plaintext.desc=On this port plain-text connections are established, which, depending on configurable {0}security settings{1}, can (or must) be upgraded to encrypted connections.
+ports.legacymode.desc=Connections established on this port are established using a pre-encrypted connection. This type of connectivity is commonly referred to as the "old-style" or "legacy" method of establishing encrypted connections. Configuration details can be modified in the {0}security settings{1}.
 ports.client_to_server=Client to server
-ports.client_to_server.desc=The standard port for clients to connect to the server. Connections may or may not be \
-  encrypted. You can update the {0}security settings{1} for this port.
-ports.client_to_server.desc_old_ssl=The port used for clients to connect to the server using the old SSL method. \
-  The old SSL method is not an XMPP standard method and will be deprecated in the future.  You can update the \
-  {0}security  settings{1} for this port.
+ports.client_to_server.desc=The standard port for clients to connect to the server.
+ports.client_to_server.desc_old_ssl=The port used for clients to connect to the server using the old SSL/TLS method.
 ports.server_to_server=Server to Server
-ports.server_to_server.desc=The port used for {0}remote servers{1} to connect to this server.
+ports.server_to_server.desc=The port used for remote servers to connect to this server.
 ports.connection_manager=Connection Manager
-ports.connection_manager.desc=The port used for {0}connection managers{1} to connect to the server.
+ports.connection_manager.desc=The port used for connection managers to connect to the server.
+ports.connection_manager.desc_old_ssl=The port used for connection managers to the server using the old SSL/TLS method.
 ports.external_components=External Components
-ports.external_components.desc=The port used for {0}external components{1} to connect to the server.
+ports.external_components.desc=The port used for external components to connect to the server.
+ports.external_components.desc_old_ssl=The port used for external components to the server using the old SSL/TLS method.
 ports.admin_console=Admin Console
 ports.admin_console.desc_unsecured=The port used for unsecured Admin Console access.
 ports.admin_console.desc_secured=The port used for secured Admin Console access.

src/i18n/openfire_i18n_ja_JP.properties

@@ -2224,18 +2224,19 @@ ports.port=\u30dd\u30fc\u30c8
 ports.type=\u30bf\u30a4\u30d7
 ports.description=\u8a73\u7d30
 ports.all_ports=\u5168\u90e8\u306e\u30a2\u30c9\u30ec\u30b9
+ports.plaintext.desc=On this port plain-text connections are established, which, depending on configurable {0}security settings{1}, can (or must) be upgraded to encrypted connections.
+ports.legacymode.desc=Connections established on this port are established using a pre-encrypted connection. This type of connectivity is commonly referred to as the "old-style" or "legacy" method of establishing encrypted connections. Configuration details can be modified in the {0}security settings{1}.
 ports.client_to_server=\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u304b\u3089\u30b5\u30fc\u30d0\u30fc
-ports.client_to_server.desc=\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u304c\u30b5\u30fc\u30d0\u3078\u63a5\u7d9a\u3059\u308b\u305f\u3081\u306e\u6a19\u6e96\u30dd\u30fc\u30c8\u3067\u3059\u3002\u63a5\u7d9a\u306f\u6697\u53f7\u5316\u3055\u308c\u3066\u3044\u308b\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3057\u3001\
-   \u3055\u308c\u3066\u3044\u306a\u3044\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002\u3053\u306e\u30dd\u30fc\u30c8\u306b\u5bfe\u3059\u308b{0}\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u8a2d\u5b9a{1}\u3092\u66f4\u65b0\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002
-ports.client_to_server.desc_old_ssl=\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u306b\u5bfe\u3057\u3066\u53e4\u3044SSL\u63a5\u7d9a\u65b9\u6cd5\u3092\u4f7f\u7528\u3057\u3066\u30b5\u30fc\u30d0\u30fc\u306b\u63a5\u7d9a\u3059\u308b\u305f\u3081\u306b\u4f7f\u7528\u3055\u308c\u308b\u30dd\u30fc\u30c8\u3067\u3059\u3002\
-  \u65e7\u5f0f\u306eSSL\u63a5\u7d9a\u65b9\u6cd5\u306fXMPP\u6a19\u6e96\u306e\u65b9\u6cd5\u3067\u306f\u306a\u304f\u3001\u307e\u305f\u5c06\u6765\u7684\u306b\u306f\u4f7f\u7528\u3092\u975e\u63a8\u5968\u3055\u308c\u308b\u3067\u3057\u3087\u3046\u3002\
-  \u3053\u306e\u30dd\u30fc\u30c8\u306b\u5bfe\u3059\u308b{0}\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u8a2d\u5b9a{1}\u3092\u66f4\u65b0\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+ports.client_to_server.desc=The standard port for clients to connect to the server.
+ports.client_to_server.desc_old_ssl=The port used for clients to connect to the server using the old SSL/TLS method.
 ports.server_to_server=\u30b5\u30fc\u30d0\u30fc\u9593\u63a5\u7d9a
-ports.server_to_server.desc=\u3053\u306e\u30b5\u30fc\u30d0\u30fc\u306b\u63a5\u7d9a\u3059\u308b{0}\u30ea\u30e2\u30fc\u30c8\u30b5\u30fc\u30d0\u30fc{1}\u306b\u4f7f\u7528\u3055\u308c\u308b\u30dd\u30fc\u30c8\u3067\u3059\u3002
+ports.server_to_server.desc=\u3053\u306e\u30b5\u30fc\u30d0\u30fc\u306b\u63a5\u7d9a\u3059\u308b\u30ea\u30e2\u30fc\u30c8\u30b5\u30fc\u30d0\u30fc\u306b\u4f7f\u7528\u3055\u308c\u308b\u30dd\u30fc\u30c8\u3067\u3059\u3002
 ports.connection_manager=\u63a5\u7d9a\u30de\u30cd\u30fc\u30b8\u30e3
-ports.connection_manager.desc=\u30b5\u30fc\u30d0\u30fc\u306b\u63a5\u7d9a\u3059\u308b\u305f\u3081\u306e{0}\u63a5\u7d9a\u30de\u30cd\u30fc\u30b8\u30e3{1}\u304c\u4f7f\u7528\u3059\u308b\u30dd\u30fc\u30c8\u3067\u3059\u3002
+ports.connection_manager.desc=\u30b5\u30fc\u30d0\u30fc\u306b\u63a5\u7d9a\u3059\u308b\u305f\u3081\u306e\u63a5\u7d9a\u30de\u30cd\u30fc\u30b8\u30e3\u304c\u4f7f\u7528\u3059\u308b\u30dd\u30fc\u30c8\u3067\u3059\u3002
+ports.connection_manager.desc_old_ssl=The port used for connection managers to the server using the old SSL/TLS method.
 ports.external_components=\u5916\u90e8\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8
-ports.external_components.desc=\u30b5\u30fc\u30d0\u30fc\u306b\u63a5\u7d9a\u3059\u308b\u305f\u3081\u306b{0}\u5916\u90e8\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8{1}\u304c\u4f7f\u7528\u3059\u308b\u30dd\u30fc\u30c8\u3067\u3059\u3002
+ports.external_components.desc=\u30b5\u30fc\u30d0\u30fc\u306b\u63a5\u7d9a\u3059\u308b\u305f\u3081\u306b\u5916\u90e8\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u304c\u4f7f\u7528\u3059\u308b\u30dd\u30fc\u30c8\u3067\u3059\u3002
+ports.external_components.desc_old_ssl=The port used for external components to the server using the old SSL/TLS method.
 ports.admin_console=\u7ba1\u7406\u30b3\u30f3\u30bd\u30fc\u30eb
 ports.admin_console.desc_unsecured=\u30bb\u30ad\u30e5\u30a2\u30fc\u3067\u306a\u3044\u7ba1\u7406\u30b3\u30f3\u30bd\u30fc\u30eb\u30a2\u30af\u30bb\u30b9\u306e\u305f\u3081\u306b\u4f7f\u7528\u3059\u308b\u30dd\u30fc\u30c8\u3067\u3059\u3002
 ports.admin_console.desc_secured=\u30bb\u30ad\u30e5\u30a2\u30fc\u306a\u7ba1\u7406\u30b3\u30f3\u30bd\u30fc\u30eb\u30a2\u30af\u30bb\u30b9\u306e\u305f\u3081\u306b\u4f7f\u7528\u3059\u308b\u30dd\u30fc\u30c8\u3067\u3059\u3002

src/i18n/openfire_i18n_nl.properties

@@ -2126,22 +2126,23 @@ profile-settings.ldap_mapping_info=LDAP Settings
 # Ports section/page
 
 ports.interface=Interface
-ports.port=Port
+ports.port=Poort
 ports.type=Type
-ports.description=Description
-ports.all_ports=All addresses
+ports.description=Omschrijving
+ports.all_ports=Alle addressen
+ports.plaintext.desc=On this port plain-text connections are established, which, depending on configurable {0}security settings{1}, can (or must) be upgraded to encrypted connections.
+ports.legacymode.desc=Connections established on this port are established using a pre-encrypted connection. This type of connectivity is commonly referred to as the "old-style" or "legacy" method of establishing encrypted connections. Configuration details can be modified in the {0}security settings{1}.
 ports.client_to_server=Client to server
-ports.client_to_server.desc=The standard port for clients to connect to the server. Connections may or may not be \
-  encrypted. You can update the {0}security settings{1} for this port.
-ports.client_to_server.desc_old_ssl=The port used for clients to connect to the server using the old SSL method. \
-  The old SSL method is not an XMPP standard method and will be deprecated in the future.  You can update the \
-  {0}security  settings{1} for this port.
+ports.client_to_server.desc=The standard port for clients to connect to the server.
+ports.client_to_server.desc_old_ssl=The port used for clients to connect to the server using the old SSL/TLS method.
 ports.server_to_server=Server to Server
-ports.server_to_server.desc=The port used for {0}remote servers{1} to connect to this server.
+ports.server_to_server.desc=The port used for remote servers to connect to this server.
 ports.connection_manager=Connection Manager
-ports.connection_manager.desc=The port used for {0}connection managers{1} to connect to the server.
+ports.connection_manager.desc=The port used for connection managers to connect to the server.
+ports.connection_manager.desc_old_ssl=The port used for connection managers to the server using the old SSL/TLS method.
 ports.external_components=External Components
-ports.external_components.desc=The port used for {0}external components{1} to connect to the server.
+ports.external_components.desc=The port used for external components to connect to the server.
+ports.external_components.desc_old_ssl=The port used for external components to the server using the old SSL/TLS method.
 ports.admin_console=Admin Console
 ports.admin_console.desc_unsecured=The port used for unsecured Admin Console access.
 ports.admin_console.desc_secured=The port used for secured Admin Console access.

src/i18n/openfire_i18n_pl_PL.properties

@@ -2111,18 +2111,19 @@ ports.port=Port
 ports.type=Type
 ports.description=Description
 ports.all_ports=All addresses
+ports.plaintext.desc=On this port plain-text connections are established, which, depending on configurable {0}security settings{1}, can (or must) be upgraded to encrypted connections.
+ports.legacymode.desc=Connections established on this port are established using a pre-encrypted connection. This type of connectivity is commonly referred to as the "old-style" or "legacy" method of establishing encrypted connections. Configuration details can be modified in the {0}security settings{1}.
 ports.client_to_server=Client to server
-ports.client_to_server.desc=The standard port for clients to connect to the server. Connections may or may not be \
-  encrypted. You can update the {0}security settings{1} for this port.
-ports.client_to_server.desc_old_ssl=The port used for clients to connect to the server using the old SSL method. \
-  The old SSL method is not an XMPP standard method and will be deprecated in the future.  You can update the \
-  {0}security  settings{1} for this port.
+ports.client_to_server.desc=The standard port for clients to connect to the server.
+ports.client_to_server.desc_old_ssl=The port used for clients to connect to the server using the old SSL/TLS method.
 ports.server_to_server=Server to Server
-ports.server_to_server.desc=The port used for {0}remote servers{1} to connect to this server.
+ports.server_to_server.desc=The port used for remote servers to connect to this server.
 ports.connection_manager=Connection Manager
-ports.connection_manager.desc=The port used for {0}connection managers{1} to connect to the server.
+ports.connection_manager.desc=The port used for connection managers to connect to the server.
+ports.connection_manager.desc_old_ssl=The port used for connection managers to the server using the old SSL/TLS method.
 ports.external_components=External Components
-ports.external_components.desc=The port used for {0}external components{1} to connect to the server.
+ports.external_components.desc=The port used for external components to connect to the server.
+ports.external_components.desc_old_ssl=The port used for external components to the server using the old SSL/TLS method.
 ports.admin_console=Admin Console
 ports.admin_console.desc_unsecured=The port used for unsecured Admin Console access.
 ports.admin_console.desc_secured=The port used for secured Admin Console access.

src/i18n/openfire_i18n_pt_BR.properties

@@ -2210,18 +2210,19 @@ ports.port=Porta
 ports.type=Tipo
 ports.description=Descri\u00e7\u00e3o
 ports.all_ports=Todos Endere\u00e7os
+ports.plaintext.desc=On this port plain-text connections are established, which, depending on configurable {0}security settings{1}, can (or must) be upgraded to encrypted connections.
+ports.legacymode.desc=Connections established on this port are established using a pre-encrypted connection. This type of connectivity is commonly referred to as the "old-style" or "legacy" method of establishing encrypted connections. Configuration details can be modified in the {0}security settings{1}.
 ports.client_to_server=Cliente-Servidor
-ports.client_to_server.desc=Porta padr\u00e3o para conex\u00e3o ao servidor. Conex\u00f5es podem ou n\u00e3o serem encriptadas.\
- Voc� pode alterar as {0}configura\u00e7\u00f5es de seguran\u00e7a{1} para esta porta.
-ports.client_to_server.desc_old_ssl=A Porta utilizadas pelos clientes para se conectarem utilizando o antigo SSL. \
-  O antigo SSL n\u00e3o \u00e9 padr\u00e3o XMPP e cair\u00e1 em desuso. Voc\u00ea pode atualizar as \
-  {0}configura��es de seguran�a{1} para esta porta.
+ports.client_to_server.desc=Porta padr\u00e3o para conex\u00e3o ao servidor. Conex\u00f5es podem ou n\u00e3o serem encriptadas.
+ports.client_to_server.desc_old_ssl=A Porta utilizadas pelos clientes para se conectarem utilizando o antigo SSL.
 ports.server_to_server=Servidor-Servidor
-ports.server_to_server.desc=A Porta utilizada por {0}servidores remotos{1} para connectarem-se a este servidor.
+ports.server_to_server.desc=A Porta utilizada por servidores remotos para connectarem-se a este servidor.
 ports.connection_manager=Gerenciador de Conex\u00f5es
-ports.connection_manager.desc=A Porta utilizada para {0}Gerenciadores de Conex\u00e3o{1} se conectarem a este servidor.
+ports.connection_manager.desc=A Porta utilizada para Gerenciadores de Conex\u00e3o se conectarem a este servidor.
+ports.connection_manager.desc_old_ssl=The port used for connection managers to the server using the old SSL/TLS method.
 ports.external_components=Componentes Externos
-ports.external_components.desc=A Porta utilizada para {0}componentes externos{1} para conectarem-se a este servidor.
+ports.external_components.desc=A Porta utilizada para componentes externos para conectarem-se a este servidor.
+ports.external_components.desc_old_ssl=The port used for external components to the server using the old SSL/TLS method.
 ports.admin_console=Console Administrativo
 ports.admin_console.desc_unsecured=Porta utilizada para conex\u00e3o insegura ao Console Administrativo.
 ports.admin_console.desc_secured=Porta utilizada para conex\u00e3o segura ao Console Administrativo.

src/i18n/openfire_i18n_sk.properties

@@ -2157,15 +2157,19 @@ ports.port=Port
 ports.type=Typ
 ports.description=Popis
 ports.all_ports=V\u0161etky adresy
+ports.plaintext.desc=On this port plain-text connections are established, which, depending on configurable {0}security settings{1}, can (or must) be upgraded to encrypted connections.
+ports.legacymode.desc=Connections established on this port are established using a pre-encrypted connection. This type of connectivity is commonly referred to as the "old-style" or "legacy" method of establishing encrypted connections. Configuration details can be modified in the {0}security settings{1}.
 ports.client_to_server=Klient-server
-ports.client_to_server.desc=\u0160tandardn\u00fd port, na ktor\u00fd sa klienti prip\u00e1jaj\u00fa k serveru. Spojenia m\u00f4\u017eu a nemusia by\u0165 \u0161ifrovan\u00e9. M\u00f4\u017eete aktualizova\u0165 {0}bezpe\u010dnostn\u00e9 nastavenia{1} tohto portu.
-ports.client_to_server.desc_old_ssl=Port, ktor\u00fd klienti pou\u017e\u00edvaj\u00fa na pripojenie k serveru pomocou SSL. Star\u00fd sp\u00f4sob pripojenia pomocou SSL nie je \u0161tandardn\u00fd pre XMPP a v bud\u00facnosti bude odstr\u00e1nen\u00fd. M\u00f4\u017eete aktualizova\u0165 {0}bezpe\u010dnostn\u00e9 nastavenia{1} pre tento port.
+ports.client_to_server.desc=\u0160tandardn\u00fd port, na ktor\u00fd sa klienti prip\u00e1jaj\u00fa k serveru.
+ports.client_to_server.desc_old_ssl=Port, ktor\u00fd klienti pou\u017e\u00edvaj\u00fa na pripojenie k serveru pomocou SSL.
 ports.server_to_server=Server-server
-ports.server_to_server.desc=Port, ktor\u00fd {0}Vzdialen\u00e9 servery{1} pou\u017e\u00edvaj\u00fa na pripojenie k tomuto serveru.
+ports.server_to_server.desc=Port, ktor\u00fd Vzdialen\u00e9 servery pou\u017e\u00edvaj\u00fa na pripojenie k tomuto serveru.
 ports.connection_manager=Spr\u00e1vca spojen\u00ed
-ports.connection_manager.desc=Port, ktor\u00fd {0}Spr\u00e1vcovia spojenia{1} pou\u017e\u00edvaj\u00fa na pripojenie k tomuto serveru.
+ports.connection_manager.desc=Port, ktor\u00fd Spr\u00e1vcovia spojenia pou\u017e\u00edvaj\u00fa na pripojenie k tomuto serveru.
+ports.connection_manager.desc_old_ssl=The port used for connection managers to the server using the old SSL/TLS method.
 ports.external_components=Vonkaj\u0161ie komponenty
-ports.external_components.desc=Port, ktor\u00fd {0}Extern\u00e9 komponenty{1} pou\u017e\u00edvaj\u00fa na pripojenie k tomuto serveru.
+ports.external_components.desc=Port, ktor\u00fd Extern\u00e9 komponenty pou\u017e\u00edvaj\u00fa na pripojenie k tomuto serveru.
+ports.external_components.desc_old_ssl=The port used for external components to the server using the old SSL/TLS method.
 ports.admin_console=Konzola spr\u00e1vcu
 ports.admin_console.desc_unsecured=Tento port sa pou\u017e\u00edva na nezabezpe\u010den\u00fd pr\u00edstup ku Konzole spr\u00e1vcu.
 ports.admin_console.desc_secured=Tento port sa pou\u017e\u00edva na zabezpe\u010den\u00fd pr\u00edstup ku Konzole spr\u00e1vcu.

src/i18n/openfire_i18n_zh_CN.properties

@@ -2110,15 +2110,19 @@ ports.port=\u7aef\u53e3
 ports.type=\u7c7b\u578b
 ports.description=\u63cf\u8ff0
 ports.all_ports=\u6240\u6709\u7684\u5730\u5740
+ports.plaintext.desc=On this port plain-text connections are established, which, depending on configurable {0}security settings{1}, can (or must) be upgraded to encrypted connections.
+ports.legacymode.desc=Connections established on this port are established using a pre-encrypted connection. This type of connectivity is commonly referred to as the "old-style" or "legacy" method of establishing encrypted connections. Configuration details can be modified in the {0}security settings{1}.
 ports.client_to_server=\u5ba2\u6237\u7aef\u5230\u670d\u52a1\u5668
-ports.client_to_server.desc=\u5ba2\u6237\u7aef\u4f7f\u7528\u6807\u51c6\u7aef\u53e3\u8fde\u63a5\u5230\u670d\u52a1\u5668\uff0c\u8fde\u63a5\u53ef\u80fd\u6ca1\u6709\u52a0\u5bc6\uff0c\u60a8\u53ef\u4ee5\u66f4\u65b0{0}\u5b89\u5168\u8bbe\u7f6e{1} \u4e3a\u8fd9\u4e2a\u7aef\u53e3
-ports.client_to_server.desc_old_ssl=\u5ba2\u6237\u7aef\u4f7f\u7528\u65e7\u7684SSL\u65b9\u6cd5\u8fde\u63a5\u5230\u670d\u52a1\u5668\u7684\u7aef\u53e3\u3002\u65e7\u7684SSL\u65b9\u6cd5\u4e0d\u662f\u4e00\u4e2aXMPP\u6807\u51c6\u65b9\u6cd5\uff0c\u5728\u4e0d\u4e45\u5c06\u4e0d\u88ab\u652f\u6301\uff0c\u60a8\u53ef\u4ee5\u66f4\u65b0{0}\u5b89\u5168\u8bbe\u7f6e{1} \u4e3a\u8fd9\u4e2a\u7aef\u53e3
+ports.client_to_server.desc=The standard port for clients to connect to the server.
+ports.client_to_server.desc_old_ssl=The port used for clients to connect to the server using the old SSL/TLS method.
 ports.server_to_server=\u670d\u52a1\u5668\u5230\u670d\u52a1\u5668
-ports.server_to_server.desc=\u7aef\u53e3\u4f7f\u7528 {0}\u8fdc\u7a0b\u670d\u52a1\u5668{1} \u8fde\u63a5\u5230\u8fd9\u53f0\u670d\u52a1\u5668.
+ports.server_to_server.desc=\u7aef\u53e3\u4f7f\u7528\u8fdc\u7a0b\u670d\u52a1\u5668\u8fde\u63a5\u5230\u8fd9\u53f0\u670d\u52a1\u5668.
 ports.connection_manager=\u8fde\u63a5\u7ba1\u7406
-ports.connection_manager.desc=\u7aef\u53e3\u4f7f\u7528 {0}\u8fde\u63a5\u7ba1\u7406\u5668{1} \u8fde\u63a5\u5230\u8fd9\u53f0\u670d\u52a1\u5668.
+ports.connection_manager.desc=\u7aef\u53e3\u4f7f\u7528\u8fde\u63a5\u7ba1\u7406\u5668\u8fde\u63a5\u5230\u8fd9\u53f0\u670d\u52a1\u5668.
+ports.connection_manager.desc_old_ssl=The port used for connection managers to the server using the old SSL/TLS method.
 ports.external_components=\u5916\u90e8\u7ec4\u4ef6
-ports.external_components.desc=\u7aef\u53e3\u4f7f\u7528 {0}\u5916\u90e8\u7ec4\u4ef6{1} \u8fde\u63a5\u5230\u8fd9\u53f0\u670d\u52a1\u5668.
+ports.external_components.desc=\u7aef\u53e3\u4f7f\u7528\u5916\u90e8\u7ec4\u4ef6\u8fde\u63a5\u5230\u8fd9\u53f0\u670d\u52a1\u5668.
+ports.external_components.desc_old_ssl=The port used for external components to the server using the old SSL/TLS method.
 ports.admin_console=\u7ba1\u7406\u63a7\u5236\u53f0
 ports.admin_console.desc_unsecured=\u7aef\u53e3\u4f7f\u7528\u4e0d\u5b89\u5168\u7684\u7ba1\u7406\u63a7\u5236\u53f0\u8bbf\u95ee.
 ports.admin_console.desc_secured=\u7aef\u53e3\u4f7f\u7528\u5b89\u5168\u7684\u7ba1\u7406\u63a7\u5236\u53f0\u8bbf\u95ee.

src/resources/jar/admin-sidebar.xml

@@ -69,12 +69,12 @@
 
             <!-- Client connections settings-->
             <item id="client-connections-settings" name="${sidebar.client-connections-settings}"
-                  url="client-connections-settings.jsp"
+                  url="connection-settings-socket-c2s.jsp"
                   description="${sidebar.client-connections-settings.descr}"/>
                   
             <!-- Server to server -->
             <item id="server2server-settings" name="${sidebar.server2server-settings}"
-                  url="server2server-settings.jsp"
+                  url="connection-settings-socket-s2s.jsp"
                   description="${sidebar.server2server-settings.descr}"/>
 
             <!-- External components -->
@@ -122,11 +122,6 @@
                   url="private-data-settings.jsp"
                   description="${sidebar.server-data-settings.descr}"/>
 
-            <!-- SSL Settings -->
-            <item id="server-ssl" name="${sidebar.server-ssl}"
-                  url="ssl-settings.jsp"
-                  description="${sidebar.server-ssl.descr}"/>
-
             <!-- Compression Settings -->
             <item id="server-compression" name="${sidebar.server-compression}"
                   url="compression-settings.jsp"

src/web/index.jsp

@@ -446,6 +446,8 @@
             continue;
         }
 
+        pageContext.setAttribute( "connectionListener", connectionListener );
+
         final String interfaceName;
         if (connectionListener.getBindAddress() == null || connectionListener.getBindAddress().isAnyLocalAddress() ) {
             interfaceName = LocaleUtils.getLocalizedString("ports.all_ports");
@@ -494,45 +496,69 @@
             <%=typeName%>
         </td>
         <td>
-            <%
-                final String description;
-                switch ( connectionListener.getType() ) {
-                    case SOCKET_C2S:
-                        if ( connectionListener.getTLSPolicy().equals( Connection.TLSPolicy.legacyMode ) ) {
-                            description = LocaleUtils.getLocalizedString( "ports.client_to_server.desc_old_ssl", Arrays.asList( "<a href='ssl-settings.jsp'>", "</a>" ) );
-                        } else {
-                            description = LocaleUtils.getLocalizedString( "ports.client_to_server.desc", Arrays.asList( "<a href='ssl-settings.jsp'>", "</a>" ) );
-                        }
-                        break;
-                    case SOCKET_S2S:
-                        description = LocaleUtils.getLocalizedString( "ports.server_to_server.desc", Arrays.asList( "<a href='server2server-settings.jsp'>", "</a>" ) );
-                        break;
-                    case COMPONENT:
-                        description = LocaleUtils.getLocalizedString( "ports.external_components.desc", Arrays.asList( "<a href='external-components-settings.jsp'>", "</a>" ) );
-                        break;
-                    case CONNECTION_MANAGER:
-                        description = LocaleUtils.getLocalizedString( "ports.connection_manager.desc", Arrays.asList( "<a href='connection-managers-settings.jsp'>", "</a>" ) );
-                        break;
-                    case WEBADMIN:
-                        if ( connectionListener.getTLSPolicy().equals( Connection.TLSPolicy.legacyMode ) ) {
-                            description = LocaleUtils.getLocalizedString( "ports.admin_console.desc_secured" );
-                        } else {
-                            description = LocaleUtils.getLocalizedString( "ports.admin_console.desc_unsecured" );
-                        }
-                        break;
-                    case BOSH_C2S:
-                        if ( connectionListener.getTLSPolicy().equals( Connection.TLSPolicy.legacyMode ) ) {
-                            description = LocaleUtils.getLocalizedString( "ports.http_bind.desc_secured" );
-                        } else {
-                            description = LocaleUtils.getLocalizedString( "ports.http_bind.desc_unsecured" );
-                        }
-                        break;
-                    default:
-                        description = "";
-                        break;
-                }
-            %>
-            <%=description%>
+            <c:choose>
+                <c:when test="${connectionListener.type eq 'SOCKET_C2S' and connectionListener.TLSPolicy ne 'legacyMode'}">
+                    <fmt:message key="ports.client_to_server.desc"/>
+                    <fmt:message key="ports.plaintext.desc">
+                        <fmt:param><a href='connection-settings-socket-c2s.jsp'></fmt:param>
+                        <fmt:param></a></fmt:param>
+                    </fmt:message>
+                </c:when>
+                <c:when test="${connectionListener.type eq 'SOCKET_C2S' and connectionListener.TLSPolicy eq 'legacyMode'}">
+                    <fmt:message key="ports.client_to_server.desc_old_ssl"/>
+                    <fmt:message key="ports.legacymode.desc">
+                        <fmt:param><a href='connection-settings-socket-c2s.jsp'></fmt:param>
+                        <fmt:param></a></fmt:param>
+                    </fmt:message>
+                </c:when>
+                <c:when test="${connectionListener.type eq 'SOCKET_S2S'}">
+                    <fmt:message key="ports.server_to_server.desc"/>
+                    <fmt:message key="ports.legacymode.desc">
+                        <fmt:param><a href='connection-settings-socket-s2s.jsp'></fmt:param>
+                        <fmt:param></a></fmt:param>
+                    </fmt:message>
+                </c:when>
+                <c:when test="${connectionListener.type eq 'COMPONENT' and connectionListener.TLSPolicy ne 'legacyMode'}">
+                    <fmt:message key="ports.external_components.desc"/>
+                    <fmt:message key="ports.plaintext.desc">
+                        <fmt:param><a href='external-components-settings.jsp'></fmt:param>
+                        <fmt:param></a></fmt:param>
+                    </fmt:message>
+                </c:when>
+                <c:when test="${connectionListener.type eq 'COMPONENT' and connectionListener.TLSPolicy eq 'legacyMode'}">
+                    <fmt:message key="ports.external_components.desc_old_ssl"/>
+                    <fmt:message key="ports.legacymode.desc">
+                        <fmt:param><a href='external-components-settings.jsp'></fmt:param>
+                        <fmt:param></a></fmt:param>
+                    </fmt:message>
+                </c:when>
+                <c:when test="${connectionListener.type eq 'CONNECTION_MANAGER' and connectionListener.TLSPolicy ne 'legacyMode'}">
+                    <fmt:message key="ports.connection_manager.desc"/>
+                    <fmt:message key="ports.plaintext.desc">
+                        <fmt:param><a href='connection-managers-settings.jsp'></fmt:param>
+                        <fmt:param></a></fmt:param>
+                    </fmt:message>
+                </c:when>
+                <c:when test="${connectionListener.type eq 'CONNECTION_MANAGER' and connectionListener.TLSPolicy eq 'legacyMode'}">
+                    <fmt:message key="ports.connection_manager.desc_old_ssl"/>
+                    <fmt:message key="ports.legacymode.desc">
+                        <fmt:param><a href='connection-managers-settings.jsp'></fmt:param>
+                        <fmt:param></a></fmt:param>
+                    </fmt:message>
+                </c:when>
+                <c:when test="${connectionListener.type eq 'WEBADMIN' and connectionListener.TLSPolicy ne 'legacyMode'}">
+                    <fmt:message key="ports.admin_console.desc_unsecured"/>
+                </c:when>
+                <c:when test="${connectionListener.type eq 'WEBADMIN' and connectionListener.TLSPolicy eq 'legacyMode'}">
+                    <fmt:message key="ports.admin_console.desc_secured"/>
+                </c:when>
+                <c:when test="${connectionListener.type eq 'BOSH_C2S' and connectionListener.TLSPolicy ne 'legacyMode'}">
+                    <fmt:message key="ports.http_bind.desc_unsecured"/>
+                </c:when>
+                <c:when test="${connectionListener.type eq 'BOSH_C2S' and connectionListener.TLSPolicy eq 'legacyMode'}">
+                    <fmt:message key="ports.http_bind.desc_secured"/>
+                </c:when>
+            </c:choose>
         </td>
     </tr>
 <%

src/web/server-session-summary.jsp

@@ -147,7 +147,7 @@
 
 <p>
 <fmt:message key="server.session.summary.info">
-    <fmt:param value="<a href=\"server2server-settings.jsp\">" />
+    <fmt:param value="<a href=\"connection-settings-socket-s2s.jsp\">" />
     <fmt:param value="</a>" />
 </fmt:message>
 </p>