Merge "build: Lower default Karma logLevel during local development"

[lhc/web/wiklou.git] / languages / i18n / en-gb.json

diff --git a/languages/i18n/en-gb.json b/languages/i18n/en-gb.json
index f85d86e..188383b 100644 (file)
--- a/languages/i18n/en-gb.json
+++ b/languages/i18n/en-gb.json
@@ -196,7 +196,7 @@
        "history": "Page history",
        "history_short": "History",
        "history_small": "history",
-       "updatedmarker": "updated since my last visit",
+       "updatedmarker": "updated since your last visit",
        "printableversion": "Printable version",
        "permalink": "Permanent link",
        "print": "Print",
@@ -205,7 +205,6 @@
        "edit": "Edit",
        "edit-local": "Edit local description",
        "create": "Create",
-       "create-local": "Add local description",
        "delete": "Delete",
        "undelete_short": "Undelete {{PLURAL:$1|one edit|$1 edits}}",
        "viewdeleted_short": "View {{PLURAL:$1|one deleted edit|$1 deleted edits}}",
@@ -563,8 +562,6 @@
        "passwordreset-username": "Username:",
        "changeemail-none": "(none)",
        "resettokens-tokens": "Tokens:",
-       "bold_sample": "Bold text",
-       "italic_sample": "Italic text",
        "savearticle": "Save page",
        "anonpreviewwarning": "<em>You are not logged in. Saving will record your IP address in this page's edit history.</em>",
        "blockedtext": "<strong>Your username or IP address has been blocked.</strong>\n\nThe block was made by $1.\nThe reason given is <em>$2</em>.\n\n* Start of block: $8\n* Expiration of block: $6\n* Intended blockee: $7\n\nYou can contact $1 or another [[{{MediaWiki:Grouppage-sysop}}|administrator]] to discuss the block.\nYou cannot use the \"{{int:emailuser}}\" feature unless a valid e-mail address is specified in your [[Special:Preferences|account preferences]] and you have not been blocked from using it.\nYour current IP address is $3, and the block ID is #$5.\nPlease include all above details in any queries you make.",
@@ -658,8 +655,8 @@
        "blanknamespace": "(Main)",
        "whatlinkshere": "What links here",
        "blockiptext": "Use the form below to block write access from a specific IP address or username.\nThis should be done only to prevent vandalism, and in accordance with [[{{MediaWiki:Policy-url}}|policy]].\nFill in a specific reason below (for example, citing particular pages that were vandalised).\nYou can block IP address ranges using the [https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing CIDR] syntax; the largest allowed range is /$1 for IPv4 and /$2 for IPv6.",
-       "ipbexpiry": "Expiry:",
        "ipbreason-dropdown": "*Common block reasons\n** Inserting false information\n** Removing content from pages\n** Spamming links to external sites\n** Inserting nonsense/gibberish into pages\n** Intimidating behaviour/harassment\n** Abusing multiple accounts\n** Unacceptable username",
+       "block-expiry": "Expiry:",
        "blocklink": "block",
        "contribslink": "contribs",
        "blocklogentry": "blocked [[$1]] with an expiry time of $2 $3",