diff options
author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2012-11-10 10:58:44 -0600 |
---|---|---|
committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2012-11-10 10:58:44 -0600 |
commit | 68363e362d4b6d3fe717a8ffae95ab13eb374e9f (patch) | |
tree | eea655f80184a3cee5a95abec5da1437c6e9aa5a /phpBB/adm/style/acp_forums_copy_perm.html | |
parent | 6c8c54d4d2575cd40fe873cd2108b031ae5830a6 (diff) | |
parent | f5ed04f8ff0c65e1bfe6a4953b974315dd2790d7 (diff) | |
download | forums-68363e362d4b6d3fe717a8ffae95ab13eb374e9f.tar forums-68363e362d4b6d3fe717a8ffae95ab13eb374e9f.tar.gz forums-68363e362d4b6d3fe717a8ffae95ab13eb374e9f.tar.bz2 forums-68363e362d4b6d3fe717a8ffae95ab13eb374e9f.tar.xz forums-68363e362d4b6d3fe717a8ffae95ab13eb374e9f.zip |
Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103
Conflicts:
phpBB/install/schemas/mssql_schema.sql
phpBB/report.php
phpBB/styles/prosilver/template/ucp_prefs_personal.html
phpBB/styles/subsilver2/template/ucp_prefs_personal.html
Diffstat (limited to 'phpBB/adm/style/acp_forums_copy_perm.html')
-rw-r--r-- | phpBB/adm/style/acp_forums_copy_perm.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/adm/style/acp_forums_copy_perm.html b/phpBB/adm/style/acp_forums_copy_perm.html index acec3c1967..1fcf2f62a4 100644 --- a/phpBB/adm/style/acp_forums_copy_perm.html +++ b/phpBB/adm/style/acp_forums_copy_perm.html @@ -9,7 +9,7 @@ <fieldset> <dl> - <dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt> + <dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}{L_COLON}</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt> <dd><select id="forum_perm_from" name="forum_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_FORUM_OPTIONS}</select></dd> </dl> <div style="text-align: center;">{S_FORM_TOKEN}{S_HIDDEN_FIELDS} |