From: jenkins-bot Date: Sun, 16 Oct 2016 02:40:49 +0000 (+0000) Subject: Merge "Display both subject and talk subpages for Special:MovePage" X-Git-Tag: 1.31.0-rc.0~5099 X-Git-Url: http://git.cyclocoop.org/%22%2C%20generer_url_ecrire%28?a=commitdiff_plain;h=01aebfce884aa0dd347b7f97c27969167a737df9;hp=-c;p=lhc%2Fweb%2Fwiklou.git Merge "Display both subject and talk subpages for Special:MovePage" --- 01aebfce884aa0dd347b7f97c27969167a737df9 diff --combined languages/i18n/en.json index 4107b9e67f,36f7461703..f30c038ccd --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@@ -2505,6 -2505,7 +2505,7 @@@ "movelogpagetext": "Below is a list of all page moves.", "movesubpage": "{{PLURAL:$1|Subpage|Subpages}}", "movesubpagetext": "This page has $1 {{PLURAL:$1|subpage|subpages}} shown below.", + "movesubpagetalktext": "The corresponding talk page has $1 {{PLURAL:$1|subpage|subpages}} shown below.", "movenosubpage": "This page has no subpages.", "movereason": "Reason:", "move-redirect-text": "", @@@ -2918,7 -2919,6 +2919,7 @@@ "newimages-showbots": "Show uploads by bots", "newimages-hidepatrolled": "Hide patrolled uploads", "noimages": "Nothing to see.", + "gallery-slideshow-toggle": "Toggle thumbnails", "ilsubmit": "Search", "bydate": "by date", "sp-newimages-showfrom": "Show new files starting from $2, $1", @@@ -3923,7 -3923,7 +3924,7 @@@ "feedback-thanks": "Thanks! Your feedback has been posted to the page \"[$2 $1]\".", "feedback-thanks-title": "Thank you!", "feedback-useragent": "User agent:", - "searchsuggest-search": "Search", + "searchsuggest-search": "Search {{SITENAME}}", "searchsuggest-containing": "containing...", "api-error-autoblocked": "Your IP address has been blocked automatically, because it was used by a blocked user.", "api-error-badaccess-groups": "You are not permitted to upload files to this wiki.", @@@ -4227,7 -4227,5 +4228,7 @@@ "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" + "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" } diff --combined languages/i18n/qqq.json index 3984585fac,a124d83eaf..a9347411d0 --- a/languages/i18n/qqq.json +++ b/languages/i18n/qqq.json @@@ -2687,9 -2687,10 +2687,10 @@@ "movepage-max-pages": "PROBABLY (A GUESS): when moving a page, you can select an option of moving its subpages, but there is a maximum that can be moved automatically.\n\nParameters:\n* $1 - maximum moved pages, defined in the variable [[mw:Special:MyLanguage/Manual:$wgMaximumMovedPages|$wgMaximumMovedPages]]", "movelogpage": "{{doc-logpage}}\n\nTitle of [[Special:Log/move]]. Used as heading on that page, and in the dropdown menu on log pages.", "movelogpagetext": "Text on the special page 'Move log'.", - "movesubpage": "This is a section header on [[Special:MovePage]], below is a list of subpages.\n\nParameters:\n* $1 - number of subpages\nSee also:\n* {{msg-mw|movenosubpage|without subpage}}\n* {{msg-mw|movesubpagetext|with subpages}}", - "movesubpagetext": "Used in [[Special:MovePage]]. Parameters:\n* $1 - number of subpages\nSee also:\n* {{msg-mw|movesubpage|section header}}\n* {{msg-mw|movenosubpage|without subpage}}", - "movenosubpage": "See also:\n* {{msg-mw|movesubpage|section header}}\n* {{msg-mw|movenosubpage|without subpage}}\n* {{msg-mw|movesubpagetext|with subpages}}", + "movesubpage": "This is a section header on [[Special:MovePage]], below is a list of subpages.\n\nParameters:\n* $1 - number of subpages\nSee also:\n* {{msg-mw|movenosubpage|without subpage}}\n* {{msg-mw|movesubpagetext|with subpages}}\n* {{msg-mw|movesubpagetalktext|with talk subpages}}", + "movesubpagetext": "Used in [[Special:MovePage]]. Parameters:\n* $1 - number of subpages\nSee also:\n* {{msg-mw|movesubpage|section header}}\n* {{msg-mw|movenosubpage|without subpage}}\n* {{msg-mw|movesubpagetalktext|with talk subpages}}", + "movesubpagetalktext": "Used in [[Special:MovePage]] when corresponding talk page has subpages. Parameters:\n* $1 - number of subpages\nSee also:\n* {{msg-mw|movesubpage|section header}}\n* {{msg-mw|movenosubpage|without subpage}}", + "movenosubpage": "See also:\n* {{msg-mw|movesubpage|section header}}\n* {{msg-mw|movenosubpage|without subpage}}\n* {{msg-mw|movesubpagetext|with subpages}}\n* {{msg-mw|movesubpagetalktext|with talk subpages}}", "movereason": "Used in [[Special:MovePage]]. The text for the inputbox to give a reason for the page move.\n\nSee also:\n* {{msg-mw|Move-page-legend|legend for the form}}\n* {{msg-mw|newtitle|label for new title}}\n* {{msg-mw|Movetalk|label for checkbox}}\n* {{msg-mw|Move-leave-redirect|label for checkbox}}\n* {{msg-mw|Fix-double-redirects|label for checkbox}}\n* {{msg-mw|Move-subpages|label for checkbox}}\n* {{msg-mw|Move-talk-subpages|label for checkbox}}\n* {{msg-mw|Move-watch|label for checkbox}}\n{{Identical|Reason}}", "move-redirect-text": "{{ignored}}The text that's added to a redirected page when that redirect is created.", "category-move-redirect-override": "{{ignored}}The text that's added to a redirected category page when that redirect is created.", @@@ -3102,7 -3103,6 +3103,7 @@@ "newimages-showbots": "Used as label for a checkbox. When checked, [[Special:NewImages]] will also display uploads by users in the bots group.", "newimages-hidepatrolled": "Used as label for a checkbox. When checked, [[Special:NewImages]] will not display patrolled uploads.\n\nCf. {{msg-mw|tog-hidepatrolled}} and {{msg-mw|apihelp-feedrecentchanges-param-hidepatrolled}}.", "noimages": "This is shown on the special page [[Special:NewImages]], when there aren't any recently uploaded files.", + "gallery-slideshow-toggle": "Tooltip for the icon that toggles thumbnails on a slideshow gallery.", "ilsubmit": "Used as label for input box in the MIMESearch form on [[Special:MIMESearch]].\n\nSee also:\n* {{msg-mw|Mimesearch|page title}}\n* {{msg-mw|Mimetype|label for input box}}\n{{Identical|Search}}", "bydate": "{{Identical|Date}}", "sp-newimages-showfrom": "This is a link on [[Special:NewImages]] which takes you to a gallery of the newest files.\n* $1 is a date (example: ''19 March 2008'')\n* $2 is a time (example: ''12:15'')", @@@ -4107,7 -4107,7 +4108,7 @@@ "feedback-thanks": "Thanks message, appears if feedback was successful. Parameters:\n* $1 - \"Feedback\"\n* $2 - Feedback page URL", "feedback-thanks-title": "The title of the thank you dialog at the end of the submission process.\n{{Identical|Thank you}}", "feedback-useragent": "A label denoting the user agent in the feedback that is posted to the feedback page.\n{{Identical|User agent}}", - "searchsuggest-search": "Greyed out default text in the simple search box in the Vector skin. (It disappears and lets the user enter the requested search terms when the search box receives focus.)\n\n{{Identical|Search}}", + "searchsuggest-search": "Greyed out default text in the simple search box in the Vector skin. (It disappears and lets the user enter the requested search terms when the search box receives focus.)\n{{Identical|Search}}", "searchsuggest-containing": "Label used in the special item of the search suggestions list which gives the user an option to perform a full text search for the term.", "api-error-autoblocked": "API error message that can be used for client side localisation of API errors.\n\nCf. {{msg-mw|Autoblockedtext}}.", "api-error-badaccess-groups": "API error message that can be used for client side localisation of API errors.", @@@ -4411,7 -4411,5 +4412,7 @@@ "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)." + "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}}" }