diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-02-04 01:30:04 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-02-04 01:31:43 +0100 |
| commit | 336187151a2010197ddda1bcdabc311fd10c1c87 (patch) | |
| tree | 6f16d15999e6ac5f158643619213acbf2a7daf7c /phpBB/language | |
| parent | 34c564062a95b9306487fbc6bbd17c7c9c8a63c4 (diff) | |
| download | forums-336187151a2010197ddda1bcdabc311fd10c1c87.tar forums-336187151a2010197ddda1bcdabc311fd10c1c87.tar.gz forums-336187151a2010197ddda1bcdabc311fd10c1c87.tar.bz2 forums-336187151a2010197ddda1bcdabc311fd10c1c87.tar.xz forums-336187151a2010197ddda1bcdabc311fd10c1c87.zip | |
[ticket/11201] Revert WLM dropping because it is still used in China.
Windows Live Messenger is still in use in china which accounts for ~20% of world
population. Revert WLM dropping which has been merged under the assumption that
WLM data and features are completely useless.
This commit reverts commits
- 460470229d972b93ef5a98b0d1d97a2a970d684f
- 9affd6f7e7b95442f1ef14894858d8213f3fbd2a
which have been merged by d59431691c27c73fba8ae9934b84b34a13280dd2.
PHPBB3-11201
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/styles.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 3 | ||||
| -rw-r--r-- | phpBB/language/en/memberlist.php | 4 | ||||
| -rw-r--r-- | phpBB/language/en/ucp.php | 1 |
4 files changed, 9 insertions, 0 deletions
diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php index 3cb2e741ca..e7954ff148 100644 --- a/phpBB/language/en/acp/styles.php +++ b/phpBB/language/en/acp/styles.php @@ -186,6 +186,7 @@ $lang = array_merge($lang, array( 'IMG_ICON_CONTACT_EMAIL' => 'Send email', 'IMG_ICON_CONTACT_ICQ' => 'ICQ', 'IMG_ICON_CONTACT_JABBER' => 'Jabber', + 'IMG_ICON_CONTACT_MSNM' => 'WLM', 'IMG_ICON_CONTACT_PM' => 'Send message', 'IMG_ICON_CONTACT_YAHOO' => 'YIM', 'IMG_ICON_CONTACT_WWW' => 'Website', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 63241b71b5..8158209a68 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -379,6 +379,7 @@ $lang = array_merge($lang, array( 'MODERATORS' => 'Moderators', 'MONTH' => 'Month', 'MOVE' => 'Move', + 'MSNM' => 'WLM', 'NA' => 'N/A', 'NEWEST_USER' => 'Our newest member <strong>%s</strong>', @@ -637,6 +638,7 @@ $lang = array_merge($lang, array( 'TOO_LONG_INTERESTS' => 'The interests you entered is too long.', 'TOO_LONG_JABBER' => 'The Jabber account name you entered is too long.', 'TOO_LONG_LOCATION' => 'The location you entered is too long.', + 'TOO_LONG_MSN' => 'The WLM name you entered is too long.', 'TOO_LONG_NEW_PASSWORD' => 'The password you entered is too long.', 'TOO_LONG_OCCUPATION' => 'The occupation you entered is too long.', 'TOO_LONG_PASSWORD_CONFIRM' => 'The password confirmation you entered is too long.', @@ -657,6 +659,7 @@ $lang = array_merge($lang, array( 'TOO_SHORT_INTERESTS' => 'The interests you entered is too short.', 'TOO_SHORT_JABBER' => 'The Jabber account name you entered is too short.', 'TOO_SHORT_LOCATION' => 'The location you entered is too short.', + 'TOO_SHORT_MSN' => 'The WLM name you entered is too short.', 'TOO_SHORT_NEW_PASSWORD' => 'The password you entered is too short.', 'TOO_SHORT_OCCUPATION' => 'The occupation you entered is too short.', 'TOO_SHORT_PASSWORD_CONFIRM' => 'The password confirmation you entered is too short.', diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php index bc5a0c100b..ec21e8e904 100644 --- a/phpBB/language/en/memberlist.php +++ b/phpBB/language/en/memberlist.php @@ -78,6 +78,9 @@ $lang = array_merge($lang, array( '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.', 'IM_MESSAGE' => 'Your message', + 'IM_MSNM' => 'Please note that you need Windows Live Messenger installed to use this.', + 'IM_MSNM_BROWSER' => 'Your browser does not support this.', + 'IM_MSNM_CONNECT' => 'WLM is not connected.\nYou have to connect to WLM to continue.', 'IM_NAME' => 'Your Name', 'IM_NO_DATA' => 'There is no suitable contact information for this user.', 'IM_NO_JABBER' => 'Sorry, direct messaging of Jabber users is not supported on this board. You will need a Jabber client installed on your system to contact the recipient above.', @@ -120,6 +123,7 @@ $lang = array_merge($lang, array( 'SEND_IM' => 'Instant messaging', 'SEND_JABBER_MESSAGE' => 'Send Jabber message', 'SEND_MESSAGE' => 'Message', + 'SEND_MSNM_MESSAGE' => 'Send WLM message', 'SEND_YIM_MESSAGE' => 'Send YIM message', 'SORT_EMAIL' => 'Email', 'SORT_LAST_ACTIVE' => 'Last active', diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 2eb34b3713..267ae00710 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -455,6 +455,7 @@ $lang = array_merge($lang, array( 'UCP_MAIN_FRONT' => 'Front page', 'UCP_MAIN_SUBSCRIBED' => 'Manage subscriptions', + 'UCP_MSNM' => 'Windows Live Messenger', 'UCP_NO_ATTACHMENTS' => 'You have posted no files.', 'UCP_PREFS' => 'Board preferences', |