Thread: [srvx-commits] CVS: services/src nickserv.c,1.202,1.203

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/srvx/services/src
In directory usw-pr-cvs1:/tmp/cvs-serv15082

Modified Files:
	nickserv.c 
Log Message:
Fix some grammar in the nickserv messages (missing 'the's were annoying Jugz)


Index: nickserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/nickserv.c,v
retrieving revision 1.202
retrieving revision 1.203
diff -C2 -r1.202 -r1.203
*** nickserv.c	5 Sep 2002 17:55:06 -0000	1.202
--- nickserv.c	8 Sep 2002 21:46:04 -0000	1.203
***************
*** 127,135 ****
  #define NSMSG_MUST_TIME_OUT       "You must wait for cookies of that type to time out."
  #define NSMSG_ATE_COOKIE          "I ate the cookie for your account.  You may now have another."
! #define NSMSG_USE_RENAME          "You're already authenticated to account $b%s$b -- contact the support staff to rename your account."
  #define NSMSG_REGISTER_BAD_NICKMASK "Could not recognize $b%s$b as either a current nick or a hostmask."
  #define NSMSG_NICK_NOT_REGISTERED "Nick $b%s$b hasn't been registered to any account."
  #define NSMSG_HANDLE_NOT_FOUND	"Couldn't find your account -- did you register yet?"
! #define NSMSG_ALREADY_AUTHED    "You are already authed to account $b%s$b; you must reconnect to auth to a different account."
  #define NSMSG_HOSTMASK_INVALID	"Your hostmask is not valid for account $b%s$b."
  #define NSMSG_USER_IS_SERVICE   "$b%s$b is a network service; you can only use that command on real users."
--- 127,135 ----
  #define NSMSG_MUST_TIME_OUT       "You must wait for cookies of that type to time out."
  #define NSMSG_ATE_COOKIE          "I ate the cookie for your account.  You may now have another."
! #define NSMSG_USE_RENAME          "You're already authenticated to the account $b%s$b -- contact the support staff to rename your account."
  #define NSMSG_REGISTER_BAD_NICKMASK "Could not recognize $b%s$b as either a current nick or a hostmask."
  #define NSMSG_NICK_NOT_REGISTERED "Nick $b%s$b hasn't been registered to any account."
  #define NSMSG_HANDLE_NOT_FOUND	"Couldn't find your account -- did you register yet?"
! #define NSMSG_ALREADY_AUTHED    "You are already authed to the account $b%s$b; you must reconnect to auth to a different account."
  #define NSMSG_HOSTMASK_INVALID	"Your hostmask is not valid for account $b%s$b."
  #define NSMSG_USER_IS_SERVICE   "$b%s$b is a network service; you can only use that command on real users."
***************
*** 148,152 ****
  #define NSMSG_HANDLEINFO_CHANNELS "  Channel(s): %s"
  #define NSMSG_HANDLEINFO_CURRENT  "  Current nickname(s): %s"
! #define NSMSG_USERINFO_AUTHED_AS  "$b%s$b is authenticated to account $b%s$b."
  #define NSMSG_USERINFO_NOT_AUTHED "$b%s$b is not authenticated to any account."
  #define NSMSG_NICKINFO_OWNER    "Nick $b%s$b is owned by account $b%s$b."
--- 148,152 ----
  #define NSMSG_HANDLEINFO_CHANNELS "  Channel(s): %s"
  #define NSMSG_HANDLEINFO_CURRENT  "  Current nickname(s): %s"
! #define NSMSG_USERINFO_AUTHED_AS  "$b%s$b is authenticated to the account $b%s$b."
  #define NSMSG_USERINFO_NOT_AUTHED "$b%s$b is not authenticated to any account."
  #define NSMSG_NICKINFO_OWNER    "Nick $b%s$b is owned by account $b%s$b."
***************
*** 156,163 ****
  #define NSMSG_HANDLE_SUSPENDED	"Your $b$N$b account has been suspended; you may not use it."
  #define NSMSG_AUTH_SUCCESS	"I recognize you."
! #define NSMSG_AUTH_ALLOWED	"User $b%s$b may now authenticate to account $b%s$b."
! #define NSMSG_AUTH_ALLOWED_MSG	"You may now authenticate to account $b%s$b by typing $b/msg $N@$s auth %s password$b (using your password).  If you will be using this computer regularly, please type $b/msg $N addmask$b (AFTER you auth) to permanently add your hostmask."
  #define NSMSG_AUTH_ALLOWED_EMAIL "You may also (after you auth) type $b/msg $N set email us...@yo...$b to set an email address.  This will let you use the $bauthcookie$b command to be authenticated in the future."
! #define NSMSG_AUTH_NORMAL_ONLY	"User $b%s$b may now only authenticate to accounts with matching hostmasks."
  #define NSMSG_AUTH_UNSPECIAL	"User $b%s$b did not have any special auth allowance."
  #define NSMSG_MUST_AUTH		"You must be authenticated first."
--- 156,163 ----
  #define NSMSG_HANDLE_SUSPENDED	"Your $b$N$b account has been suspended; you may not use it."
  #define NSMSG_AUTH_SUCCESS	"I recognize you."
! #define NSMSG_AUTH_ALLOWED	"User $b%s$b may now authenticate to the account $b%s$b."
! #define NSMSG_AUTH_ALLOWED_MSG	"You may now authenticate to the account $b%s$b by typing $b/msg $N@$s auth %s password$b (using your password).  If you will be using this computer regularly, please type $b/msg $N addmask$b (AFTER you auth) to permanently add your hostmask."
  #define NSMSG_AUTH_ALLOWED_EMAIL "You may also (after you auth) type $b/msg $N set email us...@yo...$b to set an email address.  This will let you use the $bauthcookie$b command to be authenticated in the future."
! #define NSMSG_AUTH_NORMAL_ONLY	"User $b%s$b may now only authenticate to the accounts with matching hostmasks."
  #define NSMSG_AUTH_UNSPECIAL	"User $b%s$b did not have any special auth allowance."
  #define NSMSG_MUST_AUTH		"You must be authenticated first."
***************
*** 167,171 ****
  #define NSMSG_NICK_IN_USE	"Nick $b%s$b is already in use."
  #define NSMSG_REGNICK_SUCCESS	"Nick $b%s$b has been registered to you."
! #define NSMSG_OREGNICK_SUCCESS  "Nick $b%s$b has been registered to account $b%s$b."
  #define NSMSG_PASS_SUCCESS	"Password changed."
  #define NSMSG_MASK_INVALID	"$b%s$b is an invalid hostmask."
--- 167,171 ----
  #define NSMSG_NICK_IN_USE	"Nick $b%s$b is already in use."
  #define NSMSG_REGNICK_SUCCESS	"Nick $b%s$b has been registered to you."
! #define NSMSG_OREGNICK_SUCCESS  "Nick $b%s$b has been registered to the account $b%s$b."
  #define NSMSG_PASS_SUCCESS	"Password changed."
  #define NSMSG_MASK_INVALID	"$b%s$b is an invalid hostmask."
***************
*** 213,217 ****
  #define NSMSG_HANDLES_MERGED    "Merged account $b%s$b into $b%s$b."
  #define NSMSG_HANDLES_MERGED_G  "%s (%s) merged account %s into %s."
! #define NSMSG_NICK_OWNED        "%s is a registered nick - you must auth to account %s or change your nick, or the owner may disconnect you."
  
  #define NSMSG_SETTING_LIST	"$b$N account settings:$b"
--- 213,217 ----
  #define NSMSG_HANDLES_MERGED    "Merged account $b%s$b into $b%s$b."
  #define NSMSG_HANDLES_MERGED_G  "%s (%s) merged account %s into %s."
! #define NSMSG_NICK_OWNED        "%s is a registered nick - you must auth to the account %s or change your nick, or the owner may disconnect you."
  
  #define NSMSG_SETTING_LIST	"$b$N account settings:$b"
***************
*** 889,893 ****
      case ALLOWAUTH:
          snprintf(subject, sizeof(subject), "Authentication allowed for %s", netname);
!         snprintf(body, sizeof(body), "This email has been sent to let you authenticate (auth) to account %s on %s.  Your cookie is:\n    %s\nTo auth to that account, log on to %s and type the following command:\n    /msg %s@%s COOKIE %s %s\nIf you did NOT request this authorization, you do not need to do anything.  Please contact the %s staff if you have questions.", hi->handle, netname, cookie->cookie, netname, nickserv->nick, self->name, hi->handle, cookie->cookie, netname);
          break;
      default:
--- 889,893 ----
      case ALLOWAUTH:
          snprintf(subject, sizeof(subject), "Authentication allowed for %s", netname);
!         snprintf(body, sizeof(body), "This email has been sent to let you authenticate (auth) to the account %s on %s.  Your cookie is:\n    %s\nTo auth to that account, log on to %s and type the following command:\n    /msg %s@%s COOKIE %s %s\nIf you did NOT request this authorization, you do not need to do anything.  Please contact the %s staff if you have questions.", hi->handle, netname, cookie->cookie, netname, nickserv->nick, self->name, hi->handle, cookie->cookie, netname);
          break;
      default: