From efcb1279f06d1016c25fae516158abdb895981ee Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Fri, 30 Mar 2007 14:24:55 +0000 Subject: other fixes... git-svn-id: file:///svn/phpbb/trunk@7242 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/language/en/acp/permissions_phpbb.php | 2 +- phpBB/language/en/common.php | 2 +- phpBB/language/en/help_bbcode.php | 4 ++-- phpBB/language/en/install.php | 3 ++- phpBB/language/en/memberlist.php | 5 +++++ 5 files changed, 11 insertions(+), 5 deletions(-) (limited to 'phpBB/language') diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php index d090dcef1e..47105d8828 100644 --- a/phpBB/language/en/acp/permissions_phpbb.php +++ b/phpBB/language/en/acp/permissions_phpbb.php @@ -120,7 +120,7 @@ $lang = array_merge($lang, array( 'acl_u_sendim' => array('lang' => 'Can send instant messages', 'cat' => 'misc'), 'acl_u_ignoreflood' => array('lang' => 'Can ignore flood limit', 'cat' => 'misc'), 'acl_u_hideonline' => array('lang' => 'Can hide online status', 'cat' => 'misc'), - 'acl_u_viewonline' => array('lang' => 'Can view all online', 'cat' => 'misc'), + 'acl_u_viewonline' => array('lang' => 'Can view hidden online users', 'cat' => 'misc'), 'acl_u_search' => array('lang' => 'Can search board', 'cat' => 'misc'), )); diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 87f1ee44a1..95bc1b1230 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -321,7 +321,7 @@ $lang = array_merge($lang, array( 'NEVER' => 'Never', 'NO' => 'No', 'NOT_ALLOWED_MANAGE_GROUP' => 'You are not allowed to manage this group.', - 'NOT_AUTHORIZED' => 'You are not authorised to access this area.', + 'NOT_AUTHORISED' => 'You are not authorised to access this area.', 'NOT_WATCHING_FORUM' => 'You are no longer subscribed to updates on this forum.', 'NOT_WATCHING_TOPIC' => 'You are no longer subscribed to this topic.', 'NO_ACCESS_ATTACHMENT' => 'You are not allowed to access this file.', diff --git a/phpBB/language/en/help_bbcode.php b/phpBB/language/en/help_bbcode.php index 5f58388c10..c692977358 100644 --- a/phpBB/language/en/help_bbcode.php +++ b/phpBB/language/en/help_bbcode.php @@ -44,11 +44,11 @@ $help = array( ), array( 0 => 'How to change the text colour or size', - 1 => 'To alter the color or size of your text the following tags can be used. Keep in mind that how the output appears will depend on the viewers browser and system: ' + 1 => 'To alter the colour or size of your text the following tags can be used. Keep in mind that how the output appears will depend on the viewers browser and system: ' ), array( 0 => 'Can I combine formatting tags?', - 1 => 'Yes, of course you can, for example to get someones attention you may write:

[size=18][color=red][b]LOOK AT ME![/b][/color][/size]

this would output LOOK AT ME!

We don’t recommend you output lots of text that looks like this though! Remember it is up to you, the poster to ensure tags are closed correctly. For example the following is incorrect:

[b][u]This is wrong[/b][/u]' + 1 => 'Yes, of course you can, for example to get someones attention you may write:

[size=150][color=red][b]LOOK AT ME![/b][/color][/size]

this would output LOOK AT ME!

We don’t recommend you output lots of text that looks like this though! Remember it is up to you, the poster to ensure tags are closed correctly. For example the following is incorrect:

[b][u]This is wrong[/b][/u]' ), array( 0 => '--', diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 8310da0b87..df374e4a6f 100755 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -54,6 +54,7 @@ $lang = array_merge($lang, array( 'CAT_CONVERT' => 'Convert', 'CAT_INSTALL' => 'Install', 'CAT_OVERVIEW' => 'Overview', + 'CAT_UPDATE' => 'Update', 'CHANGE' => 'Change', 'CHECK_TABLE_PREFIX' => 'Please check your table prefix and try again.', 'CLEAN_VERIFY' => 'Cleaning up and verifying the final structure', @@ -399,7 +400,7 @@ $lang = array_merge($lang, array( 'MERGE_SELECT_ERROR' => 'Conflicting file merge modes are not correctly selected.', 'NEW_FILE' => 'New updated file', - 'NO_AUTH_UPDATE' => 'Not authorized to update', + 'NO_AUTH_UPDATE' => 'Not authorised to update', 'NO_ERRORS' => 'No errors', 'NO_UPDATE_FILES' => 'Not updating the following files', 'NO_UPDATE_FILES_EXPLAIN' => 'The following files are new or modified but the directory they normally reside in could not be found on your installation. If this list contains files to other directories than language/ or styles/ than you may have modified your directory structure and the update may be incomplete.', diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php index 2d47c31f38..20e2e395c1 100644 --- a/phpBB/language/en/memberlist.php +++ b/phpBB/language/en/memberlist.php @@ -110,8 +110,13 @@ $lang = array_merge($lang, array( 'SEARCH_USER_POSTS' => 'Search user’s posts', 'SELECT_MARKED' => 'Select marked', 'SELECT_SORT_METHOD' => 'Select sort method', + 'SEND_AIM_MESSAGE' => 'Send AIM message', + 'SEND_ICQ_MESSAGE' => 'Send ICQ message', 'SEND_IM' => 'Instant messaging', + 'SEND_JABBER_MESSAGE' => 'Send Jabber message', 'SEND_MESSAGE' => 'Message', + 'SEND_MSNM_MESSAGE' => 'Send MSNM/WLM message', + 'SEND_YIM_MESSAGE' => 'Send YIM message', 'SORT_EMAIL' => 'Email', 'SORT_LAST_ACTIVE' => 'Last active', 'SORT_POST_COUNT' => 'Post count', -- cgit v1.2.1