aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en
diff options
context:
space:
mode:
authorVjacheslav Trushkin <arty@phpbb.com>2012-03-31 00:22:04 +0300
committerVjacheslav Trushkin <arty@phpbb.com>2012-03-31 00:22:04 +0300
commitf15167bcfaf891e56ced4d92bf189f03932ceb00 (patch)
tree2e1e37d5b0ac25fc09db441dd0d3aa2ee2a15962 /phpBB/language/en
parent3d610e38720664750dbbf361b173766a4ac27cfc (diff)
parentcfb8f01040ca9fded20d8f3dd4620cd7477d60fc (diff)
downloadforums-f15167bcfaf891e56ced4d92bf189f03932ceb00.tar
forums-f15167bcfaf891e56ced4d92bf189f03932ceb00.tar.gz
forums-f15167bcfaf891e56ced4d92bf189f03932ceb00.tar.bz2
forums-f15167bcfaf891e56ced4d92bf189f03932ceb00.tar.xz
forums-f15167bcfaf891e56ced4d92bf189f03932ceb00.zip
Merge remote-tracking branch 'imkingdavid/ticket/10727' into develop
* imkingdavid/ticket/10727: [ticket/10727] Do not hide Quick Reply with javascript on prosilver
Diffstat (limited to 'phpBB/language/en')
-rw-r--r--phpBB/language/en/viewtopic.php2
1 files changed, 0 insertions, 2 deletions
diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php
index 2b20938afe..f47f8a076b 100644
--- a/phpBB/language/en/viewtopic.php
+++ b/phpBB/language/en/viewtopic.php
@@ -47,7 +47,6 @@ $lang = array_merge($lang, array(
'BUMP_TOPIC' => 'Bump topic',
'CODE' => 'Code',
- 'COLLAPSE_QR' => 'Hide Quick Reply',
'DELETE_TOPIC' => 'Delete topic',
'DOWNLOAD_NOTICE' => 'You do not have the required permissions to view the files attached to this post.',
@@ -97,7 +96,6 @@ $lang = array_merge($lang, array(
'REPLY_TO_TOPIC' => 'Reply to topic',
'RETURN_POST' => '%sReturn to the post%s',
- 'SHOW_QR' => 'Quick Reply',
'SUBMIT_VOTE' => 'Submit vote',
'TOTAL_VOTES' => 'Total votes',