diff --git a/phpBB/adm/style/install_convert.html b/phpBB/adm/style/install_convert.html index 5d52015da6..783e89d6bf 100755 --- a/phpBB/adm/style/install_convert.html +++ b/phpBB/adm/style/install_convert.html @@ -120,8 +120,9 @@ +

{L_MESSAGE}

+
-

{L_MESSAGE}

{S_HIDDEN} disabled="disabled" onclick="this.className = 'button1 disabled';" onsubmit="this.disabled = 'disabled';" name="submit" value="{L_SUBMIT}" />
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 3649e7be51..886334175a 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -234,7 +234,7 @@ p a {
  • [Sec] Added alternative tokens to custom BBCodes which are safe for CSS/Javascript and changed TEXT token to entitise opening and closing parantheses.
  • [Fix] Convert 2.0 moderator posting permissions (Bug #14105)
  • [Fix] Correctly apply PM box limit of 0 to custom folder (Bug #14154)
    • - +
  • [Fix] odbc_autocommit causing existing result sets to be dropped (Bug #14182)
    • diff --git a/phpBB/docs/FAQ.html b/phpBB/docs/FAQ.html index 0ccc7c0886..6537adc1f9 100644 --- a/phpBB/docs/FAQ.html +++ b/phpBB/docs/FAQ.html @@ -310,7 +310,7 @@ p a {
    -

    Please read our documentation about permissions.

    +

    Please read the paragraph about permissions in our extensive online documentation.

    Top @@ -348,7 +348,7 @@ p a {
    -

    Please read our extensive user documentation first, it may just explain what you want to know.

    +

    Please read our extensive user documentation first, it may just explain what you want to know.

    Feel free to search our community forum for the information you require. PLEASE DO NOT post your question without having first used search, chances are someone has already asked and answered your question. You can find our board here:

    diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 1a932369a8..b35e363563 100755 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -34,10 +34,10 @@ $lang = array_merge($lang, array( 'ADMIN_CONFIG' => 'Administrator configuration', 'ADMIN_PASSWORD' => 'Administrator password', 'ADMIN_PASSWORD_CONFIRM' => 'Confirm administrator password', - 'ADMIN_PASSWORD_EXPLAIN' => '(Please enter a password between 6 and 30 characters in length.)', + 'ADMIN_PASSWORD_EXPLAIN' => 'Please enter a password between 6 and 30 characters in length.', 'ADMIN_TEST' => 'Check administrator settings', 'ADMIN_USERNAME' => 'Administrator username', - 'ADMIN_USERNAME_EXPLAIN' => '(Please enter a username between 3 and 20 characters in length.)', + 'ADMIN_USERNAME_EXPLAIN' => 'Please enter a username between 3 and 20 characters in length.', 'APP_MAGICK' => 'Imagemagick support [ Attachments ]', 'AUTHOR_NOTES' => 'Author notes
    » %s', 'AVAILABLE' => 'Available', @@ -333,10 +333,10 @@ $lang = array_merge($lang, array( 'SUCCESSFUL_CONNECT' => 'Successful connection', // TODO: Write some text on obtaining support 'SUPPORT_BODY' => 'During the release candidate phase full support will be given at the phpBB 3.0.x support forums. We will provide answers to general setup questions, configuration problems, conversion problems and support for determining common problems mostly related to bugs. We also allow discussions about modifications and custom code/style additions.

    For additional assistance, please refer to our Quick Start Guide and the online documentation.

    To ensure you stay up to date with the latest news and releases, why not subscribe to our mailing list?', - 'SYNC_FORUMS' => 'Starting to sync forums', + 'SYNC_FORUMS' => 'Starting to synchronise forums', 'SYNC_POST_COUNT' => 'Synchronising post_counts', 'SYNC_POST_COUNT_ID' => 'Synchronising post_counts from entry %1$s to %2$s.', - 'SYNC_TOPICS' => 'Starting to sync topics', + 'SYNC_TOPICS' => 'Starting to synchronise topics', 'SYNC_TOPIC_ID' => 'Synchronising topics from topic_id %1$s to %2$s.', 'TABLES_MISSING' => 'Could not find these tables
    » %s.',