aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2004-08-22 13:16:00 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2004-08-22 13:16:00 +0000
commit02ce77099065c8993c493e461ec4e14adc4fc4f6 (patch)
tree3a24314e808f6350a0f8eeddfe9cbb23e20ecb28 /phpBB/language
parent946af346a1e21699b9fd246f96a98253f689e877 (diff)
downloadforums-02ce77099065c8993c493e461ec4e14adc4fc4f6.tar
forums-02ce77099065c8993c493e461ec4e14adc4fc4f6.tar.gz
forums-02ce77099065c8993c493e461ec4e14adc4fc4f6.tar.bz2
forums-02ce77099065c8993c493e461ec4e14adc4fc4f6.tar.xz
forums-02ce77099065c8993c493e461ec4e14adc4fc4f6.zip
- user notes/feedback in post_details
git-svn-id: file:///svn/phpbb/trunk@4966 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/admin.php3
-rw-r--r--phpBB/language/en/common.php2
-rw-r--r--phpBB/language/en/mcp.php4
3 files changed, 5 insertions, 4 deletions
diff --git a/phpBB/language/en/admin.php b/phpBB/language/en/admin.php
index bc86dd197c..5a8b0e912f 100644
--- a/phpBB/language/en/admin.php
+++ b/phpBB/language/en/admin.php
@@ -1143,9 +1143,6 @@ $lang += array(
'USER_POSTING_PREFS' => 'Posting preferences',
- 'ADD_FEEDBACK' => 'Add feedback',
- 'ADD_FEEDBACK_EXPLAIN' => 'If you would like to add a report on this please fill out the following form. Only use plain text, HTML, BBCode, etc. are not permitted.',
-
'ADMIN_SIGNATURE_PREVIEW' => 'Users signature will appear like this',
'USER_ADMIN_BAN_NAME_REASON' => 'Username banned via user management',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index c40a16487b..3345bd7af0 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -86,6 +86,7 @@ $lang += array(
'DAY' => 'Day',
'DAYS' => 'Days',
'DELETE' => 'Delete',
+ 'DELETE_ALL' => 'Delete All',
'DELETE_COOKIES' => 'Delete all board cookies',
'DELETE_MARKED' => 'Delete Marked',
'DESCENDING' => 'Descending',
@@ -524,7 +525,6 @@ $unused = array(
'DESCRIPTION' => 'Description',
'DOWNLOAD' => 'Download',
'Date' => 'Date',
- 'Delete_all' => 'Delete All',
'Deny_selected' => 'Deny Selected',
'Disable_BBCode_pm' => 'Disable BBCode in this message',
'Disable_HTML_pm' => 'Disable HTML in this message',
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index 49deed20c3..88a8305ca3 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -29,6 +29,8 @@ if (empty($lang) || !is_array($lang))
$lang += array(
'ACTION' => 'Action',
+ 'ADD_FEEDBACK' => 'Add feedback',
+ 'ADD_FEEDBACK_EXPLAIN' => 'If you would like to add a report on this please fill out the following form. Only use plain text, HTML, BBCode, etc. are not permitted.',
'ALL_ENTRIES' => 'All entries',
'ALREADY_REPORTED' => 'This post has already been reported',
'APPROVE' => 'Approve',
@@ -54,6 +56,7 @@ $lang += array(
'EMPTY_REPORT' => 'You must enter a description when selecting this reason',
'EMPTY_TOPICS_REMOVED_WARNING' => 'Please note that one or several topics have been removed from the database because they were or become empty',
+ 'FEEDBACK' => 'Feedback',
'FORK' => 'Fork',
'FORK_TOPIC' => 'Fork Topic',
'FORK_TOPIC_CONFIRM' => 'Are you sure you want to copy this topic?',
@@ -242,6 +245,7 @@ $lang += array(
'UNRATE_POST_EXPLAIN' => 'Reset post rating',
'USER_CANNOT_POST' => 'You cannot post in this forum',
'USER_CANNOT_REPORT' => 'You cannot report posts in this forum',
+ 'USER_FEEDBACK_ADDED' => 'User feedback added successfully',
'VIEW_DETAILS' => 'View Details',