aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorHenry Sudhof <kellanved@phpbb.com>2007-08-01 16:23:22 +0000
committerHenry Sudhof <kellanved@phpbb.com>2007-08-01 16:23:22 +0000
commit2ffdd92975cdacd7c12b5a438a62730ec02e6129 (patch)
treeda03a217d5074fb2d5ae2a99cf754742fed3ce4b /phpBB/language
parentfae688ba2af955afb6c2eaecad7f923359836865 (diff)
downloadforums-2ffdd92975cdacd7c12b5a438a62730ec02e6129.tar
forums-2ffdd92975cdacd7c12b5a438a62730ec02e6129.tar.gz
forums-2ffdd92975cdacd7c12b5a438a62730ec02e6129.tar.bz2
forums-2ffdd92975cdacd7c12b5a438a62730ec02e6129.tar.xz
forums-2ffdd92975cdacd7c12b5a438a62730ec02e6129.zip
#13918
And the language entries for the last ci. git-svn-id: file:///svn/phpbb/trunk@7993 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/acp/posting.php6
-rw-r--r--phpBB/language/en/common.php5
2 files changed, 8 insertions, 3 deletions
diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php
index bededcf947..f5be3d4d5e 100644
--- a/phpBB/language/en/acp/posting.php
+++ b/phpBB/language/en/acp/posting.php
@@ -91,8 +91,12 @@ $lang = array_merge($lang, array(
'CURRENT_SMILIES' => 'Current smilies',
'CURRENT_SMILIES_EXPLAIN' => 'Choose what to do with the currently installed smilies.',
- 'DISPLAY_ON_POSTING' => 'Display on posting page',
+ 'DISPLAY_ON_POSTING' => 'Display on posting page',
+ 'DISPLAY_POSTING' => 'On posting page',
+ 'DISPLAY_POSTING_NO' => 'Not on posting page',
+
+
'EDIT_ICONS' => 'Edit icons',
'EDIT_SMILIES' => 'Edit smilies',
'EMOTION' => 'Emotion',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index fe528d48fe..b082a00c52 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -591,8 +591,9 @@ $lang = array_merge($lang, array(
'UNREAD_MESSAGES' => 'Unread messages',
'UNREAD_PM' => '<strong>%d</strong> unread message',
'UNREAD_PMS' => '<strong>%d</strong> unread messages',
- 'UNWATCHED_FORUMS' => 'You are no longer subscribed to the selected forums.',
- 'UNWATCHED_TOPICS' => 'You are no longer subscribed to the selected topics.',
+ 'UNWATCHED_FORUMS' => 'You are no longer subscribed to the selected forums.',
+ 'UNWATCHED_TOPICS' => 'You are no longer subscribed to the selected topics.',
+ 'UNWATCHED_FORUMS_TOPICS' => 'You are no longer subscribed to the selected entries.',
'UPDATE' => 'Update',
'UPLOAD_IN_PROGRESS' => 'The upload is currently in progress.',
'URL_REDIRECT' => 'If your browser does not support meta redirection %splease click HERE to be redirected%s.',