X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_del%27%2C%20idvote=vote.voteid%29%20%7D%7D?a=blobdiff_plain;f=languages%2Fi18n%2Fen.json;h=2004e0f576a21f421f384d2161079b99103f1862;hb=127c0072c4d29902fbf2dcfd63464042462270ed;hp=8428f20c09e760bda1df236cae5003185c1e7240;hpb=25bbaf41c57b6ece688490df4fc4ffb40e674951;p=lhc%2Fweb%2Fwiklou.git diff --git a/languages/i18n/en.json b/languages/i18n/en.json index 8428f20c09..2004e0f576 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -206,6 +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", @@ -600,8 +601,6 @@ "passwordreset-emaildisabled": "Email features have been disabled on this wiki.", "passwordreset-username": "Username:", "passwordreset-domain": "Domain:", - "passwordreset-capture": "View the resulting email?", - "passwordreset-capture-help": "If you check this box, the email (with the temporary password) will be shown to you as well as being sent to the user.", "passwordreset-email": "Email address:", "passwordreset-emailtitle": "Account details on {{SITENAME}}", "passwordreset-emailtext-ip": "Someone (probably you, from IP address $1) requested a reset of your\npassword for {{SITENAME}} ($4). The following user {{PLURAL:$3|account is|accounts are}}\nassociated with this email address:\n\n$2\n\n{{PLURAL:$3|This temporary password|These temporary passwords}} will expire in {{PLURAL:$5|one day|$5 days}}.\nYou should log in and choose a new password now. If someone else made this\nrequest, or if you have remembered your original password, and you no longer\nwish to change it, you may ignore this message and continue using your old\npassword.", @@ -609,8 +608,6 @@ "passwordreset-emailelement": "Username:\n$1\n\nTemporary password:\n$2", "passwordreset-emailsentemail": "If this email address is associated with your account, then a password reset email will be sent.", "passwordreset-emailsentusername": "If there is an email address associated with this username, then a password reset email will be sent.", - "passwordreset-emailsent-capture2": "The password reset {{PLURAL:$1|email has|emails have}} been sent. The {{PLURAL:$1|username and password|list of usernames and passwords}} is shown here.", - "passwordreset-emailerror-capture2": "Emailing the {{GENDER:$2|user}} failed: $1 The {{PLURAL:$3|username and password|list of usernames and passwords}} is shown here.", "passwordreset-nocaller": "A caller must be provided", "passwordreset-nosuchcaller": "Caller does not exist: $1", "passwordreset-ignored": "The password reset was not handled. Maybe no provider was configured?", @@ -1021,6 +1018,7 @@ "searchdisabled": "{{SITENAME}} search is disabled.\nYou can search via Google in the meantime.\nNote that their indexes of {{SITENAME}} content may be out of date.", "googlesearch": "
", "search-error": "An error has occurred while searching: $1", + "search-warning": "A warning has occured while searching: $1", "opensearch-desc": "{{SITENAME}} ({{CONTENTLANGUAGE}})", "preferences": "Preferences", "preferences-summary": "", @@ -1066,7 +1064,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)", @@ -1138,11 +1136,13 @@ "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 user groups", "editinguser": "Changing user rights of {{GENDER:$1|user}} [[User:$1|$1]] $2", + "viewinguserrights": "Viewing user rights of {{GENDER:$1|user}} [[User:$1|$1]] $2", "userrights-editusergroup": "Edit user groups", + "userrights-viewusergroup": "View user groups", "saveusergroups": "Save {{GENDER:$1|user}} groups", "userrights-groupsmember": "Member of:", "userrights-groupsmember-auto": "Implicit member of:", @@ -1151,13 +1151,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", @@ -1248,7 +1245,6 @@ "right-siteadmin": "Lock and unlock the database", "right-override-export-depth": "Export pages including linked pages up to a depth of 5", "right-sendemail": "Send email to other users", - "right-passwordreset": "View password reset emails", "right-managechangetags": "Create and (de)activate [[Special:Tags|tags]]", "right-applychangetags": "Apply [[Special:Tags|tags]] along with one's changes", "right-changetags": "Add and remove arbitrary [[Special:Tags|tags]] on individual revisions and log entries", @@ -1309,11 +1305,13 @@ "action-upload_by_url": "upload this file from a URL", "action-writeapi": "use the write API", "action-delete": "delete this page", - "action-deleterevision": "delete this revision", - "action-deletedhistory": "view this page's deleted history", + "action-deleterevision": "delete revisions", + "action-deletelogentry": "delete log entries", + "action-deletedhistory": "view a page's deleted history", + "action-deletedtext": "view deleted revision text", "action-browsearchive": "search deleted pages", - "action-undelete": "undelete this page", - "action-suppressrevision": "review and restore this hidden revision", + "action-undelete": "undelete pages", + "action-suppressrevision": "review and restore hidden revisions", "action-suppressionlog": "view this private log", "action-block": "block this user from editing", "action-protect": "change protection levels for this page", @@ -1328,6 +1326,7 @@ "action-userrights-interwiki": "edit user rights of users on other wikis", "action-siteadmin": "lock or unlock the database", "action-sendemail": "send emails", + "action-editmyoptions": "edit your preferences", "action-editmywatchlist": "edit your watchlist", "action-viewmywatchlist": "view your watchlist", "action-viewmyprivateinfo": "view your private information", @@ -2030,6 +2029,7 @@ "listgrants-summary": "The following is a list of grants with their associated access to user rights. Users can authorize applications to use their account, but with limited permissions based on the grants the user gave to the application. An application acting on behalf of a user cannot actually use rights that the user does not have however.\nThere may be [[{{MediaWiki:Listgrouprights-helppage}}|additional information]] about individual rights.", "listgrants-grant": "Grant", "listgrants-rights": "Rights", + "listgrants-grant-display": "$1($2)
",
"trackingcategories": "Tracking categories",
"trackingcategories-summary": "This page lists tracking categories which are automatically populated by the MediaWiki software. Their names can be changed by altering the relevant system messages in the {{ns:8}} namespace.",
"trackingcategories-msg": "Tracking category",
@@ -2073,7 +2073,7 @@
"emailccsubject": "Copy of your message to $1: $2",
"emailsent": "Email sent",
"emailsenttext": "Your email message has been sent.",
- "emailuserfooter": "This email was {{GENDER:$1|sent}} by $1 to {{GENDER:$2|$2}} by the \"{{int:emailuser}}\" function at {{SITENAME}}.",
+ "emailuserfooter": "This email was {{GENDER:$1|sent}} by $1 to {{GENDER:$2|$2}} by the \"{{int:emailuser}}\" function at {{SITENAME}}. {{GENDER:$2|Your}} email will be sent directly to the {{GENDER:$1|original sender}}, revealing {{GENDER:$2|your}} email address to {{GENDER:$1|them}}.",
"usermessage-summary": "Leaving system message.",
"usermessage-editor": "System messenger",
"usermessage-template": "MediaWiki:UserMessage",
@@ -3829,6 +3829,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",
@@ -4108,8 +4109,11 @@
"mw-widgets-dateinput-no-date": "No date selected",
"mw-widgets-dateinput-placeholder-day": "YYYY-MM-DD",
"mw-widgets-dateinput-placeholder-month": "YYYY-MM",
+ "mw-widgets-mediasearch-input-placeholder": "Search for media",
+ "mw-widgets-mediasearch-noresults": "No results found.",
"mw-widgets-titleinput-description-new-page": "page does not exist yet",
"mw-widgets-titleinput-description-redirect": "redirect to $1",
+ "mw-widgets-categoryselector-add-category-placeholder": "Add a category...",
"sessionmanager-tie": "Cannot combine multiple request authentication types: $1.",
"sessionprovider-generic": "$1 sessions",
"sessionprovider-mediawiki-session-cookiesessionprovider": "cookie-based sessions",
@@ -4134,6 +4138,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",
@@ -4245,6 +4250,6 @@
"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, use0.0.0.0/0
::/0
",
- "edit-error-short": "Error: $1",
- "edit-error-long": "Errors:\n\n$1"
+ "revid": "r$1",
+ "pageid": "page ID $1"
}