You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by pa...@apache.org on 2001/12/18 07:34:52 UTC
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization JetspeedLocalization.properties JetspeedLocalization_en.properties JetspeedLocalization_es.properties
paulsp 01/12/17 22:34:52
Modified: src/java/org/apache/jetspeed/modules/localization
JetspeedLocalization.properties
JetspeedLocalization_en.properties
JetspeedLocalization_es.properties
Log:
o Remove newline from SENDCONFIRMATIONEMAIL_FOOTER
o Removed English version of properties. They are the
same as the default, so why maintain both.
Revision Changes Path
1.6 +2 -2 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization.properties
Index: JetspeedLocalization.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JetspeedLocalization.properties 2001/12/17 22:55:22 1.5
+++ JetspeedLocalization.properties 2001/12/18 06:34:52 1.6
@@ -21,7 +21,7 @@
SENDCONFIRMATIONEMAIL_BODY2=You can go to the following URL to confirm your account:\n\n
SENDCONFIRMATIONEMAIL_SENT=Email Sent!
SENDCONFIRMATIONEMAIL_ERROR=Error sending email:
-SENDCONFIRMATIONEMAIL_FOOTER=Regards,\n
+SENDCONFIRMATIONEMAIL_FOOTER=Regards,
SENDCONFIRMATIONEMAIL_HEADER=Dear,
SENDCONFIRMATIONEMAIL_SUBJECT=Jetspeed new user registration
@@ -46,7 +46,7 @@
CONFIRMREGISTRATION_TITLE=Confirm Registration
CONFIRMREGISTRATION_NOUSERNAME=Sorry, a username must be available.
-CONFIRMREGISTRATION_MESSAGE=Please check your email and enter your secret key to confirm your registration:
+CONFIRMREGISTRATION_MESSAGE=Please check your email for your secret key. The secret key is required to confirm your registration
CONFIRMREGISTRATION_SECRETKEYTITLE=Secret Key:
CONFIRMREGISTRATION_CANCEL=Cancel
CONFIRMREGISTRATION_CONFIRM=Confirm Registration
1.4 +0 -78 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_en.properties
Index: JetspeedLocalization_en.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_en.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JetspeedLocalization_en.properties 2001/12/17 22:55:22 1.3
+++ JetspeedLocalization_en.properties 2001/12/18 06:34:52 1.4
@@ -1,79 +1 @@
LOCALIZATION_MAINTAINER=Jetspeed Development Team
-
-CREATENEWUSERANDCONFIRM_PWNOTMATCH=Sorry, the passwords do not match.
-CREATENEWUSERANDCONFIRM_NOUSERNAME=Sorry, you must supply a username.
-CREATENEWUSERANDCONFIRM_NOEMAIL=Sorry, you must supply a valid email address.
-CREATENEWUSERANDCONFIRM_CHOOSENEWNAME=Sorry, that username already exists. Please choose another.
-CREATENEWUSERANDCONFIRM_CREATE=Your new account has been created!
-CREATENEWUSERANDCONFIRM_DUPLICATEMSG=Choose another name.
-
-JLOGINUSER_KEYNOTVALID=Sorry, the secret key that you entered is not valid.
-JLOGINUSER_WELCOME=Welcome! Your registration has been confirmed. You are now free to use the system.
-JLOGINUSER_NAMENOTVALID=Sorry, that username is not valid. Please make sure that you have entered the valid URL from the email or create a new user account.
-JLOGINUSER_CONFIRMFIRST=Sorry, but you must first confirm this account before logging in.
-JLOGINUSER_NOAUTHUSERROLE=The role authenticated_user does not exist in database.
-
-LOGOUTUSER_THANKS=Thank you for using the system. Please come back soon.
-
-SENDCONFIRMATIONEMAIL_BODY1=Welcome to the Jetspeed Portal from Apache. Your new account has been \n\
-created. Please login using the following secret key to confirm you \n\
-registration:\n
-SENDCONFIRMATIONEMAIL_BODY2=You can go to the following URL to confirm your account:\n\n
-SENDCONFIRMATIONEMAIL_SENT=Email Sent!
-SENDCONFIRMATIONEMAIL_ERROR=Error sending email:
-SENDCONFIRMATIONEMAIL_FOOTER=Regards,\n
-SENDCONFIRMATIONEMAIL_HEADER=Dear,
-SENDCONFIRMATIONEMAIL_SUBJECT=Jetspeed new user registration
-
-
-SENDUSEREMAIL_IDNOTVALID=Please provide a valid user id.
-SENDUSEREMAIL_EMAILNOTVALID=This user currently does not have a valid email address.
-SENDUSEREMAIL_FILLTHEFORM=Please fill in the form fields below.
-SENDUSEREMAIL_SENT=Email Sent!
-
-SESSIONVALIDATOR_SESSIONNOTVALID=There has been an error, your session is valid, but the screen variable is not defined.
-
-SHOWEDIT_MUSTLOGIN=You must login before you can edit things.
-
-UPDATEACCOUNT_NOTLOGGEDIN=You must login before you can update account information.
-UPDATEACCOUNT_PWNOTMATCH=Sorry, the passwords do not match.
-UPDATEACCOUNT_NOFIRSTNAME=Sorry, you must supply a first name.
-UPDATEACCOUNT_NOLASTNAME=Sorry, you must supply a last name.
-UPDATEACCOUNT_NOEMAIL=Sorry, you must supply a valid email address.
-UPDATEACCOUNT_DONE=Your account has been updated!
-UPDATEACCOUNT_NOUSER=Could not find correct user.
-UPDATEACCOUNT_NEWEMAILCONFIRM=You have changed your email address. You must re-confirm in order to continue using the system. Please check your email account.
-
-CONFIRMREGISTRATION_TITLE=Confirm Registration
-CONFIRMREGISTRATION_NOUSERNAME=Sorry, a username must be available.
-CONFIRMREGISTRATION_MESSAGE=Please check your email and enter your secret key to confirm your registration:
-CONFIRMREGISTRATION_SECRETKEYTITLE=Secret Key:
-CONFIRMREGISTRATION_CANCEL=Cancel
-CONFIRMREGISTRATION_CONFIRM=Confirm Registration
-
-EDITACCOUNT_NOTLOGGEDIN=Sorry, you must be logged in in order to access this screen.
-EDITACCOUNT_TITLE=Edit your account details
-
-USERFORM_USERNAMEMSG=Username:
-USERFORM_PASSWORDMSG=Password:
-USERFORM_PASSWORDCONFIRMMSG=Password (confirm):
-USERFORM_FIRSTNAMEMSG=First Name:
-USERFORM_LASTNAMEMSG=Last Name:
-USERFORM_EMAILMSG=Email:
-USERFORM_CANCEL=Cancel
-USERFORM_RESET=Reset
-USERFORM_UPDATE=Update Account
-USERFORM_CREATE=Create New Account
-
-TOP_TITLE=Welcome to Jetspeed
-TOP_USERNAMEMSG=Username:
-TOP_PASSWORDMSG=Password:
-TOP_CREATENEWACCOUNT=Create New Account
-TOP_LOGINBTN=Login
-TOP_EDITACCOUNT=Edit account:
-TOP_LOGOUT=Logout
-TOP_CUSTOMIZE=Customize
-
-LEFT_DOCUMENTATION=Documentation
-
-HOME=Home
1.4 +2 -2 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_es.properties
Index: JetspeedLocalization_es.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_es.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JetspeedLocalization_es.properties 2001/12/17 22:55:22 1.3
+++ JetspeedLocalization_es.properties 2001/12/18 06:34:52 1.4
@@ -1,4 +1,4 @@
-# $Id: JetspeedLocalization_es.properties,v 1.3 2001/12/17 22:55:22 paulsp Exp $
+# $Id: JetspeedLocalization_es.properties,v 1.4 2001/12/18 06:34:52 paulsp Exp $
#
LOCALIZATION_MAINTAINER=nacho@apache.org
@@ -15,7 +15,7 @@
SENDCONFIRMATIONEMAIL_SUBJECT=Registro de nuevo usuario de Jetspeed
SENDCONFIRMATIONEMAIL_HEADER=Hola,
-SENDCONFIRMATIONEMAIL_FOOTER=Saludos,\n
+SENDCONFIRMATIONEMAIL_FOOTER=Saludos,
CREATENEWUSERANDCONFIRM_NOUSERNAME=Sorry, you must supply a username.
CREATENEWUSERANDCONFIRM_PWNOTMATCH=Sorry, the passwords do not match.
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>