Menu
▾
▴
xoops-svn
|
From: <be...@us...> - 2012-08-14 13:13:35
|
Revision: 10068
http://xoops.svn.sourceforge.net/xoops/?rev=10068&view=rev
Author: beckmi
Date: 2012-08-14 13:13:24 +0000 (Tue, 14 Aug 2012)
Log Message:
-----------
Correcting English translations.
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/blocksadmin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/comments.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/images.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/modulesadmin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/preferences.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/users.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/blocks.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/module_index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/modinfo.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/blocksadmin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/blocksadmin.php 2012-08-14 12:30:21 UTC (rev 10067)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/blocksadmin.php 2012-08-14 13:13:24 UTC (rev 10068)
@@ -12,7 +12,7 @@
define("_AM_SYSTEM_BLOCKS_MANAGMENT","Manage");
define("_AM_SYSTEM_BLOCKS_ADDBLOCK","Add a new block");
define("_AM_SYSTEM_BLOCKS_EDITBLOCK","Edit a block");
-define("_AM_SYSTEM_BLOCKS_CLONEBLOCK","Create a clone block");
+define("_AM_SYSTEM_BLOCKS_CLONEBLOCK","Clone a block");
define("_AM_SYSTEM_BLOCKS_DELETEBLOCK","Delete a block");
// Forms
@@ -70,7 +70,7 @@
// Messages
define("_AM_SYSTEM_BLOCKS_DBUPDATED", _AM_SYSTEM_DBUPDATED);
-define("_AM_SYSTEM_BLOCKS_RUSUREDEL",'Are you sure you want to delete block ? <div class="bold">%s</div>');
+define("_AM_SYSTEM_BLOCKS_RUSUREDEL",'Are you sure to delete this block ? <div class="bold">%s</div>');
define("_AM_SYSTEM_BLOCKS_SYSTEMCANT","System blocks cannot be deleted!");
define("_AM_SYSTEM_BLOCKS_MODULECANT","This block cannot be deleted directly! If you wish to disable this block, deactivate the module.");
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/comments.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/comments.php 2012-08-14 12:30:21 UTC (rev 10067)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/comments.php 2012-08-14 13:13:24 UTC (rev 10068)
@@ -8,7 +8,7 @@
*/
// Manager
-define("_AM_SYSTEM_COMMENTS_NAV_MANAGER","Comment Manager");
+define("_AM_SYSTEM_COMMENTS_NAV_MANAGER","Comment Management");
define("_AM_SYSTEM_COMMENTS_NAV_MAIN","List");
define("_AM_SYSTEM_COMMENTS_NAV_PURGE","Purge");
@@ -28,16 +28,16 @@
define("_AM_SYSTEM_COMMENTS_FORM_ALL_STATUS","Any status");
define("_AM_SYSTEM_COMMENTS_FORM_PURGE","Purge");
-define("_AM_SYSTEM_COMMENTS_FORM_PURGE_DATE_AFTER","After this date (white for any date)");
-define("_AM_SYSTEM_COMMENTS_FORM_PURGE_DATE_BEFORE","Before this date (white for any date)");
+define("_AM_SYSTEM_COMMENTS_FORM_PURGE_DATE_AFTER","After this date (leave empty for any date)");
+define("_AM_SYSTEM_COMMENTS_FORM_PURGE_DATE_BEFORE","Before this date (leave empty for any date)");
define("_AM_SYSTEM_COMMENTS_FORM_PURGE_GROUPS","Groups");
-define("_AM_SYSTEM_COMMENTS_FORM_PURGE_USER","Nickname of the user");
+define("_AM_SYSTEM_COMMENTS_FORM_PURGE_USER","User name");
define("_AM_SYSTEM_COMMENTS_FORM_PURGE_STATUS","Status");
define("_AM_SYSTEM_COMMENTS_FORM_PURGE_MODULES","Modules");
// Tab
define("_AM_SYSTEM_COMMENTS_TITLE","Title");
-define("_AM_SYSTEM_COMMENTS_POSTED","Poster");
+define("_AM_SYSTEM_COMMENTS_POSTED","Author");
define("_AM_SYSTEM_COMMENTS_IP","IP");
define("_AM_SYSTEM_COMMENTS_MODULE","Module");
define("_AM_SYSTEM_COMMENTS_STATUS","Status");
@@ -48,4 +48,4 @@
define("_AM_SYSTEM_COMMENTS_COMMENTS_FOUND","%s comment(s) found.");
//since 2.6
-define("_AM_SYSTEM_COMMENTS_DELETE_LIMIT","Sorry, you can only delete 4000 comments at a time.");
\ No newline at end of file
+define("_AM_SYSTEM_COMMENTS_DELETE_LIMIT","Sorry, you can delete only 4000 comments at a time.");
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/images.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/images.php 2012-08-14 12:30:21 UTC (rev 10067)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/images.php 2012-08-14 13:13:24 UTC (rev 10068)
@@ -41,9 +41,9 @@
define("_AM_SYSTEM_IMAGES_URL","Show image URL");
// Messages
-define("_AM_SYSTEM_IMAGES_RUDELIMG","Are you sure that you want to delete this images file ?");
+define("_AM_SYSTEM_IMAGES_RUDELIMG","Are you sure to delete this images file?");
define("_AM_SYSTEM_IMAGES_FAILSAVE","Failed save image %s into the database");
-define("_AM_SYSTEM_IMAGES_RUDELIMGCAT","Are you sure that you want to delete this category and all of its images files?");
+define("_AM_SYSTEM_IMAGES_RUDELIMGCAT","Are you sure to delete this category and all of its images files?");
define("_AM_SYSTEM_IMAGES_FAILDEL","Failed deleting image %s from the database");
define("_AM_SYSTEM_IMAGES_FAILDELCAT","Failed deleting image category %s from the database");
define("_AM_SYSTEM_IMAGES_FAILUNLINK","Failed deleting image %s from the server directory");
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/modulesadmin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/modulesadmin.php 2012-08-14 12:30:21 UTC (rev 10067)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/modulesadmin.php 2012-08-14 13:13:24 UTC (rev 10068)
@@ -20,7 +20,7 @@
define("_AM_SYSTEM_MODULES_RUSUREUNINS","Are you sure you would like to uninstall this module?");
define("_AM_SYSTEM_MODULES_RUSUREUPD","Press the button below to update this module");
define("_AM_SYSTEM_MODULES_BTOMADMIN","Manage Module");
-define("_AM_SYSTEM_MODULES_BLOCKADMIN","Manage Block");
+define("_AM_SYSTEM_MODULES_BLOCKADMIN","Manage Blocks");
define("_AM_SYSTEM_MODULES_INSTALLING","Installing ");
define("_AM_SYSTEM_MODULES_UNINSTAL","Uninstall ");
define("_AM_SYSTEM_MODULES_DEACTIVATE","Deactivate ");
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/preferences.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/preferences.php 2012-08-14 12:30:21 UTC (rev 10067)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/preferences.php 2012-08-14 13:13:24 UTC (rev 10068)
@@ -38,7 +38,7 @@
define("_MD_AM_SITENAMEDSC", "");
define("_MD_AM_SLOGAN", "Slogan for your site");
define("_MD_AM_SLOGANDSC", "");
-define("_MD_AM_ADMINML", "Admin mail address");
+define("_MD_AM_ADMINML", "Admin email address");
define("_MD_AM_ADMINMLDSC", "");
define("_MD_AM_LANGUAGE", "Default language");
define("_MD_AM_LANGUAGEDSC", "");
@@ -53,12 +53,12 @@
define("_MD_AM_DTHEMEDSC", "");
define("_MD_AM_THEMESET", "Theme Set");
define("_MD_AM_CUSTOM_REDIRECT", "Use jGrowl redirect");
-define("_MD_AM_CUSTOM_REDIRECT_DESC", "replace old redirection by an jQuery redirection");
+define("_MD_AM_CUSTOM_REDIRECT_DESC", "replace old redirection by a jGrowl redirection");
define("_MD_AM_ANONNAME", "Username for anonymous users");
define("_MD_AM_ANONNAMEDSC", "");
-define("_MD_AM_MINPASS", "Minimum length of password required");
+define("_MD_AM_MINPASS", "Minimum required length of the password");
define("_MD_AM_MINPASSDSC", "");
-define("_MD_AM_NEWUNOTIFY", "Notify by mail when a new user is registered?");
+define("_MD_AM_NEWUNOTIFY", "Notify by email when a new user is registered?");
define("_MD_AM_NEWUNOTIFYDSC", "");
define("_MD_AM_SELFDELETE", "Allow users to delete own account?");
define("_MD_AM_SELFDELETEDSC", "");
@@ -73,22 +73,22 @@
define("_MD_AM_USERCOOKIE", "Name for user cookies.");
define("_MD_AM_USERCOOKIEDSC", "If the cookie name is set, 'Remember me' will be enabled for user login. If a user has chosen 'Remember me', he will be logged in automatically. The expiration for the cookie is one year.");
define("_MD_AM_USEMYSESS", "Use custom session");
-define("_MD_AM_USEMYSESSDSC", "Select yes to customise session related values.");
+define("_MD_AM_USEMYSESSDSC", "Select yes to customize session related values.");
define("_MD_AM_SESSNAME", "Session name");
define("_MD_AM_SESSNAMEDSC", "The name of session (Valid only when 'use custom session' is enabled)");
define("_MD_AM_SESSEXPIRE", "Session expiration");
define("_MD_AM_SESSEXPIREDSC", "Maximum duration of session idle time in minutes (Valid only when 'use custom session' is enabled.)");
define("_MD_AM_ALWDHTML", "HTML tags allowed in all posts.");
define("_MD_AM_INVLDMINPASS", "Invalid value for minimum length of password.");
-define("_MD_AM_INVLDUCOOK", "Invalid value for usercookie name.");
-define("_MD_AM_INVLDSCOOK", "Invalid value for sessioncookie name.");
+define("_MD_AM_INVLDUCOOK", "Invalid value for User Cookie name.");
+define("_MD_AM_INVLDSCOOK", "Invalid value for Session Cookie name.");
define("_MD_AM_INVLDSEXP", "Invalid value for session expiration time.");
-define("_MD_AM_ADMNOTSET", "Admin mail is not set.");
+define("_MD_AM_ADMNOTSET", "Admin email is not set.");
define("_MD_AM_YES", "Yes");
define("_MD_AM_NO", "No");
define("_MD_AM_DONTCHNG", "Don't change!");
-define("_MD_AM_REMEMBER", "Remember to chmod 666 this file in order to let the system write to it properly.");
-define("_MD_AM_IFUCANT", "If you can't change the permissions you can edit the rest of this file by hand.");
+define("_MD_AM_REMEMBER", "Remember to change the permissions of this file to 644, in order for the system to operate properly.");
+define("_MD_AM_IFUCANT", "If you can't change the permissions, you can edit the rest of this file by hand.");
define("_MD_AM_COMMODE", "Default Comment Display Mode");
define("_MD_AM_COMMODEDSC", "");
@@ -98,7 +98,7 @@
define("_MD_AM_DEBUGMODE", "Debug mode");
define("_MD_AM_DEBUGMODEDSC", "Several debug options. A running website should have this turned off.");
define("_MD_AM_CHNGUTHEME", "Change all users' theme");
-define("_MD_AM_NOTIFYTO", "Select group to which new user notification mail will be sent");
+define("_MD_AM_NOTIFYTO", "Select group to which new user notification email will be sent");
define("_MD_AM_NOTIFYTODSC", "");
define("_MD_AM_ALLOWTHEME", "Allow users to select theme?");
define("_MD_AM_ALLOWIMAGE", "Allow users to display image files in posts?");
@@ -108,10 +108,10 @@
define("_MD_AM_ADMINACTV", "Activation by administrators");
define("_MD_AM_ACTVTYPE", "Select activation type of newly registered users");
define("_MD_AM_ACTVTYPEDSC", "");
-define("_MD_AM_ACTVGROUP", "Select group to which activation mail will be sent");
+define("_MD_AM_ACTVGROUP", "Select group to which activation email will be sent");
define("_MD_AM_ACTVGROUPDSC", "Valid only when 'Activation by administrators' is selected");
define("_MD_AM_USESSL", "Use SSL for login?");
-define("_MD_AM_USESSLDSC", "");
+define("_MD_AM_USESSLDSC", ", SSL is used for secure login and requires a certificate. Contact your Host about how to obtain certificate for your site.");
define("_MD_AM_SSLPOST", "SSL Post variable name");
define("_MD_AM_SSLPOSTDSC", "The name of variable used to transfer session value via POST. If you are unsure, set any name that is hard to guess.");
define("_MD_AM_DEBUGMODE0", "Off");
@@ -133,8 +133,8 @@
define("_MD_AM_BADUNAMESDSC", "Separate each with a <strong>|</strong>, case insensitive, regex enabled.");
define("_MD_AM_DOBADIPS", "Enable IP bans?");
define("_MD_AM_DOBADIPSDSC", "Users from specified IP addresses will not be able to view your site");
-define("_MD_AM_BADIPS", "Enter IP addresses that should be banned from the site.<br />Separate each with a <strong>|</strong>, case insensitive, regex enabled.");
-define("_MD_AM_BADIPSDSC", "^aaa.bbb.ccc will disallow visitors with an IP that starts with aaa.bbb.ccc<br />aaa.bbb.ccc$ will disallow visitors with an IP that ends with aaa.bbb.ccc<br />aaa.bbb.ccc will disallow visitors with an IP that contains aaa.bbb.ccc");
+define("_MD_AM_BADIPS", "Enter IP addresses that should be banned from the site.<br />Separate each with a <strong>|</strong>, case insensitive, regex enabled (so dot - '.' means 'any char' and '\.' means '.').");
+define("_MD_AM_BADIPSDSC", "^aaa\.bbb\.ccc will disallow visitors with an IP that starts with aaa.bbb.ccc<br />aaa\.bbb\.ccc$ will disallow visitors with an IP that ends with aaa.bbb.ccc<br />aaa\.bbb\.ccc will disallow visitors with an IP that contains aaa.bbb.ccc");
define("_MD_AM_PREFMAIN", "Preferences Main");
define("_MD_AM_METAKEY", "Meta Keywords");
define("_MD_AM_METAKEYDSC", "The keywords meta tag is a series of keywords that represents the content of your site. Type in keywords with each separated by a comma or a space in between. (Ex. XOOPS, PHP, mySQL, portal system)");
@@ -164,7 +164,7 @@
define("_MD_AM_DOCENSORDSC", "Words will be censored if this option is enabled. This option may be turned off for enhanced site speed.");
define("_MD_AM_CENSORWRD", "Words to censor");
define("_MD_AM_CENSORWRDDSC", "Enter words that should be censored in user posts.<br />Separate each with a <strong>|</strong>, case insensitive.");
-define("_MD_AM_CENSORRPLC", "Bad words will be replaced with:");
+define("_MD_AM_CENSORRPLC", "Censored words will be replaced with:");
define("_MD_AM_CENSORRPLCDSC", "Censored words will be replaced with the characters entered in this textbox");
define("_MD_AM_SEARCH", "Search Options");
@@ -198,7 +198,7 @@
define("_MD_AM_SSLLINKDSC", "");
// added for mailer
-define("_MD_AM_MAILER", "Mail Setup");
+define("_MD_AM_MAILER", "Email Setup");
define("_MD_AM_MAILER_MAIL", "");
define("_MD_AM_MAILER_SENDMAIL", "");
define("_MD_AM_MAILER_", "");
@@ -209,8 +209,8 @@
// RMV-NOTIFY
define("_MD_AM_MAILFROMUID", "FROM user");
define("_MD_AM_MAILFROMUIDDESC", "When the system sends a private message, which user should appear to have sent it?");
-define("_MD_AM_MAILERMETHOD", "Mail delivery method");
-define("_MD_AM_MAILERMETHODDESC", "Method used to deliver mail. Default is \"mail\", use others only if that makes trouble.");
+define("_MD_AM_MAILERMETHOD", "Email delivery method");
+define("_MD_AM_MAILERMETHODDESC", "Method used to deliver email. Default is \"mail\", use others only if that makes trouble.");
define("_MD_AM_SMTPHOST", "SMTP host(s)");
define("_MD_AM_SMTPHOSTDESC", "List of SMTP servers to try to connect to.");
define("_MD_AM_SMTPUSER", "SMTPAuth username");
@@ -265,11 +265,11 @@
define("_MD_AM_AUTH_CONFOPTION_XOOPS", "XOOPS Database");
define("_MD_AM_AUTH_CONFOPTION_LDAP", "Standard LDAP Directory");
define("_MD_AM_AUTH_CONFOPTION_AD", "Microsoft Active Directory ©");
-define("_MD_AM_AUTH_CONFOPTION_SOAP", "Xoops Soap Authentication");
+define("_MD_AM_AUTH_CONFOPTION_SOAP", "XOOPS SOAP Authentication");
define("_MD_AM_AUTHENTICATION", "Authentication Options");
define("_MD_AM_AUTHMETHOD", "Authentication Method");
define("_MD_AM_AUTHMETHODDESC", "Which authentication method would you like to use for signing on users.");
-define("_MD_AM_LDAP_MAIL_ATTR", "LDAP - Mail Field Name");
+define("_MD_AM_LDAP_MAIL_ATTR", "LDAP - Email Field Name");
define("_MD_AM_LDAP_MAIL_ATTR_DESC", "The name of the E-Mail attribute in your LDAP directory tree.");
define("_MD_AM_LDAP_NAME_ATTR", "LDAP - Common Name Field Name");
define("_MD_AM_LDAP_NAME_ATTR_DESC", "The name of the Common Name attribute in your LDAP directory.");
@@ -310,21 +310,21 @@
define("_MD_AM_LDAP_DOMAIN_NAME", "The domain name");
define("_MD_AM_LDAP_DOMAIN_NAME_DESC", "Windows domain name. for ADS and NT Server only");
-define("_MD_AM_LDAP_PROVIS", "Automatic xoops account provisionning");
-define("_MD_AM_LDAP_PROVIS_DESC", "Create xoops user database if not exists");
+define("_MD_AM_LDAP_PROVIS", "Automatic XOOPS account provisionning");
+define("_MD_AM_LDAP_PROVIS_DESC", "Create XOOPS user database if it doesn't exists");
define("_MD_AM_LDAP_PROVIS_GROUP", "Default affect group");
define("_MD_AM_LDAP_PROVIS_GROUP_DSC", "The new user is assign to these groups");
define("_MD_AM_LDAP_FIELD_MAPPING_ATTR", "Xoops-Auth server fields mapping");
-define("_MD_AM_LDAP_FIELD_MAPPING_DESC", "Describe here the mapping between the Xoops database field and the LDAP Authentication system field." .
+define("_MD_AM_LDAP_FIELD_MAPPING_DESC", "Describe here the mapping between the XOOPS database field and the LDAP Authentication system field." .
"<br /><br />Format [Xoops Database field]=[Auth system LDAP attribute]" .
"<br />for example : email=mail" .
"<br />Separate each with a |" .
"<br /><br />!! For advanced users !!");
-define("_MD_AM_LDAP_PROVIS_UPD", "Maintain xoops account provisionning");
-define("_MD_AM_LDAP_PROVIS_UPD_DESC", "The Xoops User account is always synchronized with the Authentication Server");
+define("_MD_AM_LDAP_PROVIS_UPD", "Maintain XOOPS account provisionning");
+define("_MD_AM_LDAP_PROVIS_UPD_DESC", "The XOOPS User account is always synchronized with the Authentication Server");
define("_MD_AM_CPANEL", "Control Panel GUI");
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/users.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/users.php 2012-08-14 12:30:21 UTC (rev 10067)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/users.php 2012-08-14 13:13:24 UTC (rev 10068)
@@ -25,10 +25,10 @@
// Main
define("_AM_SYSTEM_USERS_USER","User");
define("_AM_SYSTEM_USERS_ADMIN","Admin");
-define("_AM_SYSTEM_USERS_UID","Uid");
+define("_AM_SYSTEM_USERS_UID","User ID");
define("_AM_SYSTEM_USERS_STATUS","Status");
define("_AM_SYSTEM_USERS_NAME","Name");
-define("_AM_SYSTEM_USERS_UNAME","Uname");
+define("_AM_SYSTEM_USERS_UNAME","User Name");
define("_AM_SYSTEM_USERS_EMAIL","Email");
define("_AM_SYSTEM_USERS_EDIT_GROUPS","Edit groups");
define("_AM_SYSTEM_USERS_REG_DATE","Registered date");
@@ -39,9 +39,9 @@
define("_AM_SYSTEM_USERS_FINDUS","Find Users");
define("_AM_SYSTEM_USERS_AVATAR","Avatar");
define("_AM_SYSTEM_USERS_REALNAME","Real Name");
-define("_AM_SYSTEM_USERS_REGDATE","Joined Date");
+define("_AM_SYSTEM_USERS_REGDATE","Registration Date");
define("_AM_SYSTEM_USERS_PM","PM");
-define("_AM_SYSTEM_USERS_URL","URL");
+define("_AM_SYSTEM_USERS_URL","Web URL");
define("_AM_SYSTEM_USERS_PREVIOUS","Previous");
define("_AM_SYSTEM_USERS_NEXT","Next");
define("_AM_SYSTEM_USERS_USERSFOUND","%s user(s) found");
@@ -49,20 +49,21 @@
define("_AM_SYSTEM_USERS_INACTUS", "Inactive Users: %s");
define("_AM_SYSTEM_USERS_NOFOUND","No Users Found");
define("_AM_SYSTEM_USERS_ICQ","ICQ Number");
-define("_AM_SYSTEM_USERS_AIM","AIM Handle");
-define("_AM_SYSTEM_USERS_YIM","YIM Handle");
-define("_AM_SYSTEM_USERS_MSNM","MSNM Handle");
+define("_AM_SYSTEM_USERS_AIM","AIM Link");
+define("_AM_SYSTEM_USERS_YIM","YIM Link");
+
+define("_AM_SYSTEM_USERS_MSNM","MSNM Link");
define("_AM_SYSTEM_USERS_TIMEZONE","Time Zone");
define("_AM_SYSTEM_USERS_SHOWSIG","Always attach my signature");
define("_AM_SYSTEM_USERS_CDISPLAYMODE","Comments Display Mode");
define("_AM_SYSTEM_USERS_CSORTORDER","Comments Sort Order");
define("_AM_SYSTEM_USERS_EXTRAINFO","Extra Info");
define("_AM_SYSTEM_USERS_LOCATION","Location");
-define("_AM_SYSTEM_USERS_OCCUPATION","Occupation");
+define("_AM_SYSTEM_USERS_OCCUPATION","Position");
define("_AM_SYSTEM_USERS_INTEREST","Interest");
define("_AM_SYSTEM_USERS_URLC","URL contains");
define("_AM_SYSTEM_USERS_LOCATIONC","Location contains");
-define("_AM_SYSTEM_USERS_OCCUPATIONC","Occupation contains");
+define("_AM_SYSTEM_USERS_OCCUPATIONC","Position contains");
define("_AM_SYSTEM_USERS_INTERESTC","Interest contains");
define("_AM_SYSTEM_USERS_LASTLOGMORE","Last login is more than <span style='color:#ff0000;'>X</span> days ago");
define("_AM_SYSTEM_USERS_LASTLOGLESS","Last login is less than <span style='color:#ff0000;'>X</span> days ago");
@@ -73,18 +74,18 @@
define("_AM_SYSTEM_USERS_SORT","Sort by");
define("_AM_SYSTEM_USERS_ORDER","Order");
define("_AM_SYSTEM_USERS_LASTLOGIN","Last login");
-define("_AM_SYSTEM_USERS_ASC","Ascending order");
-define("_AM_SYSTEM_USERS_DESC","Descending order");
+define("_AM_SYSTEM_USERS_ASC","Ascending");
+define("_AM_SYSTEM_USERS_DESC","Descending");
define("_AM_SYSTEM_USERS_LIMIT","Number of users per page");
define("_AM_SYSTEM_USERS_RESULTS", "Search results");
define("_AM_SYSTEM_USERS_SHOWMAILOK", "Type of users to show");
-define("_AM_SYSTEM_USERS_MAILOK","Only users that accept mail");
-define("_AM_SYSTEM_USERS_MAILNG","Only users that don't accept mail");
+define("_AM_SYSTEM_USERS_MAILOK","Only users that accept email");
+define("_AM_SYSTEM_USERS_MAILNG","Only users that don't accept email");
define("_AM_SYSTEM_USERS_SHOWTYPE", "Type of users to show");
define("_AM_SYSTEM_USERS_ACTIVE","Only active users");
define("_AM_SYSTEM_USERS_INACTIVE","Only inactive users");
define("_AM_SYSTEM_USERS_BOTH", "All users");
-define("_AM_SYSTEM_USERS_SENDMAIL", "Send mail");
+define("_AM_SYSTEM_USERS_SENDMAIL", "Send email");
define("_AM_SYSTEM_USERS_ADD2GROUP", "Add users to %s group");
define("_AM_SYSTEM_USERS_GROUPS", "Groups");
define("_AM_SYSTEM_USERS_ADD_GROUPS", "Add group");
@@ -96,7 +97,7 @@
define("_AM_SYSTEM_USERS_YMCACF","You must complete all required fields");
define("_AM_SYSTEM_USERS_CNRNU","Could not register new user.");
define("_AM_SYSTEM_USERS_EDEUSER","Edit/Delete Users");
-define("_AM_SYSTEM_USERS_NICKNAME","Nickname");
+define("_AM_SYSTEM_USERS_NICKNAME","User Name");
define("_AM_SYSTEM_USERS_MODIFYUSER","Modify User");
define("_AM_SYSTEM_USERS_DELUSER","Delete User");
define("_AM_SYSTEM_USERS_GO","Go!");
@@ -120,14 +121,14 @@
define("_AM_SYSTEM_USERS_USERPOST","User Posts");
define("_AM_SYSTEM_USERS_STORIES","Stories");
define("_AM_SYSTEM_USERS_COMMENTS","Comments");
-define("_AM_SYSTEM_USERS_PTBBTSDIYT","Push the button below to synchronize data if you think the above user posts info does not seem to indicate the actual status");
+define("_AM_SYSTEM_USERS_PTBBTSDIYT","Push the button below to synchronize data if you think the above user posts info is not the actual status");
define("_AM_SYSTEM_USERS_SYNCHRONIZE","Synchronize");
define("_AM_SYSTEM_USERS_USERDONEXIT","User doesn't exist!");
define("_AM_SYSTEM_USERS_STNPDNM","Sorry, the new passwords do not match. Click back and try again");
define("_AM_SYSTEM_USERS_CNGTCOM","Could not get total comments");
define("_AM_SYSTEM_USERS_CNGTST","Could not get total stories");
define("_AM_SYSTEM_USERS_CNUUSER","Could not update user");
-define("_AM_SYSTEM_USERS_CNGUSERID","Could not get user IDS");
+define("_AM_SYSTEM_USERS_CNGUSERID","Could not get user ID");
define("_AM_SYSTEM_USERS_LIST","List");
define("_AM_SYSTEM_USERS_NOUSERS", "No users selected");
define("_AM_SYSTEM_USERS_CNRNU2","The new user could not be added to groups: %s.");
@@ -140,9 +141,9 @@
define("_AM_SYSTEM_USERS_SUBMIT","Submit");
define("_AM_SYSTEM_USERS_PURGE","Purge");
define("_AM_SYSTEM_USERS_ADD","Add member");
-define("_AM_SYSTEM_USERS_VIEW","View info member");
-define("_AM_SYSTEM_USERS_NO_FOUND","No found users");
-define("_AM_SYSTEM_USERS_NOT_CONNECT","Never connect");
+define("_AM_SYSTEM_USERS_VIEW","View member info");
+define("_AM_SYSTEM_USERS_NO_FOUND","No user(s) found");
+define("_AM_SYSTEM_USERS_NOT_CONNECT","Never connected");
define("_AM_SYSTEM_USERS_FORM_SURE_DEL","Delete user : %s");
define("_AM_SYSTEM_USERS_FORM_SURE_DEL2","Delete");
define("_AM_SYSTEM_USERS_NO_SUPP", "User cannot be deleted: %s <br />");
@@ -155,6 +156,7 @@
// Error
define("_AM_SYSTEM_USERS_PSEUDO_ERROR","User name %s already exists");
-define("_AM_SYSTEM_USERS_MAIL_ERROR","User mail %s already exists");
+define("_AM_SYSTEM_USERS_MAIL_ERROR","User email %s already exists");
+
?>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin.php 2012-08-14 12:30:21 UTC (rev 10067)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin.php 2012-08-14 13:13:24 UTC (rev 10068)
@@ -40,17 +40,17 @@
define("_AM_SYSTEM_BLOCKS","Blocks");
define("_AM_SYSTEM_BLOCKS_DESC","With blocks you can <br /> add many thing for <br /> your users");
define("_AM_SYSTEM_MODULES","Modules");
-define("_AM_SYSTEM_MODULES_DESC","At here you can install <br /> and unistall your XOOPS <br /> modules. Do you know <br /> what module is ?");
+define("_AM_SYSTEM_MODULES_DESC","Here you can install <br /> and unistall your XOOPS <br /> modules. Do you know <br /> which module?");
define("_AM_SYSTEM_EXTENSIONS","Extensions");
-define("_AM_SYSTEM_EXTENSIONS_DESC","At here you can install <br /> and uninstall your XOOPS <br /> extensions.");
+define("_AM_SYSTEM_EXTENSIONS_DESC","Here you can install <br /> and uninstall your XOOPS <br /> extensions.");
define("_AM_SYSTEM_THEME","Themes");
-define("_AM_SYSTEM_THEME_DESC","You can manage themes");
+define("_AM_SYSTEM_THEME_DESC","Here you can manage themes");
define("_AM_SYSTEM_USER","Users");
define("_AM_SYSTEM_USER_DESC","With this options you <br /> can add new user or <br /> edit old user and userinfo, <br /> change groups and many <br /> other things");
define("_AM_SYSTEM_PREF","Preferences");
define("_AM_SYSTEM_PREF_DESC","XOOPS and all of your <br /> modules have a preferences <br /> for manage module options");
-define("_AM_SYSTEM_MLUS","Mail Users");
-define("_AM_SYSTEM_MLUS_DESC","If you need send mail <br /> or mp for your users, <br /> you can use this option");
+define("_AM_SYSTEM_MLUS","Email Users");
+define("_AM_SYSTEM_MLUS_DESC","If you need send email <br /> or mp for your users, <br /> you can use this option");
define("_AM_SYSTEM_IMAGES","Image Manager");
define("_AM_SYSTEM_IMAGES_DESC","You can add your image <br /> here and make some <br /> Category for yourself");
define("_AM_SYSTEM_AVATARS","Avatars");
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/blocks.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/blocks.php 2012-08-14 12:30:21 UTC (rev 10067)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/blocks.php 2012-08-14 13:13:24 UTC (rev 10068)
@@ -30,7 +30,7 @@
define("_MB_SYSTEM_RECO","Recommend Us");
define("_MB_SYSTEM_PWWIDTH","Pop-Up Window Width");
define("_MB_SYSTEM_PWHEIGHT","Pop-Up Window Height");
-define("_MB_SYSTEM_LOGO","Logo image file under %s directory"); // %s is your root image directory name
+define("_MB_SYSTEM_LOGO","Logo image file is located under %s directory"); // %s is your root image directory name
define("_MB_SYSTEM_COMPEND", "Comments");
//define("_MB_SYSTEM_LOGGEDINAS", "Logged in as");
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/module_index.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/module_index.html 2012-08-14 12:30:21 UTC (rev 10067)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/module_index.html 2012-08-14 13:13:24 UTC (rev 10068)
@@ -1,3 +1,3 @@
<h2>Welcom to: System module</h2>
<h4>Description</h4>
-<p>For administration of core settings of the site.</p>
\ No newline at end of file
+<p>For Administration of Main settings of the Website.</p>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/modinfo.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/modinfo.php 2012-08-14 12:30:21 UTC (rev 10067)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/modinfo.php 2012-08-14 13:13:24 UTC (rev 10068)
@@ -36,7 +36,7 @@
define("_MI_SYSTEM_ADMENU7","Smilies");
define("_MI_SYSTEM_ADMENU9","User Ranks");
define("_MI_SYSTEM_ADMENU10","Edit User");
-define("_MI_SYSTEM_ADMENU11","Mail Users");
+define("_MI_SYSTEM_ADMENU11","Email Users");
define("_MI_SYSTEM_ADMENU12", "Find Users");
define("_MI_SYSTEM_ADMENU13", "Images");
define("_MI_SYSTEM_ADMENU14", "Avatars");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X