Merge commit 'f6d65'

# Conflicts:
#	skins/ArchLinux/ArchLinux.php

1 files changed, 8 insertions, 0 deletions

diff --git a/extensions/ConfirmEdit/i18n/en-gb.json b/extensions/ConfirmEdit/i18n/en-gb.json
new file mode 100644
index 00000000..83c1f0eb
--- /dev/null
+++ b/extensions/ConfirmEdit/i18n/en-gb.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"Lcawte"
+		]
+	},
+	"captchahelp-text": "Web sites that accept postings from the public, like this wiki, are often abused by spammers who use automated tools to post their links to many sites.\nWhile these spam links can be removed, they are a significant nuisance.\n\nSometimes, especially when adding new web links to a page, the wiki may show you an image of coloured or distorted text and ask you to type the words shown.\nSince this is a task that's hard to automate, it will allow most real humans to make their posts while stopping most spammers and other robotic attackers.\n\nUnfortunately this may inconvenience users with limited vision or using text-based or speech-based browsers.\nAt the moment we do not have an audio alternative available.\nPlease contact the  [[Special:ListAdmins|site administrators]] for assistance if this is unexpectedly preventing you from making legitimate posts.\n\nHit the 'back' button in your browser to return to the page editor."
+}