diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2010-12-05 14:10:49 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2010-12-05 14:10:49 +0100 |
| commit | f6a48b495e6c65c1ca2535a7d9ed7b42332ea464 (patch) | |
| tree | 870db2d593268fb59fcac57d9ef1c262acc451cb /phpBB/adm | |
| parent | 5a4938c27001cd4f0aad4efcc72175e7a7bd30a6 (diff) | |
| parent | 0491bfbc2d5e7d98a7a15b5d0096c2647b821709 (diff) | |
| download | forums-f6a48b495e6c65c1ca2535a7d9ed7b42332ea464.tar forums-f6a48b495e6c65c1ca2535a7d9ed7b42332ea464.tar.gz forums-f6a48b495e6c65c1ca2535a7d9ed7b42332ea464.tar.bz2 forums-f6a48b495e6c65c1ca2535a7d9ed7b42332ea464.tar.xz forums-f6a48b495e6c65c1ca2535a7d9ed7b42332ea464.zip | |
Merge branch 'ticket/adamreyher/9575' into develop-olympus
* ticket/adamreyher/9575:
[ticket/9575] Also change 'administrate' to 'administer' in templates
[ticket/9575] Change 'administrate' to 'administer'
Diffstat (limited to 'phpBB/adm')
| -rw-r--r-- | phpBB/adm/style/acp_forums.html | 2 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_styles.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index 9f9216a068..d27cea28f7 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -58,7 +58,7 @@ /** * Init the wanted display functionality if javascript is enabled. - * If javascript is not available, the user is still able to properly administrate. + * If javascript is not available, the user is still able to properly administer. */ onload = function() { diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html index 5bde4008ad..cb4361dd6f 100644 --- a/phpBB/adm/style/acp_styles.html +++ b/phpBB/adm/style/acp_styles.html @@ -77,7 +77,7 @@ /** * Init the wanted display functionality if javascript is enabled. - * If javascript is not available, the user is still able to properly administrate. + * If javascript is not available, the user is still able to properly administer. */ onload = function() { |