[JM-1329] Add CS tab page in OF. Reviewer Daniel Henninger.

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

src/i18n/openfire_i18n_cs_CZ.properties

@@ -142,8 +142,10 @@ tab.tab-plugins.descr=Klikn\u011bte pro spr\u00e1vu v\u0161ech dopl\u0148k\u016f
 tab.tab-clearspace=Clearspace
 tab.tab-clearspace.descr=Click manage Clearspace integration
     sidebar.sidebar-clearspace=Clearspace Integration
-        sidebar.clearspace-info=Clearspace Information
-        sidebar.clearspace-info.descr=Information about Clearspace integration
+        sidebar.clearspace-status=Connection Status
+        sidebar.clearspace-status.descr=Status about Clearspace integration
+        sidebar.clearspace-admin=Clearspace Admin
+        sidebar.clearspace-admin.descr=Click to go to Clearspace Admin Console
 
 # Log messages
 log.marker_inserted_by=--- Zna\u010dka vlo\u017eena u\u017eivatelem {0} - {1} ---
@@ -2357,25 +2359,28 @@ muc.room.edit.form.edit.title=Room Settings
 user.create.isadmin=Is Administrator?
 user.create.admin_info=Grants admin access to Openfire
 user.properties.isadmin=User has administrative privileges.
-clearspace.info.title=Clearspace information
-clearspace.info.status.title=Connection status
-clearspace.info.status.config.error=Error trying to configure Clearspace.
-clearspace.info.status.disconnected.error=Openfire and Clearspace are not connected.
-clearspace.info.status.disconnected.of.title=Openfire is not connected to Clearspce
-clearspace.info.status.disconnected.of.description=Please check the that Openfire is pointing to the right Clearspace URL {0}here{1}.
-clearspace.info.status.disconnected.cs.title=Clearspace is not connected to Openfire
-clearspace.info.status.disconnected.cs.description=The most common reason for this is that Openfire wasn't able to configure Clearsapce. Until that happen Openfire will try to configure it every minute.
-clearspace.info.status.disconnected.of_and_cs.title=Openfire and Clearspace are currently not connected.
-clearspace.info.status.disconnected.of_and_cs.description=Please check that they have the same shared secret and that Openfire is pointing to the right Clearspace URL. \
-  You can check Openfire configuration {0}here{1}. Or you can configure Clearspace at admin console then click on Real-Time tab and finally go to Connection menu item
-clearspace.info.status.disconnected.buttons.description=You can test Openfire connection or try to force Clearspace configuration by using the following buttons:
-clearspace.info.table.title=Clearspace Connection Details
-clearspace.info.label.num_components=Number of Clearpace Nodes
-clearspace.info.label.creation=Creation Date
-clearspace.info.label.last_active=Last Activity
-clearspace.info.label.statistics=Statistics
-clearspace.info.label.received=Packets Received/Sent:
-clearspace.info.label.hostname=Node IP / Hostname
-clearspace.info.status.test=Test Connection
-clearspace.info.status.admin=Clearspace Admin Console
-clearspace.info.status.configure=Configure Clearspace
\ No newline at end of file
+clearspace.admin.title=Clearspace Admin Console
+clearspace.admin.error.disconnected=Problem logging into Clearspace Admin Console
+clearspace.admin.disconnected.description=There was a problem trying to log in to Clearspace Admin Console. Go to the connection page {0}here{1} to fix the problem.
+clearspace.status.title=Connection Status
+clearspace.status.error.config=Error trying to configure Clearspace.
+clearspace.status.error.disconnected.of=Openfire is not connected to Clearspace.
+clearspace.status.disconnected.of.description=Please check that the Clearspace URL and shared secret settings are correct {0}here{1}.
+clearspace.status.error.disconnected.cs=Clearspace is not connected to Openfire.
+clearspace.status.disconnected.cs.description=The most common reason for this is that Openfire was not able to configure Clearspace. Until that happen Openfire will re-attempt this configuration automatically every minute.
+clearspace.status.error.disconnected.of_and_cs=Openfire and Clearspace are not connected.
+clearspace.status.disconnected.of_and_cs.description=Please check that Openfire is pointing to the right Clearspace URL and that Openfire and Clearspace have the same shared secret. You can check Openfires configuration {0}here{1}. You can verify Clearspaces configuration by visiting the Clearspace admin console, going to the Real Time tab, and checking under the Connection menu item.
+clearspace.status.disconnected.buttons.description=You can test Openfire connection or try to force Clearspace configuration by using the following buttons:
+clearspace.status.disconnected.testbutton=Test Connection
+clearspace.status.disconnected.configbutton=Configure Clearspace
+clearspace.status.connected.description=Clearspace and Openfire integration provides online presence and group chat capabilities in Clearspace.
+clearspace.status.connected.table.title=Clearspace Connection Details
+clearspace.status.connected.table.label.connected=Connection Status:
+clearspace.status.connected.table.value.connected=Connected
+clearspace.status.connected.table.label.num_components=Number of Clearpace Nodes:
+clearspace.status.connected.table.label.creation=Creation Date:
+clearspace.status.connected.table.label.last_active=Last Activity:
+clearspace.status.connected.table.label.statistics=Statistics:
+clearspace.status.connected.table.label.received=Packets Received/Sent:
+clearspace.status.connected.table.label.hostname=Node IP / Hostname:
+clearspace.status.connected.adminbutton=Clearspace Admin Console
\ No newline at end of file

src/i18n/openfire_i18n_de.properties

@@ -141,8 +141,10 @@ tab.tab-plugins.descr=Click to manage all plugins
 tab.tab-clearspace=Clearspace
 tab.tab-clearspace.descr=Click manage Clearspace integration
     sidebar.sidebar-clearspace=Clearspace Integration
-        sidebar.clearspace-info=Clearspace Information
-        sidebar.clearspace-info.descr=Information about Clearspace integration
+        sidebar.clearspace-status=Connection Status
+        sidebar.clearspace-status.descr=Status about Clearspace integration
+        sidebar.clearspace-admin=Clearspace Admin
+        sidebar.clearspace-admin.descr=Click to go to Clearspace Admin Console
 
 # Log messages
 log.marker_inserted_by=--- Markerung eingef\u00fcgt von {0} am {1} ---
@@ -2343,25 +2345,28 @@ muc.room.edit.form.edit.title=Room Settings
 user.create.isadmin=Is Administrator?
 user.create.admin_info=Grants admin access to Openfire
 user.properties.isadmin=User has administrative privileges.
-clearspace.info.title=Clearspace information
-clearspace.info.status.title=Connection status
-clearspace.info.status.config.error=Error trying to configure Clearspace.
-clearspace.info.status.disconnected.error=Openfire and Clearspace are not connected.
-clearspace.info.status.disconnected.of.title=Openfire is not connected to Clearspce
-clearspace.info.status.disconnected.of.description=Please check the that Openfire is pointing to the right Clearspace URL {0}here{1}.
-clearspace.info.status.disconnected.cs.title=Clearspace is not connected to Openfire
-clearspace.info.status.disconnected.cs.description=The most common reason for this is that Openfire wasn't able to configure Clearsapce. Until that happen Openfire will try to configure it every minute.
-clearspace.info.status.disconnected.of_and_cs.title=Openfire and Clearspace are currently not connected.
-clearspace.info.status.disconnected.of_and_cs.description=Please check that they have the same shared secret and that Openfire is pointing to the right Clearspace URL. \
-  You can check Openfire configuration {0}here{1}. Or you can configure Clearspace at admin console then click on Real-Time tab and finally go to Connection menu item
-clearspace.info.status.disconnected.buttons.description=You can test Openfire connection or try to force Clearspace configuration by using the following buttons:
-clearspace.info.table.title=Clearspace Connection Details
-clearspace.info.label.num_components=Number of Clearpace Nodes
-clearspace.info.label.creation=Creation Date
-clearspace.info.label.last_active=Last Activity
-clearspace.info.label.statistics=Statistics
-clearspace.info.label.received=Packets Received/Sent:
-clearspace.info.label.hostname=Node IP / Hostname
-clearspace.info.status.test=Test Connection
-clearspace.info.status.admin=Clearspace Admin Console
-clearspace.info.status.configure=Configure Clearspace
\ No newline at end of file
+clearspace.admin.title=Clearspace Admin Console
+clearspace.admin.error.disconnected=Problem logging into Clearspace Admin Console
+clearspace.admin.disconnected.description=There was a problem trying to log in to Clearspace Admin Console. Go to the connection page {0}here{1} to fix the problem.
+clearspace.status.title=Connection Status
+clearspace.status.error.config=Error trying to configure Clearspace.
+clearspace.status.error.disconnected.of=Openfire is not connected to Clearspace.
+clearspace.status.disconnected.of.description=Please check that the Clearspace URL and shared secret settings are correct {0}here{1}.
+clearspace.status.error.disconnected.cs=Clearspace is not connected to Openfire.
+clearspace.status.disconnected.cs.description=The most common reason for this is that Openfire was not able to configure Clearspace. Until that happen Openfire will re-attempt this configuration automatically every minute.
+clearspace.status.error.disconnected.of_and_cs=Openfire and Clearspace are not connected.
+clearspace.status.disconnected.of_and_cs.description=Please check that Openfire is pointing to the right Clearspace URL and that Openfire and Clearspace have the same shared secret. You can check OpenfireÕs configuration {0}here{1}. You can verify ClearspaceÕs configuration by visiting the Clearspace admin console, going to the Real Time tab, and checking under the Connection menu item.
+clearspace.status.disconnected.buttons.description=You can test Openfire connection or try to force Clearspace configuration by using the following buttons:
+clearspace.status.disconnected.testbutton=Test Connection
+clearspace.status.disconnected.configbutton=Configure Clearspace
+clearspace.status.connected.description=Clearspace and Openfire integration provides online presence and group chat capabilities in Clearspace.
+clearspace.status.connected.table.title=Clearspace Connection Details
+clearspace.status.connected.table.label.connected=Connection Status:
+clearspace.status.connected.table.value.connected=Connected
+clearspace.status.connected.table.label.num_components=Number of Clearpace Nodes:
+clearspace.status.connected.table.label.creation=Creation Date:
+clearspace.status.connected.table.label.last_active=Last Activity:
+clearspace.status.connected.table.label.statistics=Statistics:
+clearspace.status.connected.table.label.received=Packets Received/Sent:
+clearspace.status.connected.table.label.hostname=Node IP / Hostname:
+clearspace.status.connected.adminbutton=Clearspace Admin Console
\ No newline at end of file

src/i18n/openfire_i18n_en.properties

@@ -418,27 +418,31 @@
 ##      Removed key: 'clearspace.admin.title
 ##      Removed key: 'clearspace.admin.notconnected.title
 ##      Removed key: 'clearspace.admin.notconnected.description
-##      Added key: 'clearspace.info.title'
-##      Added key: 'clearspace.info.status.title'
-##      Added key: 'clearspace.info.status.config.error'
-##      Added key: 'clearspace.info.status.disconnected.error'
-##      Added key: 'clearspace.info.status.disconnected.of.title'
-##      Added key: 'clearspace.info.status.disconnected.of.description'
-##      Added key: 'clearspace.info.status.disconnected.cs.title'
-##      Added key: 'clearspace.info.status.disconnected.cs.description'
-##      Added key: 'clearspace.info.status.disconnected.of_and_cs.title'
-##      Added key: 'clearspace.info.status.disconnected.of_and_cs.description'
-##      Added key: 'clearspace.info.status.disconnected.buttons.description'
-##      Added key: 'clearspace.info.table.title'
-##      Added key: 'clearspace.info.label.num_components'
-##      Added key: 'clearspace.info.label.creation'
-##      Added key: 'clearspace.info.label.last_active'
-##      Added key: 'clearspace.info.label.statistics'
-##      Added key: 'clearspace.info.label.received'
-##      Added key: 'clearspace.info.label.hostname'
-##      Added key: 'clearspace.info.status.test'
-##      Added key: 'clearspace.info.status.admin'
-##      Added key: 'clearspace.info.status.configure'
+##      Added key: 'clearspace.admin.title'
+##      Added key: 'clearspace.admin.error.disconnected'
+##      Added key: 'clearspace.admin.disconnected.description'
+##      Added key: 'clearspace.status.title'
+##      Added key: 'clearspace.status.error.config'
+##      Added key: 'clearspace.status.error.disconnected.of'
+##      Added key: 'clearspace.status.disconnected.of.description'
+##      Added key: 'clearspace.status.error.disconnected.cs'
+##      Added key: 'clearspace.status.disconnected.cs.description'
+##      Added key: 'clearspace.status.error.disconnected.of_and_cs'
+##      Added key: 'clearspace.status.disconnected.of_and_cs.description'
+##      Added key: 'clearspace.status.disconnected.buttons.description'
+##      Added key: 'clearspace.status.disconnected.testbutton'
+##      Added key: 'clearspace.status.disconnected.configbutton'
+##      Added key: 'clearspace.status.connected.description'
+##      Added key: 'clearspace.status.connected.table.title'
+##      Added key: 'clearspace.status.connected.table.label.connected'
+##      Added key: 'clearspace.status.connected.table.value.connected'
+##      Added key: 'clearspace.status.connected.table.label.num_components'
+##      Added key: 'clearspace.status.connected.table.label.creation'
+##      Added key: 'clearspace.status.connected.table.label.last_active'
+##      Added key: 'clearspace.status.connected.table.label.statistics'
+##      Added key: 'clearspace.status.connected.table.label.received'
+##      Added key: 'clearspace.status.connected.table.label.hostname'
+##      Added key: 'clearspace.status.connected.adminbutton'
 
 
 # Openfire
@@ -591,8 +595,10 @@ tab.tab-plugins.descr=Click to manage all plugins
 tab.tab-clearspace=Clearspace
 tab.tab-clearspace.descr=Click manage Clearspace integration
     sidebar.sidebar-clearspace=Clearspace Integration
-        sidebar.clearspace-info=Clearspace Information
-        sidebar.clearspace-info.descr=Information about Clearspace integration
+        sidebar.clearspace-status=Connection Status
+        sidebar.clearspace-status.descr=Status about Clearspace integration
+        sidebar.clearspace-admin=Clearspace Admin
+        sidebar.clearspace-admin.descr=Click to go to Clearspace Admin Console
 
 
 # Log messages
@@ -2880,27 +2886,33 @@ security.audit.viewer.write_only=The security audit provider configured for this
 security.audit.viewer.view_url=The following URL refers to where you can view the logs.  Depending on the interface, you may need to log in again to view the logs.
 security.audit.viewer.view_url.url=URL
 
-# Clearspace info page
-
-clearspace.info.title=Clearspace information
-clearspace.info.status.title=Connection status
-clearspace.info.status.config.error=Error trying to configure Clearspace.
-clearspace.info.status.disconnected.error=Openfire and Clearspace are not connected.
-clearspace.info.status.disconnected.of.title=Openfire is not connected to Clearspce
-clearspace.info.status.disconnected.of.description=Please check the that Openfire is pointing to the right Clearspace URL {0}here{1}.
-clearspace.info.status.disconnected.cs.title=Clearspace is not connected to Openfire
-clearspace.info.status.disconnected.cs.description=The most common reason for this is that Openfire wasn't able to configure Clearsapce. Until that happen Openfire will try to configure it every minute.
-clearspace.info.status.disconnected.of_and_cs.title=Openfire and Clearspace are currently not connected.
-clearspace.info.status.disconnected.of_and_cs.description=Please check that they have the same shared secret and that Openfire is pointing to the right Clearspace URL. \
-  You can check Openfire configuration {0}here{1}. Or you can configure Clearspace at admin console then click on Real-Time tab and finally go to Connection menu item
-clearspace.info.status.disconnected.buttons.description=You can test Openfire connection or try to force Clearspace configuration by using the following buttons:
-clearspace.info.table.title=Clearspace Connection Details
-clearspace.info.label.num_components=Number of Clearpace Nodes
-clearspace.info.label.creation=Creation Date
-clearspace.info.label.last_active=Last Activity
-clearspace.info.label.statistics=Statistics
-clearspace.info.label.received=Packets Received/Sent:
-clearspace.info.label.hostname=Node IP / Hostname
-clearspace.info.status.test=Test Connection
-clearspace.info.status.admin=Clearspace Admin Console
-clearspace.info.status.configure=Configure Clearspace
\ No newline at end of file
+# Clearpsace Admin console page
+
+clearspace.admin.title=Clearspace Admin Console
+clearspace.admin.error.disconnected=Problem logging into Clearspace Admin Console
+clearspace.admin.disconnected.description=There was a problem trying to log in to Clearspace Admin Console. Go to the connection page {0}here{1} to fix the problem.
+
+# Clearspace Connection Status page
+
+clearspace.status.title=Connection Status
+clearspace.status.error.config=Error trying to configure Clearspace.
+clearspace.status.error.disconnected.of=Openfire is not connected to Clearspace.
+clearspace.status.disconnected.of.description=Please check that the Clearspace URL and shared secret settings are correct {0}here{1}.
+clearspace.status.error.disconnected.cs=Clearspace is not connected to Openfire.
+clearspace.status.disconnected.cs.description=The most common reason for this is that Openfire was not able to configure Clearspace. Until that happen Openfire will re-attempt this configuration automatically every minute.
+clearspace.status.error.disconnected.of_and_cs=Openfire and Clearspace are not connected.
+clearspace.status.disconnected.of_and_cs.description=Please check that Openfire is pointing to the right Clearspace URL and that Openfire and Clearspace have the same shared secret. You can check Openfires configuration {0}here{1}. You can verify Clearspaces configuration by visiting the Clearspace admin console, going to the Real Time tab, and checking under the Connection menu item.
+clearspace.status.disconnected.buttons.description=You can test Openfire connection or try to force Clearspace configuration by using the following buttons:
+clearspace.status.disconnected.testbutton=Test Connection
+clearspace.status.disconnected.configbutton=Configure Clearspace
+clearspace.status.connected.description=Clearspace and Openfire integration provides online presence and group chat capabilities in Clearspace.
+clearspace.status.connected.table.title=Clearspace Connection Details
+clearspace.status.connected.table.label.connected=Connection Status:
+clearspace.status.connected.table.value.connected=Connected
+clearspace.status.connected.table.label.num_components=Number of Clearpace Nodes:
+clearspace.status.connected.table.label.creation=Creation Date:
+clearspace.status.connected.table.label.last_active=Last Activity:
+clearspace.status.connected.table.label.statistics=Statistics:
+clearspace.status.connected.table.label.received=Packets Received/Sent:
+clearspace.status.connected.table.label.hostname=Node IP / Hostname:
+clearspace.status.connected.adminbutton=Clearspace Admin Console

src/i18n/openfire_i18n_es.properties

@@ -138,8 +138,10 @@ tab.tab-plugins.descr=Presione para administrar los plugins
 tab.tab-clearspace=Clearspace
 tab.tab-clearspace.descr=Click manage Clearspace integration
     sidebar.sidebar-clearspace=Clearspace Integration
-        sidebar.clearspace-info=Clearspace Information
-        sidebar.clearspace-info.descr=Information about Clearspace integration
+        sidebar.clearspace-status=Connection Status
+        sidebar.clearspace-status.descr=Status about Clearspace integration
+        sidebar.clearspace-admin=Clearspace Admin
+        sidebar.clearspace-admin.descr=Click to go to Clearspace Admin Console
 
 # Log messages
 log.marker_inserted_by=--- Marcador insertado por {0} en {1} ---
@@ -2394,25 +2396,28 @@ muc.room.edit.form.edit.title=Room Settings
 user.create.isadmin=Is Administrator?
 user.create.admin_info=Grants admin access to Openfire
 user.properties.isadmin=User has administrative privileges.
-clearspace.info.title=Clearspace information
-clearspace.info.status.title=Connection status
-clearspace.info.status.config.error=Error trying to configure Clearspace.
-clearspace.info.status.disconnected.error=Openfire and Clearspace are not connected.
-clearspace.info.status.disconnected.of.title=Openfire is not connected to Clearspce
-clearspace.info.status.disconnected.of.description=Please check the that Openfire is pointing to the right Clearspace URL {0}here{1}.
-clearspace.info.status.disconnected.cs.title=Clearspace is not connected to Openfire
-clearspace.info.status.disconnected.cs.description=The most common reason for this is that Openfire wasn't able to configure Clearsapce. Until that happen Openfire will try to configure it every minute.
-clearspace.info.status.disconnected.of_and_cs.title=Openfire and Clearspace are currently not connected.
-clearspace.info.status.disconnected.of_and_cs.description=Please check that they have the same shared secret and that Openfire is pointing to the right Clearspace URL. \
-  You can check Openfire configuration {0}here{1}. Or you can configure Clearspace at admin console then click on Real-Time tab and finally go to Connection menu item
-clearspace.info.status.disconnected.buttons.description=You can test Openfire connection or try to force Clearspace configuration by using the following buttons:
-clearspace.info.table.title=Clearspace Connection Details
-clearspace.info.label.num_components=Number of Clearpace Nodes
-clearspace.info.label.creation=Creation Date
-clearspace.info.label.last_active=Last Activity
-clearspace.info.label.statistics=Statistics
-clearspace.info.label.received=Packets Received/Sent:
-clearspace.info.label.hostname=Node IP / Hostname
-clearspace.info.status.test=Test Connection
-clearspace.info.status.admin=Clearspace Admin Console
-clearspace.info.status.configure=Configure Clearspace
\ No newline at end of file
+clearspace.admin.title=Clearspace Admin Console
+clearspace.admin.error.disconnected=Problem logging into Clearspace Admin Console
+clearspace.admin.disconnected.description=There was a problem trying to log in to Clearspace Admin Console. Go to the connection page {0}here{1} to fix the problem.
+clearspace.status.title=Connection Status
+clearspace.status.error.config=Error trying to configure Clearspace.
+clearspace.status.error.disconnected.of=Openfire is not connected to Clearspace.
+clearspace.status.disconnected.of.description=Please check that the Clearspace URL and shared secret settings are correct {0}here{1}.
+clearspace.status.error.disconnected.cs=Clearspace is not connected to Openfire.
+clearspace.status.disconnected.cs.description=The most common reason for this is that Openfire was not able to configure Clearspace. Until that happen Openfire will re-attempt this configuration automatically every minute.
+clearspace.status.error.disconnected.of_and_cs=Openfire and Clearspace are not connected.
+clearspace.status.disconnected.of_and_cs.description=Please check that Openfire is pointing to the right Clearspace URL and that Openfire and Clearspace have the same shared secret. You can check OpenfireÕs configuration {0}here{1}. You can verify ClearspaceÕs configuration by visiting the Clearspace admin console, going to the Real Time tab, and checking under the Connection menu item.
+clearspace.status.disconnected.buttons.description=You can test Openfire connection or try to force Clearspace configuration by using the following buttons:
+clearspace.status.disconnected.testbutton=Test Connection
+clearspace.status.disconnected.configbutton=Configure Clearspace
+clearspace.status.connected.description=Clearspace and Openfire integration provides online presence and group chat capabilities in Clearspace.
+clearspace.status.connected.table.title=Clearspace Connection Details
+clearspace.status.connected.table.label.connected=Connection Status:
+clearspace.status.connected.table.value.connected=Connected
+clearspace.status.connected.table.label.num_components=Number of Clearpace Nodes:
+clearspace.status.connected.table.label.creation=Creation Date:
+clearspace.status.connected.table.label.last_active=Last Activity:
+clearspace.status.connected.table.label.statistics=Statistics:
+clearspace.status.connected.table.label.received=Packets Received/Sent:
+clearspace.status.connected.table.label.hostname=Node IP / Hostname:
+clearspace.status.connected.adminbutton=Clearspace Admin Console
\ No newline at end of file

src/i18n/openfire_i18n_fr.properties

@@ -120,8 +120,10 @@ sidebar.available-plugins.descr = Cliquez pour voir les plugins disponibles
 tab.tab-clearspace=Clearspace
 tab.tab-clearspace.descr=Click manage Clearspace integration
     sidebar.sidebar-clearspace=Clearspace Integration
-        sidebar.clearspace-info=Clearspace Information
-        sidebar.clearspace-info.descr=Information about Clearspace integration
+        sidebar.clearspace-status=Connection Status
+        sidebar.clearspace-status.descr=Status about Clearspace integration
+        sidebar.clearspace-admin=Clearspace Admin
+        sidebar.clearspace-admin.descr=Click to go to Clearspace Admin Console
 
 # Log messages
 log.marker_inserted_by = --- Marqueur ajout\u00E9 par {0} le {1} ---
@@ -1965,25 +1967,28 @@ muc.room.edit.form.edit.title=Room Settings
 user.create.isadmin=Is Administrator?
 user.create.admin_info=Grants admin access to Openfire
 user.properties.isadmin=User has administrative privileges.
-clearspace.info.title=Clearspace information
-clearspace.info.status.title=Connection status
-clearspace.info.status.config.error=Error trying to configure Clearspace.
-clearspace.info.status.disconnected.error=Openfire and Clearspace are not connected.
-clearspace.info.status.disconnected.of.title=Openfire is not connected to Clearspce
-clearspace.info.status.disconnected.of.description=Please check the that Openfire is pointing to the right Clearspace URL {0}here{1}.
-clearspace.info.status.disconnected.cs.title=Clearspace is not connected to Openfire
-clearspace.info.status.disconnected.cs.description=The most common reason for this is that Openfire wasn't able to configure Clearsapce. Until that happen Openfire will try to configure it every minute.
-clearspace.info.status.disconnected.of_and_cs.title=Openfire and Clearspace are currently not connected.
-clearspace.info.status.disconnected.of_and_cs.description=Please check that they have the same shared secret and that Openfire is pointing to the right Clearspace URL. \
-  You can check Openfire configuration {0}here{1}. Or you can configure Clearspace at admin console then click on Real-Time tab and finally go to Connection menu item
-clearspace.info.status.disconnected.buttons.description=You can test Openfire connection or try to force Clearspace configuration by using the following buttons:
-clearspace.info.table.title=Clearspace Connection Details
-clearspace.info.label.num_components=Number of Clearpace Nodes
-clearspace.info.label.creation=Creation Date
-clearspace.info.label.last_active=Last Activity
-clearspace.info.label.statistics=Statistics
-clearspace.info.label.received=Packets Received/Sent:
-clearspace.info.label.hostname=Node IP / Hostname
-clearspace.info.status.test=Test Connection
-clearspace.info.status.admin=Clearspace Admin Console
-clearspace.info.status.configure=Configure Clearspace
\ No newline at end of file
+clearspace.admin.title=Clearspace Admin Console
+clearspace.admin.error.disconnected=Problem logging into Clearspace Admin Console
+clearspace.admin.disconnected.description=There was a problem trying to log in to Clearspace Admin Console. Go to the connection page {0}here{1} to fix the problem.
+clearspace.status.title=Connection Status
+clearspace.status.error.config=Error trying to configure Clearspace.
+clearspace.status.error.disconnected.of=Openfire is not connected to Clearspace.
+clearspace.status.disconnected.of.description=Please check that the Clearspace URL and shared secret settings are correct {0}here{1}.
+clearspace.status.error.disconnected.cs=Clearspace is not connected to Openfire.
+clearspace.status.disconnected.cs.description=The most common reason for this is that Openfire was not able to configure Clearspace. Until that happen Openfire will re-attempt this configuration automatically every minute.
+clearspace.status.error.disconnected.of_and_cs=Openfire and Clearspace are not connected.
+clearspace.status.disconnected.of_and_cs.description=Please check that Openfire is pointing to the right Clearspace URL and that Openfire and Clearspace have the same shared secret. You can check OpenfireÕs configuration {0}here{1}. You can verify ClearspaceÕs configuration by visiting the Clearspace admin console, going to the Real Time tab, and checking under the Connection menu item.
+clearspace.status.disconnected.buttons.description=You can test Openfire connection or try to force Clearspace configuration by using the following buttons:
+clearspace.status.disconnected.testbutton=Test Connection
+clearspace.status.disconnected.configbutton=Configure Clearspace
+clearspace.status.connected.description=Clearspace and Openfire integration provides online presence and group chat capabilities in Clearspace.
+clearspace.status.connected.table.title=Clearspace Connection Details
+clearspace.status.connected.table.label.connected=Connection Status:
+clearspace.status.connected.table.value.connected=Connected
+clearspace.status.connected.table.label.num_components=Number of Clearpace Nodes:
+clearspace.status.connected.table.label.creation=Creation Date:
+clearspace.status.connected.table.label.last_active=Last Activity:
+clearspace.status.connected.table.label.statistics=Statistics:
+clearspace.status.connected.table.label.received=Packets Received/Sent:
+clearspace.status.connected.table.label.hostname=Node IP / Hostname:
+clearspace.status.connected.adminbutton=Clearspace Admin Console
\ No newline at end of file

src/i18n/openfire_i18n_ja_JP.properties

@@ -321,8 +321,10 @@ tab.tab-plugins.descr=\u3059\u3079\u3066\u306e\u30d7\u30e9\u30b0\u30a4\u30f3\u30
 tab.tab-clearspace=Clearspace
 tab.tab-clearspace.descr=Click manage Clearspace integration
     sidebar.sidebar-clearspace=Clearspace Integration
-        sidebar.clearspace-info=Clearspace Information
-        sidebar.clearspace-info.descr=Information about Clearspace integration
+        sidebar.clearspace-status=Connection Status
+        sidebar.clearspace-status.descr=Status about Clearspace integration
+        sidebar.clearspace-admin=Clearspace Admin
+        sidebar.clearspace-admin.descr=Click to go to Clearspace Admin Console
 
 # Log messages
 log.marker_inserted_by=--- Marker inserted by {0} at {1} ---
@@ -2490,25 +2492,28 @@ muc.room.edit.form.edit.title=Room Settings
 user.create.isadmin=Is Administrator?
 user.create.admin_info=Grants admin access to Openfire
 user.properties.isadmin=User has administrative privileges.
-clearspace.info.title=Clearspace information
-clearspace.info.status.title=Connection status
-clearspace.info.status.config.error=Error trying to configure Clearspace.
-clearspace.info.status.disconnected.error=Openfire and Clearspace are not connected.
-clearspace.info.status.disconnected.of.title=Openfire is not connected to Clearspce
-clearspace.info.status.disconnected.of.description=Please check the that Openfire is pointing to the right Clearspace URL {0}here{1}.
-clearspace.info.status.disconnected.cs.title=Clearspace is not connected to Openfire
-clearspace.info.status.disconnected.cs.description=The most common reason for this is that Openfire wasn't able to configure Clearsapce. Until that happen Openfire will try to configure it every minute.
-clearspace.info.status.disconnected.of_and_cs.title=Openfire and Clearspace are currently not connected.
-clearspace.info.status.disconnected.of_and_cs.description=Please check that they have the same shared secret and that Openfire is pointing to the right Clearspace URL. \
-  You can check Openfire configuration {0}here{1}. Or you can configure Clearspace at admin console then click on Real-Time tab and finally go to Connection menu item
-clearspace.info.status.disconnected.buttons.description=You can test Openfire connection or try to force Clearspace configuration by using the following buttons:
-clearspace.info.table.title=Clearspace Connection Details
-clearspace.info.label.num_components=Number of Clearpace Nodes
-clearspace.info.label.creation=Creation Date
-clearspace.info.label.last_active=Last Activity
-clearspace.info.label.statistics=Statistics
-clearspace.info.label.received=Packets Received/Sent:
-clearspace.info.label.hostname=Node IP / Hostname
-clearspace.info.status.test=Test Connection
-clearspace.info.status.admin=Clearspace Admin Console
-clearspace.info.status.configure=Configure Clearspace
\ No newline at end of file
+clearspace.admin.title=Clearspace Admin Console
+clearspace.admin.error.disconnected=Problem logging into Clearspace Admin Console
+clearspace.admin.disconnected.description=There was a problem trying to log in to Clearspace Admin Console. Go to the connection page {0}here{1} to fix the problem.
+clearspace.status.title=Connection Status
+clearspace.status.error.config=Error trying to configure Clearspace.
+clearspace.status.error.disconnected.of=Openfire is not connected to Clearspace.
+clearspace.status.disconnected.of.description=Please check that the Clearspace URL and shared secret settings are correct {0}here{1}.
+clearspace.status.error.disconnected.cs=Clearspace is not connected to Openfire.
+clearspace.status.disconnected.cs.description=The most common reason for this is that Openfire was not able to configure Clearspace. Until that happen Openfire will re-attempt this configuration automatically every minute.
+clearspace.status.error.disconnected.of_and_cs=Openfire and Clearspace are not connected.
+clearspace.status.disconnected.of_and_cs.description=Please check that Openfire is pointing to the right Clearspace URL and that Openfire and Clearspace have the same shared secret. You can check Openfires configuration {0}here{1}. You can verify Clearspaces configuration by visiting the Clearspace admin console, going to the Real Time tab, and checking under the Connection menu item.
+clearspace.status.disconnected.buttons.description=You can test Openfire connection or try to force Clearspace configuration by using the following buttons:
+clearspace.status.disconnected.testbutton=Test Connection
+clearspace.status.disconnected.configbutton=Configure Clearspace
+clearspace.status.connected.description=Clearspace and Openfire integration provides online presence and group chat capabilities in Clearspace.
+clearspace.status.connected.table.title=Clearspace Connection Details
+clearspace.status.connected.table.label.connected=Connection Status:
+clearspace.status.connected.table.value.connected=Connected
+clearspace.status.connected.table.label.num_components=Number of Clearpace Nodes:
+clearspace.status.connected.table.label.creation=Creation Date:
+clearspace.status.connected.table.label.last_active=Last Activity:
+clearspace.status.connected.table.label.statistics=Statistics:
+clearspace.status.connected.table.label.received=Packets Received/Sent:
+clearspace.status.connected.table.label.hostname=Node IP / Hostname:
+clearspace.status.connected.adminbutton=Clearspace Admin Console
\ No newline at end of file

src/i18n/openfire_i18n_nl.properties

@@ -139,8 +139,10 @@ tab.tab-plugins.descr=Click to manage all plugins
 tab.tab-clearspace=Clearspace
 tab.tab-clearspace.descr=Click manage Clearspace integration
     sidebar.sidebar-clearspace=Clearspace Integration
-        sidebar.clearspace-info=Clearspace Information
-        sidebar.clearspace-info.descr=Information about Clearspace integration
+        sidebar.clearspace-status=Connection Status
+        sidebar.clearspace-status.descr=Status about Clearspace integration
+        sidebar.clearspace-admin=Clearspace Admin
+        sidebar.clearspace-admin.descr=Click to go to Clearspace Admin Console
 
 # Log messages
 log.marker_inserted_by=--- Markering ingevoegd door {0} om {1} ---
@@ -2354,25 +2356,28 @@ muc.room.edit.form.edit.title=Room Settings
 user.create.isadmin=Is Administrator?
 user.create.admin_info=Grants admin access to Openfire
 user.properties.isadmin=User has administrative privileges.
-clearspace.info.title=Clearspace information
-clearspace.info.status.title=Connection status
-clearspace.info.status.config.error=Error trying to configure Clearspace.
-clearspace.info.status.disconnected.error=Openfire and Clearspace are not connected.
-clearspace.info.status.disconnected.of.title=Openfire is not connected to Clearspce
-clearspace.info.status.disconnected.of.description=Please check the that Openfire is pointing to the right Clearspace URL {0}here{1}.
-clearspace.info.status.disconnected.cs.title=Clearspace is not connected to Openfire
-clearspace.info.status.disconnected.cs.description=The most common reason for this is that Openfire wasn't able to configure Clearsapce. Until that happen Openfire will try to configure it every minute.
-clearspace.info.status.disconnected.of_and_cs.title=Openfire and Clearspace are currently not connected.
-clearspace.info.status.disconnected.of_and_cs.description=Please check that they have the same shared secret and that Openfire is pointing to the right Clearspace URL. \
-  You can check Openfire configuration {0}here{1}. Or you can configure Clearspace at admin console then click on Real-Time tab and finally go to Connection menu item
-clearspace.info.status.disconnected.buttons.description=You can test Openfire connection or try to force Clearspace configuration by using the following buttons:
-clearspace.info.table.title=Clearspace Connection Details
-clearspace.info.label.num_components=Number of Clearpace Nodes
-clearspace.info.label.creation=Creation Date
-clearspace.info.label.last_active=Last Activity
-clearspace.info.label.statistics=Statistics
-clearspace.info.label.received=Packets Received/Sent:
-clearspace.info.label.hostname=Node IP / Hostname
-clearspace.info.status.test=Test Connection
-clearspace.info.status.admin=Clearspace Admin Console
-clearspace.info.status.configure=Configure Clearspace
\ No newline at end of file
+clearspace.admin.title=Clearspace Admin Console
+clearspace.admin.error.disconnected=Problem logging into Clearspace Admin Console
+clearspace.admin.disconnected.description=There was a problem trying to log in to Clearspace Admin Console. Go to the connection page {0}here{1} to fix the problem.
+clearspace.status.title=Connection Status
+clearspace.status.error.config=Error trying to configure Clearspace.
+clearspace.status.error.disconnected.of=Openfire is not connected to Clearspace.
+clearspace.status.disconnected.of.description=Please check that the Clearspace URL and shared secret settings are correct {0}here{1}.
+clearspace.status.error.disconnected.cs=Clearspace is not connected to Openfire.
+clearspace.status.disconnected.cs.description=The most common reason for this is that Openfire was not able to configure Clearspace. Until that happen Openfire will re-attempt this configuration automatically every minute.
+clearspace.status.error.disconnected.of_and_cs=Openfire and Clearspace are not connected.
+clearspace.status.disconnected.of_and_cs.description=Please check that Openfire is pointing to the right Clearspace URL and that Openfire and Clearspace have the same shared secret. You can check Openfires configuration {0}here{1}. You can verify Clearspaces configuration by visiting the Clearspace admin console, going to the Real Time tab, and checking under the Connection menu item.
+clearspace.status.disconnected.buttons.description=You can test Openfire connection or try to force Clearspace configuration by using the following buttons:
+clearspace.status.disconnected.testbutton=Test Connection
+clearspace.status.disconnected.configbutton=Configure Clearspace
+clearspace.status.connected.description=Clearspace and Openfire integration provides online presence and group chat capabilities in Clearspace.
+clearspace.status.connected.table.title=Clearspace Connection Details
+clearspace.status.connected.table.label.connected=Connection Status:
+clearspace.status.connected.table.value.connected=Connected
+clearspace.status.connected.table.label.num_components=Number of Clearpace Nodes:
+clearspace.status.connected.table.label.creation=Creation Date:
+clearspace.status.connected.table.label.last_active=Last Activity:
+clearspace.status.connected.table.label.statistics=Statistics:
+clearspace.status.connected.table.label.received=Packets Received/Sent:
+clearspace.status.connected.table.label.hostname=Node IP / Hostname:
+clearspace.status.connected.adminbutton=Clearspace Admin Console
\ No newline at end of file

src/i18n/openfire_i18n_pl_PL.properties

@@ -143,8 +143,10 @@ tab.tab-plugins.descr=Kliknij aby zarz\u0105dza\u0107 wszystkimi wtyczkami
 tab.tab-clearspace=Clearspace
 tab.tab-clearspace.descr=Click manage Clearspace integration
     sidebar.sidebar-clearspace=Clearspace Integration
-        sidebar.clearspace-info=Clearspace Information
-        sidebar.clearspace-info.descr=Information about Clearspace integration
+        sidebar.clearspace-status=Connection Status
+        sidebar.clearspace-status.descr=Status about Clearspace integration
+        sidebar.clearspace-admin=Clearspace Admin
+        sidebar.clearspace-admin.descr=Click to go to Clearspace Admin Console
 
 # Log messages
 log.marker_inserted_by=--- Zaznaczenie utworzone przez {0} w {1} ---
@@ -2323,25 +2325,28 @@ muc.room.edit.form.edit.title=Room Settings
 user.create.isadmin=Is Administrator?
 user.create.admin_info=Grants admin access to Openfire
 user.properties.isadmin=User has administrative privileges.
-clearspace.info.title=Clearspace information
-clearspace.info.status.title=Connection status
-clearspace.info.status.config.error=Error trying to configure Clearspace.
-clearspace.info.status.disconnected.error=Openfire and Clearspace are not connected.
-clearspace.info.status.disconnected.of.title=Openfire is not connected to Clearspce
-clearspace.info.status.disconnected.of.description=Please check the that Openfire is pointing to the right Clearspace URL {0}here{1}.
-clearspace.info.status.disconnected.cs.title=Clearspace is not connected to Openfire
-clearspace.info.status.disconnected.cs.description=The most common reason for this is that Openfire wasn't able to configure Clearsapce. Until that happen Openfire will try to configure it every minute.
-clearspace.info.status.disconnected.of_and_cs.title=Openfire and Clearspace are currently not connected.
-clearspace.info.status.disconnected.of_and_cs.description=Please check that they have the same shared secret and that Openfire is pointing to the right Clearspace URL. \
-  You can check Openfire configuration {0}here{1}. Or you can configure Clearspace at admin console then click on Real-Time tab and finally go to Connection menu item
-clearspace.info.status.disconnected.buttons.description=You can test Openfire connection or try to force Clearspace configuration by using the following buttons:
-clearspace.info.table.title=Clearspace Connection Details
-clearspace.info.label.num_components=Number of Clearpace Nodes
-clearspace.info.label.creation=Creation Date
-clearspace.info.label.last_active=Last Activity
-clearspace.info.label.statistics=Statistics
-clearspace.info.label.received=Packets Received/Sent:
-clearspace.info.label.hostname=Node IP / Hostname
-clearspace.info.status.test=Test Connection
-clearspace.info.status.admin=Clearspace Admin Console
-clearspace.info.status.configure=Configure Clearspace
\ No newline at end of file
+clearspace.admin.title=Clearspace Admin Console
+clearspace.admin.error.disconnected=Problem logging into Clearspace Admin Console
+clearspace.admin.disconnected.description=There was a problem trying to log in to Clearspace Admin Console. Go to the connection page {0}here{1} to fix the problem.
+clearspace.status.title=Connection Status
+clearspace.status.error.config=Error trying to configure Clearspace.
+clearspace.status.error.disconnected.of=Openfire is not connected to Clearspace.
+clearspace.status.disconnected.of.description=Please check that the Clearspace URL and shared secret settings are correct {0}here{1}.
+clearspace.status.error.disconnected.cs=Clearspace is not connected to Openfire.
+clearspace.status.disconnected.cs.description=The most common reason for this is that Openfire was not able to configure Clearspace. Until that happen Openfire will re-attempt this configuration automatically every minute.
+clearspace.status.error.disconnected.of_and_cs=Openfire and Clearspace are not connected.
+clearspace.status.disconnected.of_and_cs.description=Please check that Openfire is pointing to the right Clearspace URL and that Openfire and Clearspace have the same shared secret. You can check Openfires configuration {0}here{1}. You can verify Clearspaces configuration by visiting the Clearspace admin console, going to the Real Time tab, and checking under the Connection menu item.
+clearspace.status.disconnected.buttons.description=You can test Openfire connection or try to force Clearspace configuration by using the following buttons:
+clearspace.status.disconnected.testbutton=Test Connection
+clearspace.status.disconnected.configbutton=Configure Clearspace
+clearspace.status.connected.description=Clearspace and Openfire integration provides online presence and group chat capabilities in Clearspace.
+clearspace.status.connected.table.title=Clearspace Connection Details
+clearspace.status.connected.table.label.connected=Connection Status:
+clearspace.status.connected.table.value.connected=Connected
+clearspace.status.connected.table.label.num_components=Number of Clearpace Nodes:
+clearspace.status.connected.table.label.creation=Creation Date:
+clearspace.status.connected.table.label.last_active=Last Activity:
+clearspace.status.connected.table.label.statistics=Statistics:
+clearspace.status.connected.table.label.received=Packets Received/Sent:
+clearspace.status.connected.table.label.hostname=Node IP / Hostname:
+clearspace.status.connected.adminbutton=Clearspace Admin Console
\ No newline at end of file

src/i18n/openfire_i18n_pt_BR.properties

@@ -141,8 +141,10 @@ tab.tab-plugins.descr=Clique para gerenciar todos os plugins
 tab.tab-clearspace=Clearspace
 tab.tab-clearspace.descr=Click manage Clearspace integration
     sidebar.sidebar-clearspace=Clearspace Integration
-        sidebar.clearspace-info=Clearspace Information
-        sidebar.clearspace-info.descr=Information about Clearspace integration
+        sidebar.clearspace-status=Connection Status
+        sidebar.clearspace-status.descr=Status about Clearspace integration
+        sidebar.clearspace-admin=Clearspace Admin
+        sidebar.clearspace-admin.descr=Click to go to Clearspace Admin Console
 
 # Log messages
 log.marker_inserted_by=--- Marca inserida por {0} em {1} ---
@@ -2357,25 +2359,28 @@ muc.room.edit.form.edit.title=Room Settings
 user.create.isadmin=Is Administrator?
 user.create.admin_info=Grants admin access to Openfire
 user.properties.isadmin=User has administrative privileges.
-clearspace.info.title=Clearspace information
-clearspace.info.status.title=Connection status
-clearspace.info.status.config.error=Error trying to configure Clearspace.
-clearspace.info.status.disconnected.error=Openfire and Clearspace are not connected.
-clearspace.info.status.disconnected.of.title=Openfire is not connected to Clearspce
-clearspace.info.status.disconnected.of.description=Please check the that Openfire is pointing to the right Clearspace URL {0}here{1}.
-clearspace.info.status.disconnected.cs.title=Clearspace is not connected to Openfire
-clearspace.info.status.disconnected.cs.description=The most common reason for this is that Openfire wasn't able to configure Clearsapce. Until that happen Openfire will try to configure it every minute.
-clearspace.info.status.disconnected.of_and_cs.title=Openfire and Clearspace are currently not connected.
-clearspace.info.status.disconnected.of_and_cs.description=Please check that they have the same shared secret and that Openfire is pointing to the right Clearspace URL. \
-  You can check Openfire configuration {0}here{1}. Or you can configure Clearspace at admin console then click on Real-Time tab and finally go to Connection menu item
-clearspace.info.status.disconnected.buttons.description=You can test Openfire connection or try to force Clearspace configuration by using the following buttons:
-clearspace.info.table.title=Clearspace Connection Details
-clearspace.info.label.num_components=Number of Clearpace Nodes
-clearspace.info.label.creation=Creation Date
-clearspace.info.label.last_active=Last Activity
-clearspace.info.label.statistics=Statistics
-clearspace.info.label.received=Packets Received/Sent:
-clearspace.info.label.hostname=Node IP / Hostname
-clearspace.info.status.test=Test Connection
-clearspace.info.status.admin=Clearspace Admin Console
-clearspace.info.status.configure=Configure Clearspace
\ No newline at end of file
+clearspace.admin.title=Clearspace Admin Console
+clearspace.admin.error.disconnected=Problem logging into Clearspace Admin Console
+clearspace.admin.disconnected.description=There was a problem trying to log in to Clearspace Admin Console. Go to the connection page {0}here{1} to fix the problem.
+clearspace.status.title=Connection Status
+clearspace.status.error.config=Error trying to configure Clearspace.
+clearspace.status.error.disconnected.of=Openfire is not connected to Clearspace.
+clearspace.status.disconnected.of.description=Please check that the Clearspace URL and shared secret settings are correct {0}here{1}.
+clearspace.status.error.disconnected.cs=Clearspace is not connected to Openfire.
+clearspace.status.disconnected.cs.description=The most common reason for this is that Openfire was not able to configure Clearspace. Until that happen Openfire will re-attempt this configuration automatically every minute.
+clearspace.status.error.disconnected.of_and_cs=Openfire and Clearspace are not connected.
+clearspace.status.disconnected.of_and_cs.description=Please check that Openfire is pointing to the right Clearspace URL and that Openfire and Clearspace have the same shared secret. You can check OpenfireÕs configuration {0}here{1}. You can verify ClearspaceÕs configuration by visiting the Clearspace admin console, going to the Real Time tab, and checking under the Connection menu item.
+clearspace.status.disconnected.buttons.description=You can test Openfire connection or try to force Clearspace configuration by using the following buttons:
+clearspace.status.disconnected.testbutton=Test Connection
+clearspace.status.disconnected.configbutton=Configure Clearspace
+clearspace.status.connected.description=Clearspace and Openfire integration provides online presence and group chat capabilities in Clearspace.
+clearspace.status.connected.table.title=Clearspace Connection Details
+clearspace.status.connected.table.label.connected=Connection Status:
+clearspace.status.connected.table.value.connected=Connected
+clearspace.status.connected.table.label.num_components=Number of Clearpace Nodes:
+clearspace.status.connected.table.label.creation=Creation Date:
+clearspace.status.connected.table.label.last_active=Last Activity:
+clearspace.status.connected.table.label.statistics=Statistics:
+clearspace.status.connected.table.label.received=Packets Received/Sent:
+clearspace.status.connected.table.label.hostname=Node IP / Hostname:
+clearspace.status.connected.adminbutton=Clearspace Admin Console
\ No newline at end of file

src/i18n/openfire_i18n_zh_CN.properties

@@ -142,8 +142,10 @@ tab.tab-plugins.descr=\u5355\u51fb\u7ba1\u7406\u6240\u6709\u7684\u63d2\u4ef6
 tab.tab-clearspace=Clearspace
 tab.tab-clearspace.descr=Click manage Clearspace integration
     sidebar.sidebar-clearspace=Clearspace Integration
-        sidebar.clearspace-info=Clearspace Information
-        sidebar.clearspace-info.descr=Information about Clearspace integration
+        sidebar.clearspace-status=Connection Status
+        sidebar.clearspace-status.descr=Status about Clearspace integration
+        sidebar.clearspace-admin=Clearspace Admin
+        sidebar.clearspace-admin.descr=Click to go to Clearspace Admin Console
 
 # Log messages
 log.marker_inserted_by=--- \u7531 {0} \u5728 {1} \u63d2\u5165\u7684\u6807\u8bb0 ---
@@ -2135,25 +2137,28 @@ muc.room.edit.form.edit.title=Room Settings
 user.create.isadmin=Is Administrator?
 user.create.admin_info=Grants admin access to Openfire
 user.properties.isadmin=User has administrative privileges.
-clearspace.info.title=Clearspace information
-clearspace.info.status.title=Connection status
-clearspace.info.status.config.error=Error trying to configure Clearspace.
-clearspace.info.status.disconnected.error=Openfire and Clearspace are not connected.
-clearspace.info.status.disconnected.of.title=Openfire is not connected to Clearspce
-clearspace.info.status.disconnected.of.description=Please check the that Openfire is pointing to the right Clearspace URL {0}here{1}.
-clearspace.info.status.disconnected.cs.title=Clearspace is not connected to Openfire
-clearspace.info.status.disconnected.cs.description=The most common reason for this is that Openfire wasn't able to configure Clearsapce. Until that happen Openfire will try to configure it every minute.
-clearspace.info.status.disconnected.of_and_cs.title=Openfire and Clearspace are currently not connected.
-clearspace.info.status.disconnected.of_and_cs.description=Please check that they have the same shared secret and that Openfire is pointing to the right Clearspace URL. \
-  You can check Openfire configuration {0}here{1}. Or you can configure Clearspace at admin console then click on Real-Time tab and finally go to Connection menu item
-clearspace.info.status.disconnected.buttons.description=You can test Openfire connection or try to force Clearspace configuration by using the following buttons:
-clearspace.info.table.title=Clearspace Connection Details
-clearspace.info.label.num_components=Number of Clearpace Nodes
-clearspace.info.label.creation=Creation Date
-clearspace.info.label.last_active=Last Activity
-clearspace.info.label.statistics=Statistics
-clearspace.info.label.received=Packets Received/Sent:
-clearspace.info.label.hostname=Node IP / Hostname
-clearspace.info.status.test=Test Connection
-clearspace.info.status.admin=Clearspace Admin Console
-clearspace.info.status.configure=Configure Clearspace
\ No newline at end of file
+clearspace.admin.title=Clearspace Admin Console
+clearspace.admin.error.disconnected=Problem logging into Clearspace Admin Console
+clearspace.admin.disconnected.description=There was a problem trying to log in to Clearspace Admin Console. Go to the connection page {0}here{1} to fix the problem.
+clearspace.status.title=Connection Status
+clearspace.status.error.config=Error trying to configure Clearspace.
+clearspace.status.error.disconnected.of=Openfire is not connected to Clearspace.
+clearspace.status.disconnected.of.description=Please check that the Clearspace URL and shared secret settings are correct {0}here{1}.
+clearspace.status.error.disconnected.cs=Clearspace is not connected to Openfire.
+clearspace.status.disconnected.cs.description=The most common reason for this is that Openfire was not able to configure Clearspace. Until that happen Openfire will re-attempt this configuration automatically every minute.
+clearspace.status.error.disconnected.of_and_cs=Openfire and Clearspace are not connected.
+clearspace.status.disconnected.of_and_cs.description=Please check that Openfire is pointing to the right Clearspace URL and that Openfire and Clearspace have the same shared secret. You can check Openfires configuration {0}here{1}. You can verify Clearspaces configuration by visiting the Clearspace admin console, going to the Real Time tab, and checking under the Connection menu item.
+clearspace.status.disconnected.buttons.description=You can test Openfire connection or try to force Clearspace configuration by using the following buttons:
+clearspace.status.disconnected.testbutton=Test Connection
+clearspace.status.disconnected.configbutton=Configure Clearspace
+clearspace.status.connected.description=Clearspace and Openfire integration provides online presence and group chat capabilities in Clearspace.
+clearspace.status.connected.table.title=Clearspace Connection Details
+clearspace.status.connected.table.label.connected=Connection Status:
+clearspace.status.connected.table.value.connected=Connected
+clearspace.status.connected.table.label.num_components=Number of Clearpace Nodes:
+clearspace.status.connected.table.label.creation=Creation Date:
+clearspace.status.connected.table.label.last_active=Last Activity:
+clearspace.status.connected.table.label.statistics=Statistics:
+clearspace.status.connected.table.label.received=Packets Received/Sent:
+clearspace.status.connected.table.label.hostname=Node IP / Hostname:
+clearspace.status.connected.adminbutton=Clearspace Admin Console
\ No newline at end of file

src/java/org/jivesoftware/admin/AdminConsole.java

@@ -372,17 +372,24 @@ public class AdminConsole {
             Element clearspace = generatedModel.addElement("tab");
             clearspace.addAttribute("id", "tab-clearspace");
             clearspace.addAttribute("name", LocaleUtils.getLocalizedString("tab.tab-clearspace"));
-            clearspace.addAttribute("url", "clearspace-info.jsp");
+            clearspace.addAttribute("url", "clearspace-status.jsp");
             clearspace.addAttribute("description", LocaleUtils.getLocalizedString("tab.tab-clearspace.descr"));
             Element sidebar = clearspace.addElement("sidebar");
             sidebar.addAttribute("id", "sidebar-clearspace");
             sidebar.addAttribute("name", LocaleUtils.getLocalizedString("sidebar.sidebar-clearspace"));
 
-            Element item = sidebar.addElement("item");
-            item.addAttribute("id", "clearspace-info");
-            item.addAttribute("name", LocaleUtils.getLocalizedString("sidebar.clearspace-info"));
-            item.addAttribute("url", "clearspace-info.jsp");
-            item.addAttribute("description", LocaleUtils.getLocalizedString("sidebar.clearspace-info.descr"));
+            Element statusItem = sidebar.addElement("item");
+            statusItem.addAttribute("id", "clearspace-status");
+            statusItem.addAttribute("name", LocaleUtils.getLocalizedString("sidebar.clearspace-status"));
+            statusItem.addAttribute("url", "clearspace-status.jsp");
+            statusItem.addAttribute("description", LocaleUtils.getLocalizedString("sidebar.clearspace-status.descr"));
+
+            Element adminItem = sidebar.addElement("item");
+            adminItem.addAttribute("id", "clearspace-admin");
+            adminItem.addAttribute("name", LocaleUtils.getLocalizedString("sidebar.clearspace-admin"));
+            adminItem.addAttribute("url", "clearspace-admin.jsp");
+            adminItem.addAttribute("description", LocaleUtils.getLocalizedString("sidebar.clearspace-admin.descr"));
+
         }
     }
 

src/web/clearspace-admin.jsp

+<%--
+  - Copyright (C) 2005-2008 Jive Software. All rights reserved.
+  -
+  - This software is published under the terms of the GNU Public License (GPL),
+  - a copy of which is included in this distribution, or a commercial license
+  - agreement with Jive.
+--%>
+
+<%@ page import="org.jivesoftware.openfire.clearspace.ClearspaceManager"
+    errorPage="error.jsp"
+%>
+<%@ page import="org.jivesoftware.util.StringUtils" %>
+
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+
+<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager"  />
+<% webManager.init(request, response, session, application, out ); %>
+
+<%
+
+    ClearspaceManager manager = ClearspaceManager.getInstance();
+
+    // Checks if CS and OF are currently connected
+    boolean connectedOF = manager.isOpenfireConnected();
+
+    // Get the information to build the redirect request
+    String username = webManager.getUser().getUsername();
+    String secret = manager.getSharedSecret();
+    String uri = manager.getConnectionURI();
+    String nonce = manager.getNonce();
+
+    // If all the information is OK
+    if (connectedOF && username != null && secret != null && uri != null && nonce != null) {
+        // Build de URL and send the redirect to the admin console of Clearspace.
+        response.sendRedirect(uri + "admin/login.jsp?login=true&username=" + username + "&secret=" +
+                StringUtils.hash(username + ":" + secret + ":" + nonce) + "&nonce=" + nonce);
+        return;
+    }
+
+%>
+
+<html>
+<head>
+<title><fmt:message key="clearspace.admin.title"/></title>
+<meta name="pageID" content="clearspace-admin"/>
+</head>
+
+<body>
+
+<div class="error">
+    <fmt:message key="clearspace.admin.error.disconnected"/>
+</div>
+
+<fmt:message key="clearspace.admin.disconnected.description">
+    <fmt:param value="<%= "<a href='clearspace-status.jsp'>" %>" />
+    <fmt:param value="<%= "</a>" %>" />
+</fmt:message>
+
+</body>
+</html>
\ No newline at end of file

src/web/clearspace-info.jsp → src/web/clearspace-status.jsp

@@ -12,7 +12,6 @@
 <%@ page import="org.jivesoftware.openfire.clearspace.ClearspaceManager" %>
 <%@ page import="org.jivesoftware.openfire.session.ComponentSession" %>
 <%@ page import="org.jivesoftware.util.JiveGlobals" %>
-<%@ page import="org.jivesoftware.util.StringUtils" %>
 <%@ page import="java.text.NumberFormat" %>
 <%@ page import="java.util.Collection" %>
 <%@ page import="java.util.Date" %>
@@ -27,11 +26,11 @@
 
     boolean test = request.getParameter("test") != null;
     boolean configure = request.getParameter("configure") != null;
-    boolean csAdmin = request.getParameter("csAdmin") != null;
     String testPage = "setup/setup-clearspace-integration_test.jsp";
     ClearspaceManager manager = ClearspaceManager.getInstance();
     boolean configured = false;
 
+    // First if there is configure action configure clearspace
     if (configure) {
         configured = manager.configClearspace();
     }
@@ -40,20 +39,7 @@
     boolean connectedCS = manager.isClearspaceConnected();
     boolean connectedOF = manager.isOpenfireConnected();
 
-    if (csAdmin) {
-        String username = webManager.getUser().getUsername();
-        String secret = manager.getSharedSecret();
-        String uri = manager.getConnectionURI();
-        String nonce = manager.getNonce();
-
-        if (connectedOF && username != null && secret != null && uri != null) {
-            // Redirect to the admin console of Clearspace.
-            response.sendRedirect(uri + "admin/login.jsp?login=true&username=" + username + "&secret=" +
-                    StringUtils.hash(username + ":" + secret + ":" + nonce) + "&nonce=" + nonce);
-            return;
-        }
-    }
-
+    // This fields will hold the status information of the connection
     Date creationDate = null;
     Date lastActivity = null;
     int numServerPackets = 0;
@@ -89,8 +75,8 @@
 
 <html>
 <head>
-<title><fmt:message key="clearspace.info.title"/></title>
-<meta name="pageID" content="clearspace-info"/>
+<title><fmt:message key="clearspace.status.title"/></title>
+<meta name="pageID" content="clearspace-status"/>
 
 <style type="text/css" title="setupStyle" media="screen">
     @import "style/lightbox.css";
@@ -121,85 +107,49 @@
 
 <% } %>
 
-<% if (!connectedCS || !connectedOF) { %>
-<div class="error">
-    <fmt:message key="clearspace.info.status.disconnected.error"/>
-</div>
-
 <% if (configure && !configured) { %>
 
 <div class="error">
-    <fmt:message key="clearspace.info.status.config.error"/>
+    <fmt:message key="clearspace.status.error.config"/>
 </div>
 
 <% } %>
 
+<% if (connectedCS && connectedOF) { %>
 <p>
-<% if (!connectedCS && !connectedOF) { %>
-<h3><fmt:message key="clearspace.info.status.disconnected.of_and_cs.title"/></h3>
-<fmt:message key="clearspace.info.status.disconnected.of_and_cs.description">
-    <fmt:param value="<%= "<a href='clearspace-connection.jsp'>" %>" />
-    <fmt:param value="<%= "</a>" %>" />
-</fmt:message>
-
-<% } else if (!connectedCS) { %>
-<h3><fmt:message key="clearspace.info.status.disconnected.cs.title"/></h3>
-<fmt:message key="clearspace.info.status.disconnected.cs.description">
-    <fmt:param value="<%= "<a href='clearspace-connection.jsp'>" %>" />
-    <fmt:param value="<%= "</a>" %>" />
-</fmt:message>
-<% } else if (!connectedOF) { %>
-<h3><fmt:message key="clearspace.info.status.disconnected.of.title"/></h3>
-<fmt:message key="clearspace.info.status.disconnected.of.description">
-    <fmt:param value="<%= "<a href='clearspace-connection.jsp'>" %>" />
-    <fmt:param value="<%= "</a>" %>" />
-</fmt:message>
-<% } %>
-<p>
-<fmt:message key="clearspace.info.status.disconnected.buttons.description"/>    
+<fmt:message key="clearspace.status.connected.description"/>
 </p>
-<form action="clearspace-info.jsp" method="post">
-    <!-- BEGIN jive-buttons -->
-    <div class="jive-buttons">
-
-        <!-- BEGIN right-aligned buttons -->
-        <div align="left">
-
-            <input type="Submit" name="test" value="<fmt:message key="clearspace.info.status.test" />" id="jive-clearspace-test" border="0">
-
-            <input type="Submit" name="configure" value="<fmt:message key="clearspace.info.status.configure" />" id="jive-clearspace-configure" border="0">
-        </div>
-        <!-- END right-aligned buttons -->
-
-    </div>
-    <!-- END jive-buttons -->
-
-</form>
-
-<% } else { %>
 <div class="jive-table">
 <table cellpadding="0" cellspacing="0" border="0" width="100%">
 <thead>
     <tr>
         <th colspan="2">
-            <fmt:message key="clearspace.info.table.title" />
+            <fmt:message key="clearspace.status.connected.table.title" />
         </th>
     </tr>
 </thead>
 <tbody>
-    <% if (numComponents > 1) { %>
     <tr>
         <td class="c1">
-            <fmt:message key="clearspace.info.label.num_components" />
+            <fmt:message key="clearspace.status.connected.table.label.connected" />
+        </td>
+        <td>
+            <fmt:message key="clearspace.status.connected.table.value.connected" />
+        </td>
+    </tr>
+        <% if (numComponents > 1) { %>
+    <tr>
+        <td class="c1">
+            <fmt:message key="clearspace.status.connected.table.label.num_components" />
         </td>
         <td>
             <%= numFormatter.format(numComponents) %>
         </td>
     </tr>
-    <% } %>
+        <% } %>
     <tr>
         <td class="c1">
-            <fmt:message key="clearspace.info.label.creation" />
+            <fmt:message key="clearspace.status.connected.table.label.creation" />
         </td>
         <td>
             <%= JiveGlobals.formatDateTime(creationDate) %>
@@ -207,7 +157,7 @@
     </tr>
     <tr>
         <td class="c1">
-            <fmt:message key="clearspace.info.label.last_active" />
+            <fmt:message key="clearspace.status.connected.table.label.last_active" />
         </td>
         <td>
             <%= JiveGlobals.formatDateTime(lastActivity) %>
@@ -215,20 +165,20 @@
     </tr>
     <tr>
         <td class="c1">
-            <fmt:message key="clearspace.info.label.statistics" />
+            <fmt:message key="clearspace.status.connected.table.label.statistics" />
         </td>
         <td>
-            <fmt:message key="clearspace.info.label.received" />
+            <fmt:message key="clearspace.status.connected.table.label.received" />
             <%= numFormatter.format(numClientPackets) %>/<%= numFormatter.format(numServerPackets) %>
         </td>
     </tr>
     <% boolean first = true;
-    for (ComponentSession cs : componentSessions) {
-        if (first) {
-            first = false;  %>
+        for (ComponentSession cs : componentSessions) {
+            if (first) {
+                first = false;  %>
     <tr>
         <td rowsapn="<%= componentSessions.size() %>" class="c1">
-            <fmt:message key="clearspace.info.label.hostname" />
+            <fmt:message key="clearspace.status.connected.table.label.hostname" />
         </td>
         <td>
             <%= cs.getHostAddress() %>
@@ -236,7 +186,7 @@
             <%= cs.getHostName() %>
         </td>
     </tr>
-     <% } else { %>
+        <% } else { %>
     <tr>
         <td>
             <%= cs.getHostAddress() %>
@@ -244,35 +194,68 @@
             <%= cs.getHostName() %>
         </td>
     </tr>
-    <% } %>
+        <% } %>
 </tbody>
 </table>
 </div>
 
-<% } %>
+    <% } %>
 
-    <h3>Clearspace Admin Console</h3>
-    <br>
-    <p>Click the following button to go to Clearspace Admin console</p>
-    <form action="clearspace-info.jsp" method="post">
-        <!-- BEGIN jive-buttons -->
-        <div class="jive-buttons">
 
-            <!-- BEGIN right-aligned buttons -->
-            <div align="left">
+<% } else { %>
 
-                <input type="Submit" name="csAdmin" value="<fmt:message key="clearspace.info.status.admin" />" id="jive-clearspace-admin" border="0">
+    <% if (!connectedCS && !connectedOF) { %>
+<div class="error">
+    <fmt:message key="clearspace.status.error.disconnected.of_and_cs"/>
+</div>
 
-            </div>
-            <!-- END right-aligned buttons -->
+<p>
+<fmt:message key="clearspace.status.disconnected.of_and_cs.description">
+    <fmt:param value="<%= "<a href='clearspace-integration.jsp'>" %>" />
+    <fmt:param value="<%= "</a>" %>" />
+</fmt:message>
 
-        </div>
-        <!-- END jive-buttons -->
+    <% } else if (!connectedCS) { %>
+<div class="error">
+    <fmt:message key="clearspace.status.error.disconnected.cs"/>
+</div>
 
-    </form>
+<p>
+<fmt:message key="clearspace.status.disconnected.cs.description">
+    <fmt:param value="<%= "<a href='clearspace-integration.jsp'>" %>" />
+    <fmt:param value="<%= "</a>" %>" />
+</fmt:message>
+    <% } else if (!connectedOF) { %>
+<div class="error">
+    <fmt:message key="clearspace.status.error.disconnected.of"/>
+</div>
 
-    
+<p>
+<fmt:message key="clearspace.status.disconnected.of.description">
+    <fmt:param value="<%= "<a href='clearspace-integration.jsp'>" %>" />
+    <fmt:param value="<%= "</a>" %>" />
+</fmt:message>
+    <% } %>
+<p>
+<fmt:message key="clearspace.status.disconnected.buttons.description"/>
+</p>
+<form action="clearspace-status.jsp" method="post">
+    <!-- BEGIN jive-buttons -->
+    <div class="jive-buttons">
 
+        <!-- BEGIN right-aligned buttons -->
+        <div align="left">
+
+            <input type="Submit" name="test" value="<fmt:message key="clearspace.status.disconnected.testbutton" />" id="jive-clearspace-test" border="0">
+
+            <input type="Submit" name="configure" value="<fmt:message key="clearspace.status.disconnected.configbutton" />" id="jive-clearspace-configure" border="0">
+        </div>
+        <!-- END right-aligned buttons -->
+
+    </div>
+    <!-- END jive-buttons -->
+
+</form>
 
 <% } %>