Index: trunk/extensions/Configure/Configure.settings.i18n.php
===================================================================
--- trunk/extensions/Configure/Configure.settings.i18n.php (revision 44094)
+++ trunk/extensions/Configure/Configure.settings.i18n.php (revision 44095)
@@ -161,7 +161,7 @@
'configure-setting-wgEnableAPI' => "Enable API",
'configure-setting-wgEnableWriteAPI' => "Enable Write API",
'configure-setting-wgFilterCallback' => "Spam filter callback",
- 'configure-setting-wgImplicitGroups' => "Array of groups which are not shown on [[Special:ListUsers]] et al",
+ 'configure-setting-wgImplicitGroups' => "Groups which are not shown on [[Special:ListUsers]] et al",
'configure-setting-wgPasswordAttemptThrottle' => "Password attempt throttle",
'configure-setting-wgPasswordSalt' => "Password salt",
'configure-setting-wgReadOnly' => "Disallows editing, displaying the string given as the reason",
@@ -284,8 +284,8 @@
'configure-setting-wgExtraNamespaces' => "Namespace overrides",
'configure-setting-wgExtraNamespaces-key' => 'Namespace ID',
'configure-setting-wgExtraNamespaces-value' => 'Namespace name',
- 'configure-setting-wgMetaNamespace' => "The name used for the meta-namespace",
- 'configure-setting-wgMetaNamespaceTalk' => "The name used for the meta-namespace talk pages",
+ 'configure-setting-wgMetaNamespace' => "Project namespace name",
+ 'configure-setting-wgMetaNamespaceTalk' => "Project-talk namespace name",
'configure-setting-wgNamespaceAliases' => "Namespace redirects",
'configure-setting-wgNamespaceAliases-key' => 'Alias name',
'configure-setting-wgNamespaceAliases-value' => 'Target namespace ID',
@@ -478,28 +478,28 @@
'configure-setting-wgDirectoryMode' => "New directory modes",
'configure-setting-wgDiff' => "Path to the GNU diff utility",
'configure-setting-wgDiff3' => "Path to the GNU diff3 utility",
- 'configure-setting-wgFavicon' => "The URL of the site favicon",
- 'configure-setting-wgLogo' => "The URL of the site logo",
- 'configure-setting-wgMathDirectory' => "The file system path of the directory containing LaTeX math images",
- 'configure-setting-wgMathPath' => "The URL base of the directory containing LaTeX math images",
- 'configure-setting-wgRedirectScript' => "The URL of redirect.php, needed for backwards compatibility",
+ 'configure-setting-wgFavicon' => "URL of the site favicon",
+ 'configure-setting-wgLogo' => "URL of the site logo",
+ 'configure-setting-wgMathDirectory' => "file system path of the directory containing LaTeX math images",
+ 'configure-setting-wgMathPath' => "URL base of the directory containing LaTeX math images",
+ 'configure-setting-wgRedirectScript' => "URL of redirect.php, needed for backwards compatibility",
'configure-setting-wgPhpCli' => "Executable name of PHP cli client (php/php5)",
- 'configure-setting-wgProto' => "The secure server prefix",
- 'configure-setting-wgScript' => "The URL of index.php",
+ 'configure-setting-wgProto' => "secure server prefix",
+ 'configure-setting-wgScript' => "URL of index.php",
'configure-setting-wgScriptExtension' => "Extension to append to script names by default",
- 'configure-setting-wgScriptPath' => "The base URL path",
- 'configure-setting-wgServer' => "The base URL of the server",
- 'configure-setting-wgServerName' => "The name of the server without the protocol. (for example en.wikipedia.org)",
+ 'configure-setting-wgScriptPath' => "Base URL path",
+ 'configure-setting-wgServer' => "Base URL of the server",
+ 'configure-setting-wgServerName' => "Name of the server without the protocol.",
'configure-setting-wgSQLiteDataDirMode' => "Default directory mode for SQLite data directory on creation",
- 'configure-setting-wgStyleDirectory' => "The file system path to the skins directory",
- 'configure-setting-wgStylePath' => "The URL of the skins directory",
- 'configure-setting-wgStyleSheetPath' => "The URL of the directory containing the stylesheets",
- 'configure-setting-wgTmpDirectory' => "The URL of the temporary directory",
- 'configure-setting-wgUploadBaseUrl' => "The base URL for uploaded files if shared upload directory is not to be used",
- 'configure-setting-wgUsePathInfo' => "Whether to use 'pretty' URLs",
- 'configure-setting-wgUploadDirectory' => "The file system path of the upload directory",
+ 'configure-setting-wgStyleDirectory' => "File system path to the skins directory",
+ 'configure-setting-wgStylePath' => "URL of the skins directory",
+ 'configure-setting-wgStyleSheetPath' => "TRL of the directory containing the stylesheets",
+ 'configure-setting-wgTmpDirectory' => "URL of the temporary directory",
+ 'configure-setting-wgUploadBaseUrl' => "Base URL for uploaded files if shared upload directory is not to be used",
+ 'configure-setting-wgUsePathInfo' => "Use 'pretty' URLs",
+ 'configure-setting-wgUploadDirectory' => "File system path of the upload directory",
'configure-setting-wgUploadNavigationUrl' => "URL for the upload navigation link",
- 'configure-setting-wgUploadPath' => "The URL of the upload directory",
+ 'configure-setting-wgUploadPath' => "URL of the upload directory",
'configure-setting-wgVariantArticlePath' => "Path for language-variant pages",
'configure-setting-wgAllowCategorizedRecentChanges' => "Allow to filter the recent changes by a category or one of its sub(subsubsub...)categories",
'configure-setting-wgPutIPinRC' => "Log IP addresses in the 'recentchanges' table",
@@ -517,8 +517,8 @@
'configure-setting-wgRC2UDPOmitBots' => "Omit robot edits from recent changes UDP notifications",
'configure-setting-wgRC2UDPPort' => "Port for recent changes UDP notifications",
'configure-setting-wgRC2UDPPrefix' => "Prefix for lines sent to UDP for recent changes",
- 'configure-setting-wgBlockAllowsUTEdit' => "Allow a blocked user to edit his own talk page",
- 'configure-setting-wgSysopEmailBans' => "Allow sysops to ban users from accessing EmailUser",
+ 'configure-setting-wgBlockAllowsUTEdit' => "Allow a blocked user to edit their own talk page",
+ 'configure-setting-wgSysopEmailBans' => "Allow sysops to ban users from accessing [[Special:EmailUser]]",
'configure-setting-wgSysopRangeBans' => "Allow sysops to ban IP ranges",
'configure-setting-wgSysopUserBans' => "Allow sysops to ban logged-in users",
'configure-setting-wgEnotifFromEditor' => "E-mail notifications appear to be coming from the page editor (not from wiki server)",
@@ -530,7 +530,7 @@
'configure-setting-wgEnotifUseRealName' => "Use real name instead of username in e-mail \"from\" field",
'configure-setting-wgEnotifUserTalk' => "E-mail notifications can be sent for first change on a user_talk page (user preference is shown and user needs to opt-in)",
'configure-setting-wgEnotifWatchlist' => "E-mail notifications can be sent for the first change on watched pages (user preference is shown and user needs to opt-in)",
- 'configure-setting-wgUsersNotifiedOnAllChanges' => "Array of usernames who will be sent a notification e-mail for every change which occurs on a wiki",
+ 'configure-setting-wgUsersNotifiedOnAllChanges' => "Usernames who will be sent a notification e-mail for every change which occurs on a wiki",
'configure-setting-wgDebugFunctionEntry' => "Output debug message on every wfProfileIn/wfProfileOut",
'configure-setting-wgDebugProfiling' => "Detects non-matching wfProfileIn/wfProfileOut calls",
'configure-setting-wgDebugSquid' => "Lots of debugging output from SquidUpdate.php",
Index: trunk/extensions/Configure/Configure.i18n.php
===================================================================
--- trunk/extensions/Configure/Configure.i18n.php (revision 44094)
+++ trunk/extensions/Configure/Configure.i18n.php (revision 44095)
@@ -60,7 +60,8 @@
'configure-old-summary' => '$1 by $2 $3',
'configure-saved' => 'The configuration has been saved',
'configure-backlink' => 'Return to form',
- 'configure-section-popular' => 'Popular settings',
+ 'configure-section-robots' => 'Web crawlers',
+ 'configure-section-features' => 'Features',
'configure-section-general' => 'General settings',
'configure-section-paths' => 'Paths',
'configure-section-db' => 'Database',
@@ -97,7 +98,7 @@
'configure-section-proxy' => 'Proxies',
'configure-section-squid' => 'Squids',
'configure-section-cookie' => 'Cookies',
- 'configure-section-reduction' => 'Reduction',
+ 'configure-section-performance' => 'Performance',
'configure-section-upload' => 'Upload',
'configure-section-sharedupload' => 'Shared upload',
'configure-section-mime' => 'MIME types',
@@ -120,6 +121,9 @@
'configure-section-htcp' => 'HTCP multicast',
'configure-section-misc' => 'Miscellaneous',
'configure-section-mw-extensions' => 'MediaWiki extensions',
+ 'configure-section-external-tools' => 'External tools',
+ 'configure-section-filesystem' => 'Filesystem and Shell interaction',
+ 'configure-section-thumbnail' => 'Image thumbnailing',
'configure-select-wiki' => 'Wiki selection',
'configure-select-wiki-available' => 'Authorized values: $1',
'configure-select-wiki-desc' => 'Select the wiki you want to configure.',
Index: trunk/extensions/Configure/Configure.settings-core.php
===================================================================
--- trunk/extensions/Configure/Configure.settings-core.php (revision 44094)
+++ trunk/extensions/Configure/Configure.settings-core.php (revision 44095)
@@ -16,30 +16,44 @@
'site' => array(
'wgSitename' => 'text',
'wgLogo' => 'image-url',
- 'wgArticleRobotPolicies' => 'array',
'wgBreakFrames' => 'bool',
'wgCapitalLinks' => 'bool',
'wgDefaultLanguageVariant' => 'text',
- 'wgDefaultRobotPolicy' => 'text',
- 'wgExemptFromUserRobotsControl' => 'array',
- 'wgExtraLanguageNames' => 'array',
'wgExtraRandompageSQL' => 'text',
'wgExtraSubtitle' => 'text',
- 'wgHideInterlanguageLinks' => 'bool',
'wgLegalTitleChars' => 'text',
'wgMaxArticleSize' => 'int',
'wgMetadataWhitelist' => 'text',
- 'wgNoFollowLinks' => 'bool',
- 'wgPageShowWatchingUsers' => 'bool',
- 'wgRestrictionLevels' => 'array',
'wgSiteNotice' => 'text',
'wgSiteSupportPage' => 'text',
'wgStyleVersion' => 'int',
- 'wgUniversalEditButton' => 'bool',
'wgUrlProtocols' => 'array',
- 'wgUseExternalEditor' => 'bool',
'wgUseMetadataEdit' => 'bool',
),
+ 'robots' => array(
+ 'wgArticleRobotPolicies' => 'array',
+ 'wgDefaultRobotPolicy' => 'text',
+ 'wgExemptFromUserRobotsControl' => 'array',
+ 'wgNoFollowLinks' => 'bool',
+ ),
+ ),
+ 'features' => array(
+ 'features' => array(
+ 'wgUseExternalEditor' => 'bool',
+ 'wgUniversalEditButton' => 'bool',
+ 'wgPageShowWatchingUsers' => 'bool',
+ 'wgEdititis' => 'bool',
+ 'wgShowHostnames' => 'bool',
+ 'wgUseDumbLinkUpdate' => 'bool',
+ 'wgFixDoubleRedirects' => 'bool',
+ 'wgUsePathInfo' => 'bool',
+ 'wgEnableAPI' => 'bool',
+ 'wgEnableWriteAPI' => 'bool',
+ 'wgUseTeX' => 'bool',
+ 'wgEnableHtmlDiff' => 'bool',
+ 'wgUseAutomaticEditSummaries' => 'bool',
+ 'wgUseTrackbacks' => 'bool',
+ ),
'ajax' => array(
'wgUseAjax' => 'bool',
'wgAjaxExportList' => 'array',
@@ -56,6 +70,18 @@
'wgHandheldStyle' => 'text',
'wgHandheldForIPhone' => 'bool',
),
+ 'performance' => array(
+ 'wgAPIMaxDBRows' => 'int',
+ 'wgDisableQueryPages' => 'bool',
+ 'wgDisableQueryPageUpdate' => 'array',
+ 'wgDisableSearchContext' => 'bool',
+ 'wgDisableSearchUpdate' => 'bool',
+ 'wgDisableTextSearch' => 'bool',
+ 'wgMaximumMovedPages' => 'int',
+ 'wgMiserMode' => 'bool',
+ 'wgCompressRevisions' => 'bool',
+ 'wgUpdateRowsPerQuery' => 'int',
+ ),
),
'namespaces' => array(
'namespaces' => array(
@@ -89,32 +115,41 @@
'wgActionPaths' => 'array',
'wgAppleTouchIcon' => 'text',
'wgArticlePath' => 'text',
- 'wgDirectoryMode' => 'int',
- 'wgDiff' => 'text',
- 'wgDiff3' => 'text',
'wgFavicon' => 'text',
'wgMathDirectory' => 'text',
'wgMathPath' => 'text',
'wgRedirectScript' => 'text',
- 'wgPhpCli' => 'text',
'wgProto' => 'text',
'wgScript' => 'text',
'wgScriptExtension' => 'text',
'wgScriptPath' => 'text',
'wgServer' => 'text',
'wgServerName' => 'text',
- 'wgSQLiteDataDirMode' => 'int',
'wgStyleDirectory' => 'text',
'wgStylePath' => 'text',
'wgStyleSheetPath' => 'text',
'wgTmpDirectory' => 'text',
'wgUploadBaseUrl' => 'text',
- 'wgUsePathInfo' => 'bool',
'wgUploadDirectory' => 'text',
'wgUploadNavigationUrl' => 'text',
'wgUploadPath' => 'text',
'wgVariantArticlePath' => 'text',
),
+ 'external-tools' => array(
+ 'wgDiff' => 'text',
+ 'wgDiff3' => 'text',
+ 'wgPhpCli' => 'text',
+ 'wgTexvc' => 'text',
+ 'wgExternalDiffEngine' => 'text',
+ ),
+ 'filesystem' => array(
+ 'wgDirectoryMode' => 'int',
+ 'wgSQLiteDataDirMode' => 'int',
+ 'wgMaxShellFileSize' => 'int',
+ 'wgMaxShellMemory' => 'int',
+ 'wgMaxShellTime' => 'int',
+ 'wgShellLocale' => 'text',
+ ),
),
'db' => array(
'db' => array(
@@ -135,6 +170,7 @@
'wgSharedDB' => 'text',
'wgSharedPrefix' => 'text',
'wgSharedTables' => 'array',
+ 'wgAntiLockFlags' => 'int',
),
'load-balancing' => array(
'wgDBClusterTimeout' => 'int',
@@ -188,13 +224,13 @@
),
'localization' => array(
'localization' => array(
+ 'wgExtraLanguageNames' => 'array',
'wgAmericanDates' => 'bool',
'wgDisableLangConversion' => 'bool',
'wgDisableTitleConversion' => 'bool',
'wgEditEncoding' => 'text',
'wgForceUIMsgAsContentMsg' => 'array',
'wgInputEncoding' => 'text',
- 'wgInterwikiMagic' => 'bool',
'wgLanguageCode' => 'lang',
'wgLegacyEncoding' => 'text',
'wgLoginLanguageSelector' => 'bool',
@@ -212,13 +248,15 @@
'wgZhdaemonHost' => 'text',
'wgZhdaemonPort' => 'int',
),
- 'html' => array(
- 'wgXMLMimeTypes' => 'array',
+ ),
+ 'output' => array(
+ 'output' => array(
'wgDocType' => 'text',
'wgDTD' => 'text',
'wgMimeType' => 'text',
'wgXhtmlDefaultNamespace' => 'text',
'wgXhtmlNamespaces' => 'array',
+ 'wgDisableOutputCompression' => 'bool',
),
),
'debug' => array(
@@ -278,14 +316,13 @@
'wgMainCacheType' => array( -1 => 'Anything', 0 => 'None',
1 => 'DB', 2 => 'Memcached',
3 => 'Accel', 4 => 'DBA' ),
- 'wgCacheEpoch' => 'text',
+ 'wgCacheEpoch' => 'text',
'wgCachePages' => 'bool',
'wgClockSkewFudge' => 'int',
'wgFileCacheDirectory' => 'text',
'wgForcedRawSMaxage' => 'int',
'wgQueryCacheLimit' => 'int',
'wgRevisionCacheExpiry' => 'int',
- 'wgThumbnailEpoch' => 'text',
'wgTranscludeCacheExpiry' => 'int',
'wgUseFileCache' => 'bool',
'wgUseGzip' => 'bool',
@@ -320,6 +357,8 @@
),
'interwiki' => array(
'interwiki' => array(
+ 'wgHideInterlanguageLinks' => 'bool',
+ 'wgInterwikiMagic' => 'bool',
'wgDisableHardRedirects' => 'bool',
'wgEnableScaryTranscluding' => 'bool',
'wgImportSources' => 'array',
@@ -335,20 +374,14 @@
'access' => array(
'wgAccountCreationThrottle' => 'int',
'wgAllowPageInfo' => 'bool',
- 'wgAutoblockExpiry' => 'int',
- 'wgDeleteRevisionsLimit' => 'int',
'wgDisabledActions' => 'array',
'wgEmailConfirmToEdit' => 'bool',
- 'wgEnableAPI' => 'bool',
- 'wgEnableWriteAPI' => 'bool',
- 'wgFilterCallback' => 'text',
'wgImplicitGroups' => 'array',
- 'wgPasswordAttemptThrottle' => 'array',
'wgPasswordSalt' => 'bool',
'wgReadOnly' => 'text',
'wgReadOnlyFile' => 'text',
'wgRestrictionTypes' => 'array',
- 'wgSpamRegex' => 'text',
+ 'wgRestrictionLevels' => 'array',
'wgWhitelistRead' => 'array',
),
'block' => array(
@@ -356,13 +389,16 @@
'wgSysopEmailBans' => 'bool',
'wgSysopRangeBans' => 'bool',
'wgSysopUserBans' => 'bool',
+ 'wgAutoblockExpiry' => 'int',
),
- ),
- 'rates' => array(
- 'rates' => array(
+ 'filter' => array(
+ 'wgSpamRegex' => 'array',
+ 'wgFilterCallback' => 'text',
+ 'wgDeleteRevisionsLimit' => 'int',
'wgRateLimitLog' => 'text',
'wgRateLimits' => 'array',
'wgRateLimitsExcludedGroups' => 'array',
+ 'wgPasswordAttemptThrottle' => 'array',
),
),
'proxy' => array(
@@ -377,19 +413,24 @@
'wgProxyWhitelist' => 'array',
'wgSecretKey' => 'text',
'wgSorbsUrl' => 'text',
- 'wgUsePrivateIPs' => 'bool',
),
),
'squid' => array(
'squid' => array(
+ 'wgUseSquid' => 'bool',
'wgInternalServer' => 'text',
'wgMaxSquidPurgeTitles' => 'int',
'wgSquidMaxage' => 'int',
'wgSquidServers' => 'array',
'wgSquidServersNoPurge' => 'array',
'wgUseESI' => 'bool',
- 'wgUseSquid' => 'bool',
+ 'wgUsePrivateIPs' => 'bool',
),
+ 'htcp' => array(
+ 'wgHTCPMulticastAddress' => 'text',
+ 'wgHTCPMulticastTTL' => 'int',
+ 'wgHTCPPort' => 'int',
+ ),
),
'cookie' => array(
'cookie' => array(
@@ -405,22 +446,6 @@
'wgSessionName' => 'text',
),
),
- 'reduction' => array(
- 'reduction' => array(
- 'wgAPIMaxDBRows' => 'int',
- 'wgDisableQueryPages' => 'bool',
- 'wgDisableQueryPageUpdate' => 'array',
- 'wgDisableSearchContext' => 'bool',
- 'wgDisableSearchUpdate' => 'bool',
- 'wgDisableTextSearch' => 'bool',
- 'wgEdititis' => 'bool',
- 'wgFixDoubleRedirects' => 'bool',
- 'wgMaximumMovedPages' => 'int',
- 'wgMiserMode' => 'bool',
- 'wgShowHostnames' => 'bool',
- 'wgUseDumbLinkUpdate' => 'bool',
- ),
- ),
'upload' => array(
'upload' => array(
'wgAjaxLicensePreview' => 'bool',
@@ -438,6 +463,7 @@
'wgMaxUploadSize' => 'int',
'wgHTTPTimeout' => 'int',
'wgHTTPProxy' => 'text',
+ 'wgXMLMimeTypes' => 'array',
),
'sharedupload' => array(
'wgCacheSharedUploads' => 'bool',
@@ -467,17 +493,20 @@
'images' => array(
'wgAllowImageMoving' => 'bool',
'wgCustomConvertCommand' => 'text',
- 'wgGenerateThumbnailOnParse' => 'bool',
'wgIgnoreImageErrors' => 'bool',
'wgImageLimits' => 'array',
'wgMaxAnimatedGifArea' => 'int',
'wgMaxImageArea' => 'int',
'wgMediaHandlers' => 'array',
+ 'wgShowEXIF' => 'bool',
+ 'wgTrustedMediaFormats' => 'array',
+ ),
+ 'thumbnail' => array(
+ 'wgThumbnailEpoch' => 'text',
'wgThumbnailScriptPath' => 'text',
'wgThumbUpright' => 'text',
- 'wgShowEXIF' => 'bool',
+ 'wgGenerateThumbnailOnParse' => 'bool',
'wgThumbLimits' => 'array',
- 'wgTrustedMediaFormats' => 'array',
),
'djvu' => array(
'wgDjvuDump' => 'text',
@@ -529,10 +558,6 @@
'html' => array(
'wgRawHtml' => 'bool',
),
- 'tex' => array(
- 'wgTexvc' => 'text',
- 'wgUseTeX' => 'bool',
- ),
'tidy' => array(
'wgAlwaysUseTidy' => 'bool',
'wgDebugTidy' => 'bool',
@@ -668,31 +693,6 @@
'wgSearchHighlightBoundaries' => 'text',
),
),
- 'htcp' => array(
- 'htcp' => array(
- 'wgHTCPMulticastAddress' => 'text',
- 'wgHTCPMulticastTTL' => 'int',
- 'wgHTCPPort' => 'int',
- ),
- ),
- 'misc' => array(
- 'misc' => array(
- 'wgAntiLockFlags' => 'int',
-# 'wgCommandLineMode' => 'bool', # Should never be set manually.
- 'wgCommandLineDarkBg' => 'bool',
- 'wgCompressRevisions' => 'bool',
- 'wgDisableOutputCompression' => 'bool',
- 'wgEnableHtmlDiff' => 'bool',
- 'wgExternalDiffEngine' => 'text',
- 'wgMaxShellFileSize' => 'int',
- 'wgMaxShellMemory' => 'int',
- 'wgMaxShellTime' => 'int',
- 'wgShellLocale' => 'text',
- 'wgUpdateRowsPerQuery' => 'int',
- 'wgUseAutomaticEditSummaries' => 'bool',
- 'wgUseTrackbacks' => 'bool',
- ),
- ),
);
/**
@@ -764,6 +764,7 @@
'wgPasswordAttemptThrottle' => 'assoc',
'wgRemoveGroups' => 'group-array',
'wgWhitelistRead' => 'simple',
+ 'wgSpamRegex' => 'simple',
# Rate limits
'wgRateLimits' => 'array',
'wgRateLimitsExcludedGroups' => 'simple',
