Merge "Fix partial block translation for non-editing msg"

diff --combined languages/i18n/en.json
index e7691e4,48f938f..4acf6eb
--- 1/languages/i18n/en.json
--- 2/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@@ -1144,9 -1144,6 +1144,9 @@@
        "prefs-advancedwatchlist": "Advanced options",
        "prefs-displayrc": "Display options",
        "prefs-displaywatchlist": "Display options",
 +      "prefs-changesrc": "Changes shown",
 +      "prefs-changeswatchlist": "Changes shown",
 +      "prefs-pageswatchlist": "Watched pages",
        "prefs-tokenwatchlist": "Token",
        "prefs-diffs": "Diffs",
        "prefs-help-prefershttps": "This preference will take effect on your next login.",
@@@ -2526,7 -2523,7 +2526,7 @@@
        "contribsub2": "For {{GENDER:$3|$1}} ($2)",
        "contributions-userdoesnotexist": "User account \"$1\" is not registered.",
        "nocontribs": "No changes were found matching these criteria.",
 -      "uctop": "(current)",
 +      "uctop": "current",
        "month": "From month (and earlier):",
        "year": "From year (and earlier):",
        "date": "From date (and earlier):",
@@@ -2737,7 -2734,6 +2737,7 @@@
        "move-watch": "Watch source page and target page",
        "movepagebtn": "Move page",
        "pagemovedsub": "Move succeeded",
 +      "cannotmove": "The page could not be moved, for the following {{PLURAL:$1|reason|reasons}}:",
        "movepage-moved": "<strong>\"$1\" has been moved to \"$2\"</strong>",
        "movepage-moved-redirect": "A redirect has been created.",
        "movepage-moved-noredirect": "The creation of a redirect has been suppressed.",
@@@ -2810,7 -2806,7 +2810,7 @@@
        "allmessages-filter-modified": "Modified",
        "allmessages-prefix": "Filter by prefix:",
        "allmessages-language": "Language:",
 -      "allmessages-filter-submit": "Go",
 +      "allmessages-filter-submit": "Filter",
        "allmessages-filter-translate": "Translate",
        "thumbnail-more": "Enlarge",
        "filemissing": "File missing",
@@@ -4080,6 -4076,9 +4080,6 @@@
        "dberr-again": "Try waiting a few minutes and reloading.",
        "dberr-info": "(Cannot access the database: $1)",
        "dberr-info-hidden": "(Cannot access the database)",
 -      "dberr-usegoogle": "You can try searching via Google in the meantime.",
 -      "dberr-outofdate": "Note that their indexes of our content may be out of date.",
 -      "dberr-cachederror": "This is a cached copy of the requested page, and may not be up to date.",
        "htmlform-invalid-input": "There are problems with some of your input.",
        "htmlform-select-badoption": "The value you specified is not a valid option.",
        "htmlform-int-invalid": "The value you specified is not an integer.",
@@@ -4142,8 -4141,8 +4142,8 @@@
        "logentry-block-reblock": "$1 {{GENDER:$2|changed}} block settings for {{GENDER:$4|$3}} with an expiration time of $5 $6",
        "logentry-partialblock-block": "$1 {{GENDER:$2|blocked}} {{GENDER:$4|$3}} from editing {{PLURAL:$8||the pages}} $7 with an expiration time of $5 $6",
        "logentry-partialblock-reblock": "$1 {{GENDER:$2|changed}} block settings for {{GENDER:$4|$3}} preventing edits on {{PLURAL:$8||the pages}} $7 with an expiration time of $5 $6",
-       "logentry-non-editing-block-block": "$1 {{GENDER:$2|blocked}} {{GENDER:$4|$3}} from non-editing actions with an expiration time of $5 $6",
-       "logentry-non-editing-block-reblock": "$1 {{GENDER:$2|changed}} block settings for {{GENDER:$4|$3}} for non-editing actions with an expiration time of $5 $6",
+       "logentry-non-editing-block-block": "$1 {{GENDER:$2|blocked}} {{GENDER:$4|$3}} from specified non-editing actions with an expiration time of $5 $6",
+       "logentry-non-editing-block-reblock": "$1 {{GENDER:$2|changed}} block settings for {{GENDER:$4|$3}} for specified non-editing actions with an expiration time of $5 $6",
        "logentry-suppress-block": "$1 {{GENDER:$2|blocked}} {{GENDER:$4|$3}} with an expiration time of $5 $6",
        "logentry-suppress-reblock": "$1 {{GENDER:$2|changed}} block settings for {{GENDER:$4|$3}} with an expiration time of $5 $6",
        "logentry-import-upload": "$1 {{GENDER:$2|imported}} $3 by file upload",