Merge "(Bug 38439) Attempt on fixing the suicidal LangObjCache"

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

diff --git a/languages/messages/MessagesEn_gb.php b/languages/messages/MessagesEn_gb.php
index a219131..c38fd29 100644 (file)
--- a/languages/messages/MessagesEn_gb.php
+++ b/languages/messages/MessagesEn_gb.php
@@ -25,23 +25,56 @@ $specialPageAliases = array(
 $messages = array(
 # 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',
+'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',
+'tog-showjumplinks' => 'Enable ‘jump to’ accessibility links',
+
+# Categories related messages
+'category_header' => 'Pages in category ‘$1’',
+'category-media-header' => 'Media in category ‘$1’',
+
+'retrievedfrom' => 'Retrieved from ‘$1’',
+'page-rss-feed' => '‘$1’ RSS feed',
+'page-atom-feed' => '‘$1’ Atom feed',
 
 # General errors
+'dberrortext' => 'A database query syntax error has occurred.
+This may indicate a bug in the software.
+The last attempted database query was:
+<blockquote><tt>$1</tt></blockquote>
+from within function ‘<tt>$2</tt>.’
+Database returned error ‘<tt>$3: $4</tt>.’',
+'dberrortextcl' => 'A database query syntax error has occurred.
+The last attempted database query was:
+‘$1’
+from within function ‘$2.’
+Database returned error ‘$3: $4’',
 '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.',
+'fileappenderrorread' => 'Could not read ‘$1’ during append.',
+'fileappenderror' => 'Could not append ‘$1’ to ‘$2.’',
+'filecopyerror' => 'Could not copy file ‘$1’ to ‘$2.’',
+'filerenameerror' => 'Could not rename file ‘$1’ to ‘$2.’',
+'filedeleteerror' => 'Could not delete file ‘$1’.',
+'directorycreateerror' => 'Could not create directory ‘$1’.',
+'filenotfound' => 'Could not find file ‘$1’.',
+'fileexistserror' => 'Unable to write to file ‘$1’: file exists',
+'unexpected' => 'Unexpected value: ‘$1’=‘$2’.',
+'cannotdelete' => 'The page or file ‘$1’ could not be deleted.
+It may have already been deleted by someone else.',
+'cascadeprotected' => 'This page has been protected from editing, because it is included in the following {{PLURAL:$1|page, which is|pages, which are}} protected with the ‘cascading’ option turned on:
+$2',
 
 # Miscellaneous special pages
-'uncategorizedpages'      => 'Uncategorised pages',
+'uncategorizedpages' => 'Uncategorised pages',
 'uncategorizedcategories' => 'Uncategorised categories',
-'uncategorizedimages'     => 'Uncategorised files',
-'uncategorizedtemplates'  => 'Uncategorised templates',
+'uncategorizedimages' => 'Uncategorised files',
+'uncategorizedtemplates' => 'Uncategorised templates',
 
 # Edit tokens
 'sessionfailure' => 'There seems to be a problem with your login session;
@@ -58,11 +91,11 @@ Fill in a specific reason below (for example, citing particular pages that were
 If the file has been modified from its original state, some details may not fully reflect the modified file.',
 
 # EXIF tags
-'exif-ycbcrcoefficients'   => 'Colour space transformation matrix coefficients',
-'exif-colorspace'          => 'Colour space',
-'exif-datetimedigitized'   => 'Date and time of digitising',
+'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',
+'exif-exposureprogram' => 'Exposure programme',
 
 'exif-exposureprogram-2' => 'Normal programme',
 'exif-exposureprogram-5' => 'Creative programme (biased toward depth of field)',
@@ -94,6 +127,6 @@ If the file has been modified from its original state, some details may not full
 
 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 [http://www.gnu.org/licenses/old-licenses/gpl-2.0.html read it online].',
+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].',
 
 );