Revision: 46153 Author: siebrand Date: 2009-01-24 17:56:34 +0000 (Sat, 24 Jan 2009)
Log Message: ----------- Recommit r45154 after revert in r45249 and discussion http://lists.wikimedia.org/pipermail/wikitech-l/2008-December/thread.html#40797 * sysop/admin -> administrator for consistency Modified Paths: -------------- trunk/extensions/AbsenteeLandlord/AbsenteeLandlord.i18n.php trunk/extensions/CentralAuth/CentralAuth.i18n.php trunk/extensions/Configure/Configure.settings.i18n.php trunk/extensions/ConfirmAccount/ConfirmAccount.i18n.php trunk/extensions/DeletedContributions/DeletedContributions.i18n.php trunk/extensions/DynamicPageList/DynamicPageList2.i18n.php trunk/extensions/EmergencyDeSysop/EmergencyDeSysop.i18n.php trunk/extensions/LiquidThreads/Lqt.i18n.php trunk/extensions/Maintenance/Maintenance.i18n.php trunk/extensions/Makesysop/SpecialMakesysop.i18n.php trunk/extensions/Nuke/SpecialNuke.i18n.php trunk/extensions/Oversight/HideRevision.i18n.php trunk/phase3/languages/messages/MessagesEn.php Modified: trunk/extensions/AbsenteeLandlord/AbsenteeLandlord.i18n.php =================================================================== --- trunk/extensions/AbsenteeLandlord/AbsenteeLandlord.i18n.php 2009-01-24 17:49:29 UTC (rev 46152) +++ trunk/extensions/AbsenteeLandlord/AbsenteeLandlord.i18n.php 2009-01-24 17:56:34 UTC (rev 46153) @@ -9,7 +9,7 @@ $messages = array(); $messages['en'] = array( - 'absenteelandlord-reason' => 'The database has been automatically locked due to inactivity from the sysops.', + 'absenteelandlord-reason' => 'The database has been automatically locked due to inactivity from the administrators.', 'absenteelandlord-desc' => 'Auto-locks the wiki database if the sysops are all inactive for some time', ); Modified: trunk/extensions/CentralAuth/CentralAuth.i18n.php =================================================================== --- trunk/extensions/CentralAuth/CentralAuth.i18n.php 2009-01-24 17:49:29 UTC (rev 46152) +++ trunk/extensions/CentralAuth/CentralAuth.i18n.php 2009-01-24 17:56:34 UTC (rev 46153) @@ -67,7 +67,7 @@ If this is you, you can finish the login unification process simply by typing the master password for that account here:', 'centralauth-blocked-text' => 'Your home wiki (listed below) is blocked from editing. -Please contact a sysop in this wiki to unblock it. +Please contact an administrator in this wiki to unblock it. While it is blocked, you cannot merge your accounts.', 'centralauth-notice-dryrun' => "<div class='successbox'>Demo mode only</div><br clear='all'/>", Modified: trunk/extensions/Configure/Configure.settings.i18n.php =================================================================== --- trunk/extensions/Configure/Configure.settings.i18n.php 2009-01-24 17:49:29 UTC (rev 46152) +++ trunk/extensions/Configure/Configure.settings.i18n.php 2009-01-24 17:56:34 UTC (rev 46153) @@ -172,7 +172,7 @@ 'configure-setting-wgSpamRegex' => "Spam filter regular expressions", 'configure-setting-wgWhitelistRead' => "Pages anonymous user may see", 'configure-setting-wgEmailAuthentication' => "Require authentication of e-mail addresses for e-mail functions", - 'configure-setting-wgEmergencyContact' => "Site admin e-mail address", + 'configure-setting-wgEmergencyContact' => "Site administrator e-mail address", 'configure-setting-wgEnableEmail' => "Enable e-mail features", 'configure-setting-wgEnableUserEmail' => "Enable user-to-user e-mail", 'configure-setting-wgNoReplyAddress' => "Dummy address which should be accepted during e-mail send action", @@ -521,9 +521,9 @@ 'configure-setting-wgRC2UDPPort' => "Port for recent changes UDP notifications", 'configure-setting-wgRC2UDPPrefix' => "Prefix for lines sent to UDP for recent changes", 'configure-setting-wgBlockAllowsUTEdit' => "Allow a blocked user to edit his own talk page", - 'configure-setting-wgSysopEmailBans' => "Allow sysops to ban users from accessing [[Special:EmailUser]]", - 'configure-setting-wgSysopRangeBans' => "Allow sysops to ban IP ranges", - 'configure-setting-wgSysopUserBans' => "Allow sysops to ban logged-in users", + 'configure-setting-wgSysopEmailBans' => "Allow administrators to ban users from accessing [[Special:EmailUser]]", + 'configure-setting-wgSysopRangeBans' => "Allow administrators to ban IP ranges", + 'configure-setting-wgSysopUserBans' => "Allow administrators to ban logged-in users", 'configure-setting-wgEnotifFromEditor' => "E-mail notifications appear to be coming from the page editor (not from wiki server)", 'configure-setting-wgEnotifImpersonal' => "Send a generic e-mail instead of a personalised e-mail for each user", 'configure-setting-wgEnotifMaxRecips' => "Maximum number of users to e-mail at once when using impersonal e-mail", Modified: trunk/extensions/ConfirmAccount/ConfirmAccount.i18n.php =================================================================== --- trunk/extensions/ConfirmAccount/ConfirmAccount.i18n.php 2009-01-24 17:49:29 UTC (rev 46152) +++ trunk/extensions/ConfirmAccount/ConfirmAccount.i18n.php 2009-01-24 17:56:34 UTC (rev 46153) @@ -94,7 +94,7 @@ 'confirmaccount-list' => 'Below is a list of account requests awaiting approval. Once a request is either approved or rejected it will removed from this list.', 'confirmaccount-list2' => 'Below is a list recently rejected account requests which may automatically be deleted once several days old. -They can still be approved into accounts, though you may want to first consult the rejecting admin before doing so.', +They can still be approved into accounts, though you may want to first consult the rejecting administrator before doing so.', 'confirmaccount-list3' => 'Below is a list expired account requests which may automatically be deleted once several days old. They can still be approved into accounts.', 'confirmaccount-text' => 'This is a pending request for a user account at \'\'\'{{SITENAME}}\'\'\'. @@ -246,7 +246,7 @@ 'requestaccount-notes' => '{{Identical|Additional notes}}', 'requestaccount-submit' => '{{Identical|Request account}}', 'requestaccount-email-subj-admin' => '{{Identical|SITENAME account request}}', - 'requestaccount-email-body-admin' => 'This message is the email body text send to a site admin whenever someone has requested a new account. + 'requestaccount-email-body-admin' => 'This message is the e-mail body text send to a site administrator whenever someone has requested a new account. * $1: is a username * $2 is a URL', 'confirmedit-desc' => 'Short description of this extension, shown on [[Special:Version]]. Do not translate or change links.', Modified: trunk/extensions/DeletedContributions/DeletedContributions.i18n.php =================================================================== --- trunk/extensions/DeletedContributions/DeletedContributions.i18n.php 2009-01-24 17:49:29 UTC (rev 46152) +++ trunk/extensions/DeletedContributions/DeletedContributions.i18n.php 2009-01-24 17:56:34 UTC (rev 46153) @@ -9,7 +9,7 @@ $messages['en'] = array( 'deletedcontributions' => 'Deleted user contributions', - 'deletedcontributions-desc' => 'Gives sysops the ability to [[Special:DeletedContributions|browse deleted edits]] of a user', + 'deletedcontributions-desc' => 'Gives administrators the ability to [[Special:DeletedContributions|browse deleted edits]] of a user', ); /** Message documentation (Message documentation) Modified: trunk/extensions/DynamicPageList/DynamicPageList2.i18n.php =================================================================== --- trunk/extensions/DynamicPageList/DynamicPageList2.i18n.php 2009-01-24 17:49:29 UTC (rev 46152) +++ trunk/extensions/DynamicPageList/DynamicPageList2.i18n.php 2009-01-24 17:56:34 UTC (rev 46153) @@ -96,7 +96,7 @@ * $0: prefix_dpl_clview where 'prefix' is the prefix of your mediawiki table names * $1: SQL query to create the prefix_dpl_clview on your mediawiki DB */ - 'dpl2_log_' . self::FATAL_NOCLVIEW => "ERROR: Cannot perform logical operations on the Uncategorized pages (e.g. with the 'category' parameter) because the $0 view does not exist on the database! Help: have the DB admin execute this query: <code>$1</code>.", + 'dpl2_log_' . self::FATAL_NOCLVIEW => "ERROR: Cannot perform logical operations on the Uncategorized pages (f.e. with the 'category' parameter) because the $0 view does not exist on the database! Help: have the database administrator execute this query: <code>$1</code>.", 'dpl2_log_' . self::FATAL_OPENREFERENCES => 'ERROR: specifying "openreferences" is incompatible with some other option you specified. See the manual for details.', // WARN Modified: trunk/extensions/EmergencyDeSysop/EmergencyDeSysop.i18n.php =================================================================== --- trunk/extensions/EmergencyDeSysop/EmergencyDeSysop.i18n.php 2009-01-24 17:49:29 UTC (rev 46152) +++ trunk/extensions/EmergencyDeSysop/EmergencyDeSysop.i18n.php 2009-01-24 17:56:34 UTC (rev 46153) @@ -11,15 +11,15 @@ $messages['en'] = array( //About the Extension 'emergencydesysop' => 'Emergency DeSysop', - 'emergencydesysop-desc' => 'Allows a sysop to sacrifice their own privileges, in order to desysop another', + 'emergencydesysop-desc' => 'Allows an administrator to sacrifice own privileges in order to desysop another administrator', //Extension Messages - 'emergencydesysop-title' => 'Remove sysop access from both current user and another sysop', - 'emergencydesysop-otheradmin' => 'Other sysop to degroup', + 'emergencydesysop-title' => 'Remove administrator access from both current user and another administrator', + 'emergencydesysop-otheradmin' => 'Other administrator to degroup', 'emergencydesysop-reason' => 'Reason for removal', 'emergencydesysop-submit' => 'Submit', 'emergencydesysop-incomplete' => 'All form fields are required, please try again.', - 'emergencydesysop-notasysop' => 'The target user is not in the sysop group.', + 'emergencydesysop-notasysop' => 'The target user is not in the administrator group.', 'emergencydesysop-nogroups' => 'None', 'emergencydesysop-done' => 'Action complete, both you and [[$1]] have been desysopped.', 'emergencydesysop-invalidtarget' => 'The target user does not exist.', Modified: trunk/extensions/LiquidThreads/Lqt.i18n.php =================================================================== --- trunk/extensions/LiquidThreads/Lqt.i18n.php 2009-01-24 17:49:29 UTC (rev 46152) +++ trunk/extensions/LiquidThreads/Lqt.i18n.php 2009-01-24 17:56:34 UTC (rev 46153) @@ -63,7 +63,7 @@ 'lqt_noreason' => 'No reason given.', 'lqt_move_placeholder' => 'This thread is a placeholder indicating that a thread, $1, was removed from this page to another talk page. This move was made by $2 at $3.', - 'lqt_thread_deleted_for_sysops' => 'This thread has been $1 and is only visible to sysops.', + 'lqt_thread_deleted_for_sysops' => 'This thread has been $1 and is only visible to administrators.', 'lqt_thread_deleted_for_sysops_deleted' => 'deleted', // substituted above in bold 'lqt_thread_deleted' => 'This thread has been deleted.', 'lqt_summary_notice' => 'There have been no changes to this discussion for at least $2 days. Modified: trunk/extensions/Maintenance/Maintenance.i18n.php =================================================================== --- trunk/extensions/Maintenance/Maintenance.i18n.php 2009-01-24 17:49:29 UTC (rev 46152) +++ trunk/extensions/Maintenance/Maintenance.i18n.php 2009-01-24 17:56:34 UTC (rev 46153) @@ -25,7 +25,7 @@ Descriptions are next to each script', // script descriptions 'maintenance-changePassword-desc' => "Change a user's password", - 'maintenance-createAndPromote-desc' => 'Create a user and promote to sysop status', + 'maintenance-createAndPromote-desc' => 'Create a user and promote to administrator status', 'maintenance-deleteBatch-desc' => 'Mass-delete pages', 'maintenance-deleteRevision-desc' => 'Remove revisions from the database', 'maintenance-eval-desc' => 'Evaluate PHP code in the MediaWiki environment', @@ -40,7 +40,7 @@ // changePassword 'maintenance-changePassword' => "Use this form to change a user's password", // createAndPromote - 'maintenance-createAndPromote' => 'Use this form to create a new user and promote it to sysop. + 'maintenance-createAndPromote' => 'Use this form to create a new user and promote it to administrator. Check the bureaucrat box if you wish to promote to bureaucrat as well', // deleteBatch 'maintenance-deleteBatch' => 'Use this form to mass-delete pages. Modified: trunk/extensions/Makesysop/SpecialMakesysop.i18n.php =================================================================== --- trunk/extensions/Makesysop/SpecialMakesysop.i18n.php 2009-01-24 17:49:29 UTC (rev 46152) +++ trunk/extensions/Makesysop/SpecialMakesysop.i18n.php 2009-01-24 17:56:34 UTC (rev 46153) @@ -8,26 +8,26 @@ $messages = array(); $messages['en'] = array( - 'makesysoptitle' => 'Make a user into a sysop', - 'makesysop-desc' => 'Gives bureaucrats the ability to make users into sysops or bureaucrats', + 'makesysoptitle' => 'Make a user into an administrator', + 'makesysop-desc' => 'Gives bureaucrats the ability to make users into administrators or bureaucrats', 'makesysoptext' => 'This form is used by bureaucrats to turn ordinary users into administrators. Type the name of the user in the box and press the button to make the user an administrator.', 'makesysopname' => 'Name of the user:', - 'makesysopsubmit' => 'Make this user into a sysop', - 'makesysopok' => "<b>User \"$1\" is now a sysop</b>", + 'makesysopsubmit' => 'Make this user into an administrator', + 'makesysopok' => "<b>User \"$1\" is now an administrator</b>", 'makebureaucratok' => "<b>User \"$1\" is now a bureaucrat</b>", - 'makesysopfail' => "<b>User \"$1\" could not be made into a sysop. (Did you enter the name correctly?)</b>", + 'makesysopfail' => "<b>User \"$1\" could not be made into an administrator. (Did you enter the name correctly?)</b>", 'makesysop-see-userrights' => 'See [[Special:Userrights]] for more options.', 'setbureaucratflag' => 'Set bureaucrat flag', 'rights' => 'Rights:', 'set_user_rights' => 'Set user rights', 'set_rights_fail' => "<b>User rights for \"$1\" could not be set. (Did you enter the name correctly?)</b>", - 'makesysop' => 'Make a user into a sysop', + 'makesysop' => 'Make a user into an administrator', 'already_sysop' => 'This user is already an administrator', 'already_bureaucrat' => 'This user is already a bureaucrat', 'group-steward' => 'Stewards', 'group-steward-member' => 'Steward', 'grouppage-steward' => '{{ns:project}}:Stewards', - 'right-makesysop' => 'Make users into sysops or bureaucrats', + 'right-makesysop' => 'Make users into administrators or bureaucrats', ); $messages['af'] = array( Modified: trunk/extensions/Nuke/SpecialNuke.i18n.php =================================================================== --- trunk/extensions/Nuke/SpecialNuke.i18n.php 2009-01-24 17:49:29 UTC (rev 46152) +++ trunk/extensions/Nuke/SpecialNuke.i18n.php 2009-01-24 17:56:34 UTC (rev 46153) @@ -12,7 +12,7 @@ */ $messages['en'] = array( 'nuke' => 'Mass delete', - 'nuke-desc' => 'Gives sysops the ability to [[Special:Nuke|mass delete]] pages', + 'nuke-desc' => 'Gives administrators the ability to [[Special:Nuke|mass delete]] pages', 'nuke-nopages' => "No new pages by [[Special:Contributions/$1|$1]] in recent changes.", 'nuke-list' => "The following pages were recently created by [[Special:Contributions/$1|$1]]; put in a comment and hit the button to delete them.", Modified: trunk/extensions/Oversight/HideRevision.i18n.php =================================================================== --- trunk/extensions/Oversight/HideRevision.i18n.php 2009-01-24 17:49:29 UTC (rev 46152) +++ trunk/extensions/Oversight/HideRevision.i18n.php 2009-01-24 17:56:34 UTC (rev 46153) @@ -16,7 +16,7 @@ 'group-oversight-member' => 'oversight', 'grouppage-oversight' => '{{ns:project}}:Oversight', 'right-oversight' => 'View a previously hidden revision', - 'right-hiderevision' => 'Review and restore revisions hidden from sysops', + 'right-hiderevision' => 'Review and restore revisions hidden from administrators', // Empty form 'hiderevision-prompt' => 'Revision number to remove:', Modified: trunk/phase3/languages/messages/MessagesEn.php =================================================================== --- trunk/phase3/languages/messages/MessagesEn.php 2009-01-24 17:49:29 UTC (rev 46152) +++ trunk/phase3/languages/messages/MessagesEn.php 2009-01-24 17:56:34 UTC (rev 46153) @@ -6,7 +6,7 @@ * * Changes in this file will be lost during software upgrades. * You can make your customizations on the wiki. - * While logged in as a sysop user, go to [[Special:Allmessages]] + * While logged in as administrator, go to [[Special:Allmessages]] * and edit the MediaWiki:* pages listed there. */ @@ -1167,9 +1167,9 @@ You may wish to cut-n-paste the text into a text file and save it for later.</strong> The administrator who locked it offered this explanation: $1', -'protectedpagewarning' => '<strong>WARNING: This page has been locked so that only users with sysop privileges can edit it.</strong>', +'protectedpagewarning' => '<strong>WARNING: This page has been locked so that only users with administrator privileges can edit it.</strong>', 'semiprotectedpagewarning' => "'''Note:''' This page has been locked so that only registered users can edit it.", -'cascadeprotectedwarning' => "'''Warning:''' This page has been locked so that only users with sysop privileges can edit it, because it is included in the following cascade-protected {{PLURAL:$1|page|pages}}:", +'cascadeprotectedwarning' => "'''Warning:''' This page has been locked so that only users with administrator privileges can edit it, because it is included in the following cascade-protected {{PLURAL:$1|page|pages}}:", 'titleprotectedwarning' => '<strong>WARNING: This page has been locked so that only some users can create it.</strong>', 'templatesused' => 'Templates used on this page:', 'templatesusedpreview' => 'Templates used in this preview:', @@ -1297,8 +1297,8 @@ 'revdelete-hide-name' => 'Hide action and target', 'revdelete-hide-comment' => 'Hide edit comment', 'revdelete-hide-user' => "Hide editor's username/IP", -'revdelete-hide-restricted' => 'Apply these restrictions to Sysops and lock this interface', -'revdelete-suppress' => 'Suppress data from Sysops as well as others', +'revdelete-hide-restricted' => 'Apply these restrictions to administrators and lock this interface', +'revdelete-suppress' => 'Suppress data from administrators as well as others', 'revdelete-hide-image' => 'Hide file content', 'revdelete-unsuppress' => 'Remove restrictions on restored revisions', 'revdelete-log' => 'Log comment:', @@ -1313,8 +1313,8 @@ 'revdelete-content' => 'content', 'revdelete-summary' => 'edit summary', 'revdelete-uname' => 'username', -'revdelete-restricted' => 'applied restrictions to sysops', -'revdelete-unrestricted' => 'removed restrictions for sysops', +'revdelete-restricted' => 'applied restrictions to administrators', +'revdelete-unrestricted' => 'removed restrictions for administrators', 'revdelete-hid' => 'hid $1', 'revdelete-unhid' => 'unhid $1', 'revdelete-log-message' => '$1 for $2 {{PLURAL:$2|revision|revisions}}', @@ -1322,7 +1322,7 @@ # Suppression log 'suppressionlog' => 'Suppression log', -'suppressionlogtext' => 'Below is a list of deletions and blocks involving content hidden from sysops. +'suppressionlogtext' => 'Below is a list of deletions and blocks involving content hidden from administrators. See the [[Special:IPBlockList|IP block list]] for the list of currently operational bans and blocks.', # History merging @@ -1605,7 +1605,7 @@ 'group-user' => 'Users', 'group-autoconfirmed' => 'Autoconfirmed users', 'group-bot' => 'Bots', -'group-sysop' => 'Sysops', +'group-sysop' => 'Administrators', 'group-bureaucrat' => 'Bureaucrats', 'group-suppress' => 'Oversights', 'group-all' => '(all)', @@ -1613,7 +1613,7 @@ 'group-user-member' => 'User', 'group-autoconfirmed-member' => 'Autoconfirmed user', 'group-bot-member' => 'Bot', -'group-sysop-member' => 'Sysop', +'group-sysop-member' => 'Administrator', 'group-bureaucrat-member' => 'Bureaucrat', 'group-suppress-member' => 'Oversight', @@ -1653,7 +1653,7 @@ 'right-deletedhistory' => 'View deleted history entries, without their associated text', 'right-browsearchive' => 'Search deleted pages', 'right-undelete' => 'Undelete a page', -'right-suppressrevision' => 'Review and restore revisions hidden from Sysops', +'right-suppressrevision' => 'Review and restore revisions hidden from administrators', 'right-suppressionlog' => 'View private logs', 'right-block' => 'Block other users from editing', 'right-blockemail' => 'Block a user from sending email', @@ -2421,7 +2421,7 @@ 'protect-default' => '(default)', 'protect-fallback' => 'Require "$1" permission', 'protect-level-autoconfirmed' => 'Block unregistered users', -'protect-level-sysop' => 'Sysops only', +'protect-level-sysop' => 'Administrators only', 'protect-summary-cascade' => 'cascading', 'protect-expiring' => 'expires $1 (UTC)', 'protect-expiry-indefinite' => 'indefinite', @@ -2642,7 +2642,7 @@ 'block-log-flags-noemail' => 'e-mail blocked', 'block-log-flags-nousertalk' => 'cannot edit own talk page', 'block-log-flags-angry-autoblock' => 'enhanced autoblock enabled', -'range_block_disabled' => 'The sysop ability to create range blocks is disabled.', +'range_block_disabled' => 'The administrator ability to create range blocks is disabled.', 'ipb_expiry_invalid' => 'Expiry time invalid.', 'ipb_expiry_temp' => 'Hidden username blocks must be permanent.', 'ipb_already_blocked' => '"$1" is already blocked', _______________________________________________ MediaWiki-CVS mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
