Minahito
minah****@users*****
2006年 8月 18日 (金) 18:06:32 JST
Index: xoops2jp/html/modules/user/language/english/main.php
diff -u xoops2jp/html/modules/user/language/english/main.php:1.1.2.17 xoops2jp/html/modules/user/language/english/main.php:1.1.2.18
--- xoops2jp/html/modules/user/language/english/main.php:1.1.2.17 Fri Aug 18 14:35:30 2006
+++ xoops2jp/html/modules/user/language/english/main.php Fri Aug 18 18:06:32 2006
@@ -6,16 +6,15 @@
define('_MD_USER_ERROR_AVATAR_SIZE', "Uploaded file exceeds the dimensions limit for avatar.");
define('_MD_USER_ERROR_DBUPDATE_FAILED', "Failed updating database");
define('_MD_USER_ERROR_EMAIL_FORMAT', "{0} is an incorrect email address");
-define('_MD_USER_ERROR_INCORRECTLOGIN', "Invalid Login!");
define('_MD_USER_ERROR_INJURY', "The specified value {0} is wrong.");
define('_MD_USER_ERROR_MAXLENGTH', "Input {0} with {1} or less characters.");
define('_MD_USER_ERROR_MINLENGTH', "Input {0} with {1} or more characters.");
-define('_MD_USER_ERROR_PASSNOTSAME', "Both passwords are different. They must be identical.");
define('_MD_USER_ERROR_PASSWORD', "The passwords you gave did not match.");
define('_MD_USER_ERROR_REQUIRED', "{0} is required.");
define('_MD_USER_ERROR_SEND_MAIL', "Email transmission failed. Please contact site administrator.");
define('_MD_USER_ERROR_TIMEZONE', "TimeZone");
define('_MD_USER_ERROR_UNEEDAGREE', "Sorry, you have to agree to our disclaimer to get registered.");
+define('_MD_USER_ERROR_YOURREGMAILNG', "You are now registered. However, we were unable to send the activation mail to your email account due to an internal error that had occurred on our server. We are sorry for the inconvenience, please send the webmaster an email notifying him/her of the situation.");
define('_MD_USER_LANG_ALLABOUT', "All about %s");
define('_MD_USER_LANG_ATTACHSIG', "Always attach my signature");
define('_MD_USER_LANG_AVATAR', "Avatar");
@@ -30,70 +29,42 @@
define('_MD_USER_LANG_DISCLAIMER', "Disclaimer");
define('_MD_USER_LANG_EDITPROFILE', "Edit Profile");
define('_MD_USER_LANG_EMAIL', "Email address");
-define('_MD_USER_LANG_ENTERPWD', "ERROR: You must provide a password.");
define('_MD_USER_LANG_FINISH', "Finish");
define('_MD_USER_LANG_GROUPID', "Group ID");
-define('_MD_USER_LANG_GROUPS', "User\'s Groups");
define('_MD_USER_LANG_GUEST', "Guest");
define('_MD_USER_LANG_HASJUSTREG', "%s has just registered!");
-define('_MD_USER_LANG_INBOX', "Inbox");
-define('_MD_USER_LANG_INVALIDMAIL', "ERROR: Invalid email address");
define('_MD_USER_LANG_INVALIDNICKNAME', "ERROR: Invalid Username");
define('_MD_USER_LANG_LAST_LOGIN', "Last Login");
define('_MD_USER_LANG_LEVEL', "Level");
-define('_MD_USER_LANG_LOGGEDOUT', "You are now logged out");
-define('_MD_USER_LANG_LOGGINGU', "Thank you for logging in, %s.");
-define('_MD_USER_LANG_LOGOUT', "Logout");
define('_MD_USER_LANG_LOSTPASSWORD', "Lost your Password?");
-define('_MD_USER_LANG_MAILPWDNG', "mail_password: could not update user entry. Contact the Administrator");
-define('_MD_USER_LANG_MAXIMGSZ', "Max Image Size (Bytes)");
-define('_MD_USER_LANG_MAXPIXEL', "Max Pixels");
-define('_MD_USER_LANG_MOREABOUT', "More About Me");
-define('_MD_USER_LANG_MYAVATAR', "My Avatar");
-define('_MD_USER_LANG_MYINFO', "My Info");
define('_MD_USER_LANG_NAME', "Real Name");
define('_MD_USER_LANG_NAMERESERVED', "ERROR: Username is reserved.");
define('_MD_USER_LANG_NEWPWDREQ', "New Password Request at %s");
define('_MD_USER_LANG_NEWUSERREGAT', "New user registration at %s");
define('_MD_USER_LANG_NICKNAME', "Username");
-define('_MD_USER_LANG_NICKNAMENOSPACES', "There cannot be any spaces in the Username.");
define('_MD_USER_LANG_NICKNAMETAKEN', "ERROR: Username has been taken.");
-define('_MD_USER_LANG_NICKNAMETOOLONG', "Username is too long. It must be %s or less characters.");
-define('_MD_USER_LANG_NICKNAMETOOSHORT', "Username is too short. It must be %s or more characters.");
define('_MD_USER_LANG_NO', "No");
define('_MD_USER_LANG_NOACTTPADM', "The selected user has been deactivated or has not been activated yet.");
-define('_MD_USER_LANG_NOEDITRIGHT', "You do not have permisson to edit this account.");
-define('_MD_USER_LANG_NOPERMISS', "Sorry, you do not have the permission to perform this action!");
define('_MD_USER_LANG_NOPROBLEM', "No problem. Simply enter the e-mail address we have on file for your account.");
define('_MD_USER_LANG_NOREGISTER', "Sorry, we are currently closed for new user registrations.");
define('_MD_USER_LANG_NOTIFY_METHOD', "Notification Method : When you monitor e.g. a forum, how would you like to receive notifications of updates?");
define('_MD_USER_LANG_NOTIFY_MODE', "Default Notification Mode");
define('_MD_USER_LANG_NOTREGISTERED', "Not registered?");
-define('_MD_USER_LANG_OLDDELETED', "Your old avatar will be deleted!");
define('_MD_USER_LANG_PASS', "Password");
define('_MD_USER_LANG_PASSWORD', "Password");
define('_MD_USER_LANG_PM', "PM");
define('_MD_USER_LANG_POSTS', "Comments/Posts");
-define('_MD_USER_LANG_PRESSLOGIN', "Press the button below to login");
define('_MD_USER_LANG_PROFILE', "Profile");
-define('_MD_USER_LANG_PROFUPDATED', "Your Profile Updated!");
-define('_MD_USER_LANG_PWDMAILED', "Password for %s has been sent.");
-define('_MD_USER_LANG_PWDTOOSHORT', "Sorry, your password must be at least ");
define('_MD_USER_LANG_RANK', "Rank");
define('_MD_USER_LANG_RANK_ID', "ID");
define('_MD_USER_LANG_REGISTERNG', "Could not register new user.");
define('_MD_USER_LANG_REMOVEINFO', "This will remove all your information from our database.");
define('_MD_USER_LANG_SAVECHANGES', "Save Changes");
define('_MD_USER_LANG_SELECT', "Select");
-define('_MD_USER_LANG_SELECTNG', "No User Selected! Please go back and try again.");
-define('_MD_USER_LANG_SELFILE', "Select a file");
define('_MD_USER_LANG_SENDPASSWORD', "Send Password");
define('_MD_USER_LANG_SHOWALL', "Show All");
-define('_MD_USER_LANG_SORRYNOTFOUND', "Sorry, no corresponding user info was found.");
define('_MD_USER_LANG_STATISTICS', "Statistics");
define('_MD_USER_LANG_SUBMIT', "Submit");
-define('_MD_USER_LANG_SURETODEL', "Are you sure you want to delete your account?");
-define('_MD_USER_LANG_THANKYOUFORVISIT', "Thank you for your visit to our site!");
define('_MD_USER_LANG_THEME', "Theme");
define('_MD_USER_LANG_TIMEZONE', "TimeZone");
define('_MD_USER_LANG_TIMEZONE_OFFSET', "Timezone");
@@ -102,7 +73,6 @@
define('_MD_USER_LANG_UMODE', "Comments Display Mode");
define('_MD_USER_LANG_UNAME', "User name");
define('_MD_USER_LANG_UORDER', "Comments Sort Order");
-define('_MD_USER_LANG_UPLOADMYAVATAR', "Upload Avatar");
define('_MD_USER_LANG_URL', "Website");
define('_MD_USER_LANG_USECOOKIE', "Store my user name in a cookie for 1 year");
define('_MD_USER_LANG_USER_AIM', "AIM");
@@ -118,7 +88,6 @@
define('_MD_USER_LANG_USER_VIEWEMAIL', "Allow other users to view my email address");
define('_MD_USER_LANG_USER_YIM', "YIM");
define('_MD_USER_LANG_USERKEYFOR', "User activation key for %s");
-define('_MD_USER_LANG_USERNAME', "Username");
define('_MD_USER_LANG_USERREG', "User Registration");
define('_MD_USER_LANG_VERIFYPASS', "Verify Password");
define('_MD_USER_LANG_WEBSITE', "Website");
@@ -131,9 +100,10 @@
define('_MD_USER_MESSAGE_ACTVMAILNG', "Failed sending notification mail to %s");
define('_MD_USER_MESSAGE_ACTVMAILOK', "Notification mail to %s sent.");
define('_MD_USER_MESSAGE_IAGREE', "I agree to the above");
+define('_MD_USER_MESSAGE_OLDDELETED', "Your old avatar will be deleted!");
define('_MD_USER_MESSAGE_SEND_PASSWORD', "Send password");
+define('_MD_USER_MESSAGE_SURETODEL', "Are you sure you want to delete your account?");
define('_MD_USER_MESSAGE_YOURREGISTERED', "You are now registered. An email containing an user activation key has been sent to the email account you provided. Please follow the instructions in the mail to activate your account. ");
define('_MD_USER_MESSAGE_YOURREGISTERED2', "You are now registered. Please wait for your account to be activated by the adminstrators. You will receive an email once you are activated. This could take a while so please be patient.");
-define('_MD_USER_MESSAGE_YOURREGMAILNG', "You are now registered. However, we were unable to send the activation mail to your email account due to an internal error that had occurred on our server. We are sorry for the inconvenience, please send the webmaster an email notifying him/her of the situation.");
?>
Index: xoops2jp/html/modules/user/language/english/admin.php
diff -u xoops2jp/html/modules/user/language/english/admin.php:1.1.2.22 xoops2jp/html/modules/user/language/english/admin.php:1.1.2.23
--- xoops2jp/html/modules/user/language/english/admin.php:1.1.2.22 Fri Aug 18 14:35:30 2006
+++ xoops2jp/html/modules/user/language/english/admin.php Fri Aug 18 18:06:32 2006
@@ -1,28 +1,19 @@
<?php
-define('_AD_USER_ERROR_CONTENT_IS_NOT_FOUND', "Content is not found");
+define('_AD_USER_ERROR_CONTENT_IS_NOT_FOUND', "Could not find the data.");
define('_AD_USER_ERROR_EMAIL', "Email");
define('_AD_USER_ERROR_GROUP_VALUE', "Specified group value is wrong.");
define('_AD_USER_ERROR_IMAGE_REQUIRED', "You must select a image file.");
-define('_AD_USER_ERROR_INJURY_MIN_MAX', "Relationship between minimum value and maximum value is wrong.");
-define('_AD_USER_ERROR_INJURY_SPECIAL', "Value of the special rank is wrong.");
define('_AD_USER_ERROR_INTRANGE', "Incorrect input on {0}.");
-define('_AD_USER_ERROR_MAILJOB_SEND_ERROR', "Mailjob send error");
define('_AD_USER_ERROR_MAILJOB_SEND_FAIL', "Mailjob send fail");
define('_AD_USER_ERROR_MAILJOB_SEND_MEANS', "Mailjob send means");
define('_AD_USER_ERROR_MIN', "Input {0} with {1} or more characters.");
-define('_AD_USER_ERROR_NO_UPLOAD_FILE', "Upload a image file for this rank.");
define('_AD_USER_ERROR_OBJECTEXIST', "objectexist");
-define('_AD_USER_ERROR_RAISE_ERROR', "Raise an error(s).");
define('_AD_USER_ERROR_REQUEST_IS_WRONG', "Request is wrong");
define('_AD_USER_ERROR_UMODE', "The specified value for comment sort order is invalid.");
define('_AD_USER_ERROR_UNAME_NO_UNIQUE', "Username has been taken.");
-define('_AD_USER_ERROR_WRONG_FORMAT', "Your format is invalid.");
-define('_AD_USER_LANG_ACTIVEUSER', "Active user");
-define('_AD_USER_LANG_ACTKEY', "actkey");
define('_AD_USER_LANG_ALL_OF_USERS', "All of users");
define('_AD_USER_LANG_APPROVE_USERS_ONLY', "Only active users");
-define('_AD_USER_LANG_ATTACHSIG', "Always attach my signature");
define('_AD_USER_LANG_AVATAR_CREATED', "Created");
define('_AD_USER_LANG_AVATAR_DELETE', "Delete avatar");
define('_AD_USER_LANG_AVATAR_DISPLAY', "Display");
@@ -33,20 +24,14 @@
define('_AD_USER_LANG_AVATAR_TYPE', "Type");
define('_AD_USER_LANG_AVATAR_USING_COUNT', "User");
define('_AD_USER_LANG_AVATAR_WEIGHT', "Weight");
-define('_AD_USER_LANG_BIO', "Others");
define('_AD_USER_LANG_BODY', "Body");
-define('_AD_USER_LANG_BY_EMAIL', "Sent by email");
-define('_AD_USER_LANG_BY_PM', "Sent by PM");
define('_AD_USER_LANG_COMPLETED', "Completed");
define('_AD_USER_LANG_CONTROL', "Control");
define('_AD_USER_LANG_CREATE_NEW', "Create new");
define('_AD_USER_LANG_CREATE_UNIXTIME', "create unixtime");
-define('_AD_USER_LANG_CUSTOM_AVATAR', "Custom avatar");
define('_AD_USER_LANG_DELETE_RANK', "Delete a rank");
-define('_AD_USER_LANG_DESCRIPTION', "description");
define('_AD_USER_LANG_DISPLAY_USER_LEVEL', "Display user level");
define('_AD_USER_LANG_DISPLAY_USER_MAIL_CONDITION', "Display user mail condition");
-define('_AD_USER_LANG_EDIT', "Edit");
define('_AD_USER_LANG_FROM_EMAIL', "from email");
define('_AD_USER_LANG_FROM_NAME', "from name");
define('_AD_USER_LANG_GROUP', "Group");
@@ -66,16 +51,12 @@
define('_AD_USER_LANG_GROUP_PERMISSION', "Permission");
define('_AD_USER_LANG_GROUP_PROPERTY', "Property");
define('_AD_USER_LANG_GROUP_TYPE', "Type");
-define('_AD_USER_LANG_ID', "ID");
define('_AD_USER_LANG_IS_MAIL', "is mail");
define('_AD_USER_LANG_IS_PM', "is pm");
-define('_AD_USER_LANG_LAST_LOGIN', "Last login");
define('_AD_USER_LANG_LASTLOG_LESS', "Last login is less than <strong>X</strong> days ago");
define('_AD_USER_LANG_LASTLOG_MORE', "Last login is more than <strong>X</strong> days ago");
define('_AD_USER_LANG_LASTLOGIN', "Last login");
-define('_AD_USER_LANG_LASTLOGIN_FLAG', "Last Login Flag");
define('_AD_USER_LANG_LEFT_TARGET_USER', "Left target user");
-define('_AD_USER_LANG_LEVEL', "Level");
define('_AD_USER_LANG_MAIL_NG_USERS_ONLY', "Only users that don't accept mail ");
define('_AD_USER_LANG_MAIL_OK_USERS_ONLY', "Only users that accept mail");
define('_AD_USER_LANG_MAILJOB_DELETE', "Mailjob delete");
@@ -84,11 +65,7 @@
define('_AD_USER_LANG_MAILJOB_LIST', "Mailjob list");
define('_AD_USER_LANG_MAILJOB_NEW', "Mailjob new");
define('_AD_USER_LANG_MAILJOB_SEND', "Mailjob send");
-define('_AD_USER_LANG_MAILOK', "Receive occasional email notices from administrators and moderators?");
-define('_AD_USER_LANG_NAME', "Real name");
define('_AD_USER_LANG_NO_SPECIAL_RANK', "--------------");
-define('_AD_USER_LANG_OFF', "Off");
-define('_AD_USER_LANG_ON', "On");
define('_AD_USER_LANG_OVER_POSTS', "Number of Posts is greater than <strong>X</strong>");
define('_AD_USER_LANG_PENDING_USERS_ONLY', "Only inactive users");
define('_AD_USER_LANG_PERM_ACCESS', "Access");
@@ -99,62 +76,29 @@
define('_AD_USER_LANG_PERM_GROUP_PERM_MODULE', "Module Administration");
define('_AD_USER_LANG_PERM_MODULE_ACCESS', "Privilege of System/module administration");
define('_AD_USER_LANG_PERM_SYSTEM_PERM_MODULE', "System administration");
-define('_AD_USER_LANG_POSTS', "Posts");
-define('_AD_USER_LANG_RANK', "Rank");
-define('_AD_USER_LANG_RANK_EDIT', "Edit user rank");
-define('_AD_USER_LANG_RANK_IMAGE', "Image");
-define('_AD_USER_LANG_RANK_LIST', "User rank administration");
-define('_AD_USER_LANG_RANK_MAX', "Maximum posts");
-define('_AD_USER_LANG_RANK_MIN', "Minimum posts");
-define('_AD_USER_LANG_RANK_NEW', "Add a new rank");
-define('_AD_USER_LANG_RANK_SPECIAL', "Special rank");
-define('_AD_USER_LANG_RANK_TITLE', "Title");
define('_AD_USER_LANG_RECOUNT', "Recount");
define('_AD_USER_LANG_REGDATE', "Registered date");
define('_AD_USER_LANG_REGDATE_LESS', "Joined date is less than <strong>X</strong> days ago");
define('_AD_USER_LANG_REGDATE_MORE', "Joined date is more than <strong>X</strong> days ago");
-define('_AD_USER_LANG_REGISTDATE', "Registered date");
-define('_AD_USER_LANG_REGISTDATE_FLAG', "Registered date flag");
define('_AD_USER_LANG_RESET', "Reset");
define('_AD_USER_LANG_SEARCH_AGAIN', "Search again");
define('_AD_USER_LANG_SEND_MAIL_BY_THIS_CONDITION', "Send mail by this condition");
-define('_AD_USER_LANG_SENDER', "Sender");
-define('_AD_USER_LANG_SUBJECT', "Subject");
-define('_AD_USER_LANG_SYSTEM_AVATAR', "System avatar");
-define('_AD_USER_LANG_THEME', "theme");
define('_AD_USER_LANG_TITLE', "title");
-define('_AD_USER_LANG_UMODE', "Comments Display Mode");
define('_AD_USER_LANG_UNDER_POSTS', "Number of Posts is less than <strong>X</strong>");
-define('_AD_USER_LANG_UORDER', "Comments Sort Order");
define('_AD_USER_LANG_USER', "User");
-define('_AD_USER_LANG_USER_AIM', "AIM");
-define('_AD_USER_LANG_USER_AVATAR', "user avatar");
define('_AD_USER_LANG_USER_DELETE', "Delete a user");
define('_AD_USER_LANG_USER_DELETE_ADVICE', "Delete ");
define('_AD_USER_LANG_USER_EDIT', "Edit a user");
-define('_AD_USER_LANG_USER_FROM', "Location");
-define('_AD_USER_LANG_USER_ICQ', "ICQ");
-define('_AD_USER_LANG_USER_INTREST', "Interest");
define('_AD_USER_LANG_USER_LIST', "User administration");
-define('_AD_USER_LANG_USER_MAILOK', "user_mailok");
-define('_AD_USER_LANG_USER_MSNM', "MSNM");
define('_AD_USER_LANG_USER_NEW', "Add a new user");
-define('_AD_USER_LANG_USER_OCC', "Occupation");
-define('_AD_USER_LANG_USER_REGDATE', "user regdate");
define('_AD_USER_LANG_USER_SEARCH_LIST', "User search list");
-define('_AD_USER_LANG_USER_SIG', "Signature");
define('_AD_USER_LANG_USER_VIEW', "user view");
-define('_AD_USER_LANG_USER_VIEWEMAIL', "Allow other users to view my email address.");
-define('_AD_USER_LANG_USER_YIM', "YIM");
define('_AD_USER_LANG_VPASS', "Verify password");
define('_AD_USER_MESSAGE_CONFIRM_DELETE', "Are you sure you want to delete?");
define('_AD_USER_MESSAGE_CONFIRM_DELETE_RANK', "Do you delete the user rank?");
-define('_AD_USER_MESSAGE_DELETE_RANK_SUCCESS', "The user rank has been deleted.");
define('_AD_USER_MESSAGE_RECOUNT_SUCCESS', "Recount success");
-define('_AD_USER_MESSAGE_SAVE_RANK_SUCCESS', "The user rank has been saved.");
define('_AD_USER_TIP_DELETE_AVATAR', "Avatars of users who are using this avatar will be changed to blank.gif.");
define('_AD_USER_TIPS_MAILJOB_SEND', "If there are too many letters, the server may not return response message on screen. In the case, do reload. By repeating reload, you can send all of letters.");
define('_AD_USER_TIPS_RECOUNT_POSTS', "If posts of this user are a wrong, you may recount it with clicking 'Recount' button.");
-define('_AD_USER_LANG_UNAME', "User name");
?>
Index: xoops2jp/html/modules/user/language/english/modinfo.php
diff -u xoops2jp/html/modules/user/language/english/modinfo.php:1.1.2.13 xoops2jp/html/modules/user/language/english/modinfo.php:1.1.2.14
--- xoops2jp/html/modules/user/language/english/modinfo.php:1.1.2.13 Thu Aug 10 18:48:08 2006
+++ xoops2jp/html/modules/user/language/english/modinfo.php Fri Aug 18 18:06:32 2006
@@ -5,9 +5,7 @@
define('_MI_USER_ADMENU_LIST', "User Management");
define('_MI_USER_ADMENU_MAIL', "Mail Users");
define('_MI_USER_ADMENU_MAILJOB_MANAGE', "Mailjob management");
-define('_MI_USER_ADMENU_NEW_RANK', "Add a New Rank");
define('_MI_USER_ADMENU_RANK_LIST', "User Rank Manager");
-define('_MI_USER_ADMENU_SEARCH', "Find a User");
define('_MI_USER_ADMENU_USER_SEARCH', "User search");
define('_MI_USER_BLOCK_LOGIN_DESC', "Shows login form");
define('_MI_USER_BLOCK_LOGIN_NAME', "Login");
@@ -53,7 +51,6 @@
define('_MI_USER_CONF_UNAME_TEST_LEVEL_NORMAL', "Medium");
define('_MI_USER_CONF_UNAME_TEST_LEVEL_STRONG', "Strict (Only alphabets and numbers)");
define('_MI_USER_CONF_UNAME_TEST_LEVEL_WEAK', "Light (Allow 2byte characters)");
-define('_MI_USER_CONF_USE_MYSESSION', "Use mysession");
define('_MI_USER_CONF_USE_SSL', "Use SSL for login?");
define('_MI_USER_CONF_USERCOOKIE', "Name for user cookies.");
define('_MI_USER_CONF_USERCOOKIE_DESC', "This cookie contains only a user name and is saved in a user pc for a year (if the user wishes). If a user have this cookie, username will be automatically inserted in the login box.");
@@ -63,13 +60,9 @@
define('_MI_USER_KEYWORD_CREATE_RANK', "create rank");
define('_MI_USER_KEYWORD_CREATE_USER', "Create user");
define('_MI_USER_KEYWORD_GROUP_LIST', "list edit modify delete user permission add remove member");
-define('_MI_USER_KEYWORD_MAILJOB_CREATE', "Mailjob create");
-define('_MI_USER_KEYWORD_MAILJOB_LIST', "Mailjob list");
define('_MI_USER_KEYWORD_MAILJOB_MANAGE', "Mailjob manage");
define('_MI_USER_KEYWORD_USER_LIST', "user list");
define('_MI_USER_KEYWORD_USER_SEARCH', "User search");
-define('_MI_USER_LANG_MAILJOB_CREATE', "Mailjob create");
-define('_MI_USER_LANG_MAILJOB_LIST', "Mailjob list");
define('_MI_USER_MENU_CREATE_AVATAR', "Create avatar");
define('_MI_USER_MENU_CREATE_GROUP', "Create group");
define('_MI_USER_MENU_CREATE_RANK', "user rank create new");