Merge "ResourceLoaderLanguageDataModule: clean up"

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

diff --git a/languages/messages/MessagesEn_gb.php b/languages/messages/MessagesEn_gb.php
index 4e8bd4c..3928e70 100644 (file)
--- a/languages/messages/MessagesEn_gb.php
+++ b/languages/messages/MessagesEn_gb.php
@@ -7,19 +7,35 @@
  * @ingroup Language
  * @file
  *
+ * @author Dantman
+ * @author Fitoschido
+ * @author Hazard-SJ
  * @author Jon Harald Søby
+ * @author Reedy
+ * @author The Evil IP address
  */
 
 $specialPageAliases = array(
-       'Uncategorizedpages'        => array( 'UncategorisedPages' ),
        'Uncategorizedcategories'   => array( 'UncategorisedCategories' ),
-       'Uncategorizedimages'       => array( 'UncategorisedImages' ),
+       'Uncategorizedimages'       => array( 'UncategorisedFiles', 'UncategorisedImages' ),
+       'Uncategorizedpages'        => array( 'UncategorisedPages' ),
        'Uncategorizedtemplates'    => array( 'UncategorisedTemplates' ),
 );
 
 $messages = array(
-# Main script and global functions
-'nosuchactiontext' => 'The action specified by the URL is not recognised by the wiki',
+# User preference toggles
+'tog-watchcreations' => 'Add pages I create to my watchlist',
+'tog-watchdefault'   => 'Add pages I edit to my watchlist',
+'tog-watchmoves'     => 'Add pages I move to my watchlist',
+'tog-watchdeletion'  => 'Add pages I delete to my watchlist',
+
+# General errors
+'missing-article' => 'The database did not find the text of a page that it should have found, named ‘$1’ $2.
+
+This is usually caused by following an outdated diff or history link to a page that has been deleted.
+
+If this is not the case, you may have found a bug in the software.
+Please report this to an [[Special:ListUsers/sysop|administrator]], making note of the URL.',
 
 # Miscellaneous special pages
 'uncategorizedpages'      => 'Uncategorised pages',
@@ -30,7 +46,7 @@ $messages = array(
 # Edit tokens
 'sessionfailure' => 'There seems to be a problem with your login session;
 this action has been cancelled as a precaution against session hijacking.
-Please hit "back" and reload the page you came from, then try again.',
+Go back to the previous page, reload that page and then try again.',
 
 # Block/unblock
 'blockiptext' => 'Use the form below to block write access from a specific IP address or username.
@@ -44,6 +60,7 @@ If the file has been modified from its original state, some details may not full
 # EXIF tags
 'exif-ycbcrcoefficients'   => 'Colour space transformation matrix coefficients',
 'exif-colorspace'          => 'Colour space',
+'exif-datetimedigitized'   => 'Date and time of digitising',
 'exif-subsectimedigitized' => 'DateTimeDigitised subseconds',
 'exif-exposureprogram'     => 'Exposure programme',
 
@@ -59,10 +76,24 @@ If the file has been modified from its original state, some details may not full
 'exif-sensingmethod-5' => 'Colour sequential area sensor',
 'exif-sensingmethod-8' => 'Colour sequential linear sensor',
 
+# Pseudotags used for GPSAltitudeRef
+'exif-gpsaltitude-above-sealevel' => '$1 {{PLURAL:$1|metre|metres}} above sea level',
+'exif-gpsaltitude-below-sealevel' => '$1 {{PLURAL:$1|metre|metres}} below sea level',
+
 # Pseudotags used for GPSSpeedRef
 'exif-gpsspeed-k' => 'Kilometres per hour',
 
+# Pseudotags used for GPSDestDistanceRef
+'exif-gpsdestdistance-k' => 'Kilometres',
+
 # E-mail address confirmation
 'confirmemail_invalidated' => 'E-mail address confirmation cancelled',
 
+# Special:Version
+'version-license-info' => 'MediaWiki is free software; you can redistribute it and/or modify it under the terms of the GNU General Public Licence as published by the Free Software Foundation; either version 2 of the Licence, 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 Licence for more details.
+
+You should have received [{{SERVER}}{{SCRIPTPATH}}/COPYING a copy of the GNU General Public Licence] along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA or [//www.gnu.org/licenses/old-licenses/gpl-2.0.html read it online].',
+
 );