diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-04 11:22:55 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-05 21:38:57 +0100 |
| commit | 2e5106aae1bfe83ad8b2336a6d519da5aabc59d2 (patch) | |
| tree | ece483e4a0e00f08e426570bb51140273b39f03b /phpBB/language | |
| parent | 71354ef185e003319cdc9031928054fdb2f0b970 (diff) | |
| download | forums-2e5106aae1bfe83ad8b2336a6d519da5aabc59d2.tar forums-2e5106aae1bfe83ad8b2336a6d519da5aabc59d2.tar.gz forums-2e5106aae1bfe83ad8b2336a6d519da5aabc59d2.tar.bz2 forums-2e5106aae1bfe83ad8b2336a6d519da5aabc59d2.tar.xz forums-2e5106aae1bfe83ad8b2336a6d519da5aabc59d2.zip | |
[ticket/12237] Convert yahoo messanger to custom profile field
PHPBB3-12237
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/styles.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 4 | ||||
| -rw-r--r-- | phpBB/language/en/ucp.php | 1 |
3 files changed, 1 insertions, 5 deletions
diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php index eef669220a..6954702f1f 100644 --- a/phpBB/language/en/acp/styles.php +++ b/phpBB/language/en/acp/styles.php @@ -186,7 +186,6 @@ $lang = array_merge($lang, array( 'IMG_ICON_CONTACT_EMAIL' => 'Send email', 'IMG_ICON_CONTACT_JABBER' => 'Jabber', 'IMG_ICON_CONTACT_PM' => 'Send message', - 'IMG_ICON_CONTACT_YAHOO' => 'YIM', 'IMG_ICON_POST_DELETE' => 'Delete post', 'IMG_ICON_POST_EDIT' => 'Edit post', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index eba423deff..144ffd33d5 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -691,7 +691,6 @@ $lang = array_merge($lang, array( 'TOO_LONG_USER_PASSWORD' => 'The password you entered is too long.', 'TOO_LONG_USERNAME' => 'The username you entered is too long.', 'TOO_LONG_EMAIL' => 'The email address you entered is too long.', - 'TOO_LONG_YIM' => 'The Yahoo! Messenger name you entered is too long.', 'TOO_MANY_VOTE_OPTIONS' => 'You have tried to vote for too many options.', @@ -706,7 +705,6 @@ $lang = array_merge($lang, array( 'TOO_SHORT_USER_PASSWORD' => 'The password you entered is too short.', 'TOO_SHORT_USERNAME' => 'The username you entered is too short.', 'TOO_SHORT_EMAIL' => 'The email address you entered is too short.', - 'TOO_SHORT_YIM' => 'The Yahoo! Messenger name you entered is too short.', 'TOO_SMALL' => 'The value you entered is too small.', 'TOO_SMALL_MAX_RECIPIENTS' => 'The value of <strong>Maximum number of allowed recipients per private message</strong> setting you entered is too small.', @@ -830,7 +828,7 @@ $lang = array_merge($lang, array( 'YEAR' => 'Year', 'YEAR_MONTH_DAY' => '(YYYY-MM-DD)', 'YES' => 'Yes', - 'YIM' => 'YIM', + 'YIM' => 'Yahoo Messenger', 'YOU_LAST_VISIT' => 'Last visit was: %s', 'datetime' => array( diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 42fd0fd506..4fa73667cb 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -539,7 +539,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', |