r46153 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r46152‎ | r46153 | r46154 >
Date:17:56, 24 January 2009
Author:siebrand
Status:resolved (Comments)
Tags:
Comment:
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 (modified) (history)
  • /trunk/extensions/CentralAuth/CentralAuth.i18n.php (modified) (history)
  • /trunk/extensions/Configure/Configure.settings.i18n.php (modified) (history)
  • /trunk/extensions/ConfirmAccount/ConfirmAccount.i18n.php (modified) (history)
  • /trunk/extensions/DeletedContributions/DeletedContributions.i18n.php (modified) (history)
  • /trunk/extensions/DynamicPageList/DynamicPageList2.i18n.php (modified) (history)
  • /trunk/extensions/EmergencyDeSysop/EmergencyDeSysop.i18n.php (modified) (history)
  • /trunk/extensions/LiquidThreads/Lqt.i18n.php (modified) (history)
  • /trunk/extensions/Maintenance/Maintenance.i18n.php (modified) (history)
  • /trunk/extensions/Makesysop/SpecialMakesysop.i18n.php (modified) (history)
  • /trunk/extensions/Nuke/SpecialNuke.i18n.php (modified) (history)
  • /trunk/extensions/Oversight/HideRevision.i18n.php (modified) (history)
  • /trunk/phase3/languages/messages/MessagesEn.php (modified) (history)

Diff [purge]

Index: trunk/phase3/languages/messages/MessagesEn.php
@@ -6,7 +6,7 @@
77 *
88 * Changes in this file will be lost during software upgrades.
99 * You can make your customizations on the wiki.
10 - * While logged in as a sysop user, go to [[Special:Allmessages]]
 10+ * While logged in as administrator, go to [[Special:Allmessages]]
1111 * and edit the MediaWiki:* pages listed there.
1212 */
1313
@@ -1167,9 +1167,9 @@
11681168 You may wish to cut-n-paste the text into a text file and save it for later.</strong>
11691169
11701170 The administrator who locked it offered this explanation: $1',
1171 -'protectedpagewarning' => '<strong>WARNING: This page has been locked so that only users with sysop privileges can edit it.</strong>',
 1171+'protectedpagewarning' => '<strong>WARNING: This page has been locked so that only users with administrator privileges can edit it.</strong>',
11721172 'semiprotectedpagewarning' => "'''Note:''' This page has been locked so that only registered users can edit it.",
1173 -'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}}:",
 1173+'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}}:",
11741174 'titleprotectedwarning' => '<strong>WARNING: This page has been locked so that only some users can create it.</strong>',
11751175 'templatesused' => 'Templates used on this page:',
11761176 'templatesusedpreview' => 'Templates used in this preview:',
@@ -1297,8 +1297,8 @@
12981298 'revdelete-hide-name' => 'Hide action and target',
12991299 'revdelete-hide-comment' => 'Hide edit comment',
13001300 'revdelete-hide-user' => "Hide editor's username/IP",
1301 -'revdelete-hide-restricted' => 'Apply these restrictions to Sysops and lock this interface',
1302 -'revdelete-suppress' => 'Suppress data from Sysops as well as others',
 1301+'revdelete-hide-restricted' => 'Apply these restrictions to administrators and lock this interface',
 1302+'revdelete-suppress' => 'Suppress data from administrators as well as others',
13031303 'revdelete-hide-image' => 'Hide file content',
13041304 'revdelete-unsuppress' => 'Remove restrictions on restored revisions',
13051305 'revdelete-log' => 'Log comment:',
@@ -1313,8 +1313,8 @@
13141314 'revdelete-content' => 'content',
13151315 'revdelete-summary' => 'edit summary',
13161316 'revdelete-uname' => 'username',
1317 -'revdelete-restricted' => 'applied restrictions to sysops',
1318 -'revdelete-unrestricted' => 'removed restrictions for sysops',
 1317+'revdelete-restricted' => 'applied restrictions to administrators',
 1318+'revdelete-unrestricted' => 'removed restrictions for administrators',
13191319 'revdelete-hid' => 'hid $1',
13201320 'revdelete-unhid' => 'unhid $1',
13211321 'revdelete-log-message' => '$1 for $2 {{PLURAL:$2|revision|revisions}}',
@@ -1322,7 +1322,7 @@
13231323
13241324 # Suppression log
13251325 'suppressionlog' => 'Suppression log',
1326 -'suppressionlogtext' => 'Below is a list of deletions and blocks involving content hidden from sysops.
 1326+'suppressionlogtext' => 'Below is a list of deletions and blocks involving content hidden from administrators.
13271327 See the [[Special:IPBlockList|IP block list]] for the list of currently operational bans and blocks.',
13281328
13291329 # History merging
@@ -1605,7 +1605,7 @@
16061606 'group-user' => 'Users',
16071607 'group-autoconfirmed' => 'Autoconfirmed users',
16081608 'group-bot' => 'Bots',
1609 -'group-sysop' => 'Sysops',
 1609+'group-sysop' => 'Administrators',
16101610 'group-bureaucrat' => 'Bureaucrats',
16111611 'group-suppress' => 'Oversights',
16121612 'group-all' => '(all)',
@@ -1613,7 +1613,7 @@
16141614 'group-user-member' => 'User',
16151615 'group-autoconfirmed-member' => 'Autoconfirmed user',
16161616 'group-bot-member' => 'Bot',
1617 -'group-sysop-member' => 'Sysop',
 1617+'group-sysop-member' => 'Administrator',
16181618 'group-bureaucrat-member' => 'Bureaucrat',
16191619 'group-suppress-member' => 'Oversight',
16201620
@@ -1653,7 +1653,7 @@
16541654 'right-deletedhistory' => 'View deleted history entries, without their associated text',
16551655 'right-browsearchive' => 'Search deleted pages',
16561656 'right-undelete' => 'Undelete a page',
1657 -'right-suppressrevision' => 'Review and restore revisions hidden from Sysops',
 1657+'right-suppressrevision' => 'Review and restore revisions hidden from administrators',
16581658 'right-suppressionlog' => 'View private logs',
16591659 'right-block' => 'Block other users from editing',
16601660 'right-blockemail' => 'Block a user from sending email',
@@ -2421,7 +2421,7 @@
24222422 'protect-default' => '(default)',
24232423 'protect-fallback' => 'Require "$1" permission',
24242424 'protect-level-autoconfirmed' => 'Block unregistered users',
2425 -'protect-level-sysop' => 'Sysops only',
 2425+'protect-level-sysop' => 'Administrators only',
24262426 'protect-summary-cascade' => 'cascading',
24272427 'protect-expiring' => 'expires $1 (UTC)',
24282428 'protect-expiry-indefinite' => 'indefinite',
@@ -2642,7 +2642,7 @@
26432643 'block-log-flags-noemail' => 'e-mail blocked',
26442644 'block-log-flags-nousertalk' => 'cannot edit own talk page',
26452645 'block-log-flags-angry-autoblock' => 'enhanced autoblock enabled',
2646 -'range_block_disabled' => 'The sysop ability to create range blocks is disabled.',
 2646+'range_block_disabled' => 'The administrator ability to create range blocks is disabled.',
26472647 'ipb_expiry_invalid' => 'Expiry time invalid.',
26482648 'ipb_expiry_temp' => 'Hidden username blocks must be permanent.',
26492649 'ipb_already_blocked' => '"$1" is already blocked',
Index: trunk/extensions/LiquidThreads/Lqt.i18n.php
@@ -63,7 +63,7 @@
6464 'lqt_noreason' => 'No reason given.',
6565 'lqt_move_placeholder' => 'This thread is a placeholder indicating that a thread, $1, was removed from this page to another talk page.
6666 This move was made by $2 at $3.',
67 - 'lqt_thread_deleted_for_sysops' => 'This thread has been $1 and is only visible to sysops.',
 67+ 'lqt_thread_deleted_for_sysops' => 'This thread has been $1 and is only visible to administrators.',
6868 'lqt_thread_deleted_for_sysops_deleted' => 'deleted', // substituted above in bold
6969 'lqt_thread_deleted' => 'This thread has been deleted.',
7070 'lqt_summary_notice' => 'There have been no changes to this discussion for at least $2 days.
Index: trunk/extensions/AbsenteeLandlord/AbsenteeLandlord.i18n.php
@@ -9,7 +9,7 @@
1010 $messages = array();
1111
1212 $messages['en'] = array(
13 - 'absenteelandlord-reason' => 'The database has been automatically locked due to inactivity from the sysops.',
 13+ 'absenteelandlord-reason' => 'The database has been automatically locked due to inactivity from the administrators.',
1414 'absenteelandlord-desc' => 'Auto-locks the wiki database if the sysops are all inactive for some time',
1515 );
1616
Index: trunk/extensions/Maintenance/Maintenance.i18n.php
@@ -25,7 +25,7 @@
2626 Descriptions are next to each script',
2727 // script descriptions
2828 'maintenance-changePassword-desc' => "Change a user's password",
29 - 'maintenance-createAndPromote-desc' => 'Create a user and promote to sysop status',
 29+ 'maintenance-createAndPromote-desc' => 'Create a user and promote to administrator status',
3030 'maintenance-deleteBatch-desc' => 'Mass-delete pages',
3131 'maintenance-deleteRevision-desc' => 'Remove revisions from the database',
3232 'maintenance-eval-desc' => 'Evaluate PHP code in the MediaWiki environment',
@@ -40,7 +40,7 @@
4141 // changePassword
4242 'maintenance-changePassword' => "Use this form to change a user's password",
4343 // createAndPromote
44 - 'maintenance-createAndPromote' => 'Use this form to create a new user and promote it to sysop.
 44+ 'maintenance-createAndPromote' => 'Use this form to create a new user and promote it to administrator.
4545 Check the bureaucrat box if you wish to promote to bureaucrat as well',
4646 // deleteBatch
4747 'maintenance-deleteBatch' => 'Use this form to mass-delete pages.
Index: trunk/extensions/EmergencyDeSysop/EmergencyDeSysop.i18n.php
@@ -11,15 +11,15 @@
1212 $messages['en'] = array(
1313 //About the Extension
1414 'emergencydesysop' => 'Emergency DeSysop',
15 - 'emergencydesysop-desc' => 'Allows a sysop to sacrifice their own privileges, in order to desysop another',
 15+ 'emergencydesysop-desc' => 'Allows an administrator to sacrifice own privileges in order to desysop another administrator',
1616
1717 //Extension Messages
18 - 'emergencydesysop-title' => 'Remove sysop access from both current user and another sysop',
19 - 'emergencydesysop-otheradmin' => 'Other sysop to degroup',
 18+ 'emergencydesysop-title' => 'Remove administrator access from both current user and another administrator',
 19+ 'emergencydesysop-otheradmin' => 'Other administrator to degroup',
2020 'emergencydesysop-reason' => 'Reason for removal',
2121 'emergencydesysop-submit' => 'Submit',
2222 'emergencydesysop-incomplete' => 'All form fields are required, please try again.',
23 - 'emergencydesysop-notasysop' => 'The target user is not in the sysop group.',
 23+ 'emergencydesysop-notasysop' => 'The target user is not in the administrator group.',
2424 'emergencydesysop-nogroups' => 'None',
2525 'emergencydesysop-done' => 'Action complete, both you and [[$1]] have been desysopped.',
2626 'emergencydesysop-invalidtarget' => 'The target user does not exist.',
Index: trunk/extensions/Makesysop/SpecialMakesysop.i18n.php
@@ -8,26 +8,26 @@
99 $messages = array();
1010
1111 $messages['en'] = array(
12 - 'makesysoptitle' => 'Make a user into a sysop',
13 - 'makesysop-desc' => 'Gives bureaucrats the ability to make users into sysops or bureaucrats',
 12+ 'makesysoptitle' => 'Make a user into an administrator',
 13+ 'makesysop-desc' => 'Gives bureaucrats the ability to make users into administrators or bureaucrats',
1414 '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.',
1515 'makesysopname' => 'Name of the user:',
16 - 'makesysopsubmit' => 'Make this user into a sysop',
17 - 'makesysopok' => "<b>User \"$1\" is now a sysop</b>",
 16+ 'makesysopsubmit' => 'Make this user into an administrator',
 17+ 'makesysopok' => "<b>User \"$1\" is now an administrator</b>",
1818 'makebureaucratok' => "<b>User \"$1\" is now a bureaucrat</b>",
19 - 'makesysopfail' => "<b>User \"$1\" could not be made into a sysop. (Did you enter the name correctly?)</b>",
 19+ 'makesysopfail' => "<b>User \"$1\" could not be made into an administrator. (Did you enter the name correctly?)</b>",
2020 'makesysop-see-userrights' => 'See [[Special:Userrights]] for more options.',
2121 'setbureaucratflag' => 'Set bureaucrat flag',
2222 'rights' => 'Rights:',
2323 'set_user_rights' => 'Set user rights',
2424 'set_rights_fail' => "<b>User rights for \"$1\" could not be set. (Did you enter the name correctly?)</b>",
25 - 'makesysop' => 'Make a user into a sysop',
 25+ 'makesysop' => 'Make a user into an administrator',
2626 'already_sysop' => 'This user is already an administrator',
2727 'already_bureaucrat' => 'This user is already a bureaucrat',
2828 'group-steward' => 'Stewards',
2929 'group-steward-member' => 'Steward',
3030 'grouppage-steward' => '{{ns:project}}:Stewards',
31 - 'right-makesysop' => 'Make users into sysops or bureaucrats',
 31+ 'right-makesysop' => 'Make users into administrators or bureaucrats',
3232 );
3333
3434 $messages['af'] = array(
Index: trunk/extensions/DynamicPageList/DynamicPageList2.i18n.php
@@ -96,7 +96,7 @@
9797 * $0: prefix_dpl_clview where 'prefix' is the prefix of your mediawiki table names
9898 * $1: SQL query to create the prefix_dpl_clview on your mediawiki DB
9999 */
100 - '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>.",
 100+ '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>.",
101101 'dpl2_log_' . self::FATAL_OPENREFERENCES => 'ERROR: specifying "openreferences" is incompatible with some other option you specified. See the manual for details.',
102102
103103 // WARN
Index: trunk/extensions/Oversight/HideRevision.i18n.php
@@ -16,7 +16,7 @@
1717 'group-oversight-member' => 'oversight',
1818 'grouppage-oversight' => '{{ns:project}}:Oversight',
1919 'right-oversight' => 'View a previously hidden revision',
20 - 'right-hiderevision' => 'Review and restore revisions hidden from sysops',
 20+ 'right-hiderevision' => 'Review and restore revisions hidden from administrators',
2121
2222 // Empty form
2323 'hiderevision-prompt' => 'Revision number to remove:',
Index: trunk/extensions/Configure/Configure.settings.i18n.php
@@ -172,7 +172,7 @@
173173 'configure-setting-wgSpamRegex' => "Spam filter regular expressions",
174174 'configure-setting-wgWhitelistRead' => "Pages anonymous user may see",
175175 'configure-setting-wgEmailAuthentication' => "Require authentication of e-mail addresses for e-mail functions",
176 - 'configure-setting-wgEmergencyContact' => "Site admin e-mail address",
 176+ 'configure-setting-wgEmergencyContact' => "Site administrator e-mail address",
177177 'configure-setting-wgEnableEmail' => "Enable e-mail features",
178178 'configure-setting-wgEnableUserEmail' => "Enable user-to-user e-mail",
179179 'configure-setting-wgNoReplyAddress' => "Dummy address which should be accepted during e-mail send action",
@@ -521,9 +521,9 @@
522522 'configure-setting-wgRC2UDPPort' => "Port for recent changes UDP notifications",
523523 'configure-setting-wgRC2UDPPrefix' => "Prefix for lines sent to UDP for recent changes",
524524 'configure-setting-wgBlockAllowsUTEdit' => "Allow a blocked user to edit his own talk page",
525 - 'configure-setting-wgSysopEmailBans' => "Allow sysops to ban users from accessing [[Special:EmailUser]]",
526 - 'configure-setting-wgSysopRangeBans' => "Allow sysops to ban IP ranges",
527 - 'configure-setting-wgSysopUserBans' => "Allow sysops to ban logged-in users",
 525+ 'configure-setting-wgSysopEmailBans' => "Allow administrators to ban users from accessing [[Special:EmailUser]]",
 526+ 'configure-setting-wgSysopRangeBans' => "Allow administrators to ban IP ranges",
 527+ 'configure-setting-wgSysopUserBans' => "Allow administrators to ban logged-in users",
528528 'configure-setting-wgEnotifFromEditor' => "E-mail notifications appear to be coming from the page editor (not from wiki server)",
529529 'configure-setting-wgEnotifImpersonal' => "Send a generic e-mail instead of a personalised e-mail for each user",
530530 'configure-setting-wgEnotifMaxRecips' => "Maximum number of users to e-mail at once when using impersonal e-mail",
Index: trunk/extensions/Nuke/SpecialNuke.i18n.php
@@ -12,7 +12,7 @@
1313 */
1414 $messages['en'] = array(
1515 'nuke' => 'Mass delete',
16 - 'nuke-desc' => 'Gives sysops the ability to [[Special:Nuke|mass delete]] pages',
 16+ 'nuke-desc' => 'Gives administrators the ability to [[Special:Nuke|mass delete]] pages',
1717 'nuke-nopages' => "No new pages by [[Special:Contributions/$1|$1]] in recent changes.",
1818 'nuke-list' => "The following pages were recently created by [[Special:Contributions/$1|$1]];
1919 put in a comment and hit the button to delete them.",
Index: trunk/extensions/ConfirmAccount/ConfirmAccount.i18n.php
@@ -94,7 +94,7 @@
9595 'confirmaccount-list' => 'Below is a list of account requests awaiting approval.
9696 Once a request is either approved or rejected it will removed from this list.',
9797 'confirmaccount-list2' => 'Below is a list recently rejected account requests which may automatically be deleted once several days old.
98 -They can still be approved into accounts, though you may want to first consult the rejecting admin before doing so.',
 98+They can still be approved into accounts, though you may want to first consult the rejecting administrator before doing so.',
9999 'confirmaccount-list3' => 'Below is a list expired account requests which may automatically be deleted once several days old.
100100 They can still be approved into accounts.',
101101 'confirmaccount-text' => 'This is a pending request for a user account at \'\'\'{{SITENAME}}\'\'\'.
@@ -246,7 +246,7 @@
247247 'requestaccount-notes' => '{{Identical|Additional notes}}',
248248 'requestaccount-submit' => '{{Identical|Request account}}',
249249 'requestaccount-email-subj-admin' => '{{Identical|SITENAME account request}}',
250 - 'requestaccount-email-body-admin' => 'This message is the email body text send to a site admin whenever someone has requested a new account.
 250+ 'requestaccount-email-body-admin' => 'This message is the e-mail body text send to a site administrator whenever someone has requested a new account.
251251 * $1: is a username
252252 * $2 is a URL',
253253 'confirmedit-desc' => 'Short description of this extension, shown on [[Special:Version]]. Do not translate or change links.',
Index: trunk/extensions/DeletedContributions/DeletedContributions.i18n.php
@@ -9,7 +9,7 @@
1010
1111 $messages['en'] = array(
1212 'deletedcontributions' => 'Deleted user contributions',
13 - 'deletedcontributions-desc' => 'Gives sysops the ability to [[Special:DeletedContributions|browse deleted edits]] of a user',
 13+ 'deletedcontributions-desc' => 'Gives administrators the ability to [[Special:DeletedContributions|browse deleted edits]] of a user',
1414 );
1515
1616 /** Message documentation (Message documentation)
Index: trunk/extensions/CentralAuth/CentralAuth.i18n.php
@@ -67,7 +67,7 @@
6868
6969 If this is you, you can finish the login unification process simply by typing the master password for that account here:',
7070 'centralauth-blocked-text' => 'Your home wiki (listed below) is blocked from editing.
71 -Please contact a sysop in this wiki to unblock it.
 71+Please contact an administrator in this wiki to unblock it.
7272 While it is blocked, you cannot merge your accounts.',
7373
7474 'centralauth-notice-dryrun' => "<div class='successbox'>Demo mode only</div><br clear='all'/>",

Follow-up revisions

RevisionCommit summaryAuthorDate
r46298Follow up to r46153 per http://www.mediawiki.org/wiki/Special:Code/MediaWiki/...siebrand23:23, 26 January 2009

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r45154* sysop -> administrator for consistency...siebrand10:02, 29 December 2008
r45249Revert r45154 "* sysop -> administrator for consistency"...brion20:30, 31 December 2008

Comments

#Comment by 😂 (talk | contribs)   18:59, 24 January 2009

I hardly think such a small thread on wikitech-l constitutes wide agreement on this in addition to wide announcement prior to change (both of which Brion mentioned in said thread). I for one prefer sysop, actually. It hardly makes any difference which way it's put, really. I guess I'm just partial to the name because that's the way it's always been.

#Comment by Brion VIBBER (talk | contribs)   23:12, 26 January 2009

Release notes!

#Comment by Siebrand (talk | contribs)   23:24, 26 January 2009

Done in r46298

Status & tagging log