From 8c64d7c32afa5a8c28522ac0d99faa78a75ebefc Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Thu, 13 Mar 2008 15:25:20 +0000
Subject: merging #r8426 to #r8430

git-svn-id: file:///svn/phpbb/trunk@8431 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/acp/board.php  | 4 ++--
 phpBB/language/en/acp/common.php | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en/acp')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 0cc1064916..f328c05882 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -134,7 +134,7 @@ $lang = array_merge($lang, array(
 	'ACP_POST_SETTINGS_EXPLAIN'			=> 'Here you can set all default settings for posting.',
 	'ALLOW_POST_LINKS'					=> 'Allow links in posts/private messages',
 	'ALLOW_POST_LINKS_EXPLAIN'			=> 'If disallowed the <code>[URL]</code> BBCode tag and automatic/magic URLs are disabled.',
-	'ALLOW_POST_FLASH'					=> 'Allow use of <code>[FLASH]</code> BBCode tag in posts. ',
+	'ALLOW_POST_FLASH'					=> 'Allow use of <code>[FLASH]</code> BBCode tag in posts',
 	'ALLOW_POST_FLASH_EXPLAIN'			=> 'If disallowed the <code>[FLASH]</code> BBCode tag is disabled in posts. Otherwise the permission system controls which users can use the <code>[FLASH]</code> BBCode tag.',
 
 	'BUMP_INTERVAL'					=> 'Bump interval',
@@ -323,7 +323,7 @@ $lang = array_merge($lang, array(
 	'LDAP_USER'						=> 'LDAP user <var>dn</var>',
 	'LDAP_USER_EXPLAIN'				=> 'Leave blank to use anonymous binding. If filled in phpBB uses the specified distinguished name on login attempts to find the correct user, e.g. <samp>uid=Username,ou=MyUnit,o=MyCompany,c=US</samp>. Required for Active Directory Servers.',
 	'LDAP_USER_FILTER'				=> 'LDAP user filter',
-	'LDAP_USER_FILTER_EXPLAIN'		=> 'Optionally you can further limit the searched objects with additional filters. For example <samp>objectClass=posixGroup</samp> would result in the use of <samp>(&(uid=$username)(objectClass=posixGroup))</samp>',
+	'LDAP_USER_FILTER_EXPLAIN'		=> 'Optionally you can further limit the searched objects with additional filters. For example <samp>objectClass=posixGroup</samp> would result in the use of <samp>(&amp;(uid=$username)(objectClass=posixGroup))</samp>',
 ));
 
 // Server Settings
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index c3f884bc8e..47cb5de680 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -126,6 +126,8 @@ $lang = array_merge($lang, array(
 	'ACP_MOD_LOGS'				=> 'Moderator log',
 	'ACP_MOD_ROLES'				=> 'Moderator roles',
 
+	'ACP_NO_ITEMS'				=> 'There are no items yet.',
+
 	'ACP_ORPHAN_ATTACHMENTS'	=> 'Orphaned attachments',
 
 	'ACP_PERMISSIONS'			=> 'Permissions',
-- 
cgit v1.2.1