aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/viewtopic.php
diff options
context:
space:
mode:
authorDavid King <imkingdavid@gmail.com>2012-03-30 20:16:00 -0400
committerDavid King <imkingdavid@gmail.com>2012-03-30 20:16:00 -0400
commit013a8649a5164b90310e76d99fae2186b831a5f0 (patch)
tree3ad85edcdf4720c524214c68a7a4c80150ebb2f2 /phpBB/language/en/viewtopic.php
parent4f97cc12951b2be6fa8d7962beaf631f7c82fb43 (diff)
parentb42e10df28742ba5a68d15e740e33aa7f8260f40 (diff)
downloadforums-013a8649a5164b90310e76d99fae2186b831a5f0.tar
forums-013a8649a5164b90310e76d99fae2186b831a5f0.tar.gz
forums-013a8649a5164b90310e76d99fae2186b831a5f0.tar.bz2
forums-013a8649a5164b90310e76d99fae2186b831a5f0.tar.xz
forums-013a8649a5164b90310e76d99fae2186b831a5f0.zip
Merge remote-tracking branch 'igorw/feature/ajax' into develop
Diffstat (limited to 'phpBB/language/en/viewtopic.php')
-rw-r--r--phpBB/language/en/viewtopic.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php
index f47f8a076b..1460490672 100644
--- a/phpBB/language/en/viewtopic.php
+++ b/phpBB/language/en/viewtopic.php
@@ -35,6 +35,7 @@ if (empty($lang) || !is_array($lang))
// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
$lang = array_merge($lang, array(
+ 'APPROVE' => 'Approve',
'ATTACHMENT' => 'Attachment',
'ATTACHMENT_FUNCTIONALITY_DISABLED' => 'The attachments feature has been disabled.',
@@ -49,6 +50,7 @@ $lang = array_merge($lang, array(
'CODE' => 'Code',
'DELETE_TOPIC' => 'Delete topic',
+ 'DISAPPROVE' => 'Disapprove',
'DOWNLOAD_NOTICE' => 'You do not have the required permissions to view the files attached to this post.',
'EDITED_TIMES_TOTAL' => array(