Merge "Revert "RCFilters: Change reset button title when it changes state""
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 20 Mar 2017 22:00:30 +0000 (22:00 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 20 Mar 2017 22:00:30 +0000 (22:00 +0000)
1  2 
languages/i18n/en.json
resources/Resources.php

diff --combined languages/i18n/en.json
        "page_first": "first",
        "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-fieldset-title": "Search for revisions",
        "history-show-deleted": "Revision deleted only",
        "history_copyright": "-",
        "histfirst": "oldest",
        "recentchanges-legend": "Recent changes options",
        "recentchanges-summary": "Track the most recent changes to the wiki on this page.",
        "recentchangestext": "-",
 -      "recentchanges-noresult": "No changes during the given period matching these criteria.",
 +      "recentchanges-noresult": "No changes during the given period match these criteria.",
        "recentchanges-feed-description": "Track the most recent changes to the wiki in this feed.",
        "recentchanges-label-newpage": "This edit created a new page",
        "recentchanges-label-minor": "This is a minor edit",
        "rcfilters-activefilters": "Active filters",
        "rcfilters-restore-default-filters": "Restore default filters",
        "rcfilters-clear-all-filters": "Clear all filters",
-       "rcfilters-clear-filters-to-defaults": "Set filters to defaults",
        "rcfilters-search-placeholder": "Filter recent changes (browse or start typing)",
        "rcfilters-invalid-filter": "Invalid filter",
        "rcfilters-empty-filter": "No active filters. All contributions are shown.",
diff --combined resources/Resources.php
@@@ -1795,7 -1795,6 +1795,6 @@@ return 
                        'rcfilters-activefilters',
                        'rcfilters-restore-default-filters',
                        'rcfilters-clear-all-filters',
-                       'rcfilters-clear-filters-to-defaults',
                        'rcfilters-search-placeholder',
                        'rcfilters-invalid-filter',
                        'rcfilters-empty-filter',
                        'mediawiki.api',
                        'jquery.byteLimit',
                        // TitleOptionWidget
 -                      'jquery.autoEllipsis',
 +                      'jquery.highlightText',
                ],
                'messages' => [
                        // NamespaceInputWidget