diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-02-04 20:57:37 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-02-04 20:57:37 -0600 |
| commit | 1e5a1b72dca4e0ccae9340467225499649dea6c8 (patch) | |
| tree | 6f16d15999e6ac5f158643619213acbf2a7daf7c /phpBB/language/en/common.php | |
| parent | 34c564062a95b9306487fbc6bbd17c7c9c8a63c4 (diff) | |
| parent | 336187151a2010197ddda1bcdabc311fd10c1c87 (diff) | |
| download | forums-1e5a1b72dca4e0ccae9340467225499649dea6c8.tar forums-1e5a1b72dca4e0ccae9340467225499649dea6c8.tar.gz forums-1e5a1b72dca4e0ccae9340467225499649dea6c8.tar.bz2 forums-1e5a1b72dca4e0ccae9340467225499649dea6c8.tar.xz forums-1e5a1b72dca4e0ccae9340467225499649dea6c8.zip | |
Merge remote-tracking branch 'remotes/bantu/ticket/11201' into develop
# By Andreas Fischer
# Via Andreas Fischer
* remotes/bantu/ticket/11201:
[ticket/11201] Revert WLM dropping because it is still used in China.
Diffstat (limited to 'phpBB/language/en/common.php')
| -rw-r--r-- | phpBB/language/en/common.php | 3 |
1 files changed, 3 insertions, 0 deletions
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.', |