From: jenkins-bot Date: Fri, 25 Nov 2016 19:05:43 +0000 (+0000) Subject: Merge "Allow all users to view Special:UserRights" X-Git-Tag: 1.31.0-rc.0~4760 X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=4fadea72334cba2b8562a8a419665318030d3145;hp=-c Merge "Allow all users to view Special:UserRights" --- 4fadea72334cba2b8562a8a419665318030d3145 diff --combined languages/i18n/en.json index 35a9b2ea8c,37890a91af..1ccc1ad2c4 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@@ -206,6 -206,7 +206,7 @@@ "views": "Views", "toolbox": "Tools", "tool-link-userrights": "Change {{GENDER:$1|user}} groups", + "tool-link-userrights-readonly": "View {{GENDER:$1|user}} groups", "tool-link-emailuser": "Email this {{GENDER:$1|user}}", "userpage": "View user page", "projectpage": "View project page", @@@ -1062,7 -1063,7 +1063,7 @@@ "prefs-help-recentchangescount": "This includes recent changes, page histories, and logs.", "prefs-help-watchlist-token2": "This is the secret key to the web feed of your watchlist.\nAnyone who knows it will be able to read your watchlist, so do not share it.\nIf you need to, [[Special:ResetTokens|you can reset it]].", "savedprefs": "Your preferences have been saved.", - "savedrights": "The user rights of {{GENDER:$1|$1}} have been saved.", + "savedrights": "The user groups of {{GENDER:$1|$1}} have been saved.", "timezonelegend": "Time zone:", "localtime": "Local time:", "timezoneuseserverdefault": "Use wiki default ($1)", @@@ -1134,9 -1135,9 +1135,9 @@@ "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-summary": "", - "userrights-lookup-user": "Manage user groups", + "userrights-lookup-user": "Select a user", "userrights-user-editname": "Enter a username:", - "editusergroup": "Edit {{GENDER:$1|user}} groups", + "editusergroup": "Load {{GENDER:$1|user}} groups", "editinguser": "Changing user rights of {{GENDER:$1|user}} [[User:$1|$1]] $2", "userrights-editusergroup": "Edit user groups", "saveusergroups": "Save {{GENDER:$1|user}} groups", @@@ -1147,13 -1148,10 +1148,10 @@@ "userrights-reason": "Reason:", "userrights-no-interwiki": "You do not have permission to edit user rights on other wikis.", "userrights-nodatabase": "Database $1 does not exist or is not local.", - "userrights-nologin": "You must [[Special:UserLogin|log in]] with an administrator account to assign user rights.", - "userrights-notallowed": "You do not have permission to add or remove user rights.", "userrights-changeable-col": "Groups you can change", "userrights-unchangeable-col": "Groups you cannot change", "userrights-irreversible-marker": "$1*", "userrights-conflict": "Conflict of user rights changes! Please review and confirm your changes.", - "userrights-removed-self": "You removed your own rights. As such, you are no longer able to access this page.", "group": "Group:", "group-user": "Users", "group-autoconfirmed": "Autoconfirmed users", @@@ -1924,8 -1922,6 +1922,8 @@@ "apisandbox-continue-clear": "Clear", "apisandbox-continue-help": "{{int:apisandbox-continue}} will [https://www.mediawiki.org/wiki/API:Query#Continuing_queries continue] the last request; {{int:apisandbox-continue-clear}} will clear continuation-related parameters.", "apisandbox-param-limit": "Enter max to use the maximum limit.", + "apisandbox-multivalue-all-namespaces": "$1 (All namespaces)", + "apisandbox-multivalue-all-values": "$1 (All values)", "booksources": "Book sources", "booksources-summary": "", "booksources-search-legend": "Search for book sources", @@@ -3824,7 -3820,6 +3822,7 @@@ "htmlform-user-not-valid": "$1 isn't a valid username.", "rawmessage": "$1", "logentry-delete-delete": "$1 {{GENDER:$2|deleted}} page $3", + "logentry-delete-delete_redir": "$1 {{GENDER:$2|deleted}} redirect $3 by overwriting", "logentry-delete-restore": "$1 {{GENDER:$2|restored}} page $3", "logentry-delete-event": "$1 {{GENDER:$2|changed}} visibility of {{PLURAL:$5|a log event|$5 log events}} on $3: $4", "logentry-delete-revision": "$1 {{GENDER:$2|changed}} visibility of {{PLURAL:$5|a revision|$5 revisions}} on page $3: $4", @@@ -4131,7 -4126,6 +4129,7 @@@ "log-action-filter-contentmodel-change": "Change of Contentmodel", "log-action-filter-contentmodel-new": "Creation of page with non-standard Contentmodel", "log-action-filter-delete-delete": "Page deletion", + "log-action-filter-delete-delete_redir": "Redirect overwrite", "log-action-filter-delete-restore": "Page undeletion", "log-action-filter-delete-event": "Log deletion", "log-action-filter-delete-revision": "Revision deletion", @@@ -4242,5 -4236,7 +4240,5 @@@ "usercssispublic": "Please note: CSS subpages should not contain confidential data as they are viewable by other users.", "restrictionsfield-badip": "Invalid IP address or range: $1", "restrictionsfield-label": "Allowed IP ranges:", - "restrictionsfield-help": "One IP address or CIDR range per line. To enable everything, use
0.0.0.0/0
::/0", - "edit-error-short": "Error: $1", - "edit-error-long": "Errors:\n\n$1" + "restrictionsfield-help": "One IP address or CIDR range per line. To enable everything, use
0.0.0.0/0
::/0" } diff --combined languages/i18n/qqq.json index efd017cadf,edf4b852bc..637ac00fae --- a/languages/i18n/qqq.json +++ b/languages/i18n/qqq.json @@@ -389,7 -389,8 +389,8 @@@ "talk": "Used as display name for the tab to all {{msg-mw|Talk}} pages. These pages accompany all content pages and can be used for discussing the content page. Example: [[Talk:Example]].\n\nSee also:\n* {{msg-mw|Talk}}\n* {{msg-mw|Accesskey-ca-talk}}\n* {{msg-mw|Tooltip-ca-talk}}\n{{Identical|Discussion}}", "views": "Subtitle for the list of available views, for the current page. In \"monobook\" skin the list of views are shown as tabs, so this sub-title is not shown. For an example, see [{{canonicalurl:Main_Page|useskin=simple}} Main Page using simple skin].\n\n'''Note:''' This is \"views\" as in \"appearances\"/\"representations\", '''not''' as in \"visits\"/\"accesses\".\n{{Identical|View}}", "toolbox": "The title of the toolbox below the search menu.\n{{Identical|Tool}}", - "tool-link-userrights": "Link to [[Special:UserRights]] (user rights management) in the sidebar toolbox.\n\nParameters:\n* $1 - Name of user for the user group management (usable for GENDER)", + "tool-link-userrights": "Link to [[Special:UserRights]] (user rights management) in the sidebar toolbox, shown if the current user is allowed to change given user's groups.\n\nParameters:\n* $1 - Name of user for the user group management (usable for GENDER)", + "tool-link-userrights-readonly": "Link to [[Special:UserRights]] (user rights management) in the sidebar toolbox, shown if the current user is '''not''' allowed to change given user's groups.\n\nParameters:\n* $1 - Name of user for the user group management (usable for GENDER)", "tool-link-emailuser": "Link to [[Special:EmailUser]] (email user tool) in the sidebar toolbox.\n\nParameters:\n* $1 - Name of user who would receive the email\n\nSee also:\n* {{msg-mw|Emailuser-title-target}}", "userpage": "Used in user talk pages as the text of the link to the user page, with the Cologne Blue skin.", "projectpage": "Used as link text in Talk page of project page with the Cologne Blue skin.", @@@ -1246,7 -1247,7 +1247,7 @@@ "prefs-help-recentchangescount": "Used in [[Special:Preferences]], tab \"Recent changes\".", "prefs-help-watchlist-token2": "Used in [[Special:Preferences]], tab Watchlist. (Formerly in {{msg-mw|prefs-help-watchlist-token}}.)", "savedprefs": "This message appears after saving changes to your user preferences.", - "savedrights": "This message appears after saving the user rights on [[Special:UserRights]].\n* $1 - The user name of the user which rights was saved.", + "savedrights": "This message appears after saving the user groups on [[Special:UserRights]].\n* $1 - The user name of the user which groups was saved.", "timezonelegend": "{{Identical|Time zone}}", "localtime": "Used as label in [[Special:Preferences#mw-prefsection-datetime|preferences]].", "timezoneuseserverdefault": "[[Special:Preferences]] > Date and time > Time zone\n\nThis option lets your time zone setting use the one that is used on the wiki (often UTC).\n\nParameters:\n* $1 - timezone name, or timezone offset (in \"%+03d:%02d\" format)", @@@ -1320,9 -1321,9 +1321,9 @@@ "userrights-summary": "{{doc-specialpagesummary|userrights}}", "userrights-lookup-user": "Label text when managing user rights ([[Special:UserRights]])", "userrights-user-editname": "Displayed on [[Special:UserRights]].", - "editusergroup": "Button name, in page [[Special:Userrights]] (only available to administrators), in the section named {{MediaWiki:userrights-lookup-user}}.\n\n{{Identical|Edit user groups}}.\nParameters:\n* $1 - username, for GENDER support", + "editusergroup": "Button name, in page [[Special:Userrights]], in the section named {{MediaWiki:userrights-lookup-user}}.\nParameters:\n* $1 - username, for GENDER support", "editinguser": "Appears on [[Special:UserRights]]. Parameters:\n* $1 - a plaintext username\n* $2 - user tool links. e.g. \"(Talk | contribs | block | send email)\"", - "userrights-editusergroup": "Parameter:\n* $1 - (Optional) a username, can be used for GENDER\n{{Identical|Edit user groups}}", + "userrights-editusergroup": "Parameter:\n* $1 - (Optional) a username, can be used for GENDER", "saveusergroups": "Button text when editing user groups.\nParameters:\n* $1 - username, for GENDER support", "userrights-groupsmember": "Used when editing user groups in [[Special:Userrights]].\n\nThe message is followed by a list of group names.\n\nParameters:\n* $1 - (Optional) the number of items in the list following the message, for PLURAL\n* $2 - (Optional) the user name, for GENDER", "userrights-groupsmember-auto": "Used when editing user groups in [[Special:Userrights]]. The message is followed by a list of group names.\n\n\"Implicit\" is for groups that the user was automatically added to (such as \"autoconfirmed\"); cf. {{msg-mw|userrights-groupsmember}}\n\nParameters:\n* $1 - (Optional) the number of items in the list following the message, for PLURAL\n* $2 - (Optional) the user name, for GENDER", @@@ -1331,13 -1332,10 +1332,10 @@@ "userrights-reason": "Text beside log field when editing user groups\n\n{{Identical|Reason}}", "userrights-no-interwiki": "Error message when editing user groups", "userrights-nodatabase": "Error message when editing user groups.\n\n\"Local\" means databases/wikis of the same farm/cluster; that is, meta, enwiki, dewiki, commons, etc are all local databases of the Wikimedia Foundation.\n\nSee [{{canonicalurl:meta:Special:Log|type=rights}} meta:Special:Log?type=rights] for a usage of local databases: username@barwiki\n\nParameters:\n* $1 - database name", - "userrights-nologin": "Error displayed on [[Special:UserRights]] when you aren't logged in.\n\nIf you are logged in, but don't have the correct permission, you see {{msg-mw|Userrights-notallowed}}.", - "userrights-notallowed": "Error displayed on [[Special:UserRights]] when you don't have the permission.", "userrights-changeable-col": "Used when editing user groups in [[Special:Userrights]].\n\nThe message is the head of a column of group assignments.\n\nParameters:\n* $1 - (Optional) for PLURAL use, the number of items in the column following the message. Avoid PLURAL, if your language can do without.", "userrights-unchangeable-col": "Used when editing user groups in [[Special:Userrights]]. The message is the head of a column of group assignments.\n\nParameters:\n* $1 - (Optional) for PLURAL use, the number of items in the column following the message. Avoid PLURAL, if your language allows that.", "userrights-irreversible-marker": "{{optional}}\nParameters:\n* $1 - group member", "userrights-conflict": "Shown on [[Special:UserRights]] if the target's rights have been changed since the form was loaded.", - "userrights-removed-self": "Shown on [[Special:UserRights]] in a green box after the user removed its own rights to access that page.", "group": "{{Identical|Group}}", "group-user": "{{doc-group|user}}\n{{Identical|User}}", "group-autoconfirmed": "{{doc-group|autoconfirmed}}\nOn Wikimedia sites autoconfirmed users are users which are older than 4 days. After those 4 days, they have more rights.", @@@ -2108,8 -2106,6 +2106,8 @@@ "apisandbox-continue-clear": "Button text for clearing query continuation parameters.\n{{Identical|Clear}}", "apisandbox-continue-help": "Help text for the continue and clear buttons.", "apisandbox-param-limit": "Additional documentation text for 'limit'-type parameters.", + "apisandbox-multivalue-all-namespaces": "Used as an entry in a multiple-namespace widget to select all available namespaces. Parameters:\n* $1 - API input value meaning \"all namespaces\".", + "apisandbox-multivalue-all-values": "Used as an entry in a multiple-value widget to select all available values. Parameters:\n* $1 - API input value meaning \"all values\".", "booksources": "{{doc-special|BookSources}}\n\n'''This message shouldn't be changed unless it has serious mistakes.'''\n\nIt's used as the page name of the configuration page of [[Special:BookSources]]. Changing it breaks existing sites using the default version of this message.\n\nSee also:\n* {{msg-mw|Booksources|title}}\n* {{msg-mw|Booksources-text|text}}", "booksources-summary": "{{doc-specialpagesummary|booksources}}", "booksources-search-legend": "Box heading on [[Special:BookSources|book sources]] special page. The box is for searching for places where a particular book can be bought or viewed.", @@@ -4008,7 -4004,6 +4006,7 @@@ "htmlform-user-not-valid": "Error message shown if the name provided by the user isn't a valid username. $1 is the username.", "rawmessage": "{{notranslate}} Used to pass arbitrary text as a message specifier array", "logentry-delete-delete": "{{Logentry|[[Special:Log/delete]]}}", + "logentry-delete-delete_redir": "{{Logentry|[[Special:Log/delete]]}}", "logentry-delete-restore": "{{Logentry|[[Special:Log/delete]]}}", "logentry-delete-event": "{{Logentry|[[Special:Log/delete]]}}\n{{Logentryparam}}\n* $5 - count of affected log events", "logentry-delete-revision": "{{Logentry|[[Special:Log/delete]]}}\n{{Logentryparam}}\n* $5 - the number of affected revisions of the page $3", @@@ -4290,8 -4285,8 +4288,8 @@@ "mw-widgets-dateinput-placeholder-month": "Placeholder displayed in a date input field when it's empty, representing a date format with 4 digits for year and 2 digits for month, separated with hyphens (without a day). This should be uppercase, if possible, and must not include any additional explanations. If there is no good way to translate it, make this message blank.", "mw-widgets-titleinput-description-new-page": "Description label for a new page in the title input widget.", "mw-widgets-titleinput-description-redirect": "Description label for a redirect in the title input widget.", - "sessionmanager-tie": "Used as an error message when multiple session sources are tied in priority.\n\nParameters:\n* $1 - List of dession type descriptions, from messages like {{msg-mw|sessionprovider-mediawiki-session-cookiesessionprovider}}.", "mw-widgets-categoryselector-add-category-placeholder": "Placeholder displayed in the category selector widget after the capsules of already added categories.", + "sessionmanager-tie": "Used as an error message when multiple session sources are tied in priority.\n\nParameters:\n* $1 - List of dession type descriptions, from messages like {{msg-mw|sessionprovider-mediawiki-session-cookiesessionprovider}}.", "sessionprovider-generic": "Used to create a generic session type description when one isn't provided via the proper message. Should be phrased to make sense when added to a message such as {{msg-mw|cannotloginnow-text}}.\n\nParameters:\n* $1 - PHP classname.", "sessionprovider-mediawiki-session-cookiesessionprovider": "Description of the sessions provided by the CookieSessionProvider class, which use HTTP cookies. Should be phrased to make sense when added to a message such as {{msg-mw|cannotloginnow-text}}.", "sessionprovider-nocookies": "Used to inform the user that sessions may be missing due to lack of cookies.", @@@ -4315,7 -4310,6 +4313,7 @@@ "log-action-filter-contentmodel-change": "{{doc-log-action-filter-action|contentmodel|change}}", "log-action-filter-contentmodel-new": "{{doc-log-action-filter-action|contentmodel|new}}", "log-action-filter-delete-delete": "{{doc-log-action-filter-action|delete|delete}}", + "log-action-filter-delete-delete_redir": "{{doc-log-action-filter-action|delete|delete_redir}}", "log-action-filter-delete-restore": "{{doc-log-action-filter-action|delete|restore}}", "log-action-filter-delete-event": "{{doc-log-action-filter-action|delete|event}}", "log-action-filter-delete-revision": "{{doc-log-action-filter-action|delete|revision}}", @@@ -4426,5 -4420,7 +4424,5 @@@ "usercssispublic": "A reminder to users that CSS subpages are not preferences but normal pages, and thus can be viewed by other users and the general public. This message is shown to a user whenever they are editing a subpage in their own user-space that ends in .css. See also {{msg-mw|userjsispublic}}", "restrictionsfield-badip": "An error message shown when one entered an invalid IP address or range in a restrictions field (such as Special:BotPassword). $1 is the IP address.", "restrictionsfield-label": "Field label shown for restriction fields (e.g. on Special:BotPassword).", - "restrictionsfield-help": "Placeholder text displayed in restriction fields (e.g. on Special:BotPassword).", - "edit-error-short": "Error message. Parameters:\n* $1 - the error details\nSee also:\n* {{msg-mw|edit-error-long}}\n{{Identical|Error}}", - "edit-error-long": "Error message. Parameters:\n* $1 - the error details\nSee also:\n* {{msg-mw|edit-error-short}}\n{{Identical|Error}}" + "restrictionsfield-help": "Placeholder text displayed in restriction fields (e.g. on Special:BotPassword)." }