diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2014-03-05 18:44:39 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2014-03-05 18:44:39 -0600 |
| commit | 4b6f3f8b0fc3fc3b0d7fa0147930d0ea02107a8f (patch) | |
| tree | c7828ddf135f2ad66570554f1369cf70483ddefa /phpBB/language/en/ucp.php | |
| parent | 40c582688b7eb4fd5e48d06c4f2fd4c044012b08 (diff) | |
| parent | d380cdec02f2d5a6d6b4756570031af87590905a (diff) | |
| download | forums-4b6f3f8b0fc3fc3b0d7fa0147930d0ea02107a8f.tar forums-4b6f3f8b0fc3fc3b0d7fa0147930d0ea02107a8f.tar.gz forums-4b6f3f8b0fc3fc3b0d7fa0147930d0ea02107a8f.tar.bz2 forums-4b6f3f8b0fc3fc3b0d7fa0147930d0ea02107a8f.tar.xz forums-4b6f3f8b0fc3fc3b0d7fa0147930d0ea02107a8f.zip | |
Merge pull request #2088 from nickvergessen/ticket/12236
Ticket/12236 Convert AOL and Yahoo to custom profile fields
Diffstat (limited to 'phpBB/language/en/ucp.php')
| -rw-r--r-- | phpBB/language/en/ucp.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 42fd0fd506..a0f7a32116 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -481,7 +481,6 @@ $lang = array_merge($lang, array( 'UCP' => 'User Control Panel', 'UCP_ACTIVATE' => 'Activate account', 'UCP_ADMIN_ACTIVATE' => 'Please note that you will need to enter a valid email address before your account is activated. The administrator will review your account and if approved you will receive an email at the address you specified.', - 'UCP_AIM' => 'AOL Instant Messenger', 'UCP_ATTACHMENTS' => 'Attachments', 'UCP_AUTH_LINK' => 'External accounts', 'UCP_AUTH_LINK_ASK' => 'You currently have no account associated with this external service. Click the button below to link your board account to an account with this external service.', @@ -539,7 +538,6 @@ $lang = array_merge($lang, array( 'UCP_REMIND' => 'Send password', 'UCP_RESEND' => 'Send activation email', 'UCP_WELCOME' => 'Welcome to the User Control Panel. From here you can monitor, view and update your profile, preferences, subscribed forums and topics. You can also send messages to other users (if permitted). Please ensure you read any announcements before continuing.', - 'UCP_YIM' => 'Yahoo Messenger', 'UCP_ZEBRA' => 'Friends & Foes', 'UCP_ZEBRA_FOES' => 'Manage foes', 'UCP_ZEBRA_FRIENDS' => 'Manage friends', |