Added ports section to admin console. JM-935

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@6694 b35dd754-fafc-0310-a699-88a17e54d16e

src/i18n/wildfire_i18n_cs_CZ.properties

@@ -2033,6 +2033,8 @@ httpbind.settings.label_seperate_info=The HTTP bind service will be run on the s
 httpbind.settings.label_same=Use Distinct Ports
 httpbind.settings.label_same_info=The HTTP bind service will use distinct ports from those of the admin console
 httpbind.settings.secure_port=Secure Port
+httpbind.settings.error.general=An error has occured, check the log file for details.
+httpbind.settings.error.port=An error has occured configuring the HTTP binding ports, check the error log for more details.
 
 # Profile Settings
 
@@ -2041,5 +2043,38 @@ profile-settings.info=Wildfire nyn\u00ed pou\u017e\u00edv\u00e1 n\u00e1sleduj\u0
     LDAP je mo\u017en\u00e9 zm\u011bnit sou\u010dasn\u00e1 nastaven\u00ed integrace. A\u010dkoliv, pokud chcete zm\u011bnit syst\u00e9m u\u017eivatel\u016f a skupin,
     budete muset znovu spustit proces nastaven\u00ed.
 profile-settings.ldap_mapping_info=Informace o mapov\u00e1n\u00ed LDAP
-httpbind.settings.error.general=An error has occured, check the log file for details.
-httpbind.settings.error.port=An error has occured configuring the HTTP binding ports, check the error log for more details.
+
+
\ No newline at end of file
+# Ports section/page
+
+ports.interface=Interface
+ports.port=Port
+ports.type=Type
+ports.description=Description
+ports.all_ports=All addresses
+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.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.connection_manager=Connection Manager
+ports.connection_manager.desc=The port used for {0}connection managers{1} to connect to the server.
+ports.external_components=External Components
+ports.external_components.desc=The port used for {0}external components{1} to connect to the server.
+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.
+ports.file_proxy=File Transfer Proxy
+ports.file_proxy.desc=The port used for the proxy service that allows file transfers to occur between two entities \
+  on the XMPP network.
+ports.http_bind=HTTP Binding
+ports.http_bind.desc_unsecured=The port used for unsecured HTTP client connections.
+ports.http_bind.desc_secured=The port used for secured HTTP client connections.
+ports.media_proxy=Real time media proxy
+ports.media_proxy.desc=The port used for the proxy service that allows Jingle connections between two entities on \
+  the XMPP network.
+ports.stun=STUN Service
+ports.stun.desc=The port used for the service that ensures connectivity between entities when behind a NAT.
\ No newline at end of file

src/i18n/wildfire_i18n_de.properties

@@ -1793,4 +1793,46 @@ httpbind.settings.label_same=Use Distinct Ports
 httpbind.settings.label_same_info=The HTTP bind service will use distinct ports from those of the admin console
 httpbind.settings.secure_port=Secure Port
 httpbind.settings.error.general=An error has occured, check the log file for details.
-httpbind.settings.error.port=An error has occured configuring the HTTP binding ports, check the error log for more details.
+httpbind.settings.error.port=An error has occured configuring the HTTP binding ports, check the error log for more details.
\ No newline at end of file
+
+# Profile Settings
+
+profile-settings.title=Profile Settings
+profile-settings.info=Wildfire is currently using the following user and group system. When using \
+    LDAP it is possible to alter current integration settings. However, if you want to change the user and group \
+    system then you will need to re-run the setup process.
+profile-settings.ldap_mapping_info=LDAP Settings
+
+# Ports section/page
+
+ports.interface=Interface
+ports.port=Port
+ports.type=Type
+ports.description=Description
+ports.all_ports=All addresses
+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.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.connection_manager=Connection Manager
+ports.connection_manager.desc=The port used for {0}connection managers{1} to connect to the server.
+ports.external_components=External Components
+ports.external_components.desc=The port used for {0}external components{1} to connect to the server.
+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.
+ports.file_proxy=File Transfer Proxy
+ports.file_proxy.desc=The port used for the proxy service that allows file transfers to occur between two entities \
+  on the XMPP network.
+ports.http_bind=HTTP Binding
+ports.http_bind.desc_unsecured=The port used for unsecured HTTP client connections.
+ports.http_bind.desc_secured=The port used for secured HTTP client connections.
+ports.media_proxy=Real time media proxy
+ports.media_proxy.desc=The port used for the proxy service that allows Jingle connections between two entities on \
+  the XMPP network.
+ports.stun=STUN Service
+ports.stun.desc=The port used for the service that ensures connectivity between entities when behind a NAT.
\ No newline at end of file

src/i18n/wildfire_i18n_en.properties

@@ -165,6 +165,7 @@
 ##      Added section: 'ssl.certificates.*'
 ##      Added section: 'ssl.signing-request.*'
 ##      Added section: 'server-restart.*'
+##      Added section: 'ports.*'
 ##      Removed key: 'ssl.certificates.uninstalled'
 ##      Removed key: 'ssl.certificates.error_certificate'
 ##      Removed key: 'ssl.certificates.certificate'
@@ -2248,4 +2249,38 @@ profile-settings.title=Profile Settings
 profile-settings.info=Wildfire is currently using the following user and group system. When using \
     LDAP it is possible to alter current integration settings. However, if you want to change the user and group \
     system then you will need to re-run the setup process.
-profile-settings.ldap_mapping_info=LDAP Settings
+profile-settings.ldap_mapping_info=LDAP Settings
\ No newline at end of file
+
+# Ports section/page
+
+ports.interface=Interface
+ports.port=Port
+ports.type=Type
+ports.description=Description
+ports.all_ports=All addresses
+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.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.connection_manager=Connection Manager
+ports.connection_manager.desc=The port used for {0}connection managers{1} to connect to the server.
+ports.external_components=External Components
+ports.external_components.desc=The port used for {0}external components{1} to connect to the server.
+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.
+ports.file_proxy=File Transfer Proxy
+ports.file_proxy.desc=The port used for the proxy service that allows file transfers to occur between two entities \
+  on the XMPP network.
+ports.http_bind=HTTP Binding
+ports.http_bind.desc_unsecured=The port used for unsecured HTTP client connections.
+ports.http_bind.desc_secured=The port used for secured HTTP client connections.
+ports.media_proxy=Real time media proxy
+ports.media_proxy.desc=The port used for the proxy service that allows Jingle connections between two entities on \
+  the XMPP network.
+ports.stun=STUN Service
+ports.stun.desc=The port used for the service that ensures connectivity between entities when behind a NAT.
\ No newline at end of file

src/i18n/wildfire_i18n_es.properties

@@ -1895,19 +1895,21 @@ plugin.enterprise.installed = Plugin Corporativo instalado exitosamente. Refresc
 
 # http bind settings page
 
-httpbind.settings.enabled.legend=Service Enabled
-httpbind.settings.title=HTTP Bind Settings
-httpbind.settings.info=HTTP binding allows clients using the HTTP protocol to connect to Wildfire.
-httpbind.settings.label_disable=Disabled
-httpbind.settings.label_disable_info=Clients will not be able to connect with this server using HTTP binding.
-httpbind.settings.label_enable=Enabled
-httpbind.settings.label_enable_info=Clients can connect to this server using HTTP binding.
-httpbind.settings.vanilla_port=Port:
-httpbind.settings.label_seperate=Use Admin Console Ports
-httpbind.settings.label_seperate_info=The HTTP bind service will be run on the same ports as the admin console
-httpbind.settings.label_same=Use Distinct Ports
-httpbind.settings.label_same_info=The HTTP bind service will use distinct ports from those of the admin console
-httpbind.settings.secure_port=Secure Port
+httpbind.settings.enabled.legend=Servicio Habilitado
+httpbind.settings.title=Seteos de HTTP Bind
+httpbind.settings.info=HTTP binding permite a clientes conectarse a Wildfire utilizado el protocolo HTTP.
+httpbind.settings.label_disable=Dishabilitado
+httpbind.settings.label_disable_info=Clientes no podran conectarse al servidor utilizando HTTP.
+httpbind.settings.label_enable=Habilitado
+httpbind.settings.label_enable_info=Clientes podran conectarse al servidor utilizando HTTP
+httpbind.settings.vanilla_port=Puerto:
+httpbind.settings.label_seperate=Usar Puertos de la Consola de Administraci\u00f3n
+httpbind.settings.label_seperate_info=El servicio de HTTP va a correr utilizando los mismos puertos que la consola \
+  de administraci\u00f3n
+httpbind.settings.label_same=Usar Puerto Diferentes
+httpbind.settings.label_same_info=El servicio de HTTP va a utilizar puerto diferentes que la consola de \
+  administraci\u00f3n 
+httpbind.settings.secure_port=Puerto Seguro
 
 # Profile Settings
 
@@ -1916,5 +1918,40 @@ profile-settings.info=Wildfire esta utilizando el siguiente sistema de usuarios
     LDAP es posible cambiar la configuraci\u00f3n actual. Sin embargo, si desea modificar el sistema de usuarios y grupos \
     entonces deber\u00e1 volver a realizar el proceso de configuraci\u00f3n inicial.
 profile-settings.ldap_mapping_info=Informaci\u00f3n del Mapeo a LDAP
-httpbind.settings.error.general=An error has occured, check the log file for details.
-httpbind.settings.error.port=An error has occured configuring the HTTP binding ports, check the error log for more details.
+httpbind.settings.error.general=Un error ha ocurrido, verifique el arhico de errores para m\u00e1s detalles.
+httpbind.settings.error.port=Un error ha ocurrido al intentar configurar el servicio de HTTP, verifique el arhico \
\ No newline at end of file
+  de errores para m\u00e1s detalles.
+
+# Ports section/page
+
+ports.interface=Interfaz
+ports.port=Puerto
+ports.type=Tipo
+ports.description=Descripci\u00f3n
+ports.all_ports=Todas direcciones
+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 los {0}seteos{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 los {0}seteos{1} para este puerto
+ports.server_to_server=Servidor-Servidor
+ports.server_to_server.desc=Puerto utilizado por {0}servidores remotos{1} 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.external_components=Componentes externos
+ports.external_components.desc=Puerto utilizado por {0}componentes externos{1} para conectarse al servidor.
+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.
+ports.file_proxy=Transferencia de Archivos via Proxy
+ports.file_proxy.desc=Puerto utilizado por el servicio de transferencia de archivos via proxy para transferir \
+   archivos entre dos entidades de la red XMPP.
+ports.http_bind=HTTP Binding
+ports.http_bind.desc_unsecured=Puerto utilizado para conexiones inseguras de clientes HTTP.
+ports.http_bind.desc_secured=Puerto utilizado para conexiones seguras de clientes HTTP.
+ports.media_proxy=Proxy de medios en tiempo real
+ports.media_proxy.desc=Puerto utilizado por el servicio para permitir conexiones Jingle entre dos entidades de la \
+  red XMPP.
+ports.stun=Servicio STUN
+ports.stun.desc=Puerto utilizado por el servicio para asegurar conectividad entre entidades detr\u00e1s de NATs.
\ No newline at end of file

src/i18n/wildfire_i18n_fr.properties

@@ -1629,4 +1629,39 @@ group.create.enter_a_group_name = Saisisser un Nom d'affichage pour le Groupe.
 plugin.admin.refresh_success = Le Plugin a \u00E9t\u00E9 rafra\u00EEchi avec succ\u00E8s.
 server2server.settings.port = Port\:
 httpbind.settings.error.general=An error has occured, check the log file for details.
-httpbind.settings.error.port=An error has occured configuring the HTTP binding ports, check the error log for more details.
+httpbind.settings.error.port=An error has occured configuring the HTTP binding ports, check the error log for more details.
\ No newline at end of file
+
+
+# Ports section/page
+
+ports.interface=Interface
+ports.port=Port
+ports.type=Type
+ports.description=Description
+ports.all_ports=All addresses
+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.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.connection_manager=Connection Manager
+ports.connection_manager.desc=The port used for {0}connection managers{1} to connect to the server.
+ports.external_components=External Components
+ports.external_components.desc=The port used for {0}external components{1} to connect to the server.
+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.
+ports.file_proxy=File Transfer Proxy
+ports.file_proxy.desc=The port used for the proxy service that allows file transfers to occur between two entities \
+  on the XMPP network.
+ports.http_bind=HTTP Binding
+ports.http_bind.desc_unsecured=The port used for unsecured HTTP client connections.
+ports.http_bind.desc_secured=The port used for secured HTTP client connections.
+ports.media_proxy=Real time media proxy
+ports.media_proxy.desc=The port used for the proxy service that allows Jingle connections between two entities on \
+  the XMPP network.
+ports.stun=STUN Service
+ports.stun.desc=The port used for the service that ensures connectivity between entities when behind a NAT.
\ No newline at end of file

src/i18n/wildfire_i18n_nl.properties

@@ -1798,4 +1798,46 @@ httpbind.settings.label_same=Use Distinct Ports
 httpbind.settings.label_same_info=The HTTP bind service will use distinct ports from those of the admin console
 httpbind.settings.secure_port=Secure Port
 httpbind.settings.error.general=An error has occured, check the log file for details.
-httpbind.settings.error.port=An error has occured configuring the HTTP binding ports, check the error log for more details.
+httpbind.settings.error.port=An error has occured configuring the HTTP binding ports, check the error log for more details.
\ No newline at end of file
+
+# Profile Settings
+
+profile-settings.title=Profile Settings
+profile-settings.info=Wildfire is currently using the following user and group system. When using \
+    LDAP it is possible to alter current integration settings. However, if you want to change the user and group \
+    system then you will need to re-run the setup process.
+profile-settings.ldap_mapping_info=LDAP Settings
+
+# Ports section/page
+
+ports.interface=Interface
+ports.port=Port
+ports.type=Type
+ports.description=Description
+ports.all_ports=All addresses
+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.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.connection_manager=Connection Manager
+ports.connection_manager.desc=The port used for {0}connection managers{1} to connect to the server.
+ports.external_components=External Components
+ports.external_components.desc=The port used for {0}external components{1} to connect to the server.
+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.
+ports.file_proxy=File Transfer Proxy
+ports.file_proxy.desc=The port used for the proxy service that allows file transfers to occur between two entities \
+  on the XMPP network.
+ports.http_bind=HTTP Binding
+ports.http_bind.desc_unsecured=The port used for unsecured HTTP client connections.
+ports.http_bind.desc_secured=The port used for secured HTTP client connections.
+ports.media_proxy=Real time media proxy
+ports.media_proxy.desc=The port used for the proxy service that allows Jingle connections between two entities on \
+  the XMPP network.
+ports.stun=STUN Service
+ports.stun.desc=The port used for the service that ensures connectivity between entities when behind a NAT.
\ No newline at end of file

src/i18n/wildfire_i18n_pl_PL.properties

@@ -1769,4 +1769,47 @@ httpbind.settings.label_same=Use Distinct Ports
 httpbind.settings.label_same_info=The HTTP bind service will use distinct ports from those of the admin console
 httpbind.settings.secure_port=Secure Port
 httpbind.settings.error.general=An error has occured, check the log file for details.
-httpbind.settings.error.port=An error has occured configuring the HTTP binding ports, check the error log for more details.
+httpbind.settings.error.port=An error has occured configuring the HTTP binding ports, check the error log for more details.
\ No newline at end of file
+
+
+# Profile Settings
+
+profile-settings.title=Profile Settings
+profile-settings.info=Wildfire is currently using the following user and group system. When using \
+    LDAP it is possible to alter current integration settings. However, if you want to change the user and group \
+    system then you will need to re-run the setup process.
+profile-settings.ldap_mapping_info=LDAP Settings
+
+# Ports section/page
+
+ports.interface=Interface
+ports.port=Port
+ports.type=Type
+ports.description=Description
+ports.all_ports=All addresses
+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.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.connection_manager=Connection Manager
+ports.connection_manager.desc=The port used for {0}connection managers{1} to connect to the server.
+ports.external_components=External Components
+ports.external_components.desc=The port used for {0}external components{1} to connect to the server.
+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.
+ports.file_proxy=File Transfer Proxy
+ports.file_proxy.desc=The port used for the proxy service that allows file transfers to occur between two entities \
+  on the XMPP network.
+ports.http_bind=HTTP Binding
+ports.http_bind.desc_unsecured=The port used for unsecured HTTP client connections.
+ports.http_bind.desc_secured=The port used for secured HTTP client connections.
+ports.media_proxy=Real time media proxy
+ports.media_proxy.desc=The port used for the proxy service that allows Jingle connections between two entities on \
+  the XMPP network.
+ports.stun=STUN Service
+ports.stun.desc=The port used for the service that ensures connectivity between entities when behind a NAT.
\ No newline at end of file

src/i18n/wildfire_i18n_zh_CN.properties

@@ -1823,6 +1823,12 @@ calendar.today = \u4eca\u5929
 calendar.time_part = (Shift-)\u5355\u51fb\u6216\u62d6\u52a8\u6539\u53d8\u503c
 calendar.time = \u65f6\u95f4:
 
+# Enterprise Download Page
+plugin.enterprise.download.error =  \u4e0d\u80fd\u4e0b\u8f7d\u4f01\u4e1a\u63d2\u4ef6\uff0c\u8bf7\u5c1d\u8bd5\u518d\u6b21\u4e0b\u8f7d
+plugin.enterprise.dont.show= \u4e0d\u8981\u518d\u6b21\u663e\u793a\u6b64\u9875
+plugin.enterprise.installing = \u5b89\u88c5\u4f01\u4e1a\u63d2\u4ef6...
+plugin.enterprise.installed = \u4f01\u4e1a\u63d2\u4ef6\u5b89\u88c5\u6210\u529f\uff0c\u7acb\u5373\u5237\u65b0...
+
 # http bind settings page
 
 httpbind.settings.enabled.legend=Service Enabled
@@ -1838,17 +1844,45 @@ httpbind.settings.label_seperate_info=The HTTP bind service will be run on the s
 httpbind.settings.label_same=Use Distinct Ports
 httpbind.settings.label_same_info=The HTTP bind service will use distinct ports from those of the admin console
 httpbind.settings.secure_port=Secure Port
-
-# Enterprise Download Page
-plugin.enterprise.download.error =  \u4e0d\u80fd\u4e0b\u8f7d\u4f01\u4e1a\u63d2\u4ef6\uff0c\u8bf7\u5c1d\u8bd5\u518d\u6b21\u4e0b\u8f7d
-plugin.enterprise.dont.show= \u4e0d\u8981\u518d\u6b21\u663e\u793a\u6b64\u9875
-plugin.enterprise.installing = \u5b89\u88c5\u4f01\u4e1a\u63d2\u4ef6...
-plugin.enterprise.installed = \u4f01\u4e1a\u63d2\u4ef6\u5b89\u88c5\u6210\u529f\uff0c\u7acb\u5373\u5237\u65b0...
+httpbind.settings.error.general=An error has occured, check the log file for details.
+httpbind.settings.error.port=An error has occured configuring the HTTP binding ports, check the error log for more details.
 
 # Profile Settings
 
 profile-settings.title=\u7279\u6027\u8bbe\u7f6e
 profile-settings.info=Wildfire\u73b0\u5728\u4f7f\u7528\u4e0b\u9762\u7684\u7528\u6237\u548c\u7ec4\u7cfb\u7edf\u3002\u5f53\u4f7f\u7528LDAP\u65f6\u4f1a\u6539\u53d8\u5f53\u524d\u7684\u7efc\u5408\u8bbe\u7f6e\u3002\u7136\u800c\uff0c\u5982\u679c\u60a8\u9700\u8981\u6539\u53d8\u7528\u6237\u548c\u7ec4\u7cfb\u7edf\uff0c\u60a8\u9700\u8981\u91cd\u65b0\u8fd0\u884c\u8bbe\u7f6e\u8fc7\u7a0b\u3002
 profile-settings.ldap_mapping_info=LDAP\u6620\u5c04\u4fe1\u606f
-httpbind.settings.error.general=An error has occured, check the log file for details.
-httpbind.settings.error.port=An error has occured configuring the HTTP binding ports, check the error log for more details.
+
+# Ports section/page
\ No newline at end of file
+
+ports.interface=Interface
+ports.port=Port
+ports.type=Type
+ports.description=Description
+ports.all_ports=All addresses
+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.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.connection_manager=Connection Manager
+ports.connection_manager.desc=The port used for {0}connection managers{1} to connect to the server.
+ports.external_components=External Components
+ports.external_components.desc=The port used for {0}external components{1} to connect to the server.
+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.
+ports.file_proxy=File Transfer Proxy
+ports.file_proxy.desc=The port used for the proxy service that allows file transfers to occur between two entities \
+  on the XMPP network.
+ports.http_bind=HTTP Binding
+ports.http_bind.desc_unsecured=The port used for unsecured HTTP client connections.
+ports.http_bind.desc_secured=The port used for secured HTTP client connections.
+ports.media_proxy=Real time media proxy
+ports.media_proxy.desc=The port used for the proxy service that allows Jingle connections between two entities on \
+  the XMPP network.
+ports.stun=STUN Service
+ports.stun.desc=The port used for the service that ensures connectivity between entities when behind a NAT.
\ No newline at end of file

src/java/org/jivesoftware/wildfire/ConnectionManager.java

@@ -15,7 +15,7 @@ import org.jivesoftware.wildfire.net.SocketReader;
 
 import java.io.IOException;
 import java.net.Socket;
-import java.util.Iterator;
+import java.util.Collection;
 
 /**
  * Coordinates connections (accept, read, termination) on the server.
@@ -54,7 +54,7 @@ public interface ConnectionManager {
      * @return an iterator of the ports managed by this connection manager
      *      (can be an empty but never null).
      */
-    public Iterator<ServerPort> getPorts();
+    public Collection<ServerPort> getPorts();
 
     /**
      * Creates a new socket reader for the new accepted socket to be managed

src/java/org/jivesoftware/wildfire/XMPPServerInfo.java

@@ -12,8 +12,9 @@
 package org.jivesoftware.wildfire;
 
 import org.jivesoftware.util.Version;
+
+import java.util.Collection;
 import java.util.Date;
-import java.util.Iterator;
 
 /**
  * Information 'snapshot' of a server's state. Useful for statistics
@@ -66,5 +67,5 @@ public interface XMPPServerInfo {
      *
      * @return an iterator over the server ports for this server.
      */
-    public Iterator getServerPorts();
+    public Collection<ServerPort> getServerPorts();
 }
\ No newline at end of file

src/java/org/jivesoftware/wildfire/net/MulticastDNSService.java

@@ -11,19 +11,18 @@
 
 package org.jivesoftware.wildfire.net;
 
-import org.jivesoftware.wildfire.container.BasicModule;
-import org.jivesoftware.wildfire.XMPPServer;
-import org.jivesoftware.wildfire.XMPPServerInfo;
-import org.jivesoftware.wildfire.ServerPort;
 import org.jivesoftware.util.Log;
 import org.jivesoftware.util.PropertyEventDispatcher;
 import org.jivesoftware.util.PropertyEventListener;
 import org.jivesoftware.util.TaskEngine;
+import org.jivesoftware.wildfire.ServerPort;
+import org.jivesoftware.wildfire.XMPPServer;
+import org.jivesoftware.wildfire.XMPPServerInfo;
+import org.jivesoftware.wildfire.container.BasicModule;
 
 import javax.jmdns.JmDNS;
 import javax.jmdns.ServiceInfo;
 import java.io.IOException;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.TimerTask;
 
@@ -84,11 +83,9 @@ public class MulticastDNSService extends BasicModule {
         TimerTask startService = new TimerTask() {
             public void run() {
                 XMPPServerInfo info = XMPPServer.getInstance().getServerInfo();
-                Iterator ports = info.getServerPorts();
                 int clientPortNum = -1;
                 int componentPortNum = -1;
-                while (ports.hasNext()) {
-                    ServerPort port = (ServerPort)ports.next();
+                for (ServerPort port : info.getServerPorts()) {
                     if (port.isClientPort()) {
                         clientPortNum = port.getPort();
                     }

src/java/org/jivesoftware/wildfire/spi/ConnectionManagerImpl.java

@@ -38,7 +38,7 @@ import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.Executor;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -375,8 +375,8 @@ public class ConnectionManagerImpl extends BasicModule implements ConnectionMana
         startClientSSLListeners(localIPAddress);
     }
 
-    public Iterator<ServerPort> getPorts() {
-        return ports.iterator();
+    public Collection<ServerPort> getPorts() {
+        return ports;
     }
 
     public SocketReader createSocketReader(Socket sock, boolean isSecure, ServerPort serverPort,
@@ -540,6 +540,10 @@ public class ConnectionManagerImpl extends BasicModule implements ConnectionMana
         return JiveGlobals.getIntProperty("xmpp.socket.plain.port", DEFAULT_PORT);
     }
 
+    public SocketAcceptor getSSLSocketAcceptor() {
+        return sslSocketAcceptor;
+    }
+
     public void setClientSSLListenerPort(int port) {
         if (port == getClientSSLListenerPort()) {
             // Ignore new setting

src/java/org/jivesoftware/wildfire/spi/XMPPServerInfoImpl.java

@@ -11,14 +11,15 @@
 
 package org.jivesoftware.wildfire.spi;
 
+import org.jivesoftware.util.JiveGlobals;
 import org.jivesoftware.util.Version;
-import org.jivesoftware.wildfire.XMPPServerInfo;
 import org.jivesoftware.wildfire.ConnectionManager;
-import org.jivesoftware.util.JiveGlobals;
+import org.jivesoftware.wildfire.ServerPort;
+import org.jivesoftware.wildfire.XMPPServerInfo;
 
-import java.util.Date;
-import java.util.Iterator;
+import java.util.Collection;
 import java.util.Collections;
+import java.util.Date;
 
 /**
  * Implements the server info for a basic server. Optimization opportunities
@@ -81,9 +82,9 @@ public class XMPPServerInfoImpl implements XMPPServerInfo {
         return stopDate;
     }
 
-    public Iterator getServerPorts() {
+    public Collection<ServerPort> getServerPorts() {
         if (connectionManager == null) {
-            return Collections.EMPTY_LIST.iterator();
+            return Collections.emptyList();
         }
         else {
             return connectionManager.getPorts();