Sbisson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/345855 )
Change subject: [wip] RC Filters: messages for conflict between major and type
of change
......................................................................
[wip] RC Filters: messages for conflict between major and type of change
Wording to be confirmed.
Bug: T161665
Change-Id: I385041845d619a4b3e01ad8da54fe49fedfeda08
---
M languages/i18n/en.json
M languages/i18n/qqq.json
2 files changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/55/345855/1
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 0c8bf21..f6fec2d 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1428,6 +1428,9 @@
"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-hidemajor-conflicts-typeofchange-global": "The \"Non-minor
edits\" filter conflicts with one or more Type of Change filters, because
certain types of change are always designated as \"minor.\" The conflicting
filters are marked in the Active Filters area, above.",
+ "rcfilters-hidemajor-conflicts-typeofchange": "Certain types of change
are always designated as \"minor,\" so this filter conflicts with the following
Type of Change filters: $1",
+ "rcfilters-typeofchange-conflicts-hidemajor": "This Type of Change
filter conflicts with the \"Non-minor Edits\" filter. Certain types of change
are always designated as \"minor.\"",
"rcnotefrom": "Below {{PLURAL:$5|is the change|are the changes}} since
<strong>$3, $4</strong> (up to <strong>$1</strong> shown).",
"rclistfrom": "Show new changes starting from $2, $3",
"rcshowhideminor": "$1 minor edits",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 2951a4c..a7e5e60 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -1615,6 +1615,9 @@
"rcfilters-hideminor-conflicts-typeofchange-global": "The \"Minor
edits\" filter is conflicting 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.\n\n\"Type of Change\" is
{{msg-mw|Rcfilters-filtergroup-changetype}}.",
"rcfilters-hideminor-conflicts-typeofchange": "Tooltip shown when
hovering over the Minor edits tag, when a Type of Change filter is also
selected.\n\n\"Minor edits\" is
{{msg-mw|rcfilters-filter-minor-label}}.\n\n\"Type of change\" is
{{msg-mw|rcfilters-filtergroup-changetype}}.\n\nThis indicates that no results
will be shown. Parameters:\n* $1 - Comma-separated string of selected Type of
Change filters, e.g. \"Category, Logged Actions\"\n* $2 - Count of selected
User Experience Level filters, for PLURAL",
"rcfilters-typeofchange-conflicts-hideminor": "Tooltip shown when
hovering over a Type of change filter tag, when the Minor edits filter is also
selected.\n\n\"Minor edits\" is
{{msg-mw|rcfilters-filter-minor-label}}.\n\n\"Type of change\" is
{{msg-mw|rcfilters-filtergroup-changetype}}.\n\nThis indicates that no results
will be shown.",
+ "rcfilters-hideminor-conflicts-typeofchange-global": "Message shown in
the result area when both the Non-minor filter and a conflicting type of change
filter are selected. This indicates that no results will be
shown.\n\n\"Non-minor edits\" is
{{msg-mw|rcfilters-filter-major-label}}.\n\n\"Type of Change\" is
{{msg-mw|Rcfilters-filtergroup-changetype}}.",
+ "rcfilters-hideminor-conflicts-typeofchange": "Tooltip shown when
hovering over the Non-minor edits tag, when a Type of Change filter is also
selected.\n\n\"Non-minor edits\" is
{{msg-mw|rcfilters-filter-major-label}}.\n\n\"Type of change\" is
{{msg-mw|rcfilters-filtergroup-changetype}}.\n\nThis indicates that no results
will be shown. Parameters:\n* $1 - Comma-separated string of selected Type of
Change filters, e.g. \"Category, Logged Actions\"\n* $2 - Count of selected
type of change filters, for PLURAL",
+ "rcfilters-typeofchange-conflicts-hideminor": "Tooltip shown when
hovering over a Type of change filter tag, when the Non-minor edits filter is
also selected.\n\n\"Non-minor edits\" is
{{msg-mw|rcfilters-filter-major-label}}.\n\n\"Type of change\" is
{{msg-mw|rcfilters-filtergroup-changetype}}.\n\nThis indicates that no results
will be shown.",
"rcnotefrom": "This message is displayed at [[Special:RecentChanges]]
when viewing recentchanges from some specific time.\n\nThe corresponding
message is {{msg-mw|Rclistfrom}}.\n\nParameters:\n* $1 - the maximum number of
changes that are displayed\n* $2 - (Optional) a date and time\n* $3 - a date\n*
$4 - a time\n* $5 - Number of changes are displayed, for use with PLURAL",
"rclistfrom": "Used on [[Special:RecentChanges]]. Parameters:\n* $1 -
(Currently not use) date and time. The date and the time adds to the rclistfrom
description.\n* $2 - time. The time adds to the rclistfrom link description
(with split of date and time).\n* $3 - date. The date adds to the rclistfrom
link description (with split of date and time).\n\nThe corresponding message is
{{msg-mw|Rcnotefrom}}.",
"rcshowhideminor": "Option text in [[Special:RecentChanges]].
Parameters:\n* $1 - the \"show/hide\" command, with the text taken from either
{{msg-mw|rcshowhideminor-show}} or
{{msg-mw|rcshowhideminor-hide}}\n{{Identical|Minor edit}}",
--
To view, visit https://gerrit.wikimedia.org/r/345855
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I385041845d619a4b3e01ad8da54fe49fedfeda08
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Sbisson <sbis...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
