diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-04-26 18:41:26 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-04-26 18:41:26 +0000 |
| commit | fc295f5f0eef6b761c7c2d825bc01501e8882a25 (patch) | |
| tree | 8a2b6d3519dffe95bb03422ecdfe58d90a45eeff /phpBB/language/en/mcp.php | |
| parent | 78f16d70a292afee3470710669d4082d5b6212eb (diff) | |
| download | forums-fc295f5f0eef6b761c7c2d825bc01501e8882a25.tar forums-fc295f5f0eef6b761c7c2d825bc01501e8882a25.tar.gz forums-fc295f5f0eef6b761c7c2d825bc01501e8882a25.tar.bz2 forums-fc295f5f0eef6b761c7c2d825bc01501e8882a25.tar.xz forums-fc295f5f0eef6b761c7c2d825bc01501e8882a25.zip | |
checking in some fixes. ;) Most of them are really minor, including:
- correctly enter report notification into db
- fix double-quote pm issue
git-svn-id: file:///svn/phpbb/trunk@7409 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/mcp.php')
| -rw-r--r-- | phpBB/language/en/mcp.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php index ebdbeef35c..fe405eb3d0 100644 --- a/phpBB/language/en/mcp.php +++ b/phpBB/language/en/mcp.php @@ -32,6 +32,7 @@ if (empty($lang) || !is_array($lang)) $lang = array_merge($lang, array( 'ACTION' => 'Action', + 'ACTION_NOTE' => 'Action/Note', '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.', 'ADD_WARNING' => 'Add warning', @@ -100,7 +101,7 @@ $lang = array_merge($lang, array( 'LATEST_LOGS' => 'Latest 5 logged actions', 'LATEST_REPORTED' => 'Latest 5 reports', - 'LATEST_UNAPPROVED' => 'Latest 5 posts awaiting for approval', + 'LATEST_UNAPPROVED' => 'Latest 5 posts awaiting approval', 'LATEST_WARNING_TIME' => 'Latest warning issued', 'LATEST_WARNINGS' => 'Latest 5 warnings', 'LEAVE_SHADOW' => 'Leave shadow topic in place', @@ -278,7 +279,7 @@ $lang = array_merge($lang, array( 'SELECT_ACTION' => 'Select desired action', 'SELECT_FORUM_GLOBAL_ANNOUNCEMENT' => 'Please select the forum you wish this global announcement to be displayed.', 'SELECT_FORUM_GLOBAL_ANNOUNCEMENTS' => 'One or more of the selected topics are global announcements. Please select the forum you wish these to be displayed.', - 'SELECT_MERGE' => 'Select for merging', + 'SELECT_MERGE' => 'Select for merge', 'SELECT_TOPICS_FROM' => 'Select topics from', 'SELECT_TOPIC' => 'Select topic', 'SELECT_USER' => 'Select user', |