From: jenkins-bot Date: Tue, 23 Jun 2015 11:14:17 +0000 (+0000) Subject: Merge "EditPage: Check $wgContentHandlerUseDB" X-Git-Tag: 1.31.0-rc.0~11003 X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/ajouter.php?a=commitdiff_plain;h=dae916558f37103317e1bd31b9ee7d3ca6299826;hp=-c;p=lhc%2Fweb%2Fwiklou.git Merge "EditPage: Check $wgContentHandlerUseDB" --- dae916558f37103317e1bd31b9ee7d3ca6299826 diff --combined languages/i18n/en.json index 542c38758a,2518295459..de4119ee8e --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@@ -667,6 -667,7 +667,7 @@@ "copyrightwarning2": "Please note that all contributions to {{SITENAME}} may be edited, altered, or removed by other contributors.\nIf you do not want your writing to be edited mercilessly, then do not submit it here.
\nYou are also promising us that you wrote this yourself, or copied it from a public domain or similar free resource (see $1 for details).\nDo not submit copyrighted work without permission!", "editpage-head-copy-warn": "-", "editpage-tos-summary": "-", + "editpage-cannot-use-custom-model": "The content model of this page cannot be changed.", "longpage-hint": "-", "longpageerror": "Error: The text you have submitted is {{PLURAL:$1|one kilobyte|$1 kilobytes}} long, which is longer than the maximum of {{PLURAL:$2|one kilobyte|$2 kilobytes}}.\nIt cannot be saved.", "readonlywarning": "Warning: The database has been locked for maintenance, so you will not be able to save your edits right now.\nYou may wish to copy and paste your text into a text file and save it for later.\n\nThe administrator who locked it offered this explanation: $1", @@@ -1626,6 -1627,7 +1627,6 @@@ "nmembers": "$1 {{PLURAL:$1|member|members}}", "nmemberschanged": "$1 → $2 {{PLURAL:$2|member|members}}", "nrevisions": "$1 {{PLURAL:$1|revision|revisions}}", - "nviews": "$1 {{PLURAL:$1|view|views}}", "nimagelinks": "Used on $1 {{PLURAL:$1|page|pages}}", "ntransclusions": "used on $1 {{PLURAL:$1|page|pages}}", "specialpage-empty": "There are no results for this report.", diff --combined languages/i18n/qqq.json index 486c144c92,a7c04ec3c1..96381380f1 --- a/languages/i18n/qqq.json +++ b/languages/i18n/qqq.json @@@ -718,7 -718,7 +718,7 @@@ "passwordreset-email": "{{Identical|E-mail address}}", "passwordreset-emailtitle": "Used as subject (title) of email.", "passwordreset-emailtext-ip": "Be consistent with {{msg-mw|Passwordreset-emailtext-user}}.\n\nParameters:\n* $1 - an IP address\n* $2 - message {{msg-mw|Passwordreset-emailelement}} repeated $3 times\n* $3 - the number of repetitions in $2\n* $4 - base URL of the wiki\n* $5 - number of days", - "passwordreset-emailtext-user": "Be consistent with {{msg-mw|Passwordreset-emailtext-ip}}.\n\nParameters:\n* $1 - a user name\n* $2 - message {{msg-mw|Passwordreset-emailelement|notext=1}} repeated $3 times\n* $3 - the number of repetitions in $2\n* $4 - base URL of the wiki\n* $5 - number of days", + "passwordreset-emailtext-user": "Be consistent with {{msg-mw|Passwordreset-emailtext-ip}}.\n\nParameters:\n* $1 - a user name, no GENDER suport.\n* $2 - message {{msg-mw|Passwordreset-emailelement|notext=1}} repeated $3 times\n* $3 - the number of repetitions in $2\n* $4 - base URL of the wiki\n* $5 - number of days", "passwordreset-emailelement": "This is a body of a password reset email to allow them into the system with a new password. Parameters:\n* $1 - the user's login name. This parameter can be used for GENDER.\n* $2 - the temporary password given by the system", "passwordreset-emailsent": "Used in [[Special:PasswordReset]].\n\nSee also:\n* {{msg-mw|Passwordreset-emailsent-capture}}\n* {{msg-mw|Passwordreset-emailerror-capture}}", "passwordreset-emailsent-capture": "Used in [[Special:PasswordReset]].\n\nSee also:\n* {{msg-mw|Passwordreset-emailsent}}\n* {{msg-mw|Passwordreset-emailerror-capture}}", @@@ -837,6 -837,7 +837,7 @@@ "copyrightwarning2": "Copyright warning displayed under the edit box in editor\n*$1 - license name", "editpage-head-copy-warn": "{{ignored}}Custom copyright warning in the header of an edit page.", "editpage-tos-summary": "{{notranslate}}", + "editpage-cannot-use-custom-model": "Error message shown if the database does not support changing the content model of a page.", "longpage-hint": "{{notranslate}}\n* $1: Size of the textbox formatted for output, using an appropriate unit ({{msg-mw|size-bytes}}, {{msg-mw|size-kilobytes}}, {{msg-mw|size-megabytes}}, {{msg-mw|size-gigabytes}})\n* $2: Size of the textbox in bytes, not formatnum", "longpageerror": "Warning displayed when trying to save a text larger than the maximum size allowed.\n\nParameters:\n* $1 - submitted size (in kilobytes)\n* $2 - maximum size (in kilobytes)", "readonlywarning": "Parameters:\n* $1 - reason", @@@ -1796,6 -1797,7 +1797,6 @@@ "nmembers": "Appears in brackets after each category listed on the special page [[Special:WantedCategories]].\n\nParameters:\n* $1 - the number of members of the category\nSee also:\n* {{msg-mw|Nmemberschanged}}", "nmemberschanged": "Appears in brackets after each category listed on the special page [[Special:WantedCategories]] if the number of pages in the category has changed since the list was last refreshed.\n\nParameters:\n* $1 - the original number of members of the category\n* $2 - the current one\nSee also:\n* {{msg-mw|Nmembers}}", "nrevisions": "Used as link text in [[Special:FewestRevisions]].\n\nThe link points to the page history (action=history).\n\nParameters:\n* $1 - number of revisions", - "nviews": "This message is used on [[Special:PopularPages]] to say how many times each page has been viewed.\n\nPreceded by the page title, like: Page title ($1 views)\n\nParameters:\n* $1 - the number of views", "nimagelinks": "Used on [[Special:MostLinkedFiles]] to indicate how often a specific file is used.\n\nParameters:\n* $1 - number of pages\nSee also:\n* {{msg-mw|Ntransclusions}}", "ntransclusions": "Used on [[Special:MostTranscludedPages]] to indicate how often a template is in use.\n\nParameters:\n* $1 - number of pages\nSee also:\n* {{msg-mw|Nimagelinks}}", "specialpage-empty": "Used on a special page when there is no data. For example on [[Special:Unusedimages]] when all images are used.",