diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2007-07-27 15:00:10 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2007-07-27 15:00:10 +0000 |
| commit | 3829c40b5715187c05d919e56fd37e36a9eb9886 (patch) | |
| tree | 4a2198b98e187c4b8b4874622fcbbabff7af04c2 /phpBB/language | |
| parent | 1a5413275978a307d200d0b52cc30c75da003669 (diff) | |
| download | forums-3829c40b5715187c05d919e56fd37e36a9eb9886.tar forums-3829c40b5715187c05d919e56fd37e36a9eb9886.tar.gz forums-3829c40b5715187c05d919e56fd37e36a9eb9886.tar.bz2 forums-3829c40b5715187c05d919e56fd37e36a9eb9886.tar.xz forums-3829c40b5715187c05d919e56fd37e36a9eb9886.zip | |
#13816
git-svn-id: file:///svn/phpbb/trunk@7959 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/profile.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/posting.php | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php index 80c287da34..15fe8391cd 100644 --- a/phpBB/language/en/acp/profile.php +++ b/phpBB/language/en/acp/profile.php @@ -38,7 +38,7 @@ $lang = array_merge($lang, array( 'ALWAYS_TODAY' => 'Always the current date', 'BOOL_ENTRIES_EXPLAIN' => 'Enter your options now', - 'BOOL_TYPE_EXPLAIN' => 'Define the type, either a checkbox or radio buttons.', + 'BOOL_TYPE_EXPLAIN' => 'Define the type, either a checkbox or radio buttons. A checkbox will only be displayed if it is checked for a given user. In that case the <strong>second</strong> language option will be used. Radio buttons will display regardless of their value.', 'CHANGED_PROFILE_FIELD' => 'Successfully changed profile field.', 'CHARS_ANY' => 'Any character', diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php index 7858da754a..6f7b273efe 100644 --- a/phpBB/language/en/posting.php +++ b/phpBB/language/en/posting.php @@ -53,7 +53,7 @@ $lang = array_merge($lang, array( 'BBCODE_O_HELP' => 'Ordered list: [list=]text[/list]', 'BBCODE_P_HELP' => 'Insert image: [img]http://image_url[/img]', 'BBCODE_Q_HELP' => 'Quote text: [quote]text[/quote]', - 'BBCODE_S_HELP' => 'Font color: [color=red]text[/color] Tip: you can also use color=#FF0000', + 'BBCODE_S_HELP' => 'Font colour: [color=red]text[/color] Tip: you can also use color=#FF0000', 'BBCODE_U_HELP' => 'Underline text: [u]text[/u]', 'BBCODE_W_HELP' => 'Insert URL: [url]http://url[/url] or [url=http://url]URL text[/url]', 'BBCODE_D_HELP' => 'Flash: [flash=width,height]http://url[/flash]', @@ -91,8 +91,8 @@ $lang = array_merge($lang, array( 'FLASH_IS_OFF' => '[flash] is <em>OFF</em>', 'FLASH_IS_ON' => '[flash] is <em>ON</em>', 'FLOOD_ERROR' => 'You cannot make another post so soon after your last.', - 'FONT_COLOR' => 'Font color', - 'FONT_COLOR_HIDE' => 'Hide font color', + 'FONT_COLOR' => 'Font colour', + 'FONT_COLOR_HIDE' => 'Hide font colour', 'FONT_HUGE' => 'Huge', 'FONT_LARGE' => 'Large', 'FONT_NORMAL' => 'Normal', |