dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Improve clarity of diff-multi message"
[lhc/web/wiklou.git]
/
maintenance
/
language
/
messages.inc
diff --git
a/maintenance/language/messages.inc
b/maintenance/language/messages.inc
index
c7365e8
..
fd23ea1
100644
(file)
--- a/
maintenance/language/messages.inc
+++ b/
maintenance/language/messages.inc
@@
-28,7
+28,6
@@
$wgMessageStructure = array(
),
'toggles' => array(
'tog-underline',
),
'toggles' => array(
'tog-underline',
- 'tog-justify',
'tog-hideminor',
'tog-hidepatrolled',
'tog-newpageshidepatrolled',
'tog-hideminor',
'tog-hidepatrolled',
'tog-newpageshidepatrolled',
@@
-37,9
+36,7
@@
$wgMessageStructure = array(
'tog-numberheadings',
'tog-showtoolbar',
'tog-editondblclick',
'tog-numberheadings',
'tog-showtoolbar',
'tog-editondblclick',
- 'tog-editsection',
'tog-editsectiononrightclick',
'tog-editsectiononrightclick',
- 'tog-showtoc',
'tog-rememberpassword',
'tog-watchcreations',
'tog-watchdefault',
'tog-rememberpassword',
'tog-watchcreations',
'tog-watchdefault',
@@
-581,6
+578,7
@@
$wgMessageStructure = array(
'retypenew',
'resetpass_submit',
'changepassword-success',
'retypenew',
'resetpass_submit',
'changepassword-success',
+ 'changepassword-throttled',
'resetpass_forbidden',
'resetpass-no-info',
'resetpass-submit-loggedin',
'resetpass_forbidden',
'resetpass-no-info',
'resetpass-submit-loggedin',
@@
-621,6
+619,7
@@
$wgMessageStructure = array(
'changeemail-password',
'changeemail-submit',
'changeemail-cancel',
'changeemail-password',
'changeemail-submit',
'changeemail-cancel',
+ 'changeemail-throttled'
),
'resettokens' => array(
'resettokens',
),
'resettokens' => array(
'resettokens',
@@
-766,6
+765,8
@@
$wgMessageStructure = array(
'invalid-content-data',
'content-not-allowed-here',
'editwarning-warning',
'invalid-content-data',
'content-not-allowed-here',
'editwarning-warning',
+ 'editpage-notsupportedcontentformat-title',
+ 'editpage-notsupportedcontentformat-text',
),
'contentmodels' => array(
'content-model-wikitext',
),
'contentmodels' => array(
'content-model-wikitext',
@@
-978,6
+979,7
@@
$wgMessageStructure = array(
'search-result-score',
'search-redirect',
'search-section',
'search-result-score',
'search-redirect',
'search-section',
+ 'search-file-match',
'search-suggest',
'search-interwiki-caption',
'search-interwiki-default',
'search-suggest',
'search-interwiki-caption',
'search-interwiki-default',
@@
-2009,7
+2011,7
@@
$wgMessageStructure = array(
'watchmethod-list',
'watchlistcontains',
'iteminvalidname',
'watchmethod-list',
'watchlistcontains',
'iteminvalidname',
- 'wlnote',
+ 'wlnote
2
',
'wlshowlast',
'watchlist-options',
),
'wlshowlast',
'watchlist-options',
),
@@
-2470,6
+2472,7
@@
$wgMessageStructure = array(
'allmessages-prefix',
'allmessages-language',
'allmessages-filter-submit',
'allmessages-prefix',
'allmessages-language',
'allmessages-filter-submit',
+ 'allmessages-filter-translate',
),
'thumbnails' => array(
'thumbnail-more',
),
'thumbnails' => array(
'thumbnail-more',
@@
-2529,6
+2532,7
@@
$wgMessageStructure = array(
'import-error-special',
'import-error-invalid',
'import-error-unserialize',
'import-error-special',
'import-error-invalid',
'import-error-unserialize',
+ 'import-error-bad-location',
'import-options-wrong',
'import-rootpage-invalid',
'import-rootpage-nosubpage',
'import-options-wrong',
'import-rootpage-invalid',
'import-rootpage-nosubpage',
@@
-2562,7
+2566,6
@@
$wgMessageStructure = array(
'accesskey-pt-watchlist',
'accesskey-pt-mycontris',
'accesskey-pt-login',
'accesskey-pt-watchlist',
'accesskey-pt-mycontris',
'accesskey-pt-login',
- 'accesskey-pt-anonlogin',
'accesskey-pt-logout',
'accesskey-ca-talk',
'accesskey-ca-edit',
'accesskey-pt-logout',
'accesskey-ca-talk',
'accesskey-ca-edit',
@@
-2633,7
+2636,6
@@
$wgMessageStructure = array(
'tooltip-pt-watchlist',
'tooltip-pt-mycontris',
'tooltip-pt-login',
'tooltip-pt-watchlist',
'tooltip-pt-mycontris',
'tooltip-pt-login',
- 'tooltip-pt-anonlogin',
'tooltip-pt-logout',
'tooltip-ca-talk',
'tooltip-ca-edit',
'tooltip-pt-logout',
'tooltip-ca-talk',
'tooltip-ca-edit',
@@
-3684,6
+3686,13
@@
$wgMessageStructure = array(
'version-software',
'version-software-product',
'version-software-version',
'version-software',
'version-software-product',
'version-software-version',
+ 'version-db-mysql-url',
+ 'version-db-mariadb-url',
+ 'version-db-percona-url',
+ 'version-db-postgres-url',
+ 'version-db-oracle-url',
+ 'version-db-sqlite-url',
+ 'version-db-mssql-url',
'version-entrypoints',
'version-entrypoints-header-entrypoint',
'version-entrypoints-header-url',
'version-entrypoints',
'version-entrypoints-header-entrypoint',
'version-entrypoints-header-url',