aboutsummaryrefslogtreecommitdiff
path: root/phpBB
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2020-01-22 21:21:13 +0100
committerMarc Alexander <admin@m-a-styles.de>2020-01-22 21:21:13 +0100
commit6b8ccbc379c4eaca03c495bb614bcc2e81c2fabf (patch)
tree1f213d037d3bafd450ce6e997da5f06ec4bec354 /phpBB
parentMerge branch '3.3.x' (diff)
parentMerge branch '3.2.x' into 3.3.x (diff)
downloadphpbb-6b8ccbc379c4eaca03c495bb614bcc2e81c2fabf.tar.gz
phpbb-6b8ccbc379c4eaca03c495bb614bcc2e81c2fabf.tar.bz2
phpbb-6b8ccbc379c4eaca03c495bb614bcc2e81c2fabf.zip
Merge branch '3.3.x'
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/language/en/common.php4
-rw-r--r--phpBB/language/en/viewtopic.php3
2 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 17326166b2..676ed89ec8 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -168,6 +168,7 @@ $lang = array_merge($lang, array(
),
'COLLAPSE_VIEW' => 'Collapse view',
'CLOSE_WINDOW' => 'Close window',
+ 'CODE' => 'Code',
'COLOUR_SWATCH' => 'Colour swatch',
'COLON' => ':',
'COMMA_SEPARATOR' => ', ', // Comma used to join lists into a single string, use localised comma if appropriate, eg: Ideographic or Arabic
@@ -618,6 +619,9 @@ $lang = array_merge($lang, array(
'POST_UNAPPROVED' => 'This post has not been approved.',
'POST_UNAPPROVED_EXPLAIN' => 'This post is not visible to other users until it has been approved by a moderator.',
'POWERED_BY' => 'Powered by %s',
+
+ 'QUOTE' => 'Quote',
+
'PREVIEW' => 'Preview',
'PREVIOUS' => 'Previous', // Used in pagination
'PREVIOUS_STEP' => 'Previous',
diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php
index 5d127acb3d..e5c9be0517 100644
--- a/phpBB/language/en/viewtopic.php
+++ b/phpBB/language/en/viewtopic.php
@@ -49,8 +49,6 @@ $lang = array_merge($lang, array(
'BUMPED_BY' => 'Last bumped by %1$s on %2$s.',
'BUMP_TOPIC' => 'Bump topic',
- 'CODE' => 'Code',
-
'DELETE_TOPIC' => 'Delete topic',
'DELETED_INFORMATION' => 'Deleted by %1$s on %2$s',
'DISAPPROVE' => 'Disapprove',
@@ -98,7 +96,6 @@ $lang = array_merge($lang, array(
'QUICK_MOD' => 'Quick-mod tools',
'QUICKREPLY' => 'Quick Reply',
- 'QUOTE' => 'Quote',
'REPLY_TO_TOPIC' => 'Reply to topic',
'RESTORE' => 'Restore',