In Special:Protectedpages and Special:Protectedtitles, show protection expiry times...

[lhc/web/wiklou.git] / languages / messages / MessagesEn.php

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index e469e98..a0cc914 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1145,7 +1145,8 @@ Please wait before trying again.',
 # E-mail sending
 'pear-mail-error'        => '$1', # do not translate or duplicate this message to other languages
 'php-mail-error'         => '$1', # do not translate or duplicate this message to other languages
-'php-mail-error-unknown' => "Unknown error in PHP's mail() function",
+'php-mail-error-unknown' => "Unknown error in PHP's mail() function.",
+'user-mail-no-addy'      => 'Tried to send e-mail without an e-mail address.',
 
 # Change password dialog
 'resetpass'                 => 'Change password',
@@ -2874,6 +2875,7 @@ You can change this page's protection level, but it will not affect the cascadin
 'protect-level-sysop'         => 'Administrators only',
 'protect-summary-cascade'     => 'cascading',
 'protect-expiring'            => 'expires $1 (UTC)',
+'protect-expiring-local'      => 'expires $1',
 'protect-expiry-indefinite'   => 'indefinite',
 'protect-cascade'             => 'Protect pages included in this page (cascading protection)',
 'protect-cantedit'            => 'You cannot change the protection levels of this page, because you do not have permission to edit it.',
@@ -4122,7 +4124,7 @@ $8', # only translate this message to other languages if you have to change it
 'exif-gpsspeed-n' => 'Knots',
 
 # Pseudotags used for GPSDestDistanceRef
-'exif-gpsdestdistance-k' => 'Kilometres',
+'exif-gpsdestdistance-k' => 'Kilometers',
 'exif-gpsdestdistance-m' => 'Miles',
 'exif-gpsdestdistance-n' => 'Nautical miles',
 
@@ -4566,13 +4568,16 @@ Enter the file name without the "{{ns:file}}:" prefix.',
 'tags-hitcount'           => '$1 {{PLURAL:$1|change|changes}}',
 
 # Special:ComparePages
-'comparepages'     => 'Compare pages',
-'compare-selector' => 'Compare page revisions',
-'compare-page1'    => 'Page 1',
-'compare-page2'    => 'Page 2',
-'compare-rev1'     => 'Revision 1',
-'compare-rev2'     => 'Revision 2',
-'compare-submit'   => 'Compare',
+'comparepages'                => 'Compare pages',
+'compare-selector'            => 'Compare page revisions',
+'compare-page1'               => 'Page 1',
+'compare-page2'               => 'Page 2',
+'compare-rev1'                => 'Revision 1',
+'compare-rev2'                => 'Revision 2',
+'compare-submit'              => 'Compare',
+'compare-invalid-title'       => 'The title you specified is invalid.',
+'compare-title-not-exists'    => 'The title you specified does not exist.',
+'compare-revision-not-exists' => 'The revision you specified does not exist.',
 
 # Database error messages
 'dberr-header'      => 'This wiki has a problem',
@@ -4607,24 +4612,21 @@ This site is experiencing technical difficulties.',
 'ajax-add-category-submit'      => 'Add',
 'ajax-confirm-ok'               => 'OK',
 'ajax-confirm-title'            => 'Confirm action',
-'ajax-confirm-prompt'           => 'You can provide an edit summary below.
-Click "Save" to save your edit.',
 'ajax-confirm-save'             => 'Save',
 'ajax-confirm-save-all'         => 'Save all changes',
-'ajax-cancel'                   => 'Cancel edits',
+'ajax-cancel'                   => 'Cancel edit',
+'ajax-cancel-all'               => 'Cancel all changes',
 'ajax-add-category-summary'     => 'Add category "$1"',
 'ajax-edit-category-summary'    => 'Change category "$1" to "$2"',
 'ajax-remove-category-summary'  => 'Remove category "$1"',
-'ajax-add-category-question'    => 'Why do you want to add category "$1"?',
-'ajax-edit-category-question'   => 'Why do you want to change category "$1" to "$2"?',
-'ajax-remove-category-question' => 'Why do you want to remove category "$1"?',
-'ajax-confirm-actionsummary'    => 'Action to take:',
+'ajax-category-question'        => 'Why do you want to make the following changes:',
 'ajax-error-title'              => 'Error',
-'ajax-error-dismiss'            => 'OK',
-'ajax-remove-category-error'    => 'It was not possible to remove this category.
+'ajax-remove-category-error'    => 'It was not possible to remove category "$1".
 This usually occurs when the category has been added to the page in a template.',
-'ajax-edit-category-error'      => 'It was not possible to edit this category.
+'ajax-edit-category-error'      => 'It was not possible to edit category "$1".
 This usually occurs when the category has been added to the page in a template.',
-'ajax-category-already-present' => 'This page already belongs to the category $1',
+'ajax-category-already-present' => 'This page already belongs to the category "$1"',
+'ajax-category-hook-error'      => 'A local function prevented the changes from being saved.',
+'ajax-api-error'                => 'The API returned an error: $1: $2.',
 
 );