diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-10-20 20:41:11 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-10-20 20:46:48 -0400 |
| commit | 83d71ecb885ec2f594d3863cfa42111b8f06260b (patch) | |
| tree | 0da0e3ec50329e4dffdc773202046dbf643ce4e8 /phpBB/language/en | |
| parent | c6e370d33abd64fa928c4d438a75458518d0c8da (diff) | |
| parent | 2d0f96e8cc48ba6eed06f99efb33193fc495eab7 (diff) | |
| download | forums-83d71ecb885ec2f594d3863cfa42111b8f06260b.tar forums-83d71ecb885ec2f594d3863cfa42111b8f06260b.tar.gz forums-83d71ecb885ec2f594d3863cfa42111b8f06260b.tar.bz2 forums-83d71ecb885ec2f594d3863cfa42111b8f06260b.tar.xz forums-83d71ecb885ec2f594d3863cfa42111b8f06260b.zip | |
Merge remote-tracking branch 'VSEphpbb/ticket/10390' into develop
* VSEphpbb/ticket/10390:
[ticket/10390] Revert back to escaped script tags inside document.write
[ticket/10390] Fix wording: fallback should be fall back
[ticket/10390] Serve jQuery from Google CDN Yes/No button in ACP
[ticket/10390] Use simpler HTML5 compliant js for the jQuery fallback
[ticket/10390] Drop http protocol for Microsoft's CDN option
[ticket/10390] Reword the language for jQuery host/server options
[ticket/10390] Fix a type-o - captialize AJAX
[ticket/10390] Improve the jQuery CDN url generation function
[ticket/10390] Move jQuery version definition
[ticket/10390] Allow option for jQuery to be hosted by a remote CDN
Conflicts:
phpBB/install/database_update.php
Diffstat (limited to 'phpBB/language/en')
| -rw-r--r-- | phpBB/language/en/acp/board.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 44079bc0a2..ff516a8146 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -356,6 +356,8 @@ $lang = array_merge($lang, array( 'LOAD_CPF_PM' => 'Display custom profile fields in private messages', 'LOAD_CPF_VIEWPROFILE' => 'Display custom profile fields in user profiles', 'LOAD_CPF_VIEWTOPIC' => 'Display custom profile fields on topic pages', + 'LOAD_JQUERY_CDN' => 'Serve jQuery using Google’s CDN', + 'LOAD_JQUERY_CDN_EXPLAIN' => 'If this setting is enabled, jQuery will be served from Google’s AJAX API CDN instead of the copy included with phpBB on your server. If the CDN fails, phpBB will attempt to fall back to the copy included with phpBB.', 'LOAD_USER_ACTIVITY' => 'Show user’s activity', 'LOAD_USER_ACTIVITY_EXPLAIN' => 'Displays active topic/forum in user profiles and user control panel. It is recommended to disable this on boards with more than one million posts.', 'RECOMPILE_STYLES' => 'Recompile stale style components', |