Merge "Link to CREDITS file on message 'version-poweredby-others'"

diff --combined languages/messages/MessagesEn.php
index c7d1ed0,2a90fca..6a96c2d
--- 1/languages/messages/MessagesEn.php
--- 2/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@@ -1008,8 -1008,6 +1008,8 @@@ Please report this to an [[Special:List
  'cannotdelete'         => 'The page or file "$1" could not be deleted.
  It may have already been deleted by someone else.',
  'cannotdelete-title'   => 'Cannot delete page "$1"',
 +'delete-hook-aborted'  => 'Deletion aborted by hook.
 +It gave no explanation.',
  'badtitle'             => 'Bad title',
  'badtitletext'         => 'The requested page title was invalid, empty, or an incorrectly linked inter-language or inter-wiki title.
  It may contain one or more characters which cannot be used in titles.',
@@@ -1089,8 -1087,6 +1089,8 @@@ Do not forget to change your [[Special:
  Please choose a different name.',
  'loginerror'                 => 'Login error',
  'createaccounterror'         => 'Could not create account: $1',
 +'exception-nologin'          => 'Not logged in',
 +'exception-nologin-text'     => 'This page or action requires you to be logged in on this wiki.',
  'nocookiesnew'               => 'The user account was created, but you are not logged in.
  {{SITENAME}} uses cookies to log in users.
  You have cookies disabled.
@@@ -3200,8 -3196,8 +3200,8 @@@ See the [[Special:BlockList|block list]
  'expiringblock'                   => 'expires on $1 at $2',
  'anononlyblock'                   => 'anon. only',
  'noautoblockblock'                => 'autoblock disabled',
 -'createaccountblock'              => 'account creation blocked',
 -'emailblock'                      => 'e-mail blocked',
 +'createaccountblock'              => 'account creation disabled',
 +'emailblock'                      => 'e-mail disabled',
  'blocklist-nousertalk'            => 'cannot edit own talk page',
  'ipblocklist-empty'               => 'The block list is empty.',
  'ipblocklist-no-results'          => 'The requested IP address or username is not blocked.',
@@@ -3226,7 -3222,7 +3226,7 @@@ See the [[Special:BlockList|block list]
  'block-log-flags-anononly'        => 'anonymous users only',
  'block-log-flags-nocreate'        => 'account creation disabled',
  'block-log-flags-noautoblock'     => 'autoblock disabled',
 -'block-log-flags-noemail'         => 'e-mail blocked',
 +'block-log-flags-noemail'         => 'e-mail disabled',
  'block-log-flags-nousertalk'      => 'cannot edit own talk page',
  'block-log-flags-angry-autoblock' => 'enhanced autoblock enabled',
  'block-log-flags-hiddenname'      => 'username hidden',
@@@ -4639,7 -4635,7 +4639,7 @@@ You can also [[Special:EditWatchlist|us
  'version-svn-revision'          => '(r$2)', # only translate this message to other languages if you have to change it
  'version-license'               => 'License',
  'version-poweredby-credits'     => "This wiki is powered by '''[//www.mediawiki.org/ MediaWiki]''', copyright © 2001-$1 $2.",
- 'version-poweredby-others'      => 'others',
+ 'version-poweredby-others'      => '[{{SERVER}}{{SCRIPTPATH}}/CREDITS others]',
  'version-license-info'          => 'MediaWiki is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
  
  MediaWiki is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
@@@ -4844,8 -4840,6 +4844,8 @@@ Otherwise, you can use the easy form be
  'api-error-emptypage'                     => 'Creating new, empty pages is not allowed.',
  'api-error-fetchfileerror'                => 'Internal error: Something went wrong while fetching the file.',
  'api-error-file-too-large'                => 'The file you submitted was too large.',
 +'api-error-fileexists-forbidden'          => 'A file with name "$1" already exists, and cannot be overwritten.',
 +'api-error-fileexists-shared-forbidden'   => 'A file with name "$1" already exists in the shared file repository, and cannot be overwritten.',
  'api-error-filename-tooshort'             => 'The filename is too short.',
  'api-error-filetype-banned'               => 'This type of file is banned.',
  'api-error-filetype-missing'              => 'The filename is missing an extension.',