[mxbb-commits] mx_phpbb/language/lang_english lang_admin.php, 1.5, 1.6

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/mx_phpbb/language/lang_english
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv3828

Modified Files:
	lang_admin.php 
Log Message:
some fixes :)

Index: lang_admin.php
===================================================================
RCS file: /cvsroot/mxbb/mx_phpbb/language/lang_english/lang_admin.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** lang_admin.php	14 Aug 2006 10:48:33 -0000	1.5
--- lang_admin.php	8 Feb 2008 04:26:33 -0000	1.6
***************
*** 2,14 ****
  /**
  *
! * @package mxBB Portal Module - mx_phpbb
  * @version $Id$
! * @copyright (c) 2002-2006 [Markus, Jon Ohlsson] mxBB Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
  *
  */
  
! $lang['mx_forum_admin'] = 'mxBB Forum Integration';
! $lang['mx_forum_admin_explain'] = 'Here, you can do phpBB and mxBB page mappings.<br />If you run the module with fixed mappings, you only have to use ONE mx_phpbb block, and place this on every mxBB page with phpBB mappings. If you intend to split phpBB and run different forums on different mxBB pages, you need one mx_phpbb block for each subinstance.';
  
  //
--- 2,14 ----
  /**
  *
! * @package Mx-Publisher Module - mx_phpbb
  * @version $Id$
! * @copyright (c) 2002-2006 [Markus, Jon Ohlsson] Mx-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
  *
  */
  
! $lang['mx_forum_admin'] = 'Mx-Publisher Forum Integration';
! $lang['mx_forum_admin_explain'] = 'Here, you can do phpBB and Mx-Publisher page mappings.<br />If you run the module with fixed mappings, you only have to use ONE mx_phpbb block, and place this on every Mx-Publisher page with phpBB mappings. If you intend to split phpBB and run different forums on different Mx-Publisher pages, you need one mx_phpbb block for each subinstance.';
  
  //
***************
*** 45,49 ****
  $lang['reset']		= 'Reset';
  
! $lang['default_pages_title'] = 'mxBB and phpBB integration';
  $lang['default_pages_title_explain'] = '';
  
--- 45,49 ----
  $lang['reset']		= 'Reset';
  
! $lang['default_pages_title'] = 'Mx-Publisher and phpBB integration';
  $lang['default_pages_title_explain'] = '';
  
***************
*** 54,64 ****
  
  $lang['phpbb_integration_enabled'] = 'Activate the phpBB module?';
! $lang['phpbb_integration_enabled_explain'] = 'When the phpBB module is activated, all phpBB URLs will be directed to mxBB pages. If deactivated, phpBB will operate "as usual", independently of mxBB';
  
  $lang['phpbb_integration_enabled_yes'] = 'Activate';
  $lang['phpbb_integration_enabled_no'] = 'Do not use this module';
  
! $lang['phpbb_override'] = 'Associate phpBB and mxBB pages';
! $lang['phpbb_override_explain'] = 'phpBB urls are redirected to mxBB pages following these settings.<br /> If using "Block Settings", be sure to edit the phpBB blocks themselves.';
  
  $lang['phpbb_override_yes'] = 'Use Block Settings';
--- 54,64 ----
  
  $lang['phpbb_integration_enabled'] = 'Activate the phpBB module?';
! $lang['phpbb_integration_enabled_explain'] = 'When the phpBB module is activated, all phpBB URLs will be directed to Mx-Publisher pages. If deactivated, phpBB will operate "as usual", independently of Mx-Publisher';
  
  $lang['phpbb_integration_enabled_yes'] = 'Activate';
  $lang['phpbb_integration_enabled_no'] = 'Do not use this module';
  
! $lang['phpbb_override'] = 'Associate phpBB and Mx-Publisher pages';
! $lang['phpbb_override_explain'] = 'phpBB urls are redirected to Mx-Publisher pages following these settings.<br /> If using "Block Settings", be sure to edit the phpBB blocks themselves.';
  
  $lang['phpbb_override_yes'] = 'Use Block Settings';