Merge "Remove "transwiki import" jargon term"

diff --combined languages/i18n/en.json
index c62ef4b,7980d95..96e3e3e
--- 1/languages/i18n/en.json
--- 2/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@@ -1612,7 -1612,7 +1612,7 @@@
        "wantedcategories": "Wanted categories",
        "wantedcategories-summary": "",
        "wantedpages": "Wanted pages",
 -      "wantedpages-summary": "",
 +      "wantedpages-summary": "List of non-existing pages with the most links to them, excluding pages which only have redirects linking to them. For a list of non-existent pages that have redirects linking to them, see [[{{#special:BrokenRedirects}}]].",
        "wantedpages-badtitle": "Invalid title in result set: $1",
        "wantedfiles": "Wanted files",
        "wantedfiles-summary": "",
@@@ -2293,8 -2293,8 +2293,8 @@@
        "thumbnail_image-failure-limit": "There have been too many recent failed attempts ($1 or more) to render this thumbnail. Please try again later.",
        "import": "Import pages",
        "import-summary": "",
-       "importinterwiki": "Transwiki import",
-       "import-interwiki-text": "Select a wiki and page title to import.\nRevision dates and editors' names will be preserved.\nAll transwiki import actions are logged at the [[Special:Log/import|import log]].",
+       "importinterwiki": "Import from another wiki",
+       "import-interwiki-text": "Select a wiki and page title to import.\nRevision dates and editors' names will be preserved.\nAll imports from other wikis are logged at the [[Special:Log/import|import log]].",
        "import-interwiki-sourcewiki": "Source wiki:",
        "import-interwiki-sourcepage": "Source page:",
        "import-interwiki-history": "Copy all history revisions for this page",
@@@ -2314,7 -2314,7 +2314,7 @@@
        "importcantopen": "Could not open import file",
        "importbadinterwiki": "Bad interwiki link",
        "importsuccess": "Import finished!",
-       "importnosources": "No transwiki import sources have been defined and direct history uploads are disabled.",
+       "importnosources": "No wikis from which to import have been defined and direct history uploads are disabled.",
        "importnofile": "No import file was uploaded.",
        "importuploaderrorsize": "Upload of import file failed.\nThe file is bigger than the allowed upload size.",
        "importuploaderrorpartial": "Upload of import file failed.\nThe file was only partially uploaded.",
@@@ -3465,11 -3465,6 +3465,11 @@@
        "revdelete-uname-unhid": "username unhidden",
        "revdelete-restricted": "applied restrictions to administrators",
        "revdelete-unrestricted": "removed restrictions for administrators",
 +      "logentry-block-block": "$1 {{GENDER:$2|blocked}} {{GENDER:$4|$3}} with an expiry time of $5 $6",
 +      "logentry-block-unblock": "$1 {{GENDER:$2|unblocked}} {{GENDER:$4|$3}}",
 +      "logentry-block-reblock": "$1 {{GENDER:$2|changed}} block settings for {{GENDER:$4|$3}} with an expiry time of $5 $6",
 +      "logentry-suppress-block": "$1 {{GENDER:$2|blocked}} {{GENDER:$4|$3}} with an expiry time of $5 $6",
 +      "logentry-suppress-reblock": "$1 {{GENDER:$2|changed}} block settings for {{GENDER:$4|$3}} with an expiry time of $5 $6",
        "logentry-merge-merge": "$1 {{GENDER:$2|merged}} $3 into $4 (revisions up to $5)",
        "logentry-move-move": "$1 {{GENDER:$2|moved}} page $3 to $4",
        "logentry-move-move-noredirect": "$1 {{GENDER:$2|moved}} page $3 to $4 without leaving a redirect",
@@@ -3664,7 -3659,5 +3664,7 @@@
        "json-error-utf8": "Malformed UTF-8 characters, possibly incorrectly encoded",
        "json-error-recursion": "One or more recursive references in the value to be encoded",
        "json-error-inf-or-nan": "One or more NAN or INF values in the value to be encoded",
 -      "json-error-unsupported-type": "A value of a type that cannot be encoded was given"
 +      "json-error-unsupported-type": "A value of a type that cannot be encoded was given",
 +      "headline-anchor-title": "Link to this section",
 +      "section-symbol": "§"
  }