diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-08-24 17:18:43 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-08-24 17:18:43 +0000 |
| commit | a42fe680f40215159768e6b0cde4b851b711ca9b (patch) | |
| tree | b19ad3d51de0b0247df8e290eb0887e399718615 /phpBB | |
| parent | 445a0631e56519c210ac00dc2a8fcb83f7c6ec81 (diff) | |
| download | forums-a42fe680f40215159768e6b0cde4b851b711ca9b.tar forums-a42fe680f40215159768e6b0cde4b851b711ca9b.tar.gz forums-a42fe680f40215159768e6b0cde4b851b711ca9b.tar.bz2 forums-a42fe680f40215159768e6b0cde4b851b711ca9b.tar.xz forums-a42fe680f40215159768e6b0cde4b851b711ca9b.zip | |
some language changes
git-svn-id: file:///svn/phpbb/trunk@8067 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rwxr-xr-x | phpBB/adm/style/install_convert.html | 3 | ||||
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 2 | ||||
| -rw-r--r-- | phpBB/docs/FAQ.html | 4 | ||||
| -rwxr-xr-x | phpBB/language/en/install.php | 8 |
4 files changed, 9 insertions, 8 deletions
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 @@ <!-- ENDIF --> <!-- IF L_SUBMIT --> + <!-- IF L_MESSAGE --><p>{L_MESSAGE}</p><!-- ENDIF --> + <fieldset class="submit-buttons"> - <!-- IF L_MESSAGE --><p>{L_MESSAGE}</p><!-- ENDIF --> {S_HIDDEN} <!-- IF L_SUBMIT --><input class="button1<!-- IF S_REFRESH --> disabled<!-- ENDIF -->" type="submit" id="submit" <!-- IF S_REFRESH -->disabled="disabled" <!-- ELSE --> onclick="this.className = 'button1 disabled';" onsubmit="this.disabled = 'disabled';" <!-- ENDIF -->name="submit" value="{L_SUBMIT}" /><!-- ENDIF --> </fieldset> 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 { <li>[Sec] Added alternative tokens to custom BBCodes which are safe for CSS/Javascript and changed TEXT token to entitise opening and closing parantheses.</li> <li>[Fix] Convert 2.0 moderator posting permissions (Bug #14105)</li> <li>[Fix] Correctly apply PM box limit of 0 to custom folder (Bug #14154)</li> - + <li>[Fix] odbc_autocommit causing existing result sets to be dropped (Bug #14182)</li> </ul> </div> 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 { <div class="paragraph"> -<p>Please read our documentation about <a href="#">permissions</a>.</p> +<p>Please read the paragraph about permissions in our extensive <a href="http://www.phpbb.com/support/documentation/3.0/">online documentation</a>.</p> </div> <a href="#top">Top</a> @@ -348,7 +348,7 @@ p a { <div class="paragraph"> -<p>Please read our <a href="#">extensive user documentation</a> first, it may just explain what you want to know.</p> +<p>Please read our <a href="http://www.phpbb.com/support/documentation/3.0/">extensive user documentation</a> first, it may just explain what you want to know.</p> <p>Feel free to search our community forum for the information you require. <strong>PLEASE DO NOT</strong> post your question without having first used search, chances are someone has already asked and answered your question. You can find our board here:</p> 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<br />» %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 <a href="http://www.phpbb.com/community/viewforum.php?f=46">the phpBB 3.0.x support forums</a>. 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.</p><p>For additional assistance, please refer to our <a href="http://www.phpbb.com/support/documentation/3.0/quickstart/">Quick Start Guide</a> and <a href="http://www.phpbb.com/support/documentation/3.0/">the online documentation</a>.</p><p>To ensure you stay up to date with the latest news and releases, why not <a href="http://www.phpbb.com/support/">subscribe to our mailing list</a>?', - '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 <var>entry</var> %1$s to %2$s.', - 'SYNC_TOPICS' => 'Starting to sync topics', + 'SYNC_TOPICS' => 'Starting to synchronise topics', 'SYNC_TOPIC_ID' => 'Synchronising topics from <var>topic_id</var> %1$s to %2$s.', 'TABLES_MISSING' => 'Could not find these tables<br />» <strong>%s</strong>.', |