Merge "mw.widgets.visibleByteLimit: Temporarily disable whilst OOjs UI label bug...

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index fd7921f..929042f 100644 (file)
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1436,11 +1436,11 @@
        "rcfilters-hideminor-conflicts-typeofchange-global": "The \"Minor edits\" filter conflicts with one or more Type of change filters, because certain types of change cannot be designated as \"minor\". The conflicting filters are marked in the Active filters area, above.",
        "rcfilters-hideminor-conflicts-typeofchange": "Certain types of change cannot be designated as \"minor\", so this filter conflicts with the following Type of Change filters: $1",
        "rcfilters-typeofchange-conflicts-hideminor": "This Type of change filter conflicts with the \"Minor edits\" filter. Certain types of change cannot be designated as \"minor\".",
-       "rcfilters-filtergroup-lastRevision": "Last revision",
-       "rcfilters-filter-lastrevision-label": "Last revision",
-       "rcfilters-filter-lastrevision-description": "The most recent change to a page.",
-       "rcfilters-filter-previousrevision-label": "Earlier revisions",
-       "rcfilters-filter-previousrevision-description": "All changes that are not the most recent change to a page.",
+       "rcfilters-filtergroup-lastRevision": "Latest revisions",
+       "rcfilters-filter-lastrevision-label": "Latest revision",
+       "rcfilters-filter-lastrevision-description": "Only the most recent change to a page.",
+       "rcfilters-filter-previousrevision-label": "Not the latest revision",
+       "rcfilters-filter-previousrevision-description": "All changes that are not the \"latest revision\".",
        "rcfilters-filter-excluded": "Excluded",
        "rcfilters-tag-prefix-namespace": ":$1",
        "rcfilters-tag-prefix-namespace-inverted": "<strong>:not</strong> $1",

diff --git a/resources/src/mediawiki.legacy/commonPrint.css b/resources/src/mediawiki.legacy/commonPrint.css
index 602bdab..dec0fe8 100644 (file)
--- a/resources/src/mediawiki.legacy/commonPrint.css
+++ b/resources/src/mediawiki.legacy/commonPrint.css
@@ -8,24 +8,24 @@
 
 /**
  * Hide all the elements irrelevant for printing
+ * Skins however can and should override.
  */
 /* General hide-in-print class, please only use sparely */
 .noprint,
 /* Various content classes, in alphabetical order */
+.catlinks,
 .magnify,
 .mw-cite-backlink,
 .mw-jump,
 .mw-editsection,
 .mw-editsection-like,
 .mw-hidden-catlinks,
-.noexcerpt,
-.ns-0 .mw-redirectedfrom,
+.mw-indicators,
+.mw-redirectedfrom,
 .patrollink,
-.play-btn-large,
 .usermessage,
 /* Various content ids, in alphabetical order */
 #column-one,
-#coordinates .image,
 #footer-places,
 #jump-to-nav,
 #mw-navigation,