From: Siebrand Mazeland <siebrand@users.mediawiki.org>
Date: Sat, 31 Jan 2009 23:28:02 +0000 (+0000)
Subject: * (bug 17288) Improved messages for default language (English). Patch submitted by... 
X-Git-Tag: 1.31.0-rc.0~43090
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=41e5ad107c1ffbccdb9e644fb072d94488a70cd0;p=lhc%2Fweb%2Fwiklou.git

* (bug 17288) Improved messages for default language (English). Patch submitted by rememberthedot. Changes made by English language Wikipedia administrators.
* Note max. number of moved subpages in 'move-subpages' and 'move-talk-subpages'
* Register new messages
* Rebuild all language files
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 8944615cae..1cc3b40df9 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -147,13 +147,15 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 === Languages updated in 1.15 ===
 
 MediaWiki supports over 300 languages. Many localisations are updated
-regularly. Below only new and removed languages are listed.
+regularly. Below only new and removed languages are listed, as well as
+changes to languages because of MediaZilla reports.
 
 * Austrian German (de-at) (new)
 * Swiss Standard German (de-ch) (new)
 * Literary Chinese (lzh) (new)
 * Võro (vro) (renamed from fiu-vro)
 * (bug 17151) Add magic word alias for #redirect for Vietnamese
+* (bug 17288) Messages improved for default language (English)
 
 == Compatibility ==
 
diff --git a/includes/specials/SpecialMovepage.php b/includes/specials/SpecialMovepage.php
index acc27625dc..7e6f101eb8 100644
--- a/includes/specials/SpecialMovepage.php
+++ b/includes/specials/SpecialMovepage.php
@@ -235,14 +235,17 @@ class MovePageForm {
 
 		if( ($this->oldTitle->hasSubpages() || $this->oldTitle->getTalkPage()->hasSubpages())
 		&& $this->oldTitle->userCan( 'move-subpages' ) ) {
+			global $wgMaximumMovedPages;
+
 			$wgOut->addHTML( "
 				<tr>
 					<td></td>
 					<td class=\"mw-input\">" .
 				Xml::checkLabel( wfMsg(
-						$this->oldTitle->hasSubpages()
+						( $this->oldTitle->hasSubpages()
 						? 'move-subpages'
-						: 'move-talk-subpages'
+						: 'move-talk-subpages' ),
+						$wgMaximumMovedPages
 					),
 					'wpMovesubpages', 'wpMovesubpages',
 					# Don't check the box if we only have talk subpages to
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 71e77775e5..2071c6fc35 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -495,12 +495,12 @@ XHTML id names.
 'tog-hidepatrolled'           => 'Hide patrolled edits in recent changes',
 'tog-newpageshidepatrolled'   => 'Hide patrolled pages from new page list',
 'tog-extendwatchlist'         => 'Expand watchlist to show all applicable changes',
-'tog-usenewrc'                => 'Enhanced recent changes (JavaScript)',
+'tog-usenewrc'                => 'Enhanced recent changes (requires JavaScript)',
 'tog-numberheadings'          => 'Auto-number headings',
-'tog-showtoolbar'             => 'Show edit toolbar (JavaScript)',
-'tog-editondblclick'          => 'Edit pages on double click (JavaScript)',
+'tog-showtoolbar'             => 'Show edit toolbar (requires JavaScript)',
+'tog-editondblclick'          => 'Edit pages on double click (requires JavaScript)',
 'tog-editsection'             => 'Enable section editing via [edit] links',
-'tog-editsectiononrightclick' => 'Enable section editing by right clicking on section titles (JavaScript)',
+'tog-editsectiononrightclick' => 'Enable section editing by right clicking on section titles (requires JavaScript)',
 'tog-showtoc'                 => 'Show table of contents (for pages with more than 3 headings)',
 'tog-rememberpassword'        => 'Remember my login on this computer',
 'tog-editwidth'               => 'Edit box has full width',
@@ -521,7 +521,7 @@ XHTML id names.
 'tog-externaleditor'          => 'Use external editor by default (for experts only, needs special settings on your computer)',
 'tog-externaldiff'            => 'Use external diff by default (for experts only, needs special settings on your computer)',
 'tog-showjumplinks'           => 'Enable "jump to" accessibility links',
-'tog-uselivepreview'          => 'Use live preview (JavaScript) (Experimental)',
+'tog-uselivepreview'          => 'Use live preview (requires JavaScript) (Experimental)',
 'tog-forceeditsummary'        => 'Prompt me when entering a blank edit summary',
 'tog-watchlisthideown'        => 'Hide my edits from the watchlist',
 'tog-watchlisthidebots'       => 'Hide bot edits from the watchlist',
@@ -671,7 +671,7 @@ XHTML id names.
 'talkpagelinktext'  => 'Talk',
 'specialpage'       => 'Special Page',
 'personaltools'     => 'Personal tools',
-'postcomment'       => 'Post a comment',
+'postcomment'       => 'New section',
 'addsection'        => '+', # do not translate or duplicate this message to other languages
 'articlepage'       => 'View content page',
 'talk'              => 'Discussion',
@@ -679,7 +679,7 @@ XHTML id names.
 'toolbox'           => 'Toolbox',
 'userpage'          => 'View user page',
 'projectpage'       => 'View project page',
-'imagepage'         => 'View media page',
+'imagepage'         => 'View file page',
 'mediawikipage'     => 'View message page',
 'templatepage'      => 'View template page',
 'viewhelppage'      => 'View help page',
@@ -729,7 +729,7 @@ See [[Special:Version|version page]].',
 'ok'                           => 'OK',
 'sitetitle'                    => '{{SITENAME}}', # do not translate or duplicate this message to other languages
 'pagetitle'                    => '$1 - {{SITENAME}}', # only translate this message to other languages if you have to change it
-'pagetitle-view-mainpage'      => '', # do not translate or duplicate this message to other languages
+'pagetitle-view-mainpage'      => '{{SITENAME}}', # only translate this message to other languages if you have to change it
 'sitesubtitle'                 => '', # do not translate or duplicate this message to other languages
 'retrievedfrom'                => 'Retrieved from "$1"',
 'youhavenewmessages'           => 'You have $1 ($2).',
@@ -762,13 +762,13 @@ See [[Special:Version|version page]].',
 'sitenotice'                   => '-', # the equivalent to wgSiteNotice; do not translate or duplicate this message to other languages
 'anonnotice'                   => '-', # do not translate or duplicate this message to other languages
 'newsectionheaderdefaultlevel' => '== $1 ==', # do not translate or duplicate this message to other languages
-'red-link-title'               => '$1 (not yet written)',
+'red-link-title'               => '$1 (page does not exist)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Page',
 'nstab-user'      => 'User page',
 'nstab-media'     => 'Media page',
-'nstab-special'   => 'Special',
+'nstab-special'   => 'Special page',
 'nstab-project'   => 'Project page',
 'nstab-image'     => 'File',
 'nstab-mediawiki' => 'Message',
@@ -907,7 +907,7 @@ Please choose a different name.',
 'yournick'                   => 'Signature:',
 'badsig'                     => 'Invalid raw signature.
 Check HTML tags.',
-'badsiglength'               => 'The signature is too long.
+'badsiglength'               => 'Your signature is too long.
 It must be under $1 {{PLURAL:$1|character|characters}}.',
 'yourgender'                 => 'Gender:',
 'gender-unknown'             => 'Unspecified',
@@ -931,6 +931,7 @@ Please enable them and try again.',
 'loginsuccesstitle'          => 'Login successful',
 'loginsuccess'               => "'''You are now logged in to {{SITENAME}} as \"\$1\".'''",
 'nosuchuser'                 => 'There is no user by the name "$1".
+User names are case sensitive.
 Check your spelling, or [[Special:UserLogin/signup|create a new account]].',
 'nosuchusershort'            => 'There is no user by the name "<nowiki>$1</nowiki>".
 Check your spelling.',
@@ -964,12 +965,12 @@ To prevent abuse, only one password reminder will be sent per {{PLURAL:$1|hour|$
 'loginend'                   => '', # do not translate or duplicate this message to other languages
 'signupend'                  => '{{int:loginend}}', # do not translate or duplicate this message to other languages
 'mailerror'                  => 'Error sending mail: $1',
-'acct_creation_throttle_hit' => 'Sorry, you have already created {{PLURAL:$1|1 account|$1 accounts}}.
-You cannot make any more.',
+'acct_creation_throttle_hit' => 'Visitors to this wiki using your IP address have created {{PLURAL:$1|1 account|$1 accounts}} in the last day, which is the maximum allowed in this time period.
+As a result, visitors using this IP address cannot create any more accounts at the moment.',
 'emailauthenticated'         => 'Your e-mail address was authenticated on $2 at $3.',
 'emailnotauthenticated'      => 'Your e-mail address is not yet authenticated.
 No e-mail will be sent for any of the following features.',
-'noemailprefs'               => 'Specify an e-mail address for these features to work.',
+'noemailprefs'               => 'Specify an e-mail address in [[Special:Preferences|your preferences]] for these features to work.',
 'emailconfirmlink'           => 'Confirm your e-mail address',
 'invalidemailaddress'        => 'The e-mail address cannot be accepted as it appears to have an invalid format.
 Please enter a well-formatted address or empty that field.',
@@ -1096,7 +1097,9 @@ Since there is no section $1, there is no place to save your edit.',
 'loginreqlink'                     => 'log in',
 'loginreqpagetext'                 => 'You must $1 to view other pages.',
 'accmailtitle'                     => 'Password sent.',
-'accmailtext'                      => 'The password for "$1" has been sent to $2.',
+'accmailtext'                      => "A randomly generated password for [[User talk:$1|$1]] has been sent to $2.
+
+The password for this new account can be changed on the ''[[Special:Preferences|my preferences]]'' page upon logging in.",
 'newarticle'                       => '(New)',
 'newarticletext'                   => "You have followed a link to a page that does not exist yet.
 To create the page, start typing in the box below (see the [[{{MediaWiki:Helppage}}|help page]] for more info).
@@ -1125,8 +1128,8 @@ Please check if you want to create/edit this page.',
 Remember that custom .css and .js pages use a lowercase title, e.g. {{ns:user}}:Foo/monobook.css as opposed to {{ns:user}}:Foo/Monobook.css.",
 'updated'                          => '(Updated)',
 'note'                             => '<strong>Note:</strong>',
-'previewnote'                      => '<strong>This is only a preview;
-changes have not yet been saved!</strong>',
+'previewnote'                      => '<strong>Remember that this is only a preview.
+Your changes have not yet been saved!</strong>',
 'previewconflict'                  => 'This preview reflects the text in the upper text editing area as it will appear if you choose to save.',
 'session_fail_preview'             => '<strong>Sorry! We could not process your edit due to a loss of session data.
 Please try again.
@@ -1142,7 +1145,7 @@ The edit has been rejected to prevent corruption of the page text.
 This sometimes happens when you are using a buggy web-based anonymous proxy service.</strong>',
 'editing'                          => 'Editing $1',
 'editingsection'                   => 'Editing $1 (section)',
-'editingcomment'                   => 'Editing $1 (comment)',
+'editingcomment'                   => 'Editing $1 (new section)',
 'editconflict'                     => 'Edit conflict: $1',
 'explainconflict'                  => "Someone else has changed this page since you started editing it.
 The upper text area contains the page text as it currently exists.
@@ -1563,7 +1566,7 @@ please see math/README to configure.',
 'stub-threshold'            => 'Threshold for <a href="#" class="stub">stub link</a> formatting (bytes):',
 'recentchangesdays'         => 'Days to show in recent changes:',
 'recentchangesdays-max'     => '(maximum $1 {{PLURAL:$1|day|days}})',
-'recentchangescount'        => 'Number of edits to show in recent changes, history and log pages:',
+'recentchangescount'        => 'Number of edits to show in recent changes, page histories, and in logs, by default:',
 'savedprefs'                => 'Your preferences have been saved.',
 'timezonelegend'            => 'Time zone',
 'timezonetext'              => '¹The number of hours your local time differs from server time (UTC).',
@@ -1838,7 +1841,7 @@ If the checked file is the same image of original size it is not necessary to up
 'file-thumbnail-no'           => 'The filename begins with <strong><tt>$1</tt></strong>.
 It seems to be an image of reduced size <i>(thumbnail)</i>.
 If you have this image in full resolution upload this one, otherwise change the file name please.',
-'fileexists-forbidden'        => 'A file with this name exists already.
+'fileexists-forbidden'        => 'A file with this name already exists, and cannot be overwritten.
 If you still want to upload your file, please go back and use a new name. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'A file with this name exists already in the shared file repository.
 If you still want to upload your file, please go back and use a new name. [[File:$1|thumb|center|$1]]',
@@ -1938,7 +1941,7 @@ A click on a column header changes the sorting.',
 'filehist-dimensions'            => 'Dimensions',
 'filehist-filesize'              => 'File size',
 'filehist-comment'               => 'Comment',
-'imagelinks'                     => 'Links',
+'imagelinks'                     => 'File links',
 'linkstoimage'                   => 'The following {{PLURAL:$1|page links|$1 pages link}} to this file:',
 'linkstoimage-more'              => 'More than $1 {{PLURAL:$1|page links|pages link}} to this file.
 The following list shows the {{PLURAL:$1|first page link|first $1 page links}} to this file only.
@@ -1976,7 +1979,7 @@ A [[Special:WhatLinksHere/$2|full list]] is available.',
 'filedelete'                  => 'Delete $1',
 'filedelete-backlink'         => '← $1', # only translate this message to other languages if you have to change it
 'filedelete-legend'           => 'Delete file',
-'filedelete-intro'            => "You are deleting '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "You are about to delete the file '''[[Media:$1|$1]]''' along with all of its history.",
 'filedelete-intro-old'        => "You are deleting the version of '''[[Media:$1|$1]]''' as of [$4 $3, $2].",
 'filedelete-comment'          => 'Reason for deletion:',
 'filedelete-submit'           => 'Delete',
@@ -2033,7 +2036,7 @@ Remember to check for other links to the templates before deleting them.',
 'statistics-pages'             => 'Pages',
 'statistics-pages-desc'        => 'All pages in the wiki, including talk pages, redirects, etc.',
 'statistics-files'             => 'Uploaded files',
-'statistics-edits'             => 'Page edits since {{SITENAME}} was setup',
+'statistics-edits'             => 'Page edits since {{SITENAME}} was set up',
 'statistics-edits-average'     => 'Average edits per page',
 'statistics-views-total'       => 'Views total',
 'statistics-views-peredit'     => 'Views per edit',
@@ -2055,12 +2058,12 @@ A page is treated as disambiguation page if it uses a template which is linked f
 'doubleredirects-summary'    => '', # do not translate or duplicate this message to other languages
 'doubleredirectstext'        => 'This page lists pages which redirect to other redirect pages.
 Each row contains links to the first and second redirect, as well as the target of the second redirect, which is usually "real" target page, which the first redirect should point to.',
-'double-redirect-fixed-move' => '[[$1]] has been moved, it is now a redirect to [[$2]]',
+'double-redirect-fixed-move' => '[[$1]] has been moved. It now redirects to [[$2]].',
 'double-redirect-fixer'      => 'Redirect fixer',
 
 'brokenredirects'         => 'Broken redirects',
 'brokenredirects-summary' => '', # do not translate or duplicate this message to other languages
-'brokenredirectstext'     => 'The following redirects link to non-existent pages.',
+'brokenredirectstext'     => 'The following redirects link to non-existent pages:',
 'brokenredirects-edit'    => '(edit)',
 'brokenredirects-delete'  => '(delete)',
 
@@ -2115,7 +2118,7 @@ Each row contains links to the first and second redirect, as well as the target
 'mostimages-summary'              => '', # do not translate or duplicate this message to other languages
 'mostrevisions'                   => 'Pages with the most revisions',
 'mostrevisions-summary'           => '', # do not translate or duplicate this message to other languages
-'prefixindex'                     => 'Prefix index',
+'prefixindex'                     => 'All pages with prefix',
 'prefixindex-summary'             => '', # do not translate or duplicate this message to other languages
 'shortpages'                      => 'Short pages',
 'shortpages-summary'              => '', # do not translate or duplicate this message to other languages
@@ -2214,13 +2217,13 @@ Also see [[Special:WantedCategories|wanted categories]].',
 'deletedcontributions-title' => 'Deleted user contributions',
 
 # Special:LinkSearch
-'linksearch'       => 'Search web links',
+'linksearch'       => 'External links',
 'linksearch-pat'   => 'Search pattern:',
 'linksearch-ns'    => 'Namespace:',
 'linksearch-ok'    => 'Search',
 'linksearch-text'  => 'Wildcards such as "*.wikipedia.org" may be used.<br />
 Supported protocols: <tt>$1</tt>',
-'linksearch-line'  => '$1 linked from $2',
+'linksearch-line'  => '$1 is linked from $2',
 'linksearch-error' => 'Wildcards may appear only at the start of the hostname.',
 
 # Special:ListUsers
@@ -2233,8 +2236,8 @@ Supported protocols: <tt>$1</tt>',
 'newuserlogpagetext'          => 'This is a log of user creations.',
 'newuserlogentry'             => '', # do not translate or duplicate this message to other languages
 'newuserlog-byemail'          => 'password sent by e-mail',
-'newuserlog-create-entry'     => 'New user',
-'newuserlog-create2-entry'    => 'created account for $1',
+'newuserlog-create-entry'     => 'New user account',
+'newuserlog-create2-entry'    => 'created new account $1',
 'newuserlog-autocreate-entry' => 'Account created automatically',
 
 # Special:ListGroupRights
@@ -2375,7 +2378,7 @@ See $2 for a record of recent deletions.',
 ** Author request
 ** Copyright violation
 ** Vandalism',
-'delete-edit-reasonlist' => 'Edit delete reasons',
+'delete-edit-reasonlist' => 'Edit deletion reasons',
 'delete-toobig'          => 'This page has a large edit history, over $1 {{PLURAL:$1|revision|revisions}}.
 Deletion of such pages has been restricted to prevent accidental disruption of {{SITENAME}}.',
 'delete-warning-toobig'  => 'This page has a large edit history, over $1 {{PLURAL:$1|revision|revisions}}.
@@ -2393,7 +2396,7 @@ last contributor is only author of this page.',
 someone else has edited or rolled back the page already.
 
 The last edit to the page was by [[User:$3|$3]] ([[User talk:$3|Talk]] | [[Special:Contributions/$3|{{int:contribslink}}]]).',
-'editcomment'      => 'The edit comment was: "<i>$1</i>".', # only shown if there is an edit comment
+'editcomment'      => 'The edit summary was: "<i>$1</i>".', # only shown if there is an edit comment
 'revertpage'       => 'Reverted edits by [[Special:Contributions/$2|$2]] ([[User talk:$2|Talk]]) to last version by [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
 'rollback-success' => 'Reverted edits by $1;
 changed back to last version by $2.',
@@ -2427,9 +2430,9 @@ Here are the current settings for the page <strong>$1</strong>:',
 Here are the current settings for the page <strong>$1</strong>:',
 'protect-cascadeon'           => "This page is currently protected because it is included in the following {{PLURAL:$1|page, which has|pages, which have}} cascading protection turned on.
 You can change this page's protection level, but it will not affect the cascading protection.",
-'protect-default'             => '(default)',
+'protect-default'             => 'Allow all users',
 'protect-fallback'            => 'Require "$1" permission',
-'protect-level-autoconfirmed' => 'Block unregistered users',
+'protect-level-autoconfirmed' => 'Block new and unregistered users',
 'protect-level-sysop'         => 'Administrators only',
 'protect-summary-cascade'     => 'cascading',
 'protect-expiring'            => 'expires $1 (UTC)',
@@ -2555,7 +2558,7 @@ $1',
 'nolinkshere'              => "No pages link to '''[[:$1]]'''.",
 'nolinkshere-ns'           => "No pages link to '''[[:$1]]''' in the chosen namespace.",
 'isredirect'               => 'redirect page',
-'istemplate'               => 'inclusion',
+'istemplate'               => 'transclusion',
 'isimage'                  => 'image link',
 'whatlinkshere-prev'       => '{{PLURAL:$1|previous|previous $1}}',
 'whatlinkshere-next'       => '{{PLURAL:$1|next|next $1}}',
@@ -2610,7 +2613,7 @@ See [[Special:IPBlockList|IP block list]] to review blocks.',
 'ipb-blocklist-contribs'          => 'Contributions for $1',
 'unblockip'                       => 'Unblock user',
 'unblockiptext'                   => 'Use the form below to restore write access to a previously blocked IP address or username.',
-'ipusubmit'                       => 'Unblock this address',
+'ipusubmit'                       => 'Unblock this IP address',
 'unblocked'                       => '[[User:$1|$1]] has been unblocked',
 'unblocked-id'                    => 'Block $1 has been removed',
 'ipblocklist'                     => 'Blocked IP addresses and usernames',
@@ -2737,17 +2740,17 @@ Please choose another name.',
 Please merge them manually.'''",
 'movedto'                      => 'moved to',
 'movetalk'                     => 'Move associated talk page',
-'move-subpages'                => 'Move all subpages, if applicable',
-'move-talk-subpages'           => 'Move all subpages of talk page, if applicable',
+'move-subpages'                => 'Move subpages (up to $1), if applicable',
+'move-talk-subpages'           => 'Move subpages of talk page (up to $1), if applicable',
 'movepage-page-exists'         => 'The page $1 already exists and cannot be automatically overwritten.',
 'movepage-page-moved'          => 'The page $1 has been moved to $2.',
 'movepage-page-unmoved'        => 'The page $1 could not be moved to $2.',
 'movepage-max-pages'           => 'The maximum of $1 {{PLURAL:$1|page|pages}} has been moved and no more will be moved automatically.',
-'1movedto2'                    => '[[$1]] moved to [[$2]]',
-'1movedto2_redir'              => '[[$1]] moved to [[$2]] over redirect',
+'1movedto2'                    => 'moved [[$1]] to [[$2]]',
+'1movedto2_redir'              => 'moved [[$1]] to [[$2]] over redirect',
 'move-redirect-suppressed'     => 'redirect suppressed',
 'movelogpage'                  => 'Move log',
-'movelogpagetext'              => 'Below is a list of pages moved.',
+'movelogpagetext'              => 'Below is a list of all page moves.',
 'movereason'                   => 'Reason:',
 'revertmove'                   => 'revert',
 'delete_and_move'              => 'Delete and move',
@@ -2916,23 +2919,23 @@ A temporary folder is missing.',
 'accesskey-upload'                  => 's', # do not translate or duplicate this message to other languages
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'My user page',
+'tooltip-pt-userpage'             => 'Your user page',
 'tooltip-pt-anonuserpage'         => "The user page for the ip you're editing as",
-'tooltip-pt-mytalk'               => 'My talk page',
-'tooltip-pt-anontalk'             => 'Discussion about edits from this ip address',
-'tooltip-pt-preferences'          => 'My preferences',
-'tooltip-pt-watchlist'            => "The list of pages you're monitoring for changes",
-'tooltip-pt-mycontris'            => 'List of my contributions',
-'tooltip-pt-login'                => 'You are encouraged to log in, it is not mandatory however.',
-'tooltip-pt-anonlogin'            => 'You are encouraged to log in, it is not mandatory however.',
+'tooltip-pt-mytalk'               => 'Your talk page',
+'tooltip-pt-anontalk'             => 'Discussion about edits from this IP address',
+'tooltip-pt-preferences'          => 'Your preferences',
+'tooltip-pt-watchlist'            => 'The list of pages you are monitoring for changes',
+'tooltip-pt-mycontris'            => 'List of your contributions',
+'tooltip-pt-login'                => 'You are encouraged to log in; however, it is not mandatory',
+'tooltip-pt-anonlogin'            => 'You are encouraged to log in; however, it is not mandatory',
 'tooltip-pt-logout'               => 'Log out',
 'tooltip-ca-talk'                 => 'Discussion about the content page',
 'tooltip-ca-edit'                 => 'You can edit this page.
-Please use the preview button before saving.',
-'tooltip-ca-addsection'           => 'Add a comment to this discussion.',
+Please use the preview button before saving',
+'tooltip-ca-addsection'           => 'Start a new section',
 'tooltip-ca-viewsource'           => 'This page is protected.
-You can view its source.',
-'tooltip-ca-history'              => 'Past versions of this page.',
+You can view its source',
+'tooltip-ca-history'              => 'Past versions of this page',
 'tooltip-ca-protect'              => 'Protect this page',
 'tooltip-ca-delete'               => 'Delete this page',
 'tooltip-ca-undelete'             => 'Restore the edits done to this page before it was deleted',
@@ -2942,13 +2945,13 @@ You can view its source.',
 'tooltip-search'                  => 'Search {{SITENAME}}',
 'tooltip-search-go'               => 'Go to a page with this exact name if exists',
 'tooltip-search-fulltext'         => 'Search the pages for this text',
-'tooltip-p-logo'                  => 'Visit the Main Page',
-'tooltip-n-mainpage'              => 'Visit the Main Page',
+'tooltip-p-logo'                  => 'Visit the main page',
+'tooltip-n-mainpage'              => 'Visit the main page',
 'tooltip-n-portal'                => 'About the project, what you can do, where to find things',
 'tooltip-n-currentevents'         => 'Find background information on current events',
-'tooltip-n-recentchanges'         => 'The list of recent changes in the wiki.',
+'tooltip-n-recentchanges'         => 'The list of recent changes in the wiki',
 'tooltip-n-randompage'            => 'Load a random page',
-'tooltip-n-help'                  => 'The place to find out.',
+'tooltip-n-help'                  => 'The place to find out',
 'tooltip-t-whatlinkshere'         => 'List of all wiki pages that link here',
 'tooltip-t-recentchangeslinked'   => 'Recent changes in pages linked from this page',
 'tooltip-feed-rss'                => 'RSS feed for this page',
@@ -2972,14 +2975,14 @@ You can view its source.',
 'tooltip-minoredit'               => 'Mark this as a minor edit',
 'tooltip-save'                    => 'Save your changes',
 'tooltip-preview'                 => 'Preview your changes, please use this before saving!',
-'tooltip-diff'                    => 'Show which changes you made to the text.',
-'tooltip-compareselectedversions' => 'See the differences between the two selected versions of this page.',
+'tooltip-diff'                    => 'Show which changes you made to the text',
+'tooltip-compareselectedversions' => 'See the differences between the two selected versions of this page',
 'tooltip-watch'                   => 'Add this page to your watchlist',
 'tooltip-recreate'                => 'Recreate the page even though it has been deleted',
 'tooltip-upload'                  => 'Start upload',
-'tooltip-rollback'                => '"Rollback" reverts edit(s) to this page of the last contributor in one click.',
+'tooltip-rollback'                => '"Rollback" reverts edit(s) to this page of the last contributor in one click',
 'tooltip-undo'                    => '"Undo" reverts this edit and opens the edit form in preview mode.
-Allows adding a reason in the summary.',
+Allows adding a reason in the summary',
 
 # Stylesheets
 'common.css'      => '/* CSS placed here will be applied to all skins */', # only translate this message to other languages if you have to change it
@@ -3072,7 +3075,7 @@ This is probably caused by a link to a blacklisted external site.',
 'patrol-log-header'    => 'This is a log of patrolled revisions.',
 'patrol-log-line'      => 'marked $1 of $2 patrolled $3',
 'patrol-log-auto'      => '(automatic)',
-'patrol-log-diff'      => 'r$1', # only translate this message to other languages if you have to change it
+'patrol-log-diff'      => 'revision $1',
 'log-show-hide-patrol' => '$1 patrol log',
 
 # Image deletion
@@ -3100,7 +3103,7 @@ $1',
 'widthheight'          => '$1×$2', # only translate this message to other languages if you have to change it
 'widthheightpage'      => '$1×$2, $3 {{PLURAL:$3|page|pages}}',
 'file-info'            => '(file size: $1, MIME type: $2)',
-'file-info-size'       => '($1 × $2 pixel, file size: $3, MIME type: $4)',
+'file-info-size'       => '($1 × $2 pixels, file size: $3, MIME type: $4)',
 'file-nohires'         => '<small>No higher resolution available.</small>',
 'svg-long-desc'        => '(SVG file, nominally $1 × $2 pixels, file size: $3)',
 'show-big-image'       => 'Full resolution',
@@ -3588,10 +3591,10 @@ Please confirm that you really want to recreate this page.",
 'table_pager_empty'        => 'No results',
 
 # Auto-summaries
-'autosumm-blank'   => 'Removing all content from page',
-'autosumm-replace' => "Replacing page with '$1'",
-'autoredircomment' => 'Redirecting to [[$1]]',
-'autosumm-new'     => 'New page: $1',
+'autosumm-blank'   => 'Blanked the page',
+'autosumm-replace' => "Replaced content with '$1'",
+'autoredircomment' => 'Redirected page to [[$1]] ',
+'autosumm-new'     => "Created page with '$1'",
 
 # Autoblock whitelist
 'autoblock_whitelist' => 'AOL http://webmaster.info.aol.com/proxyinfo.html
@@ -3642,7 +3645,7 @@ Try normal preview.',
 'watchlistedit-normal-explain' => 'Titles on your watchlist are shown below.
 To remove a title, check the box next to it, and click Remove Titles.
 You can also [[Special:Watchlist/raw|edit the raw list]].',
-'watchlistedit-normal-submit'  => 'Remove Titles',
+'watchlistedit-normal-submit'  => 'Remove titles',
 'watchlistedit-normal-done'    => '{{PLURAL:$1|1 title was|$1 titles were}} removed from your watchlist:',
 'watchlistedit-raw-title'      => 'Edit raw watchlist',
 'watchlistedit-raw-legend'     => 'Edit raw watchlist',
@@ -3791,7 +3794,7 @@ Enter the filename without the "{{ns:file}}:" prefix.',
 
 # Special:BlankPage
 'blankpage'              => 'Blank page',
-'intentionallyblankpage' => 'This page is intentionally left blank',
+'intentionallyblankpage' => 'This page is intentionally left blank.',
 
 # External image whitelist
 'external_image_whitelist' => ' #Leave this line exactly as it is<pre>
@@ -3815,13 +3818,13 @@ Enter the filename without the "{{ns:file}}:" prefix.',
 'tags-edit'               => 'edit',
 'tags-hitcount'           => '$1 {{PLURAL:$1|change|changes}}',
 
-# Hardcoded dberror messages
-'dberr-header'   => 'This wiki has a problem',
-'dberr-problems' => 'Sorry! This site is experiencing technical difficulties.',
-'dberr-again'    => 'Try waiting a few minutes and reloading.',
-'dberr-info'     => '(Cannot contact the database server: $1)',
-
-'dberr-usegoogle' => 'You can try searching via Google in the meantime.',
-'dberr-outofdate' => 'Note that their indexes of our content may be out of date.',
+# Database error messages
+'dberr-header'      => 'This wiki has a problem',
+'dberr-problems'    => 'Sorry! This site is experiencing technical difficulties.',
+'dberr-again'       => 'Try waiting a few minutes and reloading.',
+'dberr-info'        => '(Cannot contact the database server: $1)',
+'dberr-usegoogle'   => 'You can try searching via Google in the meantime.',
+'dberr-outofdate'   => 'Note that their indexes of our content may be out of date.',
 'dberr-cachederror' => 'The following is a cached copy of the requested page, and may not be up to date.',
+
 );
diff --git a/languages/messages/MessagesFi.php b/languages/messages/MessagesFi.php
index 66c9a1b66c..21f7d1f3ff 100644
--- a/languages/messages/MessagesFi.php
+++ b/languages/messages/MessagesFi.php
@@ -2910,13 +2910,13 @@ Kirjoita tiedostonimi ilman ”{{ns:file}}:”-etuliitettä.',
 'tags-edit'     => 'muokkaa',
 'tags-hitcount' => '$1 {{PLURAL:$1|muutos|muutosta}}',
 
-'dberr-header'   => 'Wikissä on tietokantaongelma',
-'dberr-problems' => 'Tällä sivustolla on teknisiä ongelmia.',
-'dberr-again'    => 'Odota hetki ja lataa sivu uudelleen.',
-'dberr-info'     => '(Tietokantapalvelimeen yhdistäminen epäonnistui: $1)',
-
-'dberr-usegoogle' => 'Voit koittaa etsiä Googlesta kunnes virhe korjataan.',
-'dberr-outofdate' => 'Googlen indeksi ei välttämättä ole ajan tasalla.',
+# Database error messages
+'dberr-header'      => 'Wikissä on tietokantaongelma',
+'dberr-problems'    => 'Tällä sivustolla on teknisiä ongelmia.',
+'dberr-again'       => 'Odota hetki ja lataa sivu uudelleen.',
+'dberr-info'        => '(Tietokantapalvelimeen yhdistäminen epäonnistui: $1)',
+'dberr-usegoogle'   => 'Voit koittaa etsiä Googlesta kunnes virhe korjataan.',
+'dberr-outofdate'   => 'Googlen indeksi ei välttämättä ole ajan tasalla.',
 'dberr-cachederror' => 'Alla on välimuistissa oleva sivun version, joka ei välttämättä ole ajan tasalla.',
 
 );
diff --git a/languages/messages/MessagesYue.php b/languages/messages/MessagesYue.php
index 90f8262b61..feb7f795fc 100644
--- a/languages/messages/MessagesYue.php
+++ b/languages/messages/MessagesYue.php
@@ -2962,7 +2962,7 @@ $1
 #響呢行上面入晒全部嘅regex。留番呢行一樣嘅字</pre>',
 
 # Special:Tags
-'tags'			  => '有效更改過嘅標籤',
+'tags'                    => '有效更改過嘅標籤',
 'tag-filter'              => '[[Special:Tags|標籤]]過濾器:',
 'tag-filter-submit'       => '過濾器',
 'tags-title'              => '標籤',
diff --git a/languages/messages/MessagesZh_hans.php b/languages/messages/MessagesZh_hans.php
index d49a28f9e5..360e7a094c 100644
--- a/languages/messages/MessagesZh_hans.php
+++ b/languages/messages/MessagesZh_hans.php
@@ -2995,7 +2995,7 @@ $1
 #在这行上面输入所有的regex。留下这行一样的文字</pre>',
 
 # Special:Tags
-'tags'			  => '有效更改过的标签',
+'tags'                    => '有效更改过的标签',
 'tag-filter'              => '[[Special:Tags|标签]]过滤器:',
 'tag-filter-submit'       => '过滤器',
 'tags-title'              => '标签',
diff --git a/languages/messages/MessagesZh_hant.php b/languages/messages/MessagesZh_hant.php
index cf37941d4f..c4ef1943cb 100644
--- a/languages/messages/MessagesZh_hant.php
+++ b/languages/messages/MessagesZh_hant.php
@@ -2894,7 +2894,7 @@ $1
 #在這行上面輸入所有的regex。留下這行一樣的文字</pre>',
 
 # Special:Tags
-'tags'			  => '有效更改過的標籤',
+'tags'                    => '有效更改過的標籤',
 'tag-filter'              => '[[Special:Tags|標籤]]過濾器:',
 'tag-filter-submit'       => '過濾器',
 'tags-title'              => '標籤',
diff --git a/languages/messages/MessagesZh_tw.php b/languages/messages/MessagesZh_tw.php
index 820521c1de..aa471e2529 100644
--- a/languages/messages/MessagesZh_tw.php
+++ b/languages/messages/MessagesZh_tw.php
@@ -51,7 +51,7 @@ $messages = array(
 'tog-ccmeonemails'         => '當我寄電子郵件給其他使用者時，也寄一份複本到我的信箱。',
 
 # Categories related messages
-'subcategories'                 => '子分類',
+'subcategories' => '子分類',
 
 'mainpagetext'      => "<big>'''已成功安裝 MediaWiki!'''</big>",
 'mainpagedocfooter' => '請參閱 [http://meta.wikimedia.org/wiki/Help:Contents 使用者手冊] 以獲得使用此 wiki 軟體的訊息！
@@ -62,32 +62,31 @@ $messages = array(
 * [http://www.mediawiki.org/wiki/Manual:FAQ MediaWiki 常見問題解答]
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki 發佈郵件清單]',
 
-# Metadata in edit box
-'help'              => '使用說明',
-'search'            => '搜尋',
-'history'           => '修訂記錄',
-'userpage'          => '查看使用者頁面',
-'projectpage'       => '查看計畫頁面',
-'mediawikipage'     => '檢視使用者介面訊息',
-'lastmodifiedat'    => '本頁最後更動時間在 $1 $2。', # $1 date, $2 time
-'jumptosearch'      => '搜尋',
+'help'           => '使用說明',
+'search'         => '搜尋',
+'history'        => '修訂記錄',
+'userpage'       => '查看使用者頁面',
+'projectpage'    => '查看計畫頁面',
+'mediawikipage'  => '檢視使用者介面訊息',
+'lastmodifiedat' => '本頁最後更動時間在 $1 $2。', # $1 date, $2 time
+'jumptosearch'   => '搜尋',
 
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
-'copyright'            => '本站的文字內容除另有聲明外，全部以 $1 條款授權使用。',
-'edithelp'             => '編輯說明',
-'faq'                  => '常見問題解答',
-'faqpage'              => 'Project:常見問題解答',
-'helppage'             => 'Help:目錄',
-'portal'               => '社群入口',
-'portal-url'           => 'Project:社群入口',
+'copyright'  => '本站的文字內容除另有聲明外，全部以 $1 條款授權使用。',
+'edithelp'   => '編輯說明',
+'faq'        => '常見問題解答',
+'faqpage'    => 'Project:常見問題解答',
+'helppage'   => 'Help:目錄',
+'portal'     => '社群入口',
+'portal-url' => 'Project:社群入口',
 
 'badaccess-groups' => '您剛才的請求只有{{PLURAL:$2|這個|這些}}使用者組的使用者才能使用: $1',
 
-'thisisdeleted'           => '查看或復原$1?',
-'site-rss-feed'           => '訂閱 $1 的 RSS 資料來源',
-'site-atom-feed'          => '訂閱 $1 的 Atom 資料來源',
-'page-rss-feed'           => '訂閱「$1」的 RSS 資料來源',
-'page-atom-feed'          => '訂閱「$1」的 Atom 資料來源',
+'thisisdeleted'  => '查看或復原$1?',
+'site-rss-feed'  => '訂閱 $1 的 RSS 資料來源',
+'site-atom-feed' => '訂閱 $1 的 Atom 資料來源',
+'page-rss-feed'  => '訂閱「$1」的 RSS 資料來源',
+'page-atom-feed' => '訂閱「$1」的 Atom 資料來源',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-user'      => '使用者頁面',
@@ -97,47 +96,47 @@ $messages = array(
 'nstab-help'      => '說明頁面',
 
 # General errors
-'actionthrottledtext'  => '系統因為反垃圾編輯的考量，禁止如此頻繁地修改資料，請數分鐘後再嘗試。',
+'actionthrottledtext' => '系統因為反垃圾編輯的考量，禁止如此頻繁地修改資料，請數分鐘後再嘗試。',
 
 # Login and logout pages
-'logouttitle'                => '使用者退出',
-'logouttext'                 => '您現在已經退出。
+'logouttitle'             => '使用者退出',
+'logouttext'              => '您現在已經退出。
 您可以繼續以匿名方式使用{{SITENAME}}，或再次以相同或不同使用者身份登入。',
-'loginpagetitle'             => '使用者登入',
-'yourname'                   => '您的使用者名:',
-'externaldberror'            => '這可能是由於驗證資料庫錯誤或您被禁止更新您的外部帳號。',
-'login'                      => '登入',
-'nav-login-createaccount'    => '登入／建立新帳號',
-'userlogin'                  => '登入／建立新帳號',
-'nologin'                    => '您還沒有帳號嗎？$1。',
-'nologinlink'                => '建立新帳號',
-'createaccount'              => '建立新帳號',
-'gotaccount'                 => '已經擁有帳號？$1。',
-'username'                   => '使用者名:',
-'uid'                        => '使用者ID:',
-'yournick'                   => '暱稱:',
-'badsiglength'               => '暱稱過長；它的長度必須在$1個字元以下。',
-'prefs-help-realname'        => '真實姓名是選填的，如果您選擇提供它，那它便用以對您的貢獻署名。',
-'prefs-help-email'           => '電子郵件是選填的，但當啟用它後可以在您沒有公開自己的使用者身分時透過您的使用者頁或使用者討論頁與您聯繫。',
-'nocookiesnew'               => '已成功建立新帳戶！偵測到您已關閉 Cookies，請開啟它並登入。',
-'nocookieslogin'             => '本站利用 Cookies 進行使用者登入，偵測到您已關閉 Cookies，請開啟它並重新登入。',
-'noname'                     => '你沒有輸入一個有效的使用者帳號。',
-'nosuchuser'                 => '找不到使用者 "$1"。
+'loginpagetitle'          => '使用者登入',
+'yourname'                => '您的使用者名:',
+'externaldberror'         => '這可能是由於驗證資料庫錯誤或您被禁止更新您的外部帳號。',
+'login'                   => '登入',
+'nav-login-createaccount' => '登入／建立新帳號',
+'userlogin'               => '登入／建立新帳號',
+'nologin'                 => '您還沒有帳號嗎？$1。',
+'nologinlink'             => '建立新帳號',
+'createaccount'           => '建立新帳號',
+'gotaccount'              => '已經擁有帳號？$1。',
+'username'                => '使用者名:',
+'uid'                     => '使用者ID:',
+'yournick'                => '暱稱:',
+'badsiglength'            => '暱稱過長；它的長度必須在$1個字元以下。',
+'prefs-help-realname'     => '真實姓名是選填的，如果您選擇提供它，那它便用以對您的貢獻署名。',
+'prefs-help-email'        => '電子郵件是選填的，但當啟用它後可以在您沒有公開自己的使用者身分時透過您的使用者頁或使用者討論頁與您聯繫。',
+'nocookiesnew'            => '已成功建立新帳戶！偵測到您已關閉 Cookies，請開啟它並登入。',
+'nocookieslogin'          => '本站利用 Cookies 進行使用者登入，偵測到您已關閉 Cookies，請開啟它並重新登入。',
+'noname'                  => '你沒有輸入一個有效的使用者帳號。',
+'nosuchuser'              => '找不到使用者 "$1"。
 檢查您的拼寫，或者用下面的表格建立一個新帳號。',
-'nosuchusershort'            => '沒有一個名為「<nowiki>$1</nowiki>」的使用者。請檢查您輸入的文字是否有錯誤。',
-'nouserspecified'            => '你需要指定一個使用者帳號。',
-'passwordtooshort'           => '您的密碼不正確或太短，不能少於$1個字元，而且必須跟使用者名不同。',
-'noemail'                    => '使用者"$1"沒有登記電子郵件地址。',
-'passwordsent'               => '使用者"$1"的新密碼已經寄往所登記的電子郵件地址。
+'nosuchusershort'         => '沒有一個名為「<nowiki>$1</nowiki>」的使用者。請檢查您輸入的文字是否有錯誤。',
+'nouserspecified'         => '你需要指定一個使用者帳號。',
+'passwordtooshort'        => '您的密碼不正確或太短，不能少於$1個字元，而且必須跟使用者名不同。',
+'noemail'                 => '使用者"$1"沒有登記電子郵件地址。',
+'passwordsent'            => '使用者"$1"的新密碼已經寄往所登記的電子郵件地址。
 請在收到後再登入。',
-'blocked-mailpassword'       => '由於這個使用者被封鎖，我們暫時禁止您請求申請新密碼。造成不便敬請見諒',
-'eauthentsent'               => '一封確認信已經發送到所示的地址。在發送其它郵件到此帳號前，您必須首先依照這封信中的指導確認這個電子郵件信箱真實有效。',
-'emailconfirmlink'           => '確認您的電子郵件地址',
-'invalidemailaddress'        => '電子郵件地址格式不正確，請輸入正確的電子郵件地址或清空該輸入框。',
-'accountcreated'             => '已建立帳號',
-'accountcreatedtext'         => '$1的帳號已經被建立。',
-'createaccount-title'        => '在{{SITENAME}}中建立新帳號',
-'createaccount-text'         => '有人在{{SITENAME}}中為 $2 建立了一個新帳號($4)。 "$2" 的密碼是 "$3" 。您應該立即登入並更改密碼。
+'blocked-mailpassword'    => '由於這個使用者被封鎖，我們暫時禁止您請求申請新密碼。造成不便敬請見諒',
+'eauthentsent'            => '一封確認信已經發送到所示的地址。在發送其它郵件到此帳號前，您必須首先依照這封信中的指導確認這個電子郵件信箱真實有效。',
+'emailconfirmlink'        => '確認您的電子郵件地址',
+'invalidemailaddress'     => '電子郵件地址格式不正確，請輸入正確的電子郵件地址或清空該輸入框。',
+'accountcreated'          => '已建立帳號',
+'accountcreatedtext'      => '$1的帳號已經被建立。',
+'createaccount-title'     => '在{{SITENAME}}中建立新帳號',
+'createaccount-text'      => '有人在{{SITENAME}}中為 $2 建立了一個新帳號($4)。 "$2" 的密碼是 "$3" 。您應該立即登入並更改密碼。
 
 如果該帳號建立錯誤的話，您可以忽略此信息。',
 
@@ -165,9 +164,9 @@ $messages = array(
 當中被$3封鎖的原因是''$2''",
 
 # Revision feed
-'history-feed-title'          => '修訂沿革',
-'history-feed-description'    => '本站上此頁的修訂沿革',
-'history-feed-empty'          => '所請求的頁面不存在。它可能已被刪除或重新命名。
+'history-feed-title'       => '修訂沿革',
+'history-feed-description' => '本站上此頁的修訂沿革',
+'history-feed-empty'       => '所請求的頁面不存在。它可能已被刪除或重新命名。
 嘗試[[Special:Search|搜尋本站]]獲得相關的新建頁面。',
 
 # Revision deletion
@@ -179,29 +178,29 @@ $messages = array(
 'revdelete-hide-user'         => '隱藏編輯者的使用者名/IP',
 
 # History merging
-'mergehistory'         => '合併修訂記錄',
+'mergehistory' => '合併修訂記錄',
 
 # Merge log
-'mergelogpagetext'   => '以下是一個最近由一個頁面的修訂沿革合併到另一個頁面的列表。',
+'mergelogpagetext' => '以下是一個最近由一個頁面的修訂沿革合併到另一個頁面的列表。',
 
 # Diffs
-'history-title'           => '「$1」的修訂沿革',
+'history-title' => '「$1」的修訂沿革',
 
 # Search results
-'searchresults'         => '搜尋結果',
-'searchresulttext'      => '有關搜尋{{SITENAME}}的更多詳情,參見[[{{MediaWiki:Helppage}}|{{int:help}}]]。',
-'noexactmatch'          => "'''沒找到標題為\"\$1\"的頁面。''' 您可以[[:\$1|建立此頁面]]。",
+'searchresults'    => '搜尋結果',
+'searchresulttext' => '有關搜尋{{SITENAME}}的更多詳情,參見[[{{MediaWiki:Helppage}}|{{int:help}}]]。',
+'noexactmatch'     => "'''沒找到標題為\"\$1\"的頁面。''' 您可以[[:\$1|建立此頁面]]。",
 
 # Preferences page
-'preferences'              => '偏好設定',
-'mypreferences'            => '我的偏好設定',
-'prefs-personal'           => '使用者資料',
-'prefs-rc'                 => '近期變動',
-'recentchangesdays'        => '近期變動中的顯示日數:',
-'recentchangescount'       => '近期變動中的編輯數:',
-'savedprefs'               => '您的個人偏好設定已經保存。',
-'allowemail'               => '接受來自其他使用者的郵件',
-'defaultns'                => '預設搜尋的名字空間',
+'preferences'        => '偏好設定',
+'mypreferences'      => '我的偏好設定',
+'prefs-personal'     => '使用者資料',
+'prefs-rc'           => '近期變動',
+'recentchangesdays'  => '近期變動中的顯示日數:',
+'recentchangescount' => '近期變動中的編輯數:',
+'savedprefs'         => '您的個人偏好設定已經保存。',
+'allowemail'         => '接受來自其他使用者的郵件',
+'defaultns'          => '預設搜尋的名字空間',
 
 # User rights
 'userrights'               => '使用者權限管理', # Not used as normal message but as header for the special page itself
@@ -220,8 +219,8 @@ $messages = array(
 'grouppage-autoconfirmed' => '{{ns:project}}:自動確認使用者',
 
 # User rights log
-'rightslog'      => '使用者權限日誌',
-'rightslogtext'  => '以下記錄了使用者權限的更改記錄。',
+'rightslog'     => '使用者權限日誌',
+'rightslogtext' => '以下記錄了使用者權限的更改記錄。',
 
 # Recent changes
 'recentchanges'                     => '近期變動',
@@ -232,23 +231,23 @@ $messages = array(
 'number_of_watching_users_pageview' => '[$1個關注使用者]',
 
 # Recent changes linked
-'recentchangeslinked'          => '相關頁面修訂記錄',
-'recentchangeslinked-title'    => '$1 內連結頁面的修訂記錄',
-'recentchangeslinked-summary'  => "這一個特殊頁面列示這一頁連出頁面的近期變動。在您監視列表中的頁面會以'''粗體'''表示。",
+'recentchangeslinked'         => '相關頁面修訂記錄',
+'recentchangeslinked-title'   => '$1 內連結頁面的修訂記錄',
+'recentchangeslinked-summary' => "這一個特殊頁面列示這一頁連出頁面的近期變動。在您監視列表中的頁面會以'''粗體'''表示。",
 
 # Upload
-'fileexists-thumbnail-yes'    => '這個檔案好像是一幅圖片的縮圖版本<i>(縮圖)</i>。請檢查清楚該檔案<strong><tt>$1</tt></strong>。<br />
+'fileexists-thumbnail-yes' => '這個檔案好像是一幅圖片的縮圖版本<i>(縮圖)</i>。請檢查清楚該檔案<strong><tt>$1</tt></strong>。<br />
 如果檢查後的檔案是同原本圖片的大小是一樣的話，就不用再上載多一幅縮圖。',
 
-'upload-proto-error'      => '協訂錯誤',
+'upload-proto-error' => '協訂錯誤',
 
 # Special:ListFiles
-'listfiles_user'        => '使用者',
+'listfiles_user' => '使用者',
 
 # File description page
-'filehist-revert'           => '復原',
-'filehist-user'             => '使用者',
-'shareduploadwiki'          => '請參閱$1以了解其相關資訊。',
+'filehist-revert'  => '復原',
+'filehist-user'    => '使用者',
+'shareduploadwiki' => '請參閱$1以了解其相關資訊。',
 
 # File reversion
 'filerevert'                => '復原$1',
@@ -267,12 +266,12 @@ $messages = array(
 個頁面會被視為消含糊頁如果它是連自[[MediaWiki:Disambiguationspage]]。',
 
 # Miscellaneous special pages
-'popularpages'            => '熱門頁面',
-'listusers'               => '使用者列表',
-'newpages-username'       => '使用者帳號:',
+'popularpages'      => '熱門頁面',
+'listusers'         => '使用者列表',
+'newpages-username' => '使用者帳號:',
 
 # Special:Log
-'specialloguserlabel'  => '使用者:',
+'specialloguserlabel' => '使用者:',
 
 # Special:ListUsers
 'listusersfrom'      => '給定顯示使用者條件:',
@@ -290,17 +289,16 @@ $messages = array(
 'emailsent'       => '電子郵件已發送',
 
 # Watchlist
-'addedwatchtext'       => "頁面\"[[:\$1]]\"已經被加入到您的[[Special:Watchlist|監視清單]]中。
+'addedwatchtext' => "頁面\"[[:\$1]]\"已經被加入到您的[[Special:Watchlist|監視清單]]中。
 將來有關此頁面及其討論頁的任何修改將會在那裡列出，
 而且還會在[[Special:RecentChanges|近期變動]]中
 以'''粗體'''形式列出以使起更容易識別。",
 
-# Displayed when you click the "watch" button and it is in the process of watching
 'enotif_impersonal_salutation' => '{{SITENAME}}使用者',
 'enotif_anon_editor'           => '匿名使用者$1',
 
 # Delete
-'reverted'              => '復原到早期版本',
+'reverted' => '復原到早期版本',
 
 # Rollback
 'rollback'         => '復原',
@@ -316,18 +314,18 @@ $messages = array(
 'rollback-success' => '復原由$1的編輯；更改回$2的最後一個版本。',
 
 # Undelete
-'undelete'                     => '復原被刪頁面',
-'undeletepage'                 => '瀏覽及復原被刪頁面',
-'undeleteextrahelp'            => "復原整個頁面時，請清除所有複選框後按 '''''復原''''' 。 復原特定版本時，請選擇相應版本前的複選框後按'''''復原''''' 。按 '''''重設''''' 將清除評論內容及所有複選框。",
-'undeletehistory'              => '如果您復原了該頁面，所有版本都會被復原到修訂沿革中。
+'undelete'                 => '復原被刪頁面',
+'undeletepage'             => '瀏覽及復原被刪頁面',
+'undeleteextrahelp'        => "復原整個頁面時，請清除所有複選框後按 '''''復原''''' 。 復原特定版本時，請選擇相應版本前的複選框後按'''''復原''''' 。按 '''''重設''''' 將清除評論內容及所有複選框。",
+'undeletehistory'          => '如果您復原了該頁面，所有版本都會被復原到修訂沿革中。
 如果本頁刪除後有一個同名的新頁面建立，被復原的版本將會稱為較新的歷史。',
-'undeletebtn'                  => '復原',
-'undeletedarticle'             => '已經復原「$1」',
-'undeletedrevisions'           => '$1個修訂版本已經復原',
-'undeletedrevisions-files'     => '$1 個版本和 $2 個檔案被復原',
-'undeletedfiles'               => '$1 個檔案被復原',
-'cannotundelete'               => '復原失敗；可能之前已經被其他人復原。',
-'undeletedpage'                => "<big>'''$1已經被復原'''</big> 請參考[[Special:Log/delete|刪除日誌]]來查詢刪除及復原記錄。",
+'undeletebtn'              => '復原',
+'undeletedarticle'         => '已經復原「$1」',
+'undeletedrevisions'       => '$1個修訂版本已經復原',
+'undeletedrevisions-files' => '$1 個版本和 $2 個檔案被復原',
+'undeletedfiles'           => '$1 個檔案被復原',
+'cannotundelete'           => '復原失敗；可能之前已經被其他人復原。',
+'undeletedpage'            => "<big>'''$1已經被復原'''</big> 請參考[[Special:Log/delete|刪除日誌]]來查詢刪除及復原記錄。",
 
 # Contributions
 'contributions' => '使用者編修記錄',
@@ -375,7 +373,7 @@ $messages = array(
 'blockme'                     => '封鎖我',
 
 # Move page
-'movepagetext'            => "用下面的表單來重新命名一個頁面，並將其修訂沿革同時移動到新頁面。
+'movepagetext'  => "用下面的表單來重新命名一個頁面，並將其修訂沿革同時移動到新頁面。
 老的頁面將成為新頁面的重定向頁。
 連結到老頁面的連結並不會自動更改；
 請檢查雙重或損壞重定向連結。
@@ -389,50 +387,51 @@ $messages = array(
 <b>警告！</b>
 對一個經常被訪問的頁面而言這可能是一個重大與唐突的更改；
 請在行動前先了結其所可能帶來的後果。",
-'articleexists'           => '該名字的頁面已經存在，或者您選擇的名字無效。請再選一個名字。',
-'talkexists'              => '頁面本身移動成功，
+'articleexists' => '該名字的頁面已經存在，或者您選擇的名字無效。請再選一個名字。',
+'talkexists'    => '頁面本身移動成功，
 但是由於新標題下已經有對話頁存在，所以對話頁無法移動。請手工合併兩個頁面。',
 
 # Namespace 8 related
-'allmessages'               => '系統介面',
-'allmessagesname'           => '名稱',
-'allmessagesdefault'        => '預設的文字',
-'allmessagescurrent'        => '當前的文字',
+'allmessages'        => '系統介面',
+'allmessagesname'    => '名稱',
+'allmessagesdefault' => '預設的文字',
+'allmessagescurrent' => '當前的文字',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => '我的使用者頁',
-'tooltip-pt-anonuserpage'         => '您編輯本站所用IP的對應使用者頁',
-'tooltip-pt-preferences'          => '我的偏好設定',
-'tooltip-pt-mycontris'            => '我的編修記錄',
-'tooltip-ca-undelete'             => '將這個頁面復原到被刪除以前的狀態',
-'tooltip-t-contributions'         => '查看該使用者的編修記錄',
-'tooltip-t-emailuser'             => '向該使用者發送電子郵件',
-'tooltip-ca-nstab-help'           => '查看說明頁面',
-'tooltip-minoredit'               => '標記為細微修改',
+'tooltip-pt-userpage'     => '我的使用者頁',
+'tooltip-pt-anonuserpage' => '您編輯本站所用IP的對應使用者頁',
+'tooltip-pt-preferences'  => '我的偏好設定',
+'tooltip-pt-mycontris'    => '我的編修記錄',
+'tooltip-ca-undelete'     => '將這個頁面復原到被刪除以前的狀態',
+'tooltip-t-contributions' => '查看該使用者的編修記錄',
+'tooltip-t-emailuser'     => '向該使用者發送電子郵件',
+'tooltip-ca-nstab-help'   => '查看說明頁面',
+'tooltip-minoredit'       => '標記為細微修改',
 
 # Attribution
-'anonymous'        => '{{SITENAME}}的匿名{{PLURAL:$1|使用者|使用者}}',
-'siteuser'         => '{{SITENAME}}使用者$1',
-'siteusers'        => '{{SITENAME}}{{PLURAL:$2|使用者|使用者}}$1',
+'anonymous' => '{{SITENAME}}的匿名{{PLURAL:$1|使用者|使用者}}',
+'siteuser'  => '{{SITENAME}}使用者$1',
+'siteusers' => '{{SITENAME}}{{PLURAL:$2|使用者|使用者}}$1',
 
 # Patrol log
 'patrol-log-page' => '巡查記錄',
 'patrol-log-line' => '已經標示$1/$2版做已巡查的$3',
 
 # Special:NewFiles
-'newimages'     => '新建圖片畫廊',
+'newimages' => '新建圖片畫廊',
 
 # EXIF tags
-'exif-bitspersample'               => '每像素位元數',
-'exif-usercomment'                 => '使用者註釋',
-'exif-focalplanexresolution'       => 'X軸焦平面解析度',
-'exif-focalplaneyresolution'       => 'Y軸焦平面解析度',
+'exif-bitspersample'         => '每像素位元數',
+'exif-usercomment'           => '使用者註釋',
+'exif-focalplanexresolution' => 'X軸焦平面解析度',
+'exif-focalplaneyresolution' => 'Y軸焦平面解析度',
 
 # E-mail address confirmation
-'confirmemail'            => '確認電子郵件地址',
-'confirmemail_noemail'    => '您沒有在您的[[Special:Preferences|使用者設定]]裡面輸入一個有效的 email 位址。',
-'confirmemail_text'       => '此網站要求您在使用郵件功能之前驗證您的電子郵件地址。
+'confirmemail'         => '確認電子郵件地址',
+'confirmemail_noemail' => '您沒有在您的[[Special:Preferences|使用者設定]]裡面輸入一個有效的 email 位址。',
+'confirmemail_text'    => '此網站要求您在使用郵件功能之前驗證您的電子郵件地址。
 點擊以下按鈕可向您的郵箱發送一封確認郵件。該郵件包含有一行代碼連結；
 請在您的瀏覽器中加載此連結以確認您的電子郵件地址是有效的。',
-'confirmemail_pending'    => '一個確認代碼已經被發送到您的郵箱，您可能需要等幾分鐘才能收到。如果無法收到，請在申請一個新的確認碼！',
+'confirmemail_pending' => '一個確認代碼已經被發送到您的郵箱，您可能需要等幾分鐘才能收到。如果無法收到，請在申請一個新的確認碼！',
+
 );
diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc
index 1b95fe98e3..fef837b532 100644
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -153,7 +153,6 @@ $wgIgnoredMessages = array(
 	'unusedtemplates-summary',
 	'fewestrevisions-summary',
 	'upload-summary',
-	'pagetitle-view-mainpage',
 	'newuserlogentry',
 	'restrictlogpage',
 	'wantedtemplates-summary',
@@ -264,7 +263,6 @@ $wgOptionalMessages = array(
 	'pagetitle',
 	'filename-prefix-blacklist',
 	'edittools',
-	'patrol-log-diff',
 	'size-bytes',
 	'size-kilobytes',
 	'size-megabytes',
@@ -334,6 +332,7 @@ $wgOptionalMessages = array(
 	'whatlinkshere-backlink',
 	'recentchangeslinked-backlink',
 	'diff-with-additional',
+	'pagetitle-view-mainpage',
 );
 
 /** EXIF messages, which may be set as optional in several checks, but are generally mandatory */
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 02ec286f50..31b46848f6 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -2911,6 +2911,15 @@ $wgMessageStructure = array(
 		'tags-edit',
 		'tags-hitcount',
 	),
+	'db-error-messages' => array(
+		'dberr-header',
+		'dberr-problems',
+		'dberr-again',
+		'dberr-info',
+		'dberr-usegoogle',
+		'dberr-outofdate',
+		'dberr-cachederror',
+	),
 );
 
 /** Comments for each block */
@@ -3108,6 +3117,7 @@ Variants for Chinese language",
 	'special-blank'         => 'Special:BlankPage',
 	'external_images'       => 'External image whitelist',
 	'special-tags'          => 'Special:Tags',
+	'db-error-messages'     => 'Database error messages',
 );
 
 /** Short comments for standalone messages */