aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/acp
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-10-19 13:55:48 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-10-19 13:55:48 +0000
commitfcd9b898f156b9b0269a2d2108b9d83660b791d0 (patch)
tree9a2b09047c79fa386619f5ecd63306fe2bdf7ef1 /phpBB/language/en/acp
parent9a0ca3d334396940cc32ed153ccdfef76ece8d9e (diff)
downloadforums-fcd9b898f156b9b0269a2d2108b9d83660b791d0.tar
forums-fcd9b898f156b9b0269a2d2108b9d83660b791d0.tar.gz
forums-fcd9b898f156b9b0269a2d2108b9d83660b791d0.tar.bz2
forums-fcd9b898f156b9b0269a2d2108b9d83660b791d0.tar.xz
forums-fcd9b898f156b9b0269a2d2108b9d83660b791d0.zip
Revised attachment categories a bit
Fixes for the following bugs: #4830 #4818 #4816 #4810 #4808 #4798 #4796 #4772 #4662 #4646 #4546 #4524 #4270 I hope not having introduced additional severe errors :) git-svn-id: file:///svn/phpbb/trunk@6511 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/acp')
-rw-r--r--phpBB/language/en/acp/attachments.php2
-rw-r--r--phpBB/language/en/acp/board.php2
2 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php
index 0fe5c16375..d701a2d513 100644
--- a/phpBB/language/en/acp/attachments.php
+++ b/phpBB/language/en/acp/attachments.php
@@ -59,7 +59,9 @@ $lang = array_merge($lang, array(
'ATTACH_QUOTA_EXPLAIN' => 'Maximum drive space available for attachments in total, 0 is unlimited.',
'ATTACH_TO_POST' => 'Attach file to post',
+ 'CAT_FLASH_FILES' => 'Flash Files',
'CAT_IMAGES' => 'Images',
+ 'CAT_QUICKTIME_FILES' => 'Quicktime Media',
'CAT_RM_FILES' => 'Real Media Streams',
'CAT_WM_FILES' => 'Window Media Streams',
'CREATE_GROUP' => 'Create new group',
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 705682e94a..dc66d8261e 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -396,7 +396,7 @@ $lang = array_merge($lang, array(
'SMTP_DIGEST_MD5' => 'DIGEST-MD5',
'SMTP_LOGIN' => 'LOGIN',
'SMTP_PASSWORD' => 'SMTP Password',
- 'SMTP_PASSWORD_EXPLAIN' => 'Only enter a password if your smtp server requires it.',
+ 'SMTP_PASSWORD_EXPLAIN' => 'Only enter a password if your SMTP server requires it.',
'SMTP_PLAIN' => 'PLAIN',
'SMTP_POP_BEFORE_SMTP' => 'POP-BEFORE-SMTP',
'SMTP_PORT' => 'SMTP Server Port',