Merge pull request #799 from BittyByte/master

OF-1277 -- Change setting name to Invisible Login and Status

src/plugins/clientControl/changelog.html

@@ -43,7 +43,7 @@
 <h1>
 Client Control Plugin Changelog
 </h1>
-<p><b>2.1.2</b> -- May 7, 2017</p>
+<p><b>2.1.2</b> -- May 8, 2017</p>
 <ul>
     <li>[<a href='http://www.igniterealtime.org/issues/browse/OF-1325'>OF-1325</a>] - Adds 'History Transcripts' and fixes 'History Settings' in Client Control.</li>
 </ul>
@@ -69,6 +69,9 @@ Client Control Plugin Changelog
    		<li>Does not save history into transcript files</li>
    	</ul>
 </ul>
+<ul>
+    <li>[<a href='http://www.igniterealtime.org/issues/browse/OF-1277'>OF-1277</a>] - Change setting name to 'Invisible Login and Status'</li>
+</ul>
 
 <p><b>2.1.1</b> -- December 30, 2016</p>
 <ul>

src/plugins/clientControl/plugin.xml

@@ -9,7 +9,7 @@
     <description>Controls clients allowed to connect and available features</description>
     <author>Jive Software</author>
     <version>2.1.2</version>
-    <date>5/07/2017</date>
+    <date>5/08/2017</date>
     <minServerVersion>4.0.0</minServerVersion>
 
     <!-- UI extension -->

src/plugins/clientControl/readme.html

@@ -74,8 +74,8 @@ server. However, only sophisticated and knowledgeable users may be able to do su
 <li>Account Registration</li>
 <li>Advanced Configuration</li>
 <li>Host Name Change</li>
+<li>Invisible Login and Status</li>
 <li>Login Anonymously</li>
-<li>Login as Invisible</li>
 <li>Save Password &amp; Autologin</li>
 </ul>
 <p>

src/plugins/clientControl/src/i18n/clientcontrol_i18n.properties

@@ -83,8 +83,8 @@ client.features.historytranscripts.description   = Allow users control of histor
 client.features.hostname                         = Host Name Change
 client.features.hostname.description             = Allow users to change the host name.
 client.features.info                             = Use the form below to enable or disable client features. Note: Unless otherwise specified, the following options pertain to the Spark client.
-client.features.invisiblelogin                   = Login as Invisible
-client.features.invisiblelogin.description       = Allow users access to the "Login as invisible" option on login screen.
+client.features.invisiblelogin                   = Invisible Login and Status
+client.features.invisiblelogin.description       = Allow users to login as invisible and enable invisible status. 
 client.features.logoutexit                       = Logout & Exit
 client.features.logoutexit.description           = Allow users to logout and exit.
 client.features.movecopy                         = Move & Copy Contacts

src/plugins/clientControl/src/i18n/clientcontrol_i18n_cs_CZ.properties

@@ -117,8 +117,8 @@ client.features.historytranscripts.description   = Umo\u017Enit u\u017Eivatel\u0
 client.features.hostname                         = Host Name Zm\u011Bnit
 client.features.hostname.description             = Povolit u\u017Eivatel\u016Fm zm\u011Bnit jm\u00E9no hostitele.
 client.features.info                             = Tento formul\u00E1\u0159 slou\u017E\u00ED k zapnut\u00ED nebo vypnut\u00ED funkce klienta. Pozn\u00E1mka: Pokud nen\u00ED uvedeno jinak, n\u00E1sleduj\u00EDc\u00ED mo\u017Enosti se t\u00FDkaj\u00ED klienta Spark.
-client.features.invisiblelogin                   = P\u0159ihlaste se jako Invisible
-client.features.invisiblelogin.description       = Umo\u017E\u0148uj\u00ED u\u017Eivatel\u016Fm p\u0159\u00EDstup k "P\u0159ihl\u00E1sit jako neviditeln\u00FD" op\u010Dn\u00ED.
+client.features.invisiblelogin                   = Neviditeln\u00E9 p\u0159ihl\u00E1\u0161en\u00ED a stav
+client.features.invisiblelogin.description       = Povolit u\u017Eivatel\u016Fm p\u0159ihl\u00E1\u0161en\u00ED jako neviditeln\u00E9 a povolit neviditeln\u00FD stav.
 client.features.logoutexit                       = Odhl\u00E1\u0161en\u00ED & Exit
 client.features.logoutexit.description           = Povolit u\u017Eivatel\u016Fm odhl\u00E1sit a ukon\u010Dit.
 client.features.movecopy                         = Move & Copy Kontakty

src/plugins/clientControl/src/i18n/clientcontrol_i18n_es.properties

@@ -129,8 +129,8 @@ client.features.historytranscripts.description   = Umo\u017Enit u\u017Eivatel\u0
 client.features.hostname                         = Anfitri\u00F3n de cambio de nombre
 client.features.hostname.description             = Permitir a los usuarios cambiar el nombre de host.
 client.features.info                             = Utilice el formulario de abajo para activar o desactivar las funciones del cliente. Nota: A menos que se especifique lo contrario, las siguientes opciones se refieren al cliente Spark.
-client.features.invisiblelogin                   = Firma el invisible
-client.features.invisiblelogin.description       = Permitir a los usuarios acceder a la opci\u00F3n "Inicie sesi\u00F3n como invisible".
+client.features.invisiblelogin                   = Invisible inicio de sesi\u00F3n y estado
+client.features.invisiblelogin.description       = Permitir a los usuarios iniciar sesi\u00F3n como invisible y activar el estado invisible.
 client.features.logoutexit                       = Salir y Salir
 client.features.logoutexit.description           = Permitir a los usuarios para desconectarse y salir.
 client.features.movecopy                         = Mover y Copiar contactos

src/plugins/clientControl/src/i18n/clientcontrol_i18n_fr.properties

@@ -147,8 +147,8 @@ client.features.historytranscripts.description   = Autoriser les utilisateurs \u
 client.features.hostname                         = Changement de nom d'h\u00F4te
 client.features.hostname.description             = Permettre aux utilisateurs de modifier le nom d'h\u00F4te.
 client.features.info                             = Utilisez le formulaire ci-dessous pour activer ou d\u00E9sactiver les fonctionnalit\u00E9s du client. Remarque: Sauf indication contraire, les options suivantes concernent le client Spark.
-client.features.invisiblelogin                   = Se connecter en tant qu'invisible
-client.features.invisiblelogin.description       = Autoriser les utilisateurs \u00E0 acc\u00E9der \u00E0 l'option "Se connecter comme invisible".
+client.features.invisiblelogin                   = Connexion et \u00E9tat invisible
+client.features.invisiblelogin.description       = Permettre aux utilisateurs de se connecter comme invisible et d'activer l'\u00E9tat invisible.
 client.features.logoutexit                       = D\u00E9connexion & Sortie
 client.features.logoutexit.description           = Autoriser les utilisateurs \u00E0 se d\u00E9connecter et \u00E0 quitter.
 client.features.movecopy                         = D\u00E9placer et copier les contacts

src/plugins/clientControl/src/i18n/clientcontrol_i18n_pt_BR.properties

@@ -122,8 +122,8 @@ client.features.historytranscripts.description   = Permita que os usu\u00E1rios
 client.features.hostname                         = Host Name Mudan\u00E7a
 client.features.hostname.description             = Permitir que os usu\u00E1rios alterem o nome do host.
 client.features.info                             = Utilize o formul\u00E1rio abaixo para ativar ou desativar recursos do cliente. Nota: salvo indica\u00E7\u00E3o em contr\u00E1rio, as seguintes op\u00E7\u00F5es se referem ao cliente Spark.
-client.features.invisiblelogin                   = Entrar como invis\u00EDvel
-client.features.invisiblelogin.description       = Permitir aos usu\u00E1rios acesso ao "Entrar como invis\u00EDvel" op\u00E7\u00E3o na tela de login.
+client.features.invisiblelogin                   = Invis\u00EDvel Login e Status
+client.features.invisiblelogin.description       = Permitir que os usu\u00E1rios efetuem login como invis\u00EDveis e ativar o status invis\u00EDvel.
 client.features.logoutexit                       = Sair & Exit
 client.features.logoutexit.description           = Permitir que os usu\u00E1rios sair e sair.
 client.features.movecopy                         = Mover e Copiar Contactos

src/plugins/clientControl/src/i18n/clientcontrol_i18n_zh_CN.properties

@@ -153,8 +153,8 @@ client.features.historytranscripts.description   = \u5141\u8BB8\u7528\u6237\u63A
 client.features.hostname                         = \u4E3B\u673A\u540D\u66F4\u6539
 client.features.hostname.description             = \u5141\u8BB8\u7528\u6237\u66F4\u6539\u4E3B\u673A\u540D\u3002
 client.features.info                             = \u4F7F\u7528\u4E0B\u9762\u7684\u8868\u5355\u542F\u7528\u6216\u7981\u7528\u5BA2\u6237\u7AEF\u529F\u80FD\u3002 \u6CE8\u610F\uFF1A\u9664\u975E\u53E6\u6709\u8BF4\u660E\uFF0C\u4EE5\u4E0B\u9009\u9879\u4E0ESpark\u5BA2\u6237\u7AEF\u76F8\u5173\u3002
-client.features.invisiblelogin                   = \u767B\u5F55\u4E3A\u4E0D\u53EF\u89C1
-client.features.invisiblelogin.description       = \u5141\u8BB8\u7528\u6237\u5728\u767B\u5F55\u5C4F\u5E55\u4E0A\u8BBF\u95EE\u201C\u4EE5\u4E0D\u53EF\u89C1\u767B\u5F55\u201D\u9009\u9879\u3002
+client.features.invisiblelogin                   = \u9690\u5F62\u767B\u5F55\u72B6\u6001
+client.features.invisiblelogin.description       = \u5141\u8BB8\u7528\u6237\u767B\u5F55\u4E3A\u4E0D\u53EF\u89C1\uFF0C\u5E76\u542F\u7528\u9690\u5F62\u72B6\u6001\u3002
 client.features.logoutexit                       = \u9000\u51FA\u5E76\u9000\u51FA
 client.features.logoutexit.description           = \u5141\u8BB8\u7528\u6237\u6CE8\u9500\u5E76\u9000\u51FA\u3002
 client.features.movecopy                         = \u79FB\u52A8\u548C\u590D\u5236\u8054\u7CFB\u4EBA

src/plugins/clientControl/src/web/client-features.jsp

@@ -360,25 +360,25 @@
 	        <th><fmt:message key="client.features.enabled"/></th>
 	        <th><fmt:message key="client.features.disabled"/></th>
 	        <tr>
-	            <td><b><fmt:message key="client.features.anonymouslogin" /></b> - <fmt:message key="client.features.spark.only" /><br/><span class="jive-description">
-	                     <fmt:message key="client.features.anonymouslogin.description" />
+	            <td><b><fmt:message key="client.features.invisiblelogin" /></b> - <fmt:message key="client.features.spark.only" /><br/><span class="jive-description">
+	                     <fmt:message key="client.features.invisiblelogin.description" />
 	                  </span></td>
 	            <td width="1%" nowrap>
-	                <input type="radio" name="anonymousloginEnabled" value="true" <%= anonymousloginEnabled ? "checked" : "" %> />
+	                <input type="radio" name="invisibleloginEnabled" value="true" <%= invisibleloginEnabled ? "checked" : "" %> />
 	            </td>
 	            <td width="1%" nowrap>
-	                <input type="radio" name="anonymousloginEnabled" value="false" <%= !anonymousloginEnabled ? "checked" : "" %> />
+	                <input type="radio" name="invisibleloginEnabled" value="false" <%= !invisibleloginEnabled ? "checked" : "" %> />
 	            </td>
 	        </tr>
 	        <tr>
-	            <td><b><fmt:message key="client.features.invisiblelogin" /></b> - <fmt:message key="client.features.spark.only" /><br/><span class="jive-description">
-	                     <fmt:message key="client.features.invisiblelogin.description" />
+	            <td><b><fmt:message key="client.features.anonymouslogin" /></b> - <fmt:message key="client.features.spark.only" /><br/><span class="jive-description">
+	                     <fmt:message key="client.features.anonymouslogin.description" />
 	                  </span></td>
 	            <td width="1%" nowrap>
-	                <input type="radio" name="invisibleloginEnabled" value="true" <%= invisibleloginEnabled ? "checked" : "" %> />
+	                <input type="radio" name="anonymousloginEnabled" value="true" <%= anonymousloginEnabled ? "checked" : "" %> />
 	            </td>
 	            <td width="1%" nowrap>
-	                <input type="radio" name="invisibleloginEnabled" value="false" <%= !invisibleloginEnabled ? "checked" : "" %> />
+	                <input type="radio" name="anonymousloginEnabled" value="false" <%= !anonymousloginEnabled ? "checked" : "" %> />
 	            </td>
 	        </tr>
 	        <tr>