aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2009-06-21 19:17:20 +0000
committerAndreas Fischer <bantu@phpbb.com>2009-06-21 19:17:20 +0000
commitf393b748c514906f036b84a25981a05cf7677614 (patch)
tree352d7c6d8c72cfa69070dd6152fb3966d05b0e3a
parenteb72e526b804844839555314914049eec75f1398 (diff)
downloadforums-f393b748c514906f036b84a25981a05cf7677614.tar
forums-f393b748c514906f036b84a25981a05cf7677614.tar.gz
forums-f393b748c514906f036b84a25981a05cf7677614.tar.bz2
forums-f393b748c514906f036b84a25981a05cf7677614.tar.xz
forums-f393b748c514906f036b84a25981a05cf7677614.zip
Fix bug #37565 - Correctly state why one language pack is marked with an asterisk in the ACP.
Authorised by: acydburn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9649 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/docs/CHANGELOG.html1
-rw-r--r--phpBB/language/en/acp/language.php2
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 794dc4fc44..37364e09d1 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -128,6 +128,7 @@
<li>[Fix] Correct the width value for poll_center.gif omitted in imageset.cfg for subsilver2. (Bug #43005 - Patch by rxu)</li>
<li>[Fix] Correctly load complex language variable using acp_language (Bug #45735 - Patch by leviatan21)</li>
<li>[Fix] Fixed reapply_sid() to correctly strip session id in certain circumstances (Bug #43125 - Patch by leviatan21)</li>
+ <li>[Fix] Correctly state why one language pack is marked with an asterisk in the ACP. (Bug #37565 - Patch by bantu)</li>
<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>
<li>[Change] Template engine now permits to a limited extent variable includes.</li>
diff --git a/phpBB/language/en/acp/language.php b/phpBB/language/en/acp/language.php
index a10148942b..4d11309ebb 100644
--- a/phpBB/language/en/acp/language.php
+++ b/phpBB/language/en/acp/language.php
@@ -37,7 +37,7 @@ if (empty($lang) || !is_array($lang))
$lang = array_merge($lang, array(
'ACP_FILES' => 'Admin language files',
- 'ACP_LANGUAGE_PACKS_EXPLAIN' => 'Here you are able to install/remove language packs.',
+ 'ACP_LANGUAGE_PACKS_EXPLAIN' => 'Here you are able to install/remove language packs. The default language pack is marked with an asterisk (*).',
'EMAIL_FILES' => 'E-mail templates',