r65115 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r65114‎ | r65115 | r65116 >
Date:10:28, 16 April 2010
Author:siebrand
Status:ok
Tags:
Comment:
Review and messages.
Modified paths:
  • /branches/new-installer/phase3/includes/installer/Installer.i18n.php (modified) (history)
  • /branches/new-installer/phase3/includes/installer/WebInstaller.php (modified) (history)

Diff [purge]

Index: branches/new-installer/phase3/includes/installer/Installer.i18n.php
@@ -1,8 +1,8 @@
22 <?php
3 -/*
 3+/*
44 * Internationalization file for the install/upgrade process. None of the
55 * messages used here are loaded during normal operations, only during
6 - * install and upgrade. So you shouldn't put normal messages here.
 6+ * install and upgrade. So you should not put normal messages here.
77 */
88
99 $messages = array();
@@ -15,17 +15,18 @@
1616 'config-information' => 'Information',
1717 'config-session-error' => 'Error starting session: $1',
1818 'config-session-expired' => 'Your session data seems to have expired.
19 - Sessions are configured for a lifetime of $1, you can increase this by setting session.gc_maxlifetime in php.ini.
20 - Please restart the installation process.',
 19+Sessions are configured for a lifetime of $1.
 20+You can increase this by setting session.gc_maxlifetime in php.ini.
 21+Please restart the installation process.',
2122 'config-no-session' => 'Your session data was lost!
22 - Please check your php.ini and make sure session.save_path is set to an appropriate directory.',
 23+Please check your php.ini and make sure session.save_path is set to an appropriate directory.',
2324 'config-session-path-bad' => 'Your session.save_path ($1) seems to be invalid or unwritable.',
2425 'config-show-help' => 'Help',
2526 'config-hide-help' => 'Hide help',
2627 'config-your-language' => 'Your language:',
27 - 'config-your-language-help' => 'Select a language to use during the installation process',
 28+ 'config-your-language-help' => 'Select a language to use during the installation process.',
2829 'config-wiki-language' => 'Wiki language:',
29 - 'config-wiki-language-help' => 'Select the language that the wiki will predominantly be written in',
 30+ 'config-wiki-language-help' => 'Select the language that the wiki will predominantly be written in.',
3031 'config-back' => '← Back',
3132 'config-continue' => 'Continue →',
3233 'config-page-language' => 'Language',
@@ -42,107 +43,111 @@
4344 'config-page-releasenotes' => 'Release notes',
4445 'config-page-copying' => 'Copying',
4546 'config-page-upgradedoc' => 'Upgrading',
46 - 'config-help-restart' => 'Do you want to clear all saved data that you have entered, and restart the installation process?',
 47+ 'config-help-restart' => 'Do you want to clear all saved data that you have entered and restart the installation process?',
4748 'config-restart' => 'Yes, restart it',
4849 'config-welcome' => 'Welcome to MediaWiki!
4950
5051 === Technical data ===
51 -
5252 Below is some technical data that you can provide to us if you need help during installation.',
53 - 'config-copyright' => '=== Copyright and Terms ===
 53+ 'config-copyright' => "=== Copyright and Terms ===
5454
55 - MediaWiki is Copyright © 2001-2008 by Magnus Manske, Brion Vibber, Lee Daniel Crocker, Tim Starling, Erik Möller, Gabriel Wicke, Ævar Arnfjörð Bjarmason, Niklas Laxström, Domas Mituzas, Rob Church, Yuri Astrakhan, Aryeh Gregor, Aaron Schulz and others.
 55+$1
5656
57 - This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
 57+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
5858
59 - This program is distributed in the hope that it will be useful, but <strong>without any warranty</strong>; without even the implied warranty of <strong>merchantability</strong> or <strong>fitness for a particular purpose</strong>. See the GNU General Public License for more details.
 59+This program is distributed in the hope that it will be useful, but '''without any warranty'''; without even the implied warranty of '''merchantability''' or '''fitness for a particular purpose'''.
 60+See the GNU General Public License for more details.
6061
61 - You should have received <doclink href=Copying>a copy of the GNU General Public License</doclink> along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. or [http://www.gnu.org/copyleft/gpl.html read it online].',
 62+You should have received <doclink href=Copying>a copy of the GNU General Public License</doclink> along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. or [http://www.gnu.org/copyleft/gpl.html read it online].",
 63+ 'config-authors' => 'MediaWiki is Copyright © 2001-2010 by Magnus Manske, Brion Vibber, Lee Daniel Crocker, Tim Starling, Erik Möller, Gabriel Wicke, Ævar Arnfjörð Bjarmason, Niklas Laxström, Domas Mituzas, Rob Church, Yuri Astrakhan, Aryeh Gregor, Aaron Schulz, Andrew Garrett, Raimond Spekking, Alexandre Emsenhuber, Siebrand Mazeland, Chad Horohoe and others.',
6264 'config-sidebar' => "* [http://www.mediawiki.org MediaWiki home]
6365 * [http://www.mediawiki.org/wiki/Help:Contents User's Guide]
6466 * [http://www.mediawiki.org/wiki/Manual:Contents Administrator's Guide]
6567 * [http://www.mediawiki.org/wiki/Manual:FAQ FAQ]",
66 - 'config-env-good' => '<span class="success-message">Environment checked. You can install MediaWiki.</span>',
67 - 'config-env-bad' => 'Cannot install MediaWiki.',
 68+ 'config-env-good' => '<span class="success-message">The environment has been checked.
 69+You can install MediaWiki.</span>', // FIXME: take span out of message.
 70+ 'config-env-bad' => 'The environment has been checked.
 71+You cannot install MediaWiki.',
6872 'config-env-php' => 'PHP $1 installed',
69 - 'config-env-latest-ok' => 'You are installing the latest version of Mediawiki',
70 - 'config-env-latest-new' => "'''Note:''' You are installing a development version of Mediawiki",
71 - 'config-env-latest-old' => "'''Warning:''' You are installing an outdated version of Mediawiki",
 73+ 'config-env-latest-ok' => 'You are installing the latest version of Mediawiki.',
 74+ 'config-env-latest-new' => "'''Note:''' You are installing a development version of Mediawiki.",
 75+ 'config-env-latest-old' => "'''Warning:''' You are installing an outdated version of Mediawiki.",
7276 'config-env-latest-help' => 'You are installing version $1, but the latest version is $2.
73 - You are advised to use the latest release, which can be downloaded from [http://www.mediawiki.org/wiki/Download Mediawiki.org]',
 77+You are advised to use the latest release, which can be downloaded from [http://www.mediawiki.org/wiki/Download Mediawiki.org]',
7478 'config-no-db' => 'Could not find a suitable database driver!',
7579 'config-no-db-help' => 'You need to install a database driver for PHP.
76 - The following database types are supported: $1.
 80+The following database types are supported: $1.
7781
78 - If you are on shared hosting, ask your hosting provider to install a suitable database driver.
79 - If you compiled PHP yourself, reconfigure it with a database client enabled, for example using the ./configure --with-mysql.
80 - If you installed PHP from a Debian or Ubuntu package, then you also need install the php5-mysql module.',
 82+If you are on shared hosting, ask your hosting provider to install a suitable database driver.
 83+If you compiled PHP yourself, reconfigure it with a database client enabled, for example using the ./configure --with-mysql.
 84+If you installed PHP from a Debian or Ubuntu package, then you also need install the php5-mysql module.',
8185 'config-have-db' => 'Found database drivers for: $1',
82 - 'config-register-globals' => '<strong class="error">Warning:</strong>
83 - <strong>PHP\'s <tt>[http://php.net/register_globals register_globals]</tt> option is enabled. Disable it if you can.</strong>
84 - MediaWiki will work, but your server is exposed to potential security vulnerabilities.',
85 - 'config-magic-quotes-runtime' => '<strong>Fatal: [http://www.php.net/manual/en/ref.info.php#ini.magic-quotes-runtime magic_quotes_runtime] is active!</strong>
86 - This option corrupts data input unpredictably; you cannot install or use MediaWiki unless this option is disabled.',
87 - 'config-magic-quotes-sybase' => '<strong>Fatal: [http://www.php.net/manual/en/ref.info.php#ini.magic-quotes-sybase magic_quotes_sybase] is active!</strong>
88 - This option corrupts data input unpredictably; you cannot install or use MediaWiki unless this option is disabled.',
89 - 'config-mbstring' => '<strong>Fatal: [http://www.php.net/manual/en/ref.mbstring.php#mbstring.overload mbstring.func_overload] is active!</strong>
90 - This option causes errors and may corrupt data unpredictably; you cannot install or use MediaWiki unless this option is disabled.',
91 - 'config-ze1' => '<strong>Fatal: [http://www.php.net/manual/en/ini.core.php zend.ze1_compatibility_mode] is active!</strong>
92 - This option causes horrible bugs with MediaWiki; you cannot install or use MediaWiki unless this option is disabled.',
93 - 'config-safe-mode' => '<b class="error">Warning:</b>
94 - <strong>PHP\'s [http://www.php.net/features.safe-mode safe mode] is active.</strong>
95 - It may cause problems, particularly if using image uploads and math support.',
 86+ 'config-register-globals' => "'''Warning: PHP\'s <code>[http://php.net/register_globals register_globals]</code> option is enabled.'''
 87+'''Disable it if you can.'''
 88+MediaWiki will work, but your server is exposed to potential security vulnerabilities.",
 89+ 'config-magic-quotes-runtime' => "'''Fatal: [http://www.php.net/manual/en/ref.info.php#ini.magic-quotes-runtime magic_quotes_runtime] is active!'''
 90+This option corrupts data input unpredictably; you cannot install or use MediaWiki unless this option is disabled.",
 91+ 'config-magic-quotes-sybase' => "'''Fatal: [http://www.php.net/manual/en/ref.info.php#ini.magic-quotes-sybase magic_quotes_sybase] is active!'''
 92+This option corrupts data input unpredictably; you cannot install or use MediaWiki unless this option is disabled.",
 93+ 'config-mbstring' => "'''Fatal: [http://www.php.net/manual/en/ref.mbstring.php#mbstring.overload mbstring.func_overload] is active!'''
 94+This option causes errors and may corrupt data unpredictably; you cannot install or use MediaWiki unless this option is disabled.",
 95+ 'config-ze1' => "'''Fatal: [http://www.php.net/manual/en/ini.core.php zend.ze1_compatibility_mode] is active!'''
 96+This option causes horrible bugs with MediaWiki; you cannot install or use MediaWiki unless this option is disabled.",
 97+ 'config-safe-mode' => "'''Warning:'''
 98+'''PHP's [http://www.php.net/features.safe-mode safe mode] is active.'''
 99+It may cause problems, particularly if using image uploads and math support.",
96100 'config-xml-good' => 'Have XML / Latin1-UTF-8 conversion support.',
97101 'config-xml-bad' => "PHP's XML module is missing;
98 - the wiki requires functions in this module and won't work in this configuration.
99 - If you're running Mandrake, install the php-xml package.",
 102+the wiki requires functions in this module and will not work in this configuration.
 103+If you're running Mandrake, install the php-xml package.",
100104 'config-pcre' => 'The PCRE support module appears to be missing.
101 - MediaWiki requires the Perl-compatible regular expression functions to work.',
102 - 'config-memory-none' => 'PHP is configured with no <tt>memory_limit</tt>',
103 - 'config-memory-ok' => "PHP's <tt>memory_limit</tt> is $1, ok.",
104 - 'config-memory-raised' => "PHP's <tt>memory_limit</tt> is $1, raised to $2.",
105 - 'config-memory-bad' => "<strong>Warning:</strong> PHP's <tt>memory_limit</tt> is $1.
106 - This is probably too low, the installation may fail!",
 105+MediaWiki requires the Perl-compatible regular expression functions to work.',
 106+ 'config-memory-none' => 'PHP is configured with no <code>memory_limit</code>',
 107+ 'config-memory-ok' => "PHP's <code>memory_limit</code> is $1, ok.",
 108+ 'config-memory-raised' => "PHP's <code>memory_limit</code> is $1, raised to $2.",
 109+ 'config-memory-bad' => "'''Warning:''' PHP's <code>memory_limit</code> is $1.
 110+This is probably too low, the installation may fail!",
107111 'config-xcache' => '[http://trac.lighttpd.net/xcache/ XCache] installed',
108112 'config-apc' => '[http://www.php.net/apc APC] installed',
109113 'config-eaccel' => '[http://eaccelerator.sourceforge.net/ eAccelerator] installed',
110 - 'config-no-cache' => '<strong>Warning:</strong>
111 - Could not find [http://eaccelerator.sourceforge.net eAccelerator],
112 - [http://www.php.net/apc APC] or [http://trac.lighttpd.net/xcache/ XCache].
113 - Object caching is not enabled.',
114 - 'config-diff3-good' => 'Found GNU diff3: <tt>$1</tt>.',
 114+ 'config-no-cache' => "'''Warning:'''
 115+Could not find [http://eaccelerator.sourceforge.net eAccelerator],
 116+[http://www.php.net/apc APC] or [http://trac.lighttpd.net/xcache/ XCache].
 117+Object caching is not enabled.",
 118+ 'config-diff3-good' => 'Found GNU diff3: <code>$1</code>.',
115119 'config-diff3-bad' => 'GNU diff3 not found.',
116 - 'config-imagemagick' => 'Found ImageMagick: <tt>$1</tt>.
117 - Image thumbnailing will be enabled if you enable uploads.',
 120+ 'config-imagemagick' => 'Found ImageMagick: <code>$1</code>.
 121+Image thumbnailing will be enabled if you enable uploads.',
118122 'config-gd' => 'Found GD graphics library built-in.
119 - Image thumbnailing will be enabled if you enable uploads.',
 123+Image thumbnailing will be enabled if you enable uploads.',
120124 'config-no-scaling' => 'Could not find GD library or ImageMagick.
121 - Image thumbnailing will be disabled.',
122 - 'config-dir' => 'Installation directory: <tt>$1</tt>',
123 - 'config-uri' => 'Script URI path: <tt>$1</tt>',
124 - 'config-no-uri' => '<strong>Error:</strong> Could not determine the current URI. Installation aborted.',
125 - 'config-dir-not-writable' => "<strong>Error:</strong> Can't write config file. Installation aborted.
 125+Image thumbnailing will be disabled.',
 126+ 'config-dir' => 'Installation directory: <code>$1</code>',
 127+ 'config-uri' => 'Script URI path: <code>$1</code>',
 128+ 'config-no-uri' => "'''Error:''' Could not determine the current URI.'''
 129+'''Installation aborted.'''",
 130+ 'config-dir-not-writable' => "'''Error:''' Cannot write config file.
 131+Installation aborted.
126132
127 - To make the directory writable on a Unix/Linux system:
128 - <pre>
129 - cd $1
130 - chmod a+w config
131 - </pre>",
 133+To make the directory writable on a Unix/Linux system:
 134+<pre>cd $1
 135+chmod a+w config</pre>",
132136 'config-file-extension' => 'Installing MediaWiki with <tt>$1</tt> file extensions',
133137 'config-shell-locale' => 'Detected shell locale, $1',
134138 'config-uploads-safe' => 'Default uploads directory is safe from arbitrary scripts execution.',
135 - 'config-uploads-not-safe' => '<strong>Warning:</strong> Your default uploads directory <tt>$1</tt> is vulnerable to arbitrary scripts execution.
136 - Uploads will be disabled.',
 139+ 'config-uploads-not-safe' => "'''Warning:''' Your default uploads directory <code>$1</code> is vulnerable to arbitrary scripts execution.
 140+Uploads will be disabled.",
137141 'config-db-type' => 'Database type:',
138142 'config-db-host' => 'Database host:',
139143 'config-db-host-help' => 'If your database server is on different server, enter the host name or IP address here.
140144
141 - If you are using shared web hosting, your hosting provider should give you the correct host name in their documentation.',
 145+If you are using shared web hosting, your hosting provider should give you the correct host name in their documentation.',
142146 'config-db-wiki-settings' => 'Identify this wiki',
143147 'config-db-name' => 'Database name:',
144 - 'config-db-name-help' => 'Choose a name that identifies your wiki. It should not contain spaces or hyphens.
 148+ 'config-db-name-help' => 'Choose a name that identifies your wiki.
 149+It should not contain spaces or hyphens.
145150
146 - If you are using shared web hosting, your hosting provider will either give you a specific database name to use, or let you create databases via a control panel.',
 151+If you are using shared web hosting, your hosting provider will either give you a specific database name to use, or let you create databases via a control panel.',
147152 'config-db-install-account' => 'User account for installation',
148153 'config-db-username' => 'Database username:',
149154 'config-db-password' => 'Database password:',
@@ -150,31 +155,32 @@
151156 'config-db-account-lock' => 'Use the same username and password during normal operation',
152157 'config-db-wiki-account' => 'User account for normal operation',
153158 'config-db-wiki-help' => 'Select the username and password that will be used to connect to the database during normal wiki operation.
154 - If the account does not exist, and the installation account has sufficient privileges, this user account will be created with the minimum privileges required to operate the wiki.',
 159+If the account does not exist, and the installation account has sufficient privileges, this user account will be created with the minimum privileges required to operate the wiki.',
155160 'config-db-prefix' => 'Database table prefix:',
156161 'config-db-prefix-help' => 'If you need to share one database between multiple wikis, or between MediaWiki and another web application, you may choose to add a prefix to all the table names to avoid conflicts.
157 - Do not use spaces or hyphens.
 162+Do not use spaces or hyphens.
158163
159 - This field is usually left empty.',
 164+This field is usually left empty.',
160165 'config-db-charset' => 'Database character set',
161166 'config-charset-mysql5-binary' => 'MySQL 4.1/5.0 binary',
162167 'config-charset-mysql5' => 'MySQL 4.1/5.0 UTF-8',
163168 'config-charset-mysql4' => 'MySQL 4.0 backwards-compatible UTF-8',
164 - 'config-charset-help' => "<b>WARNING:</b> If you use <b>backwards-compatible UTF-8</b> on MySQL 4.1+, and subsequently back up the database with <tt>mysqldump</tt>, it may destroy all non-ASCII characters, irreversibly corrupting your backups!.
165 - <br/><br/>
166 - In <b>binary mode</b>, MediaWiki stores UTF-8 text to the database in binary fields.
167 - This is more efficient than MySQL's UTF-8 mode, and allows you to use the full range of Unicode characters.
168 - In <b>UTF-8 mode</b>, MySQL will know what character set your data is in, and can present and convert it appropriately,
169 - but it will not let you store characters above the [http://en.wikipedia.org/wiki/Mapping_of_Unicode_character_planes Basic Multilingual Plane].",
 169+ 'config-charset-help' => "'''WARNING:''' If you use '''backwards-compatible UTF-8''' on MySQL 4.1+, and subsequently back up the database with <code>mysqldump</code>, it may destroy all non-ASCII characters, irreversibly corrupting your backups!.
 170+
 171+In '''binary mode''', MediaWiki stores UTF-8 text to the database in binary fields.
 172+This is more efficient than MySQL's UTF-8 mode, and allows you to use the full range of Unicode characters.
 173+In '''UTF-8 mode''', MySQL will know what character set your data is in, and can present and convert it appropriately,
 174+but it will not let you store characters above the [http://en.wikipedia.org/wiki/Mapping_of_Unicode_character_planes Basic Multilingual Plane].",
170175 'config-mysql-old' => 'MySQL $1 or later is required, you have $2.',
171176 'config-db-port' => 'Database port:',
172177 'config-db-schema' => 'Schema for MediaWiki',
173178 'config-db-ts2-schema' => 'Schema for tsearch2',
174 - 'config-db-schema-help' => 'The above schemas are usually correct. Only change them if you know you need to.',
 179+ 'config-db-schema-help' => 'The above schemas are usually correct.
 180+Only change them if you know you need to.',
175181 'config-sqlite-dir' => 'SQLite data directory:',
176 - 'config-sqlite-dir-help' => 'SQLite stores data into a file in the filesystem.
177 - This directory must be writable by the webserver.
178 - It should <strong>not</strong> accessible via the web.',
 182+ 'config-sqlite-dir-help' => "SQLite stores data into a file in the filesystem.
 183+This directory must be writable by the webserver.
 184+It should '''not''' accessible via the web.",
179185 'config-type-mysql' => 'MySQL',
180186 'config-type-postgres' => 'PostgreSQL',
181187 'config-type-sqlite' => 'SQLite',
@@ -185,55 +191,63 @@
186192 'config-header-oracle' => 'Oracle settings',
187193 'config-invalid-db-type' => 'Invalid database type',
188194 'config-missing-db-name' => 'You must enter a value for "Database name"',
189 - 'config-invalid-db-name' => 'Invalid database name "$1". It may only contain numbers, letters and underscores.',
190 - 'config-invalid-db-prefix' => 'Invalid database prefix "$1". It may only contain numbers, letters and underscores.',
 195+ 'config-invalid-db-name' => 'Invalid database name "$1".
 196+It may only contain numbers, letters and underscores.',
 197+ 'config-invalid-db-prefix' => 'Invalid database prefix "$1".
 198+It may only contain numbers, letters and underscores.',
191199 'config-connection-error' => '$1.
192200
193 - Check the host, username and password below and try again.',
194 - 'config-invalid-schema' => 'Invalid schema for MediaWiki "$1". Please use only letters, numbers and underscores.',
195 - 'config-invalid-ts2schema' => 'Invalid schema for tsearch2 "$1". Please use only letters, numbers and underscores.',
 201+Check the host, username and password below and try again.',
 202+ 'config-invalid-schema' => 'Invalid schema for MediaWiki "$1".
 203+Please use only letters, numbers and underscores.',
 204+ 'config-invalid-ts2schema' => 'Invalid schema for tsearch2 "$1".
 205+Please use only letters, numbers and underscores.',
196206 'config-postgres-old' => 'PostgreSQL $1 or later is required, you have $2.',
197 - 'config-sqlite-name-help' => 'Choose a name that identifies your wiki. Do not use spaces or hyphens. This will be used for the SQLite data file name.',
 207+ 'config-sqlite-name-help' => 'Choose a name that identifies your wiki.
 208+Do not use spaces or hyphens.
 209+This will be used for the SQLite data file name.',
198210 'config-sqlite-parent-unwritable' => 'Cannot create the data directory "$1", because the parent directory "$2" is not writable by the webserver.
199 - Please create this directory yourself, make it writable, and try again.',
 211+Please create this directory yourself, make it writable, and try again.',
200212 'config-sqlite-mkdir-error' => 'Error creating the data directory "$1".
201 - Please check the location and try again.',
 213+Please check the location and try again.',
202214 'config-sqlite-dir-unwritable' => 'Unable to write to the given directory: $1.
203 - Please change its permissions so that the webserver can write to it, and try again.',
 215+Please change its permissions so that the webserver can write to it, and try again.',
204216 'config-sqlite-connection-error' => '$1.
205217
206 - Check the data directory and database name below and try again.',
 218+Check the data directory and database name below and try again.',
207219 'config-sqlite-readonly' => 'File $1 is not writeable.',
208220 'config-sqlite-cant-create-db' => 'Could not create database file $1.',
209 - 'config-can-upgrade' => 'There are MediaWiki tables in this database.
210 - To upgrade them to MediaWiki $1, click <strong>Continue</strong>.',
211 - 'config-upgrade-done' => 'Upgrade complete.
 221+ 'config-can-upgrade' => "There are MediaWiki tables in this database.
 222+To upgrade them to MediaWiki $1, click '''Continue'''.",
 223+ 'config-upgrade-done' => "Upgrade complete.
212224
213 - You can now [$1 start using your wiki].
 225+You can now [$1 start using your wiki].
214226
215 - If you want to regenerate your LocalSettings.php file, click the button below.
216 - This is <strong>not recommended</strong> unless you are having problems with your wiki.',
217 - 'config-regenerate' => 'Regenerate LocalSettings.php >',
 227+If you want to regenerate your LocalSettings.php file, click the button below.
 228+This is '''not recommended''' unless you are having problems with your wiki.",
 229+ 'config-regenerate' => 'Regenerate LocalSettings.php →',
218230 'config-show-table-status' => 'SHOW TABLE STATUS query failed!',
219 - 'config-unknown-collation' => '<strong>Warning:</strong> Datbase is using unrecognised collation.',
 231+ 'config-unknown-collation' => "'''Warning:''' Datbase is using unrecognised collation.",
220232 'config-db-web-account' => 'Database account for web access',
221233 'config-db-web-help' => 'Select the username and password that the web server will use to connect to the database server, during ordinary operation of the wiki.',
222234 'config-db-web-account-same' => 'Use the same account as for installation',
223235 'config-db-web-create' => 'Create the account if it does not already exist',
224236 'config-db-web-no-create-privs' => 'The account you specified for installation does not have enough privileges to create an account.
225 - The account you specify here must already exist.',
 237+The account you specify here must already exist.',
226238 'config-mysql-engine' => 'Storage engine',
227239 'config-mysql-innodb' => 'InnoDB',
228240 'config-mysql-myisam' => 'MyISAM',
229 - 'config-mysql-engine-help' => '<strong>InnoDB</strong> is almost always the best option, since it has good concurrency support.
 241+ 'config-mysql-engine-help' => "'''InnoDB''' is almost always the best option, since it has good concurrency support.
230242
231 - <strong>MyISAM</strong> may be faster in single-user or read-only installations. MyISAM databases tend to get corrupted more often than InnoDB databases.',
 243+'''MyISAM''' may be faster in single-user or read-only installations.
 244+MyISAM databases tend to get corrupted more often than InnoDB databases.",
232245 'config-mysql-charset' => 'Database character set',
233246 'config-mysql-binary' => 'Binary',
234247 'config-mysql-utf8' => 'UTF-8',
235 - 'config-mysql-charset-help' => "In '''binary mode''', MediaWiki stores UTF-8 text to the database in binary fields. This is more efficient than MySQL's UTF-8 mode, and allows you to use the full range of Unicode characters.
 248+ 'config-mysql-charset-help' => "In '''binary mode''', MediaWiki stores UTF-8 text to the database in binary fields.
 249+This is more efficient than MySQL's UTF-8 mode, and allows you to use the full range of Unicode characters.
236250
237 - In '''UTF-8 mode''', MySQL will know what character set your data is in, and can present and convert it appropriately, but it won't let you store characters above the [http://en.wikipedia.org/wiki/Mapping_of_Unicode_character_planes Basic Multilingual Plane]. ",
 251+In '''UTF-8 mode''', MySQL will know what character set your data is in, and can present and convert it appropriately, but it will not let you store characters above the [http://en.wikipedia.org/wiki/Mapping_of_Unicode_character_planes Basic Multilingual Plane].",
238252 'config-site-name' => 'Name of wiki:',
239253 'config-site-name-help' => "This will appear in the browser's title bar and various other places.",
240254 'config-site-name-blank' => 'Please enter a site name.',
@@ -242,27 +256,29 @@
243257 'config-ns-site-name' => 'Same as the wiki name: $1',
244258 'config-ns-other' => 'Other (please specify)',
245259 'config-ns-other-default' => 'MyWiki',
246 - 'config-project-namespace-help' => 'Following Wikipedia\'s example, many wikis keep their policy and help pages separate from their content pages, in a "<strong>project namespace</strong>".
247 - All page titles in this namespace start with a certain prefix, which you can specify here.
248 - Traditionally, this prefix is derived from the name of the wiki, but it cannot contain punctuation characters such as # or :',
249 - 'config-ns-invalid' => 'The specified namespace "<nowiki>$1</nowiki>" is invalid. Please specify a different project namespace',
 260+ 'config-project-namespace-help' => 'Following Wikipedia\'s example, many wikis keep their policy and help pages separate from their content pages, in a "\'\'\'project namespace\'\'\'".
 261+All page titles in this namespace start with a certain prefix, which you can specify here.
 262+Traditionally, this prefix is derived from the name of the wiki, but it cannot contain punctuation characters such as "#" or ":".',
 263+ 'config-ns-invalid' => 'The specified namespace "<nowiki>$1</nowiki>" is invalid.
 264+Please specify a different project namespace',
250265 'config-admin-default-username' => 'WikiSysop',
251266 'config-admin-box' => 'Administrator account',
252267 'config-admin-name' => 'Your name:',
253268 'config-admin-password' => 'Password:',
254269 'config-admin-password-confirm' => 'Password again:',
255270 'config-admin-help' => 'Enter your preferred username here, for example "Joe Bloggs".
256 - This is the name you will use to log in to the wiki.',
 271+This is the name you will use to log in to the wiki.',
257272 'config-admin-name-blank' => 'Please enter an administrator username.',
258 - 'config-admin-name-invalid' => 'The specified username "<nowiki>$1</nowiki>" is invalid. Please specify a different username.',
 273+ 'config-admin-name-invalid' => 'The specified username "<nowiki>$1</nowiki>" is invalid.
 274+Please specify a different username.',
259275 'config-admin-password-blank' => 'Please enter a password for administrator account.',
260276 'config-admin-password-same' => 'The password must not be the same as the username.',
261277 'config-admin-password-mismatch' => 'The two passwords you entered do not match.',
262 - 'config-admin-email' => 'Email address:',
263 - 'config-admin-email-help' => 'Enter an email address here to allow you to receive email from other users on the wiki, reset your password, and be notified of changes to pages on your watchlist.',
 278+ 'config-admin-email' => 'E-mail address:',
 279+ 'config-admin-email-help' => 'Enter an e-mail address here to allow you to receive e-mail from other users on the wiki, reset your password, and be notified of changes to pages on your watchlist.',
264280 'config-subscribe' => 'Subscribe to the [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce release announcements mailing list].',
265281 'config-subscribe-help' => 'This is a low-volume mailing list used for release announcements, including important security announcements.
266 - You should subscribe to it and update your copy of MediaWiki when new versions come out.',
 282+You should subscribe to it and update your copy of MediaWiki when new versions come out.',
267283 'config-almost-done' => 'You are almost done! You can now skip the remaining configuration and install the wiki right now.',
268284 'config-optional-continue' => 'Ask me more questions.',
269285 'config-optional-skip' => "I'm bored already, just install the wiki.",
@@ -272,35 +288,36 @@
273289 'config-profile-fishbowl' => 'Fishbowl',
274290 'config-profile-private' => 'Private wiki',
275291 'config-profile-help' => "Wikis work best when you let as many people edit them as possible.
276 - In MediaWiki, it's easy to review the recent changes, and to revert any damage that is done by naïve or malicious users.
 292+In MediaWiki, it's easy to review the recent changes, and to revert any damage that is done by naïve or malicious users.
277293
278 - However, many people have found MediaWiki to be useful in a wide variety of roles, and sometimes it's not easy to convince everyone around you of the benefits of the wiki way. So we give you the choice.
 294+However, many people have found MediaWiki to be useful in a wide variety of roles, and sometimes it's not easy to convince everyone around you of the benefits of the wiki way.
 295+So we give you the choice.
279296
280 - A '''traditional wiki''' allows anyone to edit, without even logging in. Some people prefer a wiki with '''account creation required''', since this provides extra accountability (but may deter casual contributors).
 297+A '''traditional wiki''' allows anyone to edit, without even logging in.
 298+Some people prefer a wiki with '''account creation required''', since this provides extra accountability (but may deter casual contributors).
281299
282 - A '''fishbowl''' only allows approved users to edit, but the public can view the pages, including history. A '''private wiki''' only allows approved users to view pages, with the same group allowed to edit.
 300+A '''fishbowl''' only allows approved users to edit, but the public can view the pages, including history.
 301+A '''private wiki''' only allows approved users to view pages, with the same group allowed to edit.
283302
284 - More complex user rights configurations are available after installation, see the [http://www.mediawiki.org/wiki/Manual:User_rights relevant manual entry].
285 - ",
 303+More complex user rights configurations are available after installation, see the [http://www.mediawiki.org/wiki/Manual:User_rights relevant manual entry].",
286304 'config-license' => 'Copyright and license',
287305 'config-license-none' => 'No license footer',
288306 'config-license-gfdl-old' => 'GNU Free Documentation License 1.2 or later',
289307 'config-license-gfdl-current' => 'GNU Free Documentation License 1.3 or later',
290308 'config-license-pd' => 'Public Domain',
291309 'config-license-cc-choose' => 'A Creative Commons license',
292 - 'config-license-help' => 'Many public wikis put all contributions under a [http://freedomdefined.org/Definition free license].
293 - This helps to create a sense of community ownership and encourages long-term contribution.
294 - It is not generally necessary for a private or corporate wiki.
 310+ 'config-license-help' => "Many public wikis put all contributions under a [http://freedomdefined.org/Definition free license].
 311+This helps to create a sense of community ownership and encourages long-term contribution.
 312+It is not generally necessary for a private or corporate wiki.
295313
296 - If you want to be able to use text from Wikipedia, and you want Wikipedia to be able to accept text copied from your wiki, you should choose <strong>GNU Free Documentation License 1.2</strong>.
297 - However, this license has some features which make reuse and interpretation difficult.
 314+If you want to be able to use text from Wikipedia, and you want Wikipedia to be able to accept text copied from your wiki, you should choose '''GNU Free Documentation License 1.2'''.
 315+However, this license has some features which make reuse and interpretation difficult.
298316
299 - If Wikipedia-compatibility is not important, <strong>Creative Commons</strong> with the <strong>Share Alike</strong> option (cc-by-sa) is a good choice.
300 - ',
301 - 'config-email-settings' => 'Email settings',
302 - 'config-enable-email' => 'Enable outbound email',
303 - 'config-enable-email-help' => "If you want email to work, [http://au2.php.net/manual/en/mail.configuration.php PHP's mail settings] need to be configured correctly.
304 - If you do not want any email features, you can disable them here.",
 317+If Wikipedia-compatibility is not important, '''Creative Commons''' with the '''Share Alike''' option (cc-by-sa) is a good choice.",
 318+ 'config-email-settings' => 'E-mail settings',
 319+ 'config-enable-email' => 'Enable outbound e-mail',
 320+ 'config-enable-email-help' => "If you want e-mail to work, [http://www.php.net/manual/en/mail.configuration.php PHP's mail settings] need to be configured correctly.
 321+If you do not want any e-mail features, you can disable them here.",
305322 'config-email-user' => 'Enable user-to-user e-mail',
306323 'config-email-user-help' => 'All users to send each other e-mail, if they have enabled it in their preferences',
307324 'config-email-usertalk' => 'Enable user talk page notification',
@@ -308,65 +325,70 @@
309326 'config-email-watchlist' => 'Enable watchlist notification',
310327 'config-email-watchlist-help' => 'Allow users to receive notifications to their watched pages, if they have enabled it in their preferences',
311328 'config-email-auth' => 'Enable e-mail authentication',
312 - 'config-email-auth-help' => "If this option is enabled, users have to confirm their e-mail address using a magic link sent to them whenever they set or change it, and only authenticated e-mail addresses can receive mails from other users or
313 - change notification mails. Setting this option is '''recommended''' for public wikis because of potential abuse of the e-mail features.",
314 - 'config-email-sender' => 'Return address:',
315 - 'config-email-sender-help' => 'Enter the email address to use as the return address on outbound email.
316 - This is where bounces will be sent.
317 - Many mail servers require at least the domain name part to be valid.',
 329+ 'config-email-auth-help' => "If this option is enabled, users have to confirm their e-mail address using a magic link sent to them whenever they set or change it, and only authenticated e-mail addresses can receive mails from other users or change notification mails.
 330+Setting this option is '''recommended''' for public wikis because of potential abuse of the e-mail features.",
 331+ 'config-email-sender' => 'Return e-mail address:',
 332+ 'config-email-sender-help' => 'Enter the e-mail address to use as the return address on outbound e-mail.
 333+This is where bounces will be sent.
 334+Many mail servers require at least the domain name part to be valid.',
318335 'config-upload-settings' => 'Images and file uploads',
319336 'config-upload-enable' => 'Enable file uploads',
320337 'config-upload-help' => "File uploads potentially expose your server to security risks.
321 - For more information, read the [http://www.mediawiki.org/wiki/Manual:Security security section] in the manual.
 338+For more information, read the [http://www.mediawiki.org/wiki/Manual:Security security section] in the manual.
322339
323 - To enable file uploads, change the mode on the <tt>images</tt> subdirectory under MediaWiki's root directory so that the web server can write to it. Then enable this option.",
 340+To enable file uploads, change the mode on the <code>images</code> subdirectory under MediaWiki's root directory so that the web server can write to it.
 341+Then enable this option.",
324342 'config-upload-disabled' => 'Because your web server is configured to execute scripts from the default uploads directory, uploads will be disabled.',
325343 'config-upload-deleted' => 'Directory for deleted files :',
326344 'config-upload-deleted-help' => 'Choose a directory in which to archive deleted files.
327 - Ideally, this should not be accessible from the web.',
 345+Ideally, this should not be accessible from the web.',
328346 'config-logo' => 'Logo URL:',
329347 'config-logo-help' => "MediaWiki's default skin includes space for a 135x135 pixel logo in the top left corner.
330 - Upload an image of the appropriate size, and enter the URL here.
 348+Upload an image of the appropriate size, and enter the URL here.
331349
332 - If you don't want a logo, leave this box blank.",
333 - 'config-cc-error' => 'The Creative Commons license chooser gave no result. Please enter the license name manually.',
 350+If you do not want a logo, leave this box blank.",
 351+ 'config-cc-error' => 'The Creative Commons license chooser gave no result.
 352+Please enter the license name manually.',
334353 'config-cc-again' => 'Pick again...',
335354 'config-cc-not-chosen' => 'Please choose which Creative Commons license you want and click "proceed".',
336355 'config-advanced-settings' => 'Advanced configuration',
337356 'config-cache-options' => 'Settings for object caching',
338 - 'config-cache-help' => 'Object caching is used to improve the speed of MediaWiki by caching frequently used data. Medium to large sites
339 - are highly encouraged to enable this, and small sites will see benefits as well.',
340 - 'config-cache-none' => 'No caching. No functionality is removed, but speed may be impacted.',
 357+ 'config-cache-help' => 'Object caching is used to improve the speed of MediaWiki by caching frequently used data.
 358+Medium to large sites are highly encouraged to enable this, and small sites will see benefits as well.',
 359+ 'config-cache-none' => 'No caching.
 360+No functionality is removed, but speed may be impacted.',
341361 'config-cache-accel' => 'PHP object caching (APC, eAccelerator or XCache)',
342362 'config-cache-memcached' => 'Use Memcached (requires additional setup and configuration)',
343363 'config-cache-db' => 'Cache data into the database',
344364 'config-cache-anything' => 'MediaWiki will attempt to cache data anywhere possible, except Memcached',
345365 'config-memcached-servers' => 'Memcached servers',
346 - 'config-memcached-help' => 'List of IP addresses to use for Memcached. Should be separated with
347 - commas and specify the port to be used (eg: 1.2.3.4:56, 7.8.9.10:11)',
 366+ 'config-memcached-help' => 'List of IP addresses to use for Memcached.
 367+Should be separated with commas and specify the port to be used (eg: 1.2.3.4:56, 7.8.9.10:11)',
348368 'config-extensions' => 'Extensions',
349 - 'config-extensions-help' => 'The extensions listed above were automatically detected in your <tt>./extensions</tt> directory.
 369+ 'config-extensions-help' => 'The extensions listed above were automatically detected in your <code>./extensions</code> directory.
350370
351 - They may require additional configuration, but you can enable them now',
 371+They may require additional configuration, but you can enable them now',
352372 'config-install-step-done' => 'done',
353 - 'config-install-step-failed' => 'FAILED',
 373+ 'config-install-step-failed' => 'Failed',
354374 'config-install-extensions' => 'Including extensions',
355375 'config-install-database' => 'Setting up database',
356 - 'config-install-pg-schema-failed' => 'Tables creation failed. Make sure that the user "$1" can write to the schema "$2".',
 376+ 'config-install-pg-schema-failed' => 'Tables creation failed.
 377+Make sure that the user "$1" can write to the schema "$2".',
357378 'config-install-tables' => 'Creating tables',
358379 'config-install-interwiki-sql' => 'Could not find file interwiki.sql',
359380 'config-install-secretkey' => 'Generating secret key',
360 - 'config-insecure-secretkey' => 'Warning: Unable to create secure $wgSecretKey. Consider changing it manually.',
 381+ 'config-insecure-secretkey' => 'Warning: Unable to create secure $wgSecretKey.
 382+Consider changing it manually.',
361383 'config-install-sysop' => 'Creating administrator user account',
362384 'config-install-localsettings' => 'Creating LocalSettings.php',
363 - 'config-install-localsettings-unwritable' => 'Warning: could not write LocalSettings.php. Please create it yourself, using the following text:',
 385+ 'config-install-localsettings-unwritable' => 'Warning: could not write LocalSettings.php.
 386+Please create it yourself, using the following text:',
364387 'config-install-done' => "'''Congratulations''', you have successfully installed MediaWiki.
365388
366 - You will need to move it from <tt>./config/LocalSettings.php</tt> to <tt>./LocalSettings.php</tt> in order
367 - for MediaWiki to begin working.
 389+You will need to move it from <code>./config/LocalSettings.php</code> to <code>./LocalSettings.php</code> in order for MediaWiki to begin working.
368390
369 - [$1 Link to your wiki]",
 391+[$1 Link to your wiki]",
370392 'config-install-done-moved' => "'''Congratulations''', you have successfully installed MediaWiki.
371393
372 - [$1 Link to your wiki]",
373 -);
\ No newline at end of file
 394+[$1 Link to your wiki]",
 395+);
Index: branches/new-installer/phase3/includes/installer/WebInstaller.php
@@ -966,7 +966,7 @@
967967 $this->parent->output->addWikiText( wfMsgNoTrans( 'config-welcome' ) );
968968 $status = $this->parent->doEnvironmentChecks();
969969 if ( $status ) {
970 - $this->parent->output->addWikiText( wfMsgNoTrans( 'config-copyright' ) );
 970+ $this->parent->output->addWikiText( wfMsgNoTrans( 'config-copyright', wfMsg( 'config-authors' ) ) );
971971 $this->startForm();
972972 $this->endForm();
973973 }

Status & tagging log