diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-11-15 16:46:23 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-11-15 16:46:23 +0100 |
| commit | 512aee5124c04bed2b20f416796b30fdf1101c02 (patch) | |
| tree | 22084f735624a8ba8c939fbc4bfde37f7838a6dc /phpBB/adm | |
| parent | 08827fa733f0e84d91727d9feaeb057d5af0d163 (diff) | |
| parent | 39f8592312933eba903818f1a4de6bc5ac2b3dd0 (diff) | |
| download | forums-512aee5124c04bed2b20f416796b30fdf1101c02.tar forums-512aee5124c04bed2b20f416796b30fdf1101c02.tar.gz forums-512aee5124c04bed2b20f416796b30fdf1101c02.tar.bz2 forums-512aee5124c04bed2b20f416796b30fdf1101c02.tar.xz forums-512aee5124c04bed2b20f416796b30fdf1101c02.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10419] Reword the language strings
[ticket/10419] Reword some language strings, minor code changes
[ticket/10419] Add mbstring PHP ini parameters checks to ACP
Diffstat (limited to 'phpBB/adm')
| -rw-r--r-- | phpBB/adm/style/acp_main.html | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index 8946903e28..11f7fedd38 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -34,6 +34,36 @@ </div> <!-- ENDIF --> + <!-- IF S_MBSTRING_LOADED --> + <!-- IF S_MBSTRING_FUNC_OVERLOAD_FAIL --> + <div class="errorbox"> + <h3>{L_ERROR_MBSTRING_FUNC_OVERLOAD}</h3> + <p>{L_ERROR_MBSTRING_FUNC_OVERLOAD_EXPLAIN}</p> + </div> + <!-- ENDIF --> + + <!-- IF S_MBSTRING_ENCODING_TRANSLATION_FAIL --> + <div class="errorbox"> + <h3>{L_ERROR_MBSTRING_ENCODING_TRANSLATION}</h3> + <p>{L_ERROR_MBSTRING_ENCODING_TRANSLATION_EXPLAIN}</p> + </div> + <!-- ENDIF --> + + <!-- IF S_MBSTRING_HTTP_INPUT_FAIL --> + <div class="errorbox"> + <h3>{L_ERROR_MBSTRING_HTTP_INPUT}</h3> + <p>{L_ERROR_MBSTRING_HTTP_INPUT_EXPLAIN}</p> + </div> + <!-- ENDIF --> + + <!-- IF S_MBSTRING_HTTP_OUTPUT_FAIL --> + <div class="errorbox"> + <h3>{L_ERROR_MBSTRING_HTTP_OUTPUT}</h3> + <p>{L_ERROR_MBSTRING_HTTP_OUTPUT_EXPLAIN}</p> + </div> + <!-- ENDIF --> + <!-- ENDIF --> + <!-- IF S_WRITABLE_CONFIG --> <div class="errorbox notice"> <p>{L_WRITABLE_CONFIG}</p> |