* remove bogus outputFooter call

[lhc/web/wiklou.git] / includes / installer / Installer.i18n.php

diff --git a/includes/installer/Installer.i18n.php b/includes/installer/Installer.i18n.php
index 745be2a..d624532 100644 (file)
--- a/includes/installer/Installer.i18n.php
+++ b/includes/installer/Installer.i18n.php
@@ -257,6 +257,9 @@ Change its permissions so that the webserver can write to it, and try again.',
 Check the data directory and database name below and try again.',
        'config-sqlite-readonly'          => 'File <code>$1</code> is not writeable.',
        'config-sqlite-cant-create-db'    => 'Could not create database file <code>$1</code>.',
+       'config-sqlite-fts3-downgrade'    => 'PHP is missing FTS3 support, downgrading tables',
+       'config-sqlite-fts3-add'          => 'Adding FTS3 search capabilities',
+       'config-sqlite-fts3-ok'           => 'Fulltext search table appears to be in order',
        'config-can-upgrade'              => "There are MediaWiki tables in this database.
 To upgrade them to MediaWiki $1, click '''Continue'''.",
        'config-upgrade-done'             => "Upgrade complete.
@@ -345,18 +348,19 @@ A '''private wiki''' only allows approved users to view pages, with the same gro
 More complex user rights configurations are available after installation, see the [http://www.mediawiki.org/wiki/Manual:User_rights relevant manual entry].",
        'config-license'                  => 'Copyright and license:',
        'config-license-none'             => 'No license footer',
-       'config-license-gfdl-old'         => 'GNU Free Documentation License 1.2 or later',
+       'config-license-cc-by-sa'         => 'Creative Commons Attribution Share Alike (Wikipedia-compatible)',
+       'config-license-cc-by-nc-sa'      => 'Creative Commons Attribution Non-Commercial Share Alike',
+       'config-license-gfdl-old'         => 'GNU Free Documentation License 1.2',
        'config-license-gfdl-current'     => 'GNU Free Documentation License 1.3 or later',
        'config-license-pd'               => 'Public Domain',
-       'config-license-cc-choose'        => 'A Creative Commons license',
+       'config-license-cc-choose'        => 'Select a custom Creative Commons license',
        'config-license-help'             => "Many public wikis put all contributions under a [http://freedomdefined.org/Definition free license].
 This helps to create a sense of community ownership and encourages long-term contribution.
 It is not generally necessary for a private or corporate wiki.
 
-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'''.
-However, this license has some features which make reuse and interpretation difficult.
+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 '''Creative Commons Attribution Share Alike'''.
 
-If Wikipedia-compatibility is not important, '''Creative Commons''' with the '''Share Alike''' option (cc-by-sa) is a good choice.",
+The GNU Free Documentation License was the old license Wikipedia was under. It is still a valid license, however, this license has some features which make reuse and interpretation difficult.",
        'config-email-settings'           => 'E-mail settings',
        'config-enable-email'             => 'Enable outbound e-mail',
        '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.
@@ -424,9 +428,13 @@ Make sure that the user "$1" can write to the schema "$2".',
        'config-insecure-secretkey'       => "'''Warning:''' Unable to create secure <code>\$wgSecretKey</code>.
 Consider changing it manually.",
        'config-install-sysop'            => 'Creating administrator user account',
-       'config-install-localsettings'    => 'Creating <code>LocalSettings.php</code>',
+       'config-install-localsettings'    => 'Creating LocalSettings.php',
        'config-install-localsettings-unwritable' => 'Warning: Could not write <code>LocalSettings.php</code>.
-Create it yourself, using the following text:',
+Create it yourself, using the following text:
+<textarea name="LocalSettings" id="LocalSettings" cols="80" rows="25" readonly="readonly">
+$1
+</textarea>
+',
        'config-install-done'             => "'''Congratulations!'''
 You have successfully installed MediaWiki.