Merge "Change 'history-show-deleted' message to 'Revision deleted only' for clarity"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 15 Mar 2017 22:34:16 +0000 (22:34 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 15 Mar 2017 22:34:16 +0000 (22:34 +0000)
1  2 
languages/i18n/en.json

diff --combined languages/i18n/en.json
        "login-security": "Verify your identity",
        "nav-login-createaccount": "Log in / create account",
        "loginprompt": "",
 -      "userlogin": "Log in / create account",
 -      "userloginnocreate": "Log in",
        "logout": "Log out",
        "userlogout": "Log out",
        "userlogout-summary": "",
        "notloggedin": "Not logged in",
        "userlogin-noaccount": "Don't have an account?",
        "userlogin-joinproject": "Join {{SITENAME}}",
 -      "nologin": "Don't have an account? $1.",
 -      "nologinlink": "Create an account",
        "createaccount": "Create account",
 -      "gotaccount": "Already have an account? $1.",
 -      "gotaccountlink": "Log in",
 -      "userlogin-resetlink": "Forgotten your login details?",
        "userlogin-resetpassword-link": "Forgot your password?",
        "helplogin-url": "https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Logging_in",
        "userlogin-helplink2": "Help with logging in",
        "createaccountmail": "Use a temporary random password and send it to the specified email address",
        "createaccountmail-help": "Can be used to create account for another person without learning the password.",
        "createacct-realname": "Real name (optional)",
 -      "createaccountreason": "Reason:",
        "createacct-reason": "Reason",
        "createacct-reason-ph": "Why you are creating another account",
        "createacct-reason-help": "Message shown in the account creation log",
        "page_last": "last",
        "histlegend": "Diff selection: Mark the radio boxes of the revisions to compare and hit enter or the button at the bottom.<br />\nLegend: <strong>({{int:cur}})</strong> = difference with latest revision, <strong>({{int:last}})</strong> = difference with preceding revision, <strong>{{int:minoreditletter}}</strong> = minor edit.",
        "history-fieldset-title": "Browse history",
-       "history-show-deleted": "Deleted only",
+       "history-show-deleted": "Revision deleted only",
        "history_copyright": "-",
        "histfirst": "oldest",
        "histlast": "newest",
        "prefs-help-prefershttps": "This preference will take effect on your next login.",
        "prefswarning-warning": "You've made changes to your preferences that have not been saved yet.\nIf you leave this page without clicking \"$1\" your preferences will not be updated.",
        "prefs-tabs-navigation-hint": "Tip: You can use the left and right arrow keys to navigate between the tabs in the tabs list.",
 -      "userrights": "User rights management",
 +      "userrights": "User rights",
        "userrights-summary": "",
        "userrights-lookup-user": "Select a user",
        "userrights-user-editname": "Enter a username:",
        "rcfilters-filterlist-feedbacklink": "Provide feedback on the new (beta) filters",
        "rcfilters-highlightbutton-title": "Highlight results",
        "rcfilters-highlightmenu-title": "Select a color",
 +      "rcfilters-highlightmenu-help": "Select a color to highlight this property",
        "rcfilters-filterlist-noresults": "No filters found",
        "rcfilters-filtergroup-registration": "User registration",
        "rcfilters-filter-registered-label": "Registered",
        "rcfilters-filter-registered-description": "Logged-in editors.",
        "rcfilters-filter-unregistered-label": "Unregistered",
 -      "rcfilters-filter-unregistered-description": " Editors who aren’t logged in.",
 +      "rcfilters-filter-unregistered-description": "Editors who aren’t logged in.",
 +      "rcfilters-filter-unregistered-conflicts-user-experience-level": "The \"Unregistered\" filter is inactive because its effect is being canceled by the following Experience {{PLURAL:$2|filter|filters}}, which {{PLURAL:$2|finds|find}} only registered users: $1",
        "rcfilters-filtergroup-authorship": "Edit authorship",
        "rcfilters-filter-editsbyself-label": "Your own edits",
        "rcfilters-filter-editsbyself-description": "Edits by you.",
        "rcfilters-filter-editsbyother-label": "Edits by others",
        "rcfilters-filter-editsbyother-description": "Edits created by other users (not you).",
        "rcfilters-filtergroup-userExpLevel": "Experience level (for registered users only)",
 -      "rcfilters-filter-userExpLevel-newcomer-label": "Newcomers",
 -      "rcfilters-filter-userExpLevel-newcomer-description": "Fewer than 10 edits and 4 days of activity.",
 -      "rcfilters-filter-userExpLevel-learner-label": "Learners",
 -      "rcfilters-filter-userExpLevel-learner-description": "More days of activity and edits than \"Newcomers\" but fewer than \"Experienced users\".",
 -      "rcfilters-filter-userExpLevel-experienced-label": "Experienced users",
 -      "rcfilters-filter-userExpLevel-experienced-description": "More than 30 days of activity and 500 edits.",
 +      "rcfilters-filtergroup-user-experience-level-conflicts-unregistered": "This filter is inactive because it finds only registered users, so the \"Unregistered\" filter is canceling its effect.",
 +      "rcfilters-filtergroup-user-experience-level-conflicts-unregistered-global": "The \"Unregistered\" filter is in conflict with one or more Experience filters. Experience filters find registered users only. The conflicting filters are marked as inactive above.",
 +      "rcfilters-filter-user-experience-level-newcomer-label": "Newcomers",
 +      "rcfilters-filter-user-experience-level-newcomer-description": "Fewer than 10 edits and 4 days of activity.",
 +      "rcfilters-filter-user-experience-level-learner-label": "Learners",
 +      "rcfilters-filter-user-experience-level-learner-description": "More days of activity and edits than \"Newcomers\" but fewer than \"Experienced users\".",
 +      "rcfilters-filter-user-experience-level-experienced-label": "Experienced users",
 +      "rcfilters-filter-user-experience-level-experienced-description": "More than 30 days of activity and 500 edits.",
        "rcfilters-filtergroup-automated": "Automated contributions",
        "rcfilters-filter-bots-label": "Bot",
        "rcfilters-filter-bots-description": "Edits made by automated tools.",
        "rcfilters-filter-humans-label": "Human (not bot)",
        "rcfilters-filter-humans-description": "Edits made by human editors.",
 +      "rcfilters-filtergroup-reviewstatus": "Review status",
 +      "rcfilters-filter-patrolled-label": "Patrolled",
 +      "rcfilters-filter-patrolled-description": "Edits marked as patrolled.",
 +      "rcfilters-filter-unpatrolled-label": "Unpatrolled",
 +      "rcfilters-filter-unpatrolled-description": "Edits not marked as patrolled.",
        "rcfilters-filtergroup-significance": "Significance",
        "rcfilters-filter-minor-label": "Minor edits",
        "rcfilters-filter-minor-description": "Edits the author labeled as minor.",
        "logentry-tag-update-revision": "$1 {{GENDER:$2|updated}} tags on revision $4 of page $3 ({{PLURAL:$7|added}} $6; {{PLURAL:$9|removed}} $8)",
        "logentry-tag-update-logentry": "$1 {{GENDER:$2|updated}} tags on log entry $5 of page $3 ({{PLURAL:$7|added}} $6; {{PLURAL:$9|removed}} $8)",
        "rightsnone": "(none)",
 -      "revdelete-logentry": "changed revision visibility of \"[[$1]]\"",
 -      "logdelete-logentry": "changed event visibility of \"[[$1]]\"",
 -      "revdelete-content": "content",
 -      "revdelete-summary": "edit summary",
 -      "revdelete-uname": "username",
 -      "revdelete-hid": "hid $1",
 -      "revdelete-unhid": "unhid $1",
 -      "revdelete-log-message": "$1 for $2 {{PLURAL:$2|revision|revisions}}",
 -      "logdelete-log-message": "$1 for $2 {{PLURAL:$2|event|events}}",
        "deletedarticle": "deleted \"[[$1]]\"",
        "suppressedarticle": "suppressed \"[[$1]]\"",
        "undeletedarticle": "restored \"[[$1]]\"",