From cda8083ba73d8884780a3e802b32b0441d2170b0 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sun, 2 Sep 2007 17:24:56 +0000
Subject: fixing some bugs

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

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index a1f311ff75..2a640ba4fb 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -424,10 +424,9 @@ $lang = array_merge($lang, array(
 $lang = array_merge($lang, array(
 	'ACP_JABBER_SETTINGS_EXPLAIN'	=> 'Here you can enable and control the use of Jabber for instant messaging and board notifications. Jabber is an open source protocol and therefore available for use by anyone. Some Jabber servers include gateways or transports which allow you to contact users on other networks. Not all servers offer all transports and changes in protocols can prevent transports from operating. Please be sure to enter already registered account details - phpBB will use the details you enter here as is.',
 
-	'ERR_JAB_AUTH'			=> 'Could not authorise on Jabber server.',
-	'ERR_JAB_CONNECT'		=> 'Could not connect to Jabber server.',
 	'JAB_ENABLE'				=> 'Enable Jabber',
 	'JAB_ENABLE_EXPLAIN'		=> 'Enables use of Jabber messaging and notifications.',
+	'JAB_GTALK_NOTE'			=> 'Please note that using GTalk will not work due to the <samp>dns_get_record</samp> function not found. This function is not available in PHP4 and not implemented on Windows platforms, nor does it (currently) work on *BSD systems.',
 	'JAB_PACKAGE_SIZE'			=> 'Jabber package size',
 	'JAB_PACKAGE_SIZE_EXPLAIN'	=> 'This is the number of messages sent in one package. If set to 0 the message is sent immediately and will not be queued for later sending.',
 	'JAB_PASSWORD'				=> 'Jabber password',
diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php
index 3deeb344af..0b50c8a7c2 100644
--- a/phpBB/language/en/acp/permissions.php
+++ b/phpBB/language/en/acp/permissions.php
@@ -265,7 +265,8 @@ $lang = array_merge($lang, array(
 	'VIEW_GLOBAL_PERMS'		=> 'Global permissions',
 	'VIEW_PERMISSIONS'		=> 'View permissions',
 
-	'WRONG_PERMISSION_TYPE'	=> 'Wrong permission type selected.',
+	'WRONG_PERMISSION_TYPE'				=> 'Wrong permission type selected.',
+	'WRONG_PERMISSION_SETTING_FORMAT'	=> 'The permission settings are in a wrong format, phpBB is not able to process them correctly.',
 ));
 
 ?>
\ No newline at end of file
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 9b3ebbfe52..47bad2d3cd 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -160,6 +160,8 @@ $lang = array_merge($lang, array(
 	'ENCLOSURE'							=> 'Enclosure',
 	'ERR_CHANGING_DIRECTORY'			=> 'Unable to change directory.',
 	'ERR_CONNECTING_SERVER'				=> 'Error connecting to the server.',
+	'ERR_JAB_AUTH'						=> 'Could not authorise on Jabber server.',
+	'ERR_JAB_CONNECT'					=> 'Could not connect to Jabber server.',
 	'ERR_UNABLE_TO_LOGIN'				=> 'The specified username or password is incorrect.',
 	'ERR_WRONG_PATH_TO_PHPBB'			=> 'The phpBB path specified appears to be invalid.',
 	'EXPAND_VIEW'						=> 'Expand view',
-- 
cgit v1.2.1