aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-03-05 22:13:22 +0100
committerJoas Schilling <nickvergessen@gmx.de>2014-03-05 22:13:22 +0100
commitf2059f52f3f8f430888366b70aa07c534abb35a1 (patch)
treea0eac95bf86b38536793107f12d1b39f2b5128cc /phpBB/language
parenta1dab58f6d030ba8d986a27b3faf5a91629d688b (diff)
downloadforums-f2059f52f3f8f430888366b70aa07c534abb35a1.tar
forums-f2059f52f3f8f430888366b70aa07c534abb35a1.tar.gz
forums-f2059f52f3f8f430888366b70aa07c534abb35a1.tar.bz2
forums-f2059f52f3f8f430888366b70aa07c534abb35a1.tar.xz
forums-f2059f52f3f8f430888366b70aa07c534abb35a1.zip
[ticket/12236] Move AOL Instant Messanger field to custom profile field
PHPBB3-12236
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/acp/styles.php1
-rw-r--r--phpBB/language/en/common.php2
-rw-r--r--phpBB/language/en/memberlist.php3
-rw-r--r--phpBB/language/en/ucp.php1
4 files changed, 0 insertions, 7 deletions
diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index 6954702f1f..e7c149600d 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -182,7 +182,6 @@ $lang = array_merge($lang, array(
'IMG_ICON_BACK_TOP' => 'Top',
- 'IMG_ICON_CONTACT_AIM' => 'AIM',
'IMG_ICON_CONTACT_EMAIL' => 'Send email',
'IMG_ICON_CONTACT_JABBER' => 'Jabber',
'IMG_ICON_CONTACT_PM' => 'Send message',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 144ffd33d5..2ccff566d4 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -682,7 +682,6 @@ $lang = array_merge($lang, array(
'TOO_LONG' => 'The value you entered is too long.',
- 'TOO_LONG_AIM' => 'The screenname you entered is too long.',
'TOO_LONG_CONFIRM_CODE' => 'The confirm code you entered is too long.',
'TOO_LONG_DATEFORMAT' => 'The date format you entered is too long.',
'TOO_LONG_JABBER' => 'The Jabber account name you entered is too long.',
@@ -696,7 +695,6 @@ $lang = array_merge($lang, array(
'TOO_SHORT' => 'The value you entered is too short.',
- 'TOO_SHORT_AIM' => 'The screenname you entered is too short.',
'TOO_SHORT_CONFIRM_CODE' => 'The confirm code you entered is too short.',
'TOO_SHORT_DATEFORMAT' => 'The date format you entered is too short.',
'TOO_SHORT_JABBER' => 'The Jabber account name you entered is too short.',
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index e641236420..83f5e4107e 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -71,8 +71,6 @@ $lang = array_merge($lang, array(
'HIDE_MEMBER_SEARCH' => 'Hide member search',
'IM_ADD_CONTACT' => 'Add Contact',
- 'IM_AIM' => 'Please note that you need AOL Instant Messenger installed to use this.',
- 'IM_AIM_EXPRESS' => 'AIM Express',
'IM_DOWNLOAD_APP' => 'Download application',
'IM_JABBER' => 'Please note that users may have selected to not receive unsolicited instant messages.',
'IM_JABBER_SUBJECT' => 'This is an automated message please do not reply! Message from user %1$s at %2$s.',
@@ -114,7 +112,6 @@ $lang = array_merge($lang, array(
'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',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 4fa73667cb..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.',