diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-10-08 12:44:23 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-10-08 12:44:23 +0000 |
| commit | 73981ac5dcf9fc3fb54f392b3fb5206d30bbb5c3 (patch) | |
| tree | e976f93f4581c17f1af0cff262fdabde3526c129 /phpBB/language/en | |
| parent | d15751b149bf4004a212e23b0523394909043876 (diff) | |
| download | forums-73981ac5dcf9fc3fb54f392b3fb5206d30bbb5c3.tar forums-73981ac5dcf9fc3fb54f392b3fb5206d30bbb5c3.tar.gz forums-73981ac5dcf9fc3fb54f392b3fb5206d30bbb5c3.tar.bz2 forums-73981ac5dcf9fc3fb54f392b3fb5206d30bbb5c3.tar.xz forums-73981ac5dcf9fc3fb54f392b3fb5206d30bbb5c3.zip | |
[Feature] Allow specific connection to different server for jabber functionality by providing a valid JID as username. This also allows the use of talk.google.com as jabber server with gmail.com JIDs. (Bug #14989)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8979 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en')
| -rw-r--r-- | phpBB/language/en/acp/board.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 76de3487fd..f6bbe175bd 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -459,8 +459,8 @@ $lang = array_merge($lang, array( 'JAB_SETTINGS_CHANGED' => 'Jabber settings changed successfully.', 'JAB_USE_SSL' => 'Use SSL to connect', 'JAB_USE_SSL_EXPLAIN' => 'If enabled a secure connection is tried to be established. The Jabber port will be modified to 5223 if port 5222 is specified.', - 'JAB_USERNAME' => 'Jabber username', - 'JAB_USERNAME_EXPLAIN' => 'Specify a registered username. The username will not be checked for validity.', + 'JAB_USERNAME' => 'Jabber username or JID', + 'JAB_USERNAME_EXPLAIN' => 'Specify a registered username or a valid JID. The username will not be checked for validity. If you only specify a username, then your JID will be the username and the server you specified above. Else, specify a valid JID, for example user@jabber.org.', )); ?>
\ No newline at end of file |