diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-11-15 16:46:08 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-11-15 16:46:08 +0100 |
| commit | 39f8592312933eba903818f1a4de6bc5ac2b3dd0 (patch) | |
| tree | 2b95f370bb32717192454c90a8a1748fa7c727e3 /phpBB/adm/style | |
| parent | f7286e1abe5ae2b0ec81f8f7ce39ca0b3062ed16 (diff) | |
| parent | f1a53659bdacdc045943b8a09240e6ecadcc5360 (diff) | |
| download | forums-39f8592312933eba903818f1a4de6bc5ac2b3dd0.tar forums-39f8592312933eba903818f1a4de6bc5ac2b3dd0.tar.gz forums-39f8592312933eba903818f1a4de6bc5ac2b3dd0.tar.bz2 forums-39f8592312933eba903818f1a4de6bc5ac2b3dd0.tar.xz forums-39f8592312933eba903818f1a4de6bc5ac2b3dd0.zip | |
Merge remote-tracking branch 'rxu/ticket/10419' into develop-olympus
* rxu/ticket/10419:
[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/style')
| -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 7d3b6945ac..c665c9d893 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> |