r63399 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r63398‎ | r63399 | r63400 >
Date:17:23, 8 March 2010
Author:demon
Status:ok
Tags:
Comment:
Cleanup some of the UI text, per Nikerabbit
Modified paths:
  • /branches/new-installer/phase3/languages/messages/MessagesEn.php (modified) (history)

Diff [purge]

Index: branches/new-installer/phase3/languages/messages/MessagesEn.php
@@ -4133,11 +4133,11 @@
41344134 'config-your-language-help' => 'Select a language to use during the installation process',
41354135 'config-wiki-language' => 'Wiki language:',
41364136 'config-wiki-language-help' => 'Select the language that the wiki will predominantly be written in',
4137 -'config-back' => '< Back',
4138 -'config-continue' => 'Continue >',
 4137+'config-back' => '← Back',
 4138+'config-continue' => 'Continue →',
41394139 'config-page-language' => 'Language',
41404140 'config-page-welcome' => 'Welcome',
4141 -'config-page-dbconnect' => 'Connect to DB',
 4141+'config-page-dbconnect' => 'Connect to database',
41424142 'config-page-upgrade' => 'Upgrade existing',
41434143 'config-page-dbsettings' => 'Database settings',
41444144 'config-page-name' => 'Name',
@@ -4172,7 +4172,7 @@
41734173 * [http://www.mediawiki.org/wiki/Manual:FAQ FAQ]",
41744174 'config-env-latest-ok' => 'You are installing the latest version of Mediawiki',
41754175 'config-env-latest-new' => "'''Note:''' You are installing a development version of Mediawiki",
4176 -'config-env-latest-old' => "'''Warning''': You are installing an outdated version of Mediawiki",
 4176+'config-env-latest-old' => "'''Warning:''' You are installing an outdated version of Mediawiki",
41774177 'config-env-latest-help' => 'You are installing version $1, but the latest version is $2.
41784178 You are advised to use the latest release, which can be downloaded from [http://www.mediawiki.org/wiki/Download Mediawiki.org]',
41794179 'config-env-good' => '<span class="success-message">Environment checked. You can install MediaWiki.</span>',
@@ -4188,7 +4188,7 @@
41894189 'config-have-db' => 'Found database drivers for: $1',
41904190 'config-register-globals' => '<strong class="error">Warning:</strong>
41914191 <strong>PHP\'s <tt>[http://php.net/register_globals register_globals]</tt> option is enabled. Disable it if you can.</strong>
4192 -MediaWiki will work, but your server is more exposed to PHP-based security vulnerabilities.',
 4192+MediaWiki will work, but your server is exposed to potential security vulnerabilities.',
41934193 '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>
41944194 This option corrupts data input unpredictably; you cannot install or use MediaWiki unless this option is disabled.',
41954195 '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>
@@ -4199,13 +4199,13 @@
42004200 This option causes horrible bugs with MediaWiki; you cannot install or use MediaWiki unless this option is disabled.',
42014201 'config-safe-mode' => '<b class="error">Warning:</b>
42024202 <strong>PHP\'s [http://www.php.net/features.safe-mode safe mode] is active.</strong>
4203 -You may have problems caused by this, particularly if using image uploads.',
 4203+It may cause problems, particularly if using image uploads and math support.',
42044204 'config-xml-good' => 'Have XML / Latin1-UTF-8 conversion support.',
42054205 'config-xml-bad' => 'PHP\'s XML module is missing;
42064206 the wiki requires functions in this module and won\'t work in this configuration.
42074207 If you\'re running Mandrake, install the php-xml package.',
42084208 'config-pcre' => 'The PCRE support module appears to be missing.
4209 -MediaWiki requires the Perl-compatible regular expression functions.',
 4209+MediaWiki requires the Perl-compatible regular expression functions to work.',
42104210 'config-memory-none' => 'PHP is configured with no <tt>memory_limit</tt>',
42114211 'config-memory-ok' => 'PHP\'s <tt>memory_limit</tt> is $1, ok.',
42124212 'config-memory-raised' => 'PHP\'s <tt>memory_limit</tt> is $1, raised to $2.',
@@ -4215,14 +4215,17 @@
42164216 'config-apc' => '[http://www.php.net/apc APC] installed',
42174217 'config-eaccel' => '[http://eaccelerator.sourceforge.net/ eAccelerator] installed',
42184218 'config-no-cache' => '<strong>Warning:</strong>
4219 -Couldn\'t find [http://eaccelerator.sourceforge.net eAccelerator],
4220 -[http://www.php.net/apc APC] or [http://trac.lighttpd.net/xcache/ XCache];
4221 -cannot use these for object caching.',
 4219+Could not find [http://eaccelerator.sourceforge.net eAccelerator],
 4220+[http://www.php.net/apc APC] or [http://trac.lighttpd.net/xcache/ XCache].
 4221+Object caching is not enabled.',
42224222 'config-diff3-good' => 'Found GNU diff3: <tt>$1</tt>.',
42234223 'config-diff3-bad' => 'GNU diff3 not found.',
4224 -'config-imagemagick' => 'Found ImageMagick: <tt>$1</tt>; image thumbnailing will be enabled if you enable uploads.',
4225 -'config-gd' => 'Found GD graphics library built-in, image thumbnailing will be enabled if you enable uploads.',
4226 -'config-no-scaling' => 'Couldn\'t find GD library or ImageMagick; image thumbnailing disabled.',
 4224+'config-imagemagick' => 'Found ImageMagick: <tt>$1</tt>.
 4225+Image thumbnailing will be enabled if you enable uploads.',
 4226+'config-gd' => 'Found GD graphics library built-in.
 4227+Image thumbnailing will be enabled if you enable uploads.',
 4228+'config-no-scaling' => 'Could not find GD library or ImageMagick.
 4229+Image thumbnailing will be disabled.',
42274230 'config-dir' => 'Installation directory: <tt>$1</tt>',
42284231 'config-uri' => 'Script URI path: <tt>$1</tt>',
42294232 'config-no-uri' => '<strong>Error:</strong> Could not determine the current URI. Installation aborted.',
@@ -4231,14 +4234,14 @@
42324235
42334236 'config-db-type' => 'Database type:',
42344237 'config-db-host' => 'Database host:',
4235 -'config-db-host-help' => 'If your database server isn\'t on your web server, enter the name or IP address here.
 4238+'config-db-host-help' => 'If your database server is on different server, enter the host name or IP address here.
42364239
4237 -If you are using a shared web host, your hosting provider should give you the correct host name in their documentation.',
 4240+If you are using shared web hosting, your hosting provider should give you the correct host name in their documentation.',
42384241 'config-db-wiki-settings' => 'Identify this wiki',
42394242 'config-db-name' => 'Database name:',
42404243 'config-db-name-help' => 'Choose a name that identifies your wiki. It should not contain spaces or hyphens.
42414244
4242 -If you are using a shared host, your hosting provider will either give you a specific database name to use, or let you create databases via a control panel.',
 4245+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.',
42434246 'config-db-install-account' => 'User account for installation',
42444247 'config-db-username' => 'Database username:',
42454248 'config-db-password' => 'Database password:',
@@ -4251,26 +4254,29 @@
42524255 '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.
42534256 Do not use spaces or hyphens.
42544257
4255 -This may normally be left blank.',
 4258+This field is usually left empty.',
42564259 'config-db-charset' => 'Database character set',
42574260 'config-charset-mysql5-binary' => 'MySQL 4.1/5.0 binary',
42584261 'config-charset-mysql5' => 'MySQL 4.1/5.0 UTF-8',
42594262 'config-charset-mysql4' => 'MySQL 4.0 backwards-compatible UTF-8',
42604263 '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!.
42614264 <br/><br/>
4262 -In <b>binary mode</b>, 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. In <b>UTF-8 mode</b>, 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].',
 4265+In <b>binary mode</b>, MediaWiki stores UTF-8 text to the database in binary fields.
 4266+This is more efficient than MySQL\'s UTF-8 mode, and allows you to use the full range of Unicode characters.
 4267+In <b>UTF-8 mode</b>, MySQL will know what character set your data is in, and can present and convert it appropriately,
 4268+but it will not let you store characters above the [http://en.wikipedia.org/wiki/Mapping_of_Unicode_character_planes Basic Multilingual Plane].',
42634269 'config-mysql-old' => 'MySQL $1 or later is required, you have $2.',
42644270 'config-db-port' => 'Database port:',
42654271 'config-db-schema' => 'Schema for MediaWiki',
42664272 'config-db-ts2-schema' => 'Schema for tsearch2',
4267 -'config-db-schema-help' => 'The above schemas are generally correct, only change them if you are sure you need to.',
 4273+'config-db-schema-help' => 'The above schemas are usually correct. Only change them if you know you need to.',
42684274 'config-sqlite-dir' => 'SQLite data directory:',
4269 -'config-sqlite-dir-help' => 'SQLite stores table data into files in the filesystem.
 4275+'config-sqlite-dir-help' => 'SQLite stores data into a file in the filesystem.
42704276 This directory must be writable by the webserver.
42714277 It should <strong>not</strong> accessible via the web.',
42724278 'config-sqlite-permissions' => 'Permission for data directory:',
42734279 'config-sqlite-permissions-help' => 'Please specify the default permissions for the data directory.
4274 -If you don\'t know, it\'s probably safe to leave the default.',
 4280+If you do not know, it is usually safe to use the default value.',
42754281 'config-type-mysql' => 'MySQL',
42764282 'config-type-postgres' => 'PostgreSQL',
42774283 'config-type-sqlite' => 'SQLite',
@@ -4288,11 +4294,14 @@
42894295 Check the host, username and password below and try again.',
42904296 'config-invalid-schema' => 'Invalid schema for MediaWiki "$1". Please use only letters, numbers and underscores.',
42914297 'config-invalid-ts2schema' => 'Invalid schema for tsearch2 "$1". Please use only letters, numbers and underscores.',
4292 -'config-postgres-old' => 'Postgres $1 or later is required, you have $2.',
 4298+'config-postgres-old' => 'PostgreSQL $1 or later is required, you have $2.',
42934299 '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.',
4294 -'config-sqlite-parent-unwritable' => 'Cannot create the data directory "$1", because the parent directory "$2" is not writable by the webserver. Please create this directory yourself, make it writable, and try again.',
4295 -'config-sqlite-mkdir-error' => 'Error creating the data directory "$1". Please check the location and try again.',
4296 -'config-sqlite-unwritable' => 'Unable to write to the directory specified: $1. Please change its permissions so that the webserver can write to it, and try again.',
 4300+'config-sqlite-parent-unwritable' => 'Cannot create the data directory "$1", because the parent directory "$2" is not writable by the webserver.
 4301+Please create this directory yourself, make it writable, and try again.',
 4302+'config-sqlite-mkdir-error' => 'Error creating the data directory "$1".
 4303+Please check the location and try again.',
 4304+'config-sqlite-unwritable' => 'Unable to write to the given directory: $1.
 4305+Please change its permissions so that the webserver can write to it, and try again.',
42974306 'config-sqlite-connection-error' => '$1.
42984307
42994308 Check the data directory and database name below and try again.',
@@ -4306,19 +4315,20 @@
43074316 This is <strong>not recommended</strong> unless you are having problems with your wiki.',
43084317 'config-regenerate' => 'Regenerate LocalSettings.php >',
43094318 'config-show-table-status' => 'SHOW TABLE STATUS query failed!',
4310 -'config-unknown-collation' => '<strong>Warning:</strong> Unrecognised existing collation',
 4319+'config-unknown-collation' => '<strong>Warning:</strong> Datbase is using unrecognised collation.',
43114320
43124321 'config-db-web-account' => 'Database account for web access',
43134322 '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.',
43144323 'config-db-web-account-same' => 'Use the same account as for installation',
4315 -'config-db-web-create' => 'Create the account if it doesn\'t already exist',
4316 -'config-db-web-no-create-privs' => 'The account you specified for installation does not have enough privileges to safely create accounts, so the account you specify here must already exist.',
 4324+'config-db-web-create' => 'Create the account if it does not already exist',
 4325+'config-db-web-no-create-privs' => 'The account you specified for installation does not have enough privileges to create an account.
 4326+The account you specify here must already exist.',
43174327 'config-mysql-engine' => 'Storage engine',
43184328 'config-mysql-innodb' => 'InnoDB',
43194329 'config-mysql-myisam' => 'MyISAM',
4320 -'config-mysql-engine-help' => '<strong>InnoDB</strong> is best for public web installations, since it has good concurrency support.
 4330+'config-mysql-engine-help' => '<strong>InnoDB</strong> is almost always the best option, since it has good concurrency support.
43214331
4322 -<strong>MyISAM</strong> may be faster in single-user installations. MyISAM databases tend to get corrupted more often than InnoDB databases.',
 4332+<strong>MyISAM</strong> may be faster in single-user or read-only installations. MyISAM databases tend to get corrupted more often than InnoDB databases.',
43234333 'config-mysql-charset' => 'Database character set',
43244334 'config-mysql-binary' => 'Binary',
43254335 'config-mysql-utf-8' => 'UTF-8',
@@ -4341,12 +4351,10 @@
43424352 'config-admin-password' => 'Password:',
43434353 'config-admin-password-confirm' => 'Password again:',
43444354 'config-admin-help' => 'Enter your preferred username here, for example "Joe Bloggs".
4345 -This is the name you will use to log in to the wiki.
4346 -
4347 -The password cannot be the same as the username.',
 4355+This is the name you will use to log in to the wiki.',
43484356 'config-admin-name-blank' => 'Please enter an administrator username.',
43494357 'config-admin-name-invalid' => 'The specified username "<nowiki>$1</nowiki>" is invalid. Please specify a different username.',
4350 -'config-admin-password-blank' => 'Please enter an administrator password.',
 4358+'config-admin-password-blank' => 'Please enter a password for administrator account.',
43514359 'config-admin-password-same' => 'The password must not be the same as the username.',
43524360 'config-admin-password-mismatch' => 'The two passwords you entered do not match.',
43534361 'config-admin-email' => 'Email address:',
@@ -4354,7 +4362,7 @@
43554363 'config-subscribe' => 'Subscribe to the [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce release announcements mailing list].',
43564364 'config-subscribe-help' => 'This is a low-volume mailing list used for release announcements, including important security announcements.
43574365 You should subscribe to it and update your copy of MediaWiki when new versions come out.',
4358 -'config-almost-done' => "You're almost done! If you like, you can skip the remaining configuration and install the wiki right now.",
 4366+'config-almost-done' => "You are almost done! You can now skip the remaining configuration and install the wiki right now.",
43594367 'config-optional-continue' => "Ask me more questions.",
43604368 'config-optional-skip' => "I'm bored already, just install the wiki.",
43614369 'config-profile' => 'User rights profile',
@@ -4373,7 +4381,7 @@
43744382
43754383 More complex user rights configurations are available after installation, see the [http://www.mediawiki.org/wiki/Manual:User_rights relevant manual entry].
43764384 ",
4377 -'config-license' => 'Copyright/License',
 4385+'config-license' => 'Copyright and license',
43784386 'config-license-none' => 'No license footer',
43794387 'config-license-gfdl-old' => 'GNU Free Documentation License 1.2 or later',
43804388 'config-license-gfdl-current' => 'GNU Free Documentation License 1.3 or later',
@@ -4391,16 +4399,16 @@
43924400 'config-email-settings' => 'Email settings',
43934401 'config-enable-email' => 'Enable outbound email',
43944402 '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.
4395 -If you don't want any email features, you can disable it here.",
 4403+If you do not want any email features, you can disable them here.",
43964404 'config-email-user' => 'Enable user-to-user e-mail',
4397 -'config-email-user-help' => "All users to send each other e-mail, if they've enabled it in their preferences",
4398 -'config-email-usertalk' => 'Enable usertalk notification',
4399 -'config-email-usertalk-help' => "Allow users to receive notifications on user talk changes, if they've enabled it in their preferences",
 4405+'config-email-user-help' => "All users to send each other e-mail, if they have enabled it in their preferences",
 4406+'config-email-usertalk' => 'Enable user talk page notification',
 4407+'config-email-usertalk-help' => "Allow users to receive notifications on user talk page changes, if they have enabled it in their preferences",
44004408 'config-email-watchlist' => 'Enable watchlist notification',
4401 -'config-email-watchlist-help' => "Allow users to receive notifications to their watched pages, if they've enabled it in their preferences",
 4409+'config-email-watchlist-help' => "Allow users to receive notifications to their watched pages, if they have enabled it in their preferences",
44024410 'config-email-auth' => 'Enable e-mail authentication',
4403 -'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 and/or
4404 -change notification mails. Setting this option is '''recommended''' for public wikis because of potential abuse of the e-mail features above.",
 4411+'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
 4412+change notification mails. Setting this option is '''recommended''' for public wikis because of potential abuse of the e-mail features.",
44054413 'config-email-sender' => 'Return address:',
44064414 'config-email-sender-help' => 'Enter the email address to use as the return address on outbound email.
44074415 This is where bounces will be sent.
@@ -4410,10 +4418,10 @@
44114419 'config-upload-help' => "File uploads potentially expose your server to security risks.
44124420 For more information, read the [http://www.mediawiki.org/wiki/Manual:Security security section] in the manual.
44134421
4414 -To enable 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.",
4415 -'config-upload-deleted' => 'Deleted directory:',
 4422+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.",
 4423+'config-upload-deleted' => 'Directory for deleted files :',
44164424 'config-upload-deleted-help' => 'Choose a directory in which to archive deleted files.
4417 -Ideally, this should not be publically accessible.',
 4425+Ideally, this should not be accessible from the web.',
44184426 'config-logo' => 'Logo URL:',
44194427 'config-logo-help' => "MediaWiki's default skin includes space for a 135x135 pixel logo in the top left corner.
44204428 Upload an image of the appropriate size, and enter the URL here.
@@ -4423,14 +4431,14 @@
44244432 'config-cc-again' => 'Pick again...',
44254433 'config-cc-not-chosen' => 'Please choose which Creative Commons license you want and click "proceed".',
44264434 'config-advanced-settings' => 'Advanced configuration',
4427 -'config-cache-options' => 'Object cache settings',
4428 -'config-cache-help' => 'Object caching is used to improve the speed of MediaWiki. Medium to large sites
 4435+'config-cache-options' => 'Settings for object caching',
 4436+'config-cache-help' => 'Object caching is used to improve the speed of MediaWiki by caching frequently used data. Medium to large sites
44294437 are highly encouraged to enable this, and small sites will see benefits as well.',
4430 -'config-cache-anything' => 'MediaWiki will attempt to cache anywhere possible, except Memcached',
4431 -'config-cache-db' => 'Cache data in the database',
 4438+'config-cache-anything' => 'MediaWiki will attempt to cache data anywhere possible, except Memcached',
 4439+'config-cache-db' => 'Cache data into the database',
44324440 'config-cache-accel' => 'PHP object caching (APC, eAccelerator or XCache)',
4433 -'config-cache-memcached' => 'Use Memcached (requires additional setup, and server IP addresses below)',
4434 -'config-cache-none' => 'Use no caching. No functionality is removed, but speed may be impacted',
 4441+'config-cache-memcached' => 'Use Memcached (requires additional setup and configuration)',
 4442+'config-cache-none' => 'No caching. No functionality is removed, but speed may be impacted.',
44354443 'config-memcached-servers' => 'Memcached servers',
44364444 'config-memcached-help' => 'List of IP addresses to use for Memcached. Should be separated with
44374445 commas and specify the port to be used (eg: 1.2.3.4:56, 7.8.9.10:11)',
@@ -4445,8 +4453,8 @@
44464454 'config-install-schema' => 'Generating schema',
44474455 'config-install-tables' => 'Creating tables',
44484456 'config-install-secretkey' => 'Generating secret key',
4449 -'config-insecure-secretkey' => 'Warning: $wgSecretKey key is insecure, generated with mt_rand(), consider changing it manually',
4450 -'config-install-user' => 'Creating admin user',
 4457+'config-insecure-secretkey' => 'Warning: Unable to create secure $wgSecretKey. Consider changing it manually.',
 4458+'config-install-user' => 'Creating administrator user account',
44514459 'config-install-localsettings' => 'Writing LocalSettings.php',
44524460
44534461 # Special:Version

Status & tagging log