shuber 2004/09/15 12:37:16 CEST
Modified files: (Branch: JAHIA-4-0-BRANCH)
src/java JahiaMessageResources.properties
JahiaMessageResources_en.properties
JahiaMessageResources_fr.properties
Log:
Added missing resource keys for new IP checks.
Revision Changes Path
1.15.2.4 +3 -1 jahia/src/java/JahiaMessageResources.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/JahiaMessageResources.properties.diff?r1=1.15.2.3&r2=1.15.2.4&f=h
1.11.2.4 +3 -1 jahia/src/java/JahiaMessageResources_en.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/JahiaMessageResources_en.properties.diff?r1=1.11.2.3&r2=1.11.2.4&f=h
1.14.2.5 +3 -1 jahia/src/java/JahiaMessageResources_fr.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/JahiaMessageResources_fr.properties.diff?r1=1.14.2.4&r2=1.14.2.5&f=h
Index: JahiaMessageResources.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/Attic/JahiaMessageResources.properties,v
retrieving revision 1.15.2.3
retrieving revision 1.15.2.4
diff -u -r1.15.2.3 -r1.15.2.4
--- JahiaMessageResources.properties 18 Aug 2004 16:26:27 -0000 1.15.2.3
+++ JahiaMessageResources.properties 15 Sep 2004 10:37:15 -0000 1.15.2.4
@@ -213,6 +213,8 @@
org.jahia.security.license.IPValidator.errorRetrievingLocalhostIP.label
= Error retrieving the server's IP address for the machine
running this instance of Jahia
org.jahia.security.license.IPValidator.invalidIPAddress.label
= Current IP address {0} for Jahia Server is not authorized
by license. (License IP={1})
+org.jahia.security.license.IPValidator.invalidIPFormat.label
= IP address {0} has an invalid format
+org.jahia.security.license.IPValidator.invalidIPAddressForRange.label
= IP address {0} is not in allowed range {1} to {2}
org.jahia.security.license.PageCountValidator.errorInPageCountCheck.label
= Error while trying to retrieve number of pages on Jahia's
sites.
org.jahia.security.license.PageCountValidator.invalidPageCount.label
= Site {2} has {0} pages which is more than what the license
authorises ({1})
@@ -246,4 +248,4 @@
org.jahia.engines.users.newuserregistration.passwordTooShort
= Password too short (mininum 6 characters)
org.jahia.engines.users.newuserregistration.userNameAlreadyExists
= User name already exists
org.jahia.engines.users.newuserregistration.errorWhileCreatingUser
= Error while creating user
-org.jahia.engines.users.newuserregistration.unauthorizedGroup
= User tried to register into unauthorized group {0}
\ No newline at end of file
+org.jahia.engines.users.newuserregistration.unauthorizedGroup
= User tried to register into unauthorized group {0}
Index: JahiaMessageResources_en.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/Attic/JahiaMessageResources_en.properties,v
retrieving revision 1.11.2.3
retrieving revision 1.11.2.4
diff -u -r1.11.2.3 -r1.11.2.4
--- JahiaMessageResources_en.properties 18 Aug 2004 16:26:27 -0000
1.11.2.3
+++ JahiaMessageResources_en.properties 15 Sep 2004 10:37:15 -0000
1.11.2.4
@@ -213,6 +213,8 @@
org.jahia.security.license.IPValidator.errorRetrievingLocalhostIP.label
= Error retrieving the server's IP address for the machine
running this instance of Jahia
org.jahia.security.license.IPValidator.invalidIPAddress.label
= Current IP address {0} for Jahia Server is not authorized
by license. (License IP={1})
+org.jahia.security.license.IPValidator.invalidIPFormat.label
= IP address {0} has an invalid format
+org.jahia.security.license.IPValidator.invalidIPAddressForRange.label
= IP address {0} is not in allowed range {1} to {2}
org.jahia.security.license.PageCountValidator.errorInPageCountCheck.label
= Error while trying to retrieve number of pages on Jahia's
sites.
org.jahia.security.license.PageCountValidator.invalidPageCount.label
= Site {2} has {0} pages which is more than what the license
authorises ({1})
@@ -246,4 +248,4 @@
org.jahia.engines.users.newuserregistration.passwordTooShort
= Password too short (mininum 6 characters)
org.jahia.engines.users.newuserregistration.userNameAlreadyExists
= User name already exists
org.jahia.engines.users.newuserregistration.errorWhileCreatingUser
= Error while creating user
-org.jahia.engines.users.newuserregistration.unauthorizedGroup
= User tried to register into unauthorized group {0}
\ No newline at end of file
+org.jahia.engines.users.newuserregistration.unauthorizedGroup
= User tried to register into unauthorized group {0}
Index: JahiaMessageResources_fr.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/Attic/JahiaMessageResources_fr.properties,v
retrieving revision 1.14.2.4
retrieving revision 1.14.2.5
diff -u -r1.14.2.4 -r1.14.2.5
--- JahiaMessageResources_fr.properties 18 Aug 2004 16:26:27 -0000
1.14.2.4
+++ JahiaMessageResources_fr.properties 15 Sep 2004 10:37:15 -0000
1.14.2.5
@@ -191,6 +191,8 @@
org.jahia.security.license.IPValidator.errorRetrievingLocalhostIP.label
= Erreur pendant la récupération de l'addresse
IP de la machine qui fait tourner Jahia
org.jahia.security.license.IPValidator.invalidIPAddress.label
= L'adresse actuelle {0} du serveur Jahia n'est pas
autorisée par la license. (IP de la license={1})
+org.jahia.security.license.IPValidator.invalidIPFormat.label
= L'adresse IP {0} n'est pas formatée proprement
+org.jahia.security.license.IPValidator.invalidIPAddressForRange.label
= L'adresse IP {0} n'est pas contenue dans l'intervalle {1}
à {2}
org.jahia.security.license.PageCountValidator.errorInPageCountCheck.label
= Erreur lors de la répération du nombre de
pages sur chaque site Jahia.
org.jahia.security.license.PageCountValidator.invalidPageCount.label
= Le site {2} a {0} pages, ce qui est plus que le maximum
autorisé par la licence ({1})
@@ -224,4 +226,4 @@
org.jahia.engines.users.newuserregistration.passwordTooShort
= Mot de passe trop court (mininum 6 caractères)
org.jahia.engines.users.newuserregistration.userNameAlreadyExists
= Ce nom d'utilisateur existe déjà
org.jahia.engines.users.newuserregistration.errorWhileCreatingUser
= Erreur lors de la création de l'utilisateur.
-org.jahia.engines.users.newuserregistration.unauthorizedGroup
= Tentative d'ajout d'un utilisateur à un group
interdit ({0})
\ No newline at end of file
+org.jahia.engines.users.newuserregistration.unauthorizedGroup
= Tentative d'ajout d'un utilisateur à un group
interdit ({0})
