diff options
| author | Nils Adermann <naderman@naderman.de> | 2006-04-23 13:08:48 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2006-04-23 13:08:48 +0000 |
| commit | d9576fd70ba9f60c99a2ece5e520b309a86f7362 (patch) | |
| tree | d5e2b850750fdc4ad1a4fe5d38a58ff4a081a2e6 /phpBB/language | |
| parent | a58fa3a9f2da83a6a79655ca7a7402c32d810310 (diff) | |
| download | forums-d9576fd70ba9f60c99a2ece5e520b309a86f7362.tar forums-d9576fd70ba9f60c99a2ece5e520b309a86f7362.tar.gz forums-d9576fd70ba9f60c99a2ece5e520b309a86f7362.tar.bz2 forums-d9576fd70ba9f60c99a2ece5e520b309a86f7362.tar.xz forums-d9576fd70ba9f60c99a2ece5e520b309a86f7362.zip | |
- allow user A to have user B as a friend if A is a foe of B
- don't allow users to have the Anonymous user on their foe/friend list [Bug #1205]
- properly hide users on the online/offline friend list in ucp [Bug #1206]
git-svn-id: file:///svn/phpbb/trunk@5836 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/ucp.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 5f5db94f07..20976a3875 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -242,8 +242,8 @@ $lang = array_merge($lang, array( 'NOTIFY_METHOD_EXPLAIN' => 'Method for sending messages sent via this board.', 'NOTIFY_METHOD_IM' => 'Jabber only', 'NOTIFY_ON_PM' => 'Email me on new private messages', - 'NOT_ADDED_FRIENDS' => 'Usernames not added to friends list because you are within their foes list.', - 'NOT_ADDED_FOES' => 'Usernames not added to foes list because of administrator/moderator status.', + 'NOT_ADDED_FRIENDS' => 'You cannot add the anonymous user to your friends list.', + 'NOT_ADDED_FOES' => 'Usernames not added to foes list because of administrator/moderator status or because you tried to add the anonymous user.', 'NOT_AGREE' => 'I do not agree to these terms', 'NOT_ENOUGH_SPACE_FOLDER' => 'The Destination Folder "%s" seems to be full. The requested action has not been taken.', 'NOT_MOVED_MESSAGE' => 'You have 1 private message currently on hold because of full folder.', |