diff -aruN --binary 15/administrator/components/com_admin/admin.admin.html.php 16/administrator/components/com_admin/admin.admin.html.php
--- 15/administrator/components/com_admin/admin.admin.html.php	2009-11-04 18:51:18.000000000 +0100
+++ 16/administrator/components/com_admin/admin.admin.html.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: admin.admin.html.php 12694 2009-09-11 21:03:02Z ian $
+ * @version		$Id: admin.admin.html.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Admin
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_admin/admin.admin.php 16/administrator/components/com_admin/admin.admin.php
--- 15/administrator/components/com_admin/admin.admin.php	2009-05-29 13:51:00.000000000 +0200
+++ 16/administrator/components/com_admin/admin.admin.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: admin.admin.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: admin.admin.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Admin
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_admin/toolbar.admin.html.php 16/administrator/components/com_admin/toolbar.admin.html.php
--- 15/administrator/components/com_admin/toolbar.admin.html.php	2009-05-29 13:51:00.000000000 +0200
+++ 16/administrator/components/com_admin/toolbar.admin.html.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: toolbar.admin.html.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: toolbar.admin.html.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Admin
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_admin/toolbar.admin.php 16/administrator/components/com_admin/toolbar.admin.php
--- 15/administrator/components/com_admin/toolbar.admin.php	2009-05-29 13:51:00.000000000 +0200
+++ 16/administrator/components/com_admin/toolbar.admin.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: toolbar.admin.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: toolbar.admin.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Admin
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_banners/admin.banners.php 16/administrator/components/com_banners/admin.banners.php
--- 15/administrator/components/com_banners/admin.banners.php	2009-05-29 13:51:00.000000000 +0200
+++ 16/administrator/components/com_banners/admin.banners.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: admin.banners.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: admin.banners.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Banners
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_banners/banners.xml 16/administrator/components/com_banners/banners.xml
--- 15/administrator/components/com_banners/banners.xml	2009-05-29 13:51:00.000000000 +0200
+++ 16/administrator/components/com_banners/banners.xml	2010-04-23 13:40:10.000000000 +0200
@@ -3,7 +3,7 @@
   <name>Banners</name>
   <author>Joomla! Project</author>
   <creationDate>April 2006</creationDate>
-  <copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+  <copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
   <license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
   <authorEmail>admin@joomla.org</authorEmail>
   <authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/administrator/components/com_banners/controllers/banner.php 16/administrator/components/com_banners/controllers/banner.php
--- 15/administrator/components/com_banners/controllers/banner.php	2009-05-29 13:50:58.000000000 +0200
+++ 16/administrator/components/com_banners/controllers/banner.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: banner.php 10878 2008-08-30 17:29:13Z willebil $
+ * @version		$Id: banner.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Banners
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_banners/controllers/client.php 16/administrator/components/com_banners/controllers/client.php
--- 15/administrator/components/com_banners/controllers/client.php	2009-05-29 13:50:58.000000000 +0200
+++ 16/administrator/components/com_banners/controllers/client.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: client.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: client.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Banners
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_banners/elements/bannerclient.php 16/administrator/components/com_banners/elements/bannerclient.php
--- 15/administrator/components/com_banners/elements/bannerclient.php	2009-05-29 13:51:00.000000000 +0200
+++ 16/administrator/components/com_banners/elements/bannerclient.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: bannerclient.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: bannerclient.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Banners
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_banners/helpers/banner.php 16/administrator/components/com_banners/helpers/banner.php
--- 15/administrator/components/com_banners/helpers/banner.php	2009-05-29 13:50:58.000000000 +0200
+++ 16/administrator/components/com_banners/helpers/banner.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: banner.php 11646 2009-03-01 19:34:56Z ian $
+ * @version		$Id: banner.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Banners
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_banners/tables/bannerclient.php 16/administrator/components/com_banners/tables/bannerclient.php
--- 15/administrator/components/com_banners/tables/bannerclient.php	2009-05-29 13:50:58.000000000 +0200
+++ 16/administrator/components/com_banners/tables/bannerclient.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: bannerclient.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: bannerclient.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Banners
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_banners/tables/banner.php 16/administrator/components/com_banners/tables/banner.php
--- 15/administrator/components/com_banners/tables/banner.php	2009-05-29 13:50:58.000000000 +0200
+++ 16/administrator/components/com_banners/tables/banner.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: banner.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: banner.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Banners
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_banners/views/banner.php 16/administrator/components/com_banners/views/banner.php
--- 15/administrator/components/com_banners/views/banner.php	2009-11-04 18:51:18.000000000 +0100
+++ 16/administrator/components/com_banners/views/banner.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: banner.php 12694 2009-09-11 21:03:02Z ian $
+ * @version		$Id: banner.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Banners
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_banners/views/client.php 16/administrator/components/com_banners/views/client.php
--- 15/administrator/components/com_banners/views/client.php	2009-05-29 13:51:00.000000000 +0200
+++ 16/administrator/components/com_banners/views/client.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: client.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: client.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Banners
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_cache/admin.cache.html.php 16/administrator/components/com_cache/admin.cache.html.php
--- 15/administrator/components/com_cache/admin.cache.html.php	2009-05-29 13:51:14.000000000 +0200
+++ 16/administrator/components/com_cache/admin.cache.html.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: admin.cache.html.php 11403 2009-01-06 06:19:31Z ian $
+ * @version		$Id: admin.cache.html.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Cache
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_cache/admin.cache.php 16/administrator/components/com_cache/admin.cache.php
--- 15/administrator/components/com_cache/admin.cache.php	2009-05-29 13:51:14.000000000 +0200
+++ 16/administrator/components/com_cache/admin.cache.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: admin.cache.php 11403 2009-01-06 06:19:31Z ian $
+ * @version		$Id: admin.cache.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Cache
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_cache/cache.class.php 16/administrator/components/com_cache/cache.class.php
--- 15/administrator/components/com_cache/cache.class.php	2009-05-29 13:51:14.000000000 +0200
+++ 16/administrator/components/com_cache/cache.class.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: cache.class.php 11074 2008-10-13 04:54:12Z ian $
+ * @version		$Id: cache.class.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Cache
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_cache/cache.xml 16/administrator/components/com_cache/cache.xml
--- 15/administrator/components/com_cache/cache.xml	2009-05-29 13:51:14.000000000 +0200
+++ 16/administrator/components/com_cache/cache.xml	2010-04-23 13:40:10.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Cache Manager</name>
 	<author>Joomla! Project</author>
 	<creationDate>2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/administrator/components/com_cache/toolbar.cache.html.php 16/administrator/components/com_cache/toolbar.cache.html.php
--- 15/administrator/components/com_cache/toolbar.cache.html.php	2009-05-29 13:51:14.000000000 +0200
+++ 16/administrator/components/com_cache/toolbar.cache.html.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: toolbar.cache.html.php 11393 2009-01-05 02:11:06Z ian $
+ * @version		$Id: toolbar.cache.html.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Cache
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_cache/toolbar.cache.php 16/administrator/components/com_cache/toolbar.cache.php
--- 15/administrator/components/com_cache/toolbar.cache.php	2009-05-29 13:51:14.000000000 +0200
+++ 16/administrator/components/com_cache/toolbar.cache.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: toolbar.cache.php 11393 2009-01-05 02:11:06Z ian $
+ * @version		$Id: toolbar.cache.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Cache
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_categories/admin.categories.html.php 16/administrator/components/com_categories/admin.categories.html.php
--- 15/administrator/components/com_categories/admin.categories.html.php	2009-05-29 13:50:52.000000000 +0200
+++ 16/administrator/components/com_categories/admin.categories.html.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: admin.categories.html.php 11655 2009-03-08 20:04:17Z willebil $
+ * @version		$Id: admin.categories.html.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Categories
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_categories/admin.categories.php 16/administrator/components/com_categories/admin.categories.php
--- 15/administrator/components/com_categories/admin.categories.php	2009-05-29 13:50:52.000000000 +0200
+++ 16/administrator/components/com_categories/admin.categories.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: admin.categories.php 11633 2009-02-19 23:59:09Z willebil $
+ * @version		$Id: admin.categories.php 15194 2010-03-05 08:53:57Z ian $
  * @package		Joomla
  * @subpackage	Categories
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
@@ -110,6 +110,9 @@
 
 	$db					=& JFactory::getDBO();
 	$filter_order		= $mainframe->getUserStateFromRequest( $option.'.filter_order',					'filter_order',		'c.ordering',	'cmd' );
+	if ($filter_order == 'section_name' && ($section == 'com_newsfeeds' || $section == 'com_banner' || $section == 'com_weblinks' || $section == 'com_contact_details')){
+						     $filter_order = 'c.ordering';
+						 } 
 	$filter_order_Dir	= $mainframe->getUserStateFromRequest( $option.'.filter_order_Dir',				'filter_order_Dir',	'',				'word' );
 	$filter_state		= $mainframe->getUserStateFromRequest( $option.'.'.$section.'.filter_state',	'filter_state',		'',				'word' );
 	$sectionid			= $mainframe->getUserStateFromRequest( $option.'.'.$section.'.sectionid',		'sectionid',		0,				'int' );
diff -aruN --binary 15/administrator/components/com_categories/toolbar.categories.html.php 16/administrator/components/com_categories/toolbar.categories.html.php
--- 15/administrator/components/com_categories/toolbar.categories.html.php	2009-05-29 13:50:52.000000000 +0200
+++ 16/administrator/components/com_categories/toolbar.categories.html.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: toolbar.categories.html.php 10465 2008-06-28 13:20:22Z willebil $
+ * @version		$Id: toolbar.categories.html.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Categories
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_categories/toolbar.categories.php 16/administrator/components/com_categories/toolbar.categories.php
--- 15/administrator/components/com_categories/toolbar.categories.php	2009-05-29 13:50:52.000000000 +0200
+++ 16/administrator/components/com_categories/toolbar.categories.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: toolbar.categories.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: toolbar.categories.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Categories
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_checkin/admin.checkin.php 16/administrator/components/com_checkin/admin.checkin.php
--- 15/administrator/components/com_checkin/admin.checkin.php	2009-05-29 13:51:14.000000000 +0200
+++ 16/administrator/components/com_checkin/admin.checkin.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: admin.checkin.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: admin.checkin.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Checkin
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_checkin/toolbar.checkin.html.php 16/administrator/components/com_checkin/toolbar.checkin.html.php
--- 15/administrator/components/com_checkin/toolbar.checkin.html.php	2009-05-29 13:51:14.000000000 +0200
+++ 16/administrator/components/com_checkin/toolbar.checkin.html.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: toolbar.checkin.html.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: toolbar.checkin.html.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Checkin
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_checkin/toolbar.checkin.php 16/administrator/components/com_checkin/toolbar.checkin.php
--- 15/administrator/components/com_checkin/toolbar.checkin.php	2009-05-29 13:51:14.000000000 +0200
+++ 16/administrator/components/com_checkin/toolbar.checkin.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: toolbar.checkin.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: toolbar.checkin.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Checkin
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_config/admin.config.php 16/administrator/components/com_config/admin.config.php
--- 15/administrator/components/com_config/admin.config.php	2009-05-29 13:51:16.000000000 +0200
+++ 16/administrator/components/com_config/admin.config.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: admin.config.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: admin.config.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Config
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_config/config.xml 16/administrator/components/com_config/config.xml
--- 15/administrator/components/com_config/config.xml	2009-05-29 13:51:16.000000000 +0200
+++ 16/administrator/components/com_config/config.xml	2010-04-23 13:40:10.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Configuration Manager</name>
 	<author>Joomla! Project</author>
 	<creationDate>2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/administrator/components/com_config/controller.php 16/administrator/components/com_config/controller.php
--- 15/administrator/components/com_config/controller.php	2009-05-29 13:51:16.000000000 +0200
+++ 16/administrator/components/com_config/controller.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: controller.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: controller.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_config/controllers/application.php 16/administrator/components/com_config/controllers/application.php
--- 15/administrator/components/com_config/controllers/application.php	2009-11-04 18:51:18.000000000 +0100
+++ 16/administrator/components/com_config/controllers/application.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: application.php 13243 2009-10-20 04:01:04Z ian $
+ * @version		$Id: application.php 15097 2010-02-27 14:19:54Z ian $
  * @package		Joomla
  * @subpackage	Config
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
@@ -144,7 +144,7 @@
 			JHTML::_('select.option', 5.5, JText::_('(UTC +05:30) Bombay, Calcutta, Madras, New Delhi, Colombo')),
 			JHTML::_('select.option', 5.75, JText::_('(UTC +05:45) Kathmandu')),
 			JHTML::_('select.option', 6, JText::_('(UTC +06:00) Almaty, Dhaka')),
-			JHTML::_('select.option', 6.30, JText::_('(UTC +06:30) Yagoon')),
+			JHTML::_('select.option', 6.5, JText::_('(UTC +06:30) Yagoon')),
 			JHTML::_('select.option', 7, JText::_('(UTC +07:00) Bangkok, Hanoi, Jakarta')),
 			JHTML::_('select.option', 8, JText::_('(UTC +08:00) Beijing, Perth, Singapore, Hong Kong')),
 			JHTML::_('select.option', 8.75, JText::_('(UTC +08:00) Ulaanbaatar, Western Australia')),
@@ -153,7 +153,7 @@
 			JHTML::_('select.option', 10, JText::_('(UTC +10:00) Eastern Australia, Guam, Vladivostok')),
 			JHTML::_('select.option', 10.5, JText::_('(UTC +10:30) Lord Howe Island (Australia)')),
 			JHTML::_('select.option', 11, JText::_('(UTC +11:00) Magadan, Solomon Islands, New Caledonia')),
-			JHTML::_('select.option', 11.30, JText::_('(UTC +11:30) Norfolk Island')),
+			JHTML::_('select.option', 11.5, JText::_('(UTC +11:30) Norfolk Island')),
 			JHTML::_('select.option', 12, JText::_('(UTC +12:00) Auckland, Wellington, Fiji, Kamchatka')),
 			JHTML::_('select.option', 12.75, JText::_('(UTC +12:45) Chatham Island')),
 			JHTML::_('select.option', 13, JText::_('(UTC +13:00) Tonga')),
diff -aruN --binary 15/administrator/components/com_config/controllers/component.php 16/administrator/components/com_config/controllers/component.php
--- 15/administrator/components/com_config/controllers/component.php	2009-06-30 21:01:32.000000000 +0200
+++ 16/administrator/components/com_config/controllers/component.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: component.php 12389 2009-07-01 00:34:45Z ian $
+ * @version		$Id: component.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Config
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_config/models/component.php 16/administrator/components/com_config/models/component.php
--- 15/administrator/components/com_config/models/component.php	2009-05-29 13:51:16.000000000 +0200
+++ 16/administrator/components/com_config/models/component.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: component.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: component.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Config
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_config/toolbar.config.html.php 16/administrator/components/com_config/toolbar.config.html.php
--- 15/administrator/components/com_config/toolbar.config.html.php	2009-05-29 13:51:16.000000000 +0200
+++ 16/administrator/components/com_config/toolbar.config.html.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: toolbar.config.html.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: toolbar.config.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Config
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_config/toolbar.config.php 16/administrator/components/com_config/toolbar.config.php
--- 15/administrator/components/com_config/toolbar.config.php	2009-05-29 13:51:16.000000000 +0200
+++ 16/administrator/components/com_config/toolbar.config.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: toolbar.config.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: toolbar.config.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Config
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_config/views/application/view.php 16/administrator/components/com_config/views/application/view.php
--- 15/administrator/components/com_config/views/application/view.php	2009-11-04 18:51:18.000000000 +0100
+++ 16/administrator/components/com_config/views/application/view.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: view.php 13237 2009-10-20 01:00:39Z ian $
+ * @version		$Id: view.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Config
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_config/views/component/view.php 16/administrator/components/com_config/views/component/view.php
--- 15/administrator/components/com_config/views/component/view.php	2009-05-29 13:51:16.000000000 +0200
+++ 16/administrator/components/com_config/views/component/view.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: view.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: view.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Config
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_contact/admin.contact.html.php 16/administrator/components/com_contact/admin.contact.html.php
--- 15/administrator/components/com_contact/admin.contact.html.php	2009-05-29 13:51:04.000000000 +0200
+++ 16/administrator/components/com_contact/admin.contact.html.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: admin.contact.html.php 11655 2009-03-08 20:04:17Z willebil $
+* @version		$Id: admin.contact.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Contact
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_contact/admin.contact.php 16/administrator/components/com_contact/admin.contact.php
--- 15/administrator/components/com_contact/admin.contact.php	2009-05-29 13:51:04.000000000 +0200
+++ 16/administrator/components/com_contact/admin.contact.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: admin.contact.php 11299 2008-11-22 01:40:44Z ian $
+* @version		$Id: admin.contact.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Contact
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_contact/contact_items.xml 16/administrator/components/com_contact/contact_items.xml
--- 15/administrator/components/com_contact/contact_items.xml	2009-05-29 13:51:04.000000000 +0200
+++ 16/administrator/components/com_contact/contact_items.xml	2010-04-23 13:40:10.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Contact Items</name>
 	<author>Joomla! Project</author>
 	<creationDate>2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/administrator/components/com_contact/contact.xml 16/administrator/components/com_contact/contact.xml
--- 15/administrator/components/com_contact/contact.xml	2009-05-29 13:51:04.000000000 +0200
+++ 16/administrator/components/com_contact/contact.xml	2010-04-23 13:40:10.000000000 +0200
@@ -2,7 +2,7 @@
 <install type="component" version="1.5.0">
 	<name>Contact</name>
 	<author>Joomla! Project</author>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<creationDate>April 2006</creationDate>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
diff -aruN --binary 15/administrator/components/com_contact/elements/contact.php 16/administrator/components/com_contact/elements/contact.php
--- 15/administrator/components/com_contact/elements/contact.php	2009-05-29 13:51:02.000000000 +0200
+++ 16/administrator/components/com_contact/elements/contact.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: contact.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: contact.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_contact/helpers/vcard.php 16/administrator/components/com_contact/helpers/vcard.php
--- 15/administrator/components/com_contact/helpers/vcard.php	2009-05-29 13:51:02.000000000 +0200
+++ 16/administrator/components/com_contact/helpers/vcard.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: vcard.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: vcard.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Contact
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_contact/tables/contact.php 16/administrator/components/com_contact/tables/contact.php
--- 15/administrator/components/com_contact/tables/contact.php	2009-11-04 18:51:18.000000000 +0100
+++ 16/administrator/components/com_contact/tables/contact.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: contact.php 12694 2009-09-11 21:03:02Z ian $
+ * @version		$Id: contact.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Contact
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_contact/toolbar.contact.html.php 16/administrator/components/com_contact/toolbar.contact.html.php
--- 15/administrator/components/com_contact/toolbar.contact.html.php	2009-05-29 13:51:04.000000000 +0200
+++ 16/administrator/components/com_contact/toolbar.contact.html.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: toolbar.contact.html.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: toolbar.contact.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Contact
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_contact/toolbar.contact.php 16/administrator/components/com_contact/toolbar.contact.php
--- 15/administrator/components/com_contact/toolbar.contact.php	2009-05-29 13:51:04.000000000 +0200
+++ 16/administrator/components/com_contact/toolbar.contact.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: toolbar.contact.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: toolbar.contact.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Contact
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_content/admin.content.html.php 16/administrator/components/com_content/admin.content.html.php
--- 15/administrator/components/com_content/admin.content.html.php	2009-05-29 13:51:24.000000000 +0200
+++ 16/administrator/components/com_content/admin.content.html.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: admin.content.html.php 11655 2009-03-08 20:04:17Z willebil $
+* @version		$Id: admin.content.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Content
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_content/admin.content.php 16/administrator/components/com_content/admin.content.php
--- 15/administrator/components/com_content/admin.content.php	2009-05-29 13:51:24.000000000 +0200
+++ 16/administrator/components/com_content/admin.content.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,10 +1,10 @@
 <?php
 
 /**
-* @version		$Id: admin.content.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: admin.content.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Content
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_content/content.xml 16/administrator/components/com_content/content.xml
--- 15/administrator/components/com_content/content.xml	2009-05-29 13:51:24.000000000 +0200
+++ 16/administrator/components/com_content/content.xml	2010-04-23 13:40:10.000000000 +0200
@@ -4,7 +4,7 @@
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
 	<copyright>
-		Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+		Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 	</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
diff -aruN --binary 15/administrator/components/com_content/controller.php 16/administrator/components/com_content/controller.php
--- 15/administrator/components/com_content/controller.php	2009-05-29 13:51:24.000000000 +0200
+++ 16/administrator/components/com_content/controller.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: controller.php 11633 2009-02-19 23:59:09Z willebil $
+ * @version		$Id: controller.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_content/elements/article.php 16/administrator/components/com_content/elements/article.php
--- 15/administrator/components/com_content/elements/article.php	2009-05-29 13:51:22.000000000 +0200
+++ 16/administrator/components/com_content/elements/article.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: article.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: article.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_content/elements/author.php 16/administrator/components/com_content/elements/author.php
--- 15/administrator/components/com_content/elements/author.php	2009-05-29 13:51:22.000000000 +0200
+++ 16/administrator/components/com_content/elements/author.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: author.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: author.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Articles
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_content/helper/content.php 16/administrator/components/com_content/helper/content.php
--- 15/administrator/components/com_content/helper/content.php	2009-05-29 13:51:22.000000000 +0200
+++ 16/administrator/components/com_content/helper/content.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: content.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: content.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_content/helper.php 16/administrator/components/com_content/helper.php
--- 15/administrator/components/com_content/helper.php	2009-05-29 13:51:24.000000000 +0200
+++ 16/administrator/components/com_content/helper.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: helper.php 11646 2009-03-01 19:34:56Z ian $
+ * @version		$Id: helper.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_content/models/element.php 16/administrator/components/com_content/models/element.php
--- 15/administrator/components/com_content/models/element.php	2009-05-29 13:51:22.000000000 +0200
+++ 16/administrator/components/com_content/models/element.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: element.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: element.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_content/toolbar.content.html.php 16/administrator/components/com_content/toolbar.content.html.php
--- 15/administrator/components/com_content/toolbar.content.html.php	2009-05-29 13:51:24.000000000 +0200
+++ 16/administrator/components/com_content/toolbar.content.html.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: toolbar.content.html.php 11798 2009-05-06 02:11:47Z ian $
+* @version		$Id: toolbar.content.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Content
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_content/toolbar.content.php 16/administrator/components/com_content/toolbar.content.php
--- 15/administrator/components/com_content/toolbar.content.php	2009-05-29 13:51:24.000000000 +0200
+++ 16/administrator/components/com_content/toolbar.content.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: toolbar.content.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: toolbar.content.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Content
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_content/views/element/view.php 16/administrator/components/com_content/views/element/view.php
--- 15/administrator/components/com_content/views/element/view.php	2009-05-29 13:51:24.000000000 +0200
+++ 16/administrator/components/com_content/views/element/view.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: view.php 11625 2009-02-15 15:32:42Z kdevine $
+ * @version		$Id: view.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_cpanel/admin.cpanel.html.php 16/administrator/components/com_cpanel/admin.cpanel.html.php
--- 15/administrator/components/com_cpanel/admin.cpanel.html.php	2009-05-29 13:51:14.000000000 +0200
+++ 16/administrator/components/com_cpanel/admin.cpanel.html.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: admin.cpanel.html.php 10559 2008-07-16 20:57:43Z instance $
+* @version		$Id: admin.cpanel.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Admin
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_cpanel/admin.cpanel.php 16/administrator/components/com_cpanel/admin.cpanel.php
--- 15/administrator/components/com_cpanel/admin.cpanel.php	2009-05-29 13:51:14.000000000 +0200
+++ 16/administrator/components/com_cpanel/admin.cpanel.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: admin.cpanel.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: admin.cpanel.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Admin
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_cpanel/cpanel.xml 16/administrator/components/com_cpanel/cpanel.xml
--- 15/administrator/components/com_cpanel/cpanel.xml	2009-05-29 13:51:14.000000000 +0200
+++ 16/administrator/components/com_cpanel/cpanel.xml	2010-04-23 13:40:10.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Control Panel</name>
 	<author>Joomla! Project</author>
 	<creationDate>2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/administrator/components/com_cpanel/toolbar.cpanel.html.php 16/administrator/components/com_cpanel/toolbar.cpanel.html.php
--- 15/administrator/components/com_cpanel/toolbar.cpanel.html.php	2009-05-29 13:51:14.000000000 +0200
+++ 16/administrator/components/com_cpanel/toolbar.cpanel.html.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: toolbar.cpanel.html.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: toolbar.cpanel.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Admin
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_cpanel/toolbar.cpanel.php 16/administrator/components/com_cpanel/toolbar.cpanel.php
--- 15/administrator/components/com_cpanel/toolbar.cpanel.php	2009-05-29 13:51:14.000000000 +0200
+++ 16/administrator/components/com_cpanel/toolbar.cpanel.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: toolbar.cpanel.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: toolbar.cpanel.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Admin
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_frontpage/admin.frontpage.php 16/administrator/components/com_frontpage/admin.frontpage.php
--- 15/administrator/components/com_frontpage/admin.frontpage.php	2009-05-29 13:50:52.000000000 +0200
+++ 16/administrator/components/com_frontpage/admin.frontpage.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: admin.frontpage.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: admin.frontpage.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Content
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_frontpage/frontpage.xml 16/administrator/components/com_frontpage/frontpage.xml
--- 15/administrator/components/com_frontpage/frontpage.xml	2009-05-29 13:50:52.000000000 +0200
+++ 16/administrator/components/com_frontpage/frontpage.xml	2010-04-23 13:40:10.000000000 +0200
@@ -2,7 +2,7 @@
 <install type="component" version="1.5.0">
 	<name>Frontpage</name>
 	<author>Joomla! Project</author>
-	<copyright>(C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/administrator/components/com_frontpage/tables/frontpage.php 16/administrator/components/com_frontpage/tables/frontpage.php
--- 15/administrator/components/com_frontpage/tables/frontpage.php	2009-05-29 13:50:50.000000000 +0200
+++ 16/administrator/components/com_frontpage/tables/frontpage.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: frontpage.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: frontpage.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Content
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_frontpage/views/frontpage.php 16/administrator/components/com_frontpage/views/frontpage.php
--- 15/administrator/components/com_frontpage/views/frontpage.php	2009-05-29 13:50:52.000000000 +0200
+++ 16/administrator/components/com_frontpage/views/frontpage.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: frontpage.php 11655 2009-03-08 20:04:17Z willebil $
+* @version		$Id: frontpage.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Content
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_installer/admin.installer.php 16/administrator/components/com_installer/admin.installer.php
--- 15/administrator/components/com_installer/admin.installer.php	2009-05-29 13:51:12.000000000 +0200
+++ 16/administrator/components/com_installer/admin.installer.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: admin.installer.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: admin.installer.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Installer
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_installer/controller.php 16/administrator/components/com_installer/controller.php
--- 15/administrator/components/com_installer/controller.php	2009-05-29 13:51:12.000000000 +0200
+++ 16/administrator/components/com_installer/controller.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: controller.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: controller.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Installer
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_installer/helper.php 16/administrator/components/com_installer/helper.php
--- 15/administrator/components/com_installer/helper.php	2009-05-29 13:51:12.000000000 +0200
+++ 16/administrator/components/com_installer/helper.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: helper.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: helper.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Menus
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_installer/installer.xml 16/administrator/components/com_installer/installer.xml
--- 15/administrator/components/com_installer/installer.xml	2009-05-29 13:51:12.000000000 +0200
+++ 16/administrator/components/com_installer/installer.xml	2010-04-23 13:40:10.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Installation Manager</name>
 	<author>Joomla! Project</author>
 	<creationDate>2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/administrator/components/com_installer/models/components.php 16/administrator/components/com_installer/models/components.php
--- 15/administrator/components/com_installer/models/components.php	2009-06-30 21:01:32.000000000 +0200
+++ 16/administrator/components/com_installer/models/components.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: components.php 12389 2009-07-01 00:34:45Z ian $
+ * @version		$Id: components.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Menus
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_installer/models/extension.php 16/administrator/components/com_installer/models/extension.php
--- 15/administrator/components/com_installer/models/extension.php	2009-05-29 13:51:04.000000000 +0200
+++ 16/administrator/components/com_installer/models/extension.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: extension.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: extension.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Installer
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_installer/models/install.php 16/administrator/components/com_installer/models/install.php
--- 15/administrator/components/com_installer/models/install.php	2009-05-29 13:51:04.000000000 +0200
+++ 16/administrator/components/com_installer/models/install.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: install.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: install.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Menus
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_installer/models/languages.php 16/administrator/components/com_installer/models/languages.php
--- 15/administrator/components/com_installer/models/languages.php	2009-06-30 21:01:32.000000000 +0200
+++ 16/administrator/components/com_installer/models/languages.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: languages.php 12389 2009-07-01 00:34:45Z ian $
+ * @version		$Id: languages.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Menus
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_installer/models/modules.php 16/administrator/components/com_installer/models/modules.php
--- 15/administrator/components/com_installer/models/modules.php	2009-06-30 21:01:32.000000000 +0200
+++ 16/administrator/components/com_installer/models/modules.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: modules.php 12389 2009-07-01 00:34:45Z ian $
+ * @version		$Id: modules.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Menus
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_installer/models/plugins.php 16/administrator/components/com_installer/models/plugins.php
--- 15/administrator/components/com_installer/models/plugins.php	2009-06-30 21:01:32.000000000 +0200
+++ 16/administrator/components/com_installer/models/plugins.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: plugins.php 12389 2009-07-01 00:34:45Z ian $
+ * @version		$Id: plugins.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Menus
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_installer/models/templates.php 16/administrator/components/com_installer/models/templates.php
--- 15/administrator/components/com_installer/models/templates.php	2009-06-30 21:01:32.000000000 +0200
+++ 16/administrator/components/com_installer/models/templates.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: templates.php 12389 2009-07-01 00:34:45Z ian $
+ * @version		$Id: templates.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Menus
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_installer/views/components/view.php 16/administrator/components/com_installer/views/components/view.php
--- 15/administrator/components/com_installer/views/components/view.php	2009-05-29 13:51:08.000000000 +0200
+++ 16/administrator/components/com_installer/views/components/view.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: view.php 10466 2008-06-28 14:42:22Z ircmaxell $
+ * @version		$Id: view.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Menus
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_installer/views/default/view.php 16/administrator/components/com_installer/views/default/view.php
--- 15/administrator/components/com_installer/views/default/view.php	2009-05-29 13:51:06.000000000 +0200
+++ 16/administrator/components/com_installer/views/default/view.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: view.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: view.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Menus
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_installer/views/install/view.php 16/administrator/components/com_installer/views/install/view.php
--- 15/administrator/components/com_installer/views/install/view.php	2009-05-29 13:51:08.000000000 +0200
+++ 16/administrator/components/com_installer/views/install/view.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: view.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: view.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Menus
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_installer/views/languages/view.php 16/administrator/components/com_installer/views/languages/view.php
--- 15/administrator/components/com_installer/views/languages/view.php	2009-05-29 13:51:10.000000000 +0200
+++ 16/administrator/components/com_installer/views/languages/view.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: view.php 11213 2008-10-25 12:43:11Z pasamio $
+ * @version		$Id: view.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Menus
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_installer/views/modules/view.php 16/administrator/components/com_installer/views/modules/view.php
--- 15/administrator/components/com_installer/views/modules/view.php	2009-05-29 13:51:10.000000000 +0200
+++ 16/administrator/components/com_installer/views/modules/view.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: view.php 10466 2008-06-28 14:42:22Z ircmaxell $
+ * @version		$Id: view.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Menus
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_installer/views/plugins/view.php 16/administrator/components/com_installer/views/plugins/view.php
--- 15/administrator/components/com_installer/views/plugins/view.php	2009-05-29 13:51:06.000000000 +0200
+++ 16/administrator/components/com_installer/views/plugins/view.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: view.php 10466 2008-06-28 14:42:22Z ircmaxell $
+ * @version		$Id: view.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Menus
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_installer/views/templates/view.php 16/administrator/components/com_installer/views/templates/view.php
--- 15/administrator/components/com_installer/views/templates/view.php	2009-05-29 13:51:10.000000000 +0200
+++ 16/administrator/components/com_installer/views/templates/view.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: view.php 10466 2008-06-28 14:42:22Z ircmaxell $
+ * @version		$Id: view.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Menus
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_languages/admin.languages.html.php 16/administrator/components/com_languages/admin.languages.html.php
--- 15/administrator/components/com_languages/admin.languages.html.php	2009-05-29 13:51:18.000000000 +0200
+++ 16/administrator/components/com_languages/admin.languages.html.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: admin.languages.html.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: admin.languages.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Languages
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_languages/admin.languages.php 16/administrator/components/com_languages/admin.languages.php
--- 15/administrator/components/com_languages/admin.languages.php	2009-05-29 13:51:18.000000000 +0200
+++ 16/administrator/components/com_languages/admin.languages.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: admin.languages.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: admin.languages.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Languages
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_languages/languages.xml 16/administrator/components/com_languages/languages.xml
--- 15/administrator/components/com_languages/languages.xml	2009-05-29 13:51:18.000000000 +0200
+++ 16/administrator/components/com_languages/languages.xml	2010-04-23 13:40:10.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Language Manager</name>
 	<author>Joomla! Project</author>
 	<creationDate>2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/administrator/components/com_languages/toolbar.languages.html.php 16/administrator/components/com_languages/toolbar.languages.html.php
--- 15/administrator/components/com_languages/toolbar.languages.html.php	2009-05-29 13:51:18.000000000 +0200
+++ 16/administrator/components/com_languages/toolbar.languages.html.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: toolbar.languages.html.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: toolbar.languages.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Languages
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_languages/toolbar.languages.php 16/administrator/components/com_languages/toolbar.languages.php
--- 15/administrator/components/com_languages/toolbar.languages.php	2009-05-29 13:51:18.000000000 +0200
+++ 16/administrator/components/com_languages/toolbar.languages.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: toolbar.languages.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: toolbar.languages.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Languages
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_login/admin.login.php 16/administrator/components/com_login/admin.login.php
--- 15/administrator/components/com_login/admin.login.php	2009-05-29 13:51:22.000000000 +0200
+++ 16/administrator/components/com_login/admin.login.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: admin.login.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: admin.login.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Joomla.Extensions
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_massmail/admin.massmail.html.php 16/administrator/components/com_massmail/admin.massmail.html.php
--- 15/administrator/components/com_massmail/admin.massmail.html.php	2009-05-29 13:51:18.000000000 +0200
+++ 16/administrator/components/com_massmail/admin.massmail.html.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: admin.massmail.html.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: admin.massmail.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Massmail
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_massmail/admin.massmail.php 16/administrator/components/com_massmail/admin.massmail.php
--- 15/administrator/components/com_massmail/admin.massmail.php	2009-05-29 13:51:18.000000000 +0200
+++ 16/administrator/components/com_massmail/admin.massmail.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: admin.massmail.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: admin.massmail.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Massmail
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_massmail/massmail.xml 16/administrator/components/com_massmail/massmail.xml
--- 15/administrator/components/com_massmail/massmail.xml	2009-05-29 13:51:18.000000000 +0200
+++ 16/administrator/components/com_massmail/massmail.xml	2010-04-23 13:40:10.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Mass Mail</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/administrator/components/com_massmail/toolbar.massmail.html.php 16/administrator/components/com_massmail/toolbar.massmail.html.php
--- 15/administrator/components/com_massmail/toolbar.massmail.html.php	2009-05-29 13:51:18.000000000 +0200
+++ 16/administrator/components/com_massmail/toolbar.massmail.html.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: toolbar.massmail.html.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: toolbar.massmail.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Massmail
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_massmail/toolbar.massmail.php 16/administrator/components/com_massmail/toolbar.massmail.php
--- 15/administrator/components/com_massmail/toolbar.massmail.php	2009-05-29 13:51:18.000000000 +0200
+++ 16/administrator/components/com_massmail/toolbar.massmail.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: toolbar.massmail.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: toolbar.massmail.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Massmail
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_media/assets/medialist-details.css 16/administrator/components/com_media/assets/medialist-details.css
--- 15/administrator/components/com_media/assets/medialist-details.css	2009-05-29 13:51:26.000000000 +0200
+++ 16/administrator/components/com_media/assets/medialist-details.css	2010-04-23 13:40:10.000000000 +0200
@@ -1,8 +1,8 @@
 /**
  * CSS Document for media manager list view
- * @version $Id: medialist-details.css 10387 2008-06-03 10:59:16Z pasamio $
+ * @version $Id: medialist-details.css 14401 2010-01-26 14:10:00Z louis $
  * @package Joomla
- * @copyright Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license GNU/GPL, see LICENSE.php
  * Joomla! is free software and parts of it may contain or be derived from the
  * GNU General Public License or other free or open source software licenses.
diff -aruN --binary 15/administrator/components/com_media/assets/medialist-thumbs.css 16/administrator/components/com_media/assets/medialist-thumbs.css
--- 15/administrator/components/com_media/assets/medialist-thumbs.css	2009-05-29 13:51:26.000000000 +0200
+++ 16/administrator/components/com_media/assets/medialist-thumbs.css	2010-04-23 13:40:10.000000000 +0200
@@ -1,8 +1,8 @@
 /**
  * CSS Document for media manager thumbnail view
- * @version $Id: medialist-thumbs.css 10387 2008-06-03 10:59:16Z pasamio $
+ * @version $Id: medialist-thumbs.css 14401 2010-01-26 14:10:00Z louis $
  * @package Joomla
- * @copyright Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license GNU/GPL, see LICENSE.php
  * Joomla! is free software and parts of it may contain or be derived from the
  * GNU General Public License or other free or open source software licenses.
diff -aruN --binary 15/administrator/components/com_media/assets/mediamanager.css 16/administrator/components/com_media/assets/mediamanager.css
--- 15/administrator/components/com_media/assets/mediamanager.css	2009-05-29 13:51:26.000000000 +0200
+++ 16/administrator/components/com_media/assets/mediamanager.css	2010-04-23 13:40:10.000000000 +0200
@@ -1,6 +1,6 @@
 /**
-* @version $Id: mediamanager.css 10387 2008-06-03 10:59:16Z pasamio $
-* @copyright Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @version $Id: mediamanager.css 14401 2010-01-26 14:10:00Z louis $
+* @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_media/assets/mediamanager.js 16/administrator/components/com_media/assets/mediamanager.js
--- 15/administrator/components/com_media/assets/mediamanager.js	2009-05-29 13:51:26.000000000 +0200
+++ 16/administrator/components/com_media/assets/mediamanager.js	2010-04-23 13:40:10.000000000 +0200
@@ -1,7 +1,7 @@
 /**
-* @version      $Id: mediamanager.js 10710 2008-08-21 10:08:12Z eddieajau $
+* @version      $Id: mediamanager.js 14401 2010-01-26 14:10:00Z louis $
 * @package      Joomla
-* @copyright    Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright    Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license      GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_media/assets/popup-imagelist.css 16/administrator/components/com_media/assets/popup-imagelist.css
--- 15/administrator/components/com_media/assets/popup-imagelist.css	2009-05-29 13:51:26.000000000 +0200
+++ 16/administrator/components/com_media/assets/popup-imagelist.css	2010-04-23 13:40:10.000000000 +0200
@@ -1,6 +1,6 @@
 /**
-* @version $Id: popup-imagelist.css 10387 2008-06-03 10:59:16Z pasamio $
-* @copyright Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @version $Id: popup-imagelist.css 14401 2010-01-26 14:10:00Z louis $
+* @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_media/assets/popup-imagemanager.css 16/administrator/components/com_media/assets/popup-imagemanager.css
--- 15/administrator/components/com_media/assets/popup-imagemanager.css	2009-05-29 13:51:26.000000000 +0200
+++ 16/administrator/components/com_media/assets/popup-imagemanager.css	2010-04-23 13:40:10.000000000 +0200
@@ -1,6 +1,6 @@
 /**
-* @version $Id: popup-imagemanager.css 10387 2008-06-03 10:59:16Z pasamio $
-* @copyright Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @version $Id: popup-imagemanager.css 14401 2010-01-26 14:10:00Z louis $
+* @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_media/assets/popup-imagemanager.js 16/administrator/components/com_media/assets/popup-imagemanager.js
--- 15/administrator/components/com_media/assets/popup-imagemanager.js	2009-05-29 13:51:26.000000000 +0200
+++ 16/administrator/components/com_media/assets/popup-imagemanager.js	2010-04-23 13:40:10.000000000 +0200
@@ -1,7 +1,7 @@
 /**
-* @version		$Id: popup-imagemanager.js 10702 2008-08-21 09:31:31Z eddieajau $
+* @version		$Id: popup-imagemanager.js 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_media/controller.php 16/administrator/components/com_media/controller.php
--- 15/administrator/components/com_media/controller.php	2009-05-29 13:51:32.000000000 +0200
+++ 16/administrator/components/com_media/controller.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: controller.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: controller.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Media
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_media/controllers/file.php 16/administrator/components/com_media/controllers/file.php
--- 15/administrator/components/com_media/controllers/file.php	2009-05-29 13:51:30.000000000 +0200
+++ 16/administrator/components/com_media/controllers/file.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: file.php 11713 2009-03-27 09:18:26Z willebil $
+ * @version		$Id: file.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_media/controllers/folder.php 16/administrator/components/com_media/controllers/folder.php
--- 15/administrator/components/com_media/controllers/folder.php	2009-05-29 13:51:30.000000000 +0200
+++ 16/administrator/components/com_media/controllers/folder.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: folder.php 11713 2009-03-27 09:18:26Z willebil $
+ * @version		$Id: folder.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Media
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_media/helpers/media.php 16/administrator/components/com_media/helpers/media.php
--- 15/administrator/components/com_media/helpers/media.php	2009-05-29 13:51:26.000000000 +0200
+++ 16/administrator/components/com_media/helpers/media.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: media.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: media.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Media
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_media/media.php 16/administrator/components/com_media/media.php
--- 15/administrator/components/com_media/media.php	2009-11-04 18:51:18.000000000 +0100
+++ 16/administrator/components/com_media/media.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: media.php 12696 2009-09-12 02:08:54Z ian $
+ * @version		$Id: media.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Media
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_media/media.xml 16/administrator/components/com_media/media.xml
--- 15/administrator/components/com_media/media.xml	2009-05-29 13:51:32.000000000 +0200
+++ 16/administrator/components/com_media/media.xml	2010-04-23 13:40:10.000000000 +0200
@@ -3,7 +3,7 @@
   <name>Media Manager</name>
   <author>Joomla! Project</author>
   <creationDate>April 2006</creationDate>
-  <copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+  <copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
   <license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
   <authorEmail>admin@joomla.org</authorEmail>
   <authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/administrator/components/com_media/models/list.php 16/administrator/components/com_media/models/list.php
--- 15/administrator/components/com_media/models/list.php	2009-05-29 13:51:26.000000000 +0200
+++ 16/administrator/components/com_media/models/list.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: list.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: list.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Media
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_media/models/manager.php 16/administrator/components/com_media/models/manager.php
--- 15/administrator/components/com_media/models/manager.php	2009-11-04 18:51:18.000000000 +0100
+++ 16/administrator/components/com_media/models/manager.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: manager.php 13297 2009-10-24 01:29:37Z ian $
+ * @version		$Id: manager.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_media/views/images/view.html.php 16/administrator/components/com_media/views/images/view.html.php
--- 15/administrator/components/com_media/views/images/view.html.php	2009-05-29 13:51:30.000000000 +0200
+++ 16/administrator/components/com_media/views/images/view.html.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: view.html.php 11236 2008-11-02 02:44:35Z ian $
+* @version		$Id: view.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Media
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_media/views/imageslist/view.html.php 16/administrator/components/com_media/views/imageslist/view.html.php
--- 15/administrator/components/com_media/views/imageslist/view.html.php	2009-05-29 13:51:30.000000000 +0200
+++ 16/administrator/components/com_media/views/imageslist/view.html.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: view.html.php 11666 2009-03-08 20:31:39Z willebil $
+* @version		$Id: view.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Media
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_media/views/media/view.html.php 16/administrator/components/com_media/views/media/view.html.php
--- 15/administrator/components/com_media/views/media/view.html.php	2009-07-30 20:02:22.000000000 +0200
+++ 16/administrator/components/com_media/views/media/view.html.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: view.html.php 12544 2009-07-23 10:24:34Z erdsiger $
+* @version		$Id: view.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Media
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_media/views/medialist/view.html.php 16/administrator/components/com_media/views/medialist/view.html.php
--- 15/administrator/components/com_media/views/medialist/view.html.php	2009-05-29 13:51:32.000000000 +0200
+++ 16/administrator/components/com_media/views/medialist/view.html.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: view.html.php 11307 2008-11-24 00:21:48Z ian $
+* @version		$Id: view.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Media
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_menus/admin.menus.php 16/administrator/components/com_menus/admin.menus.php
--- 15/administrator/components/com_menus/admin.menus.php	2009-05-29 13:50:56.000000000 +0200
+++ 16/administrator/components/com_menus/admin.menus.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: admin.menus.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: admin.menus.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Menus
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_menus/classes/ilink.php 16/administrator/components/com_menus/classes/ilink.php
--- 15/administrator/components/com_menus/classes/ilink.php	2009-11-04 18:51:18.000000000 +0100
+++ 16/administrator/components/com_menus/classes/ilink.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: ilink.php 12694 2009-09-11 21:03:02Z ian $
+ * @version		$Id: ilink.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Menus
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_menus/controller.php 16/administrator/components/com_menus/controller.php
--- 15/administrator/components/com_menus/controller.php	2009-05-29 13:50:56.000000000 +0200
+++ 16/administrator/components/com_menus/controller.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: controller.php 11646 2009-03-01 19:34:56Z ian $
+ * @version		$Id: controller.php 15095 2010-02-27 14:14:06Z ian $
  * @package		Joomla
  * @subpackage	Menus
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
@@ -725,9 +725,11 @@
 		foreach( $mids as $mid )
 		{
 			$original->load( $mid );
+			$parent = $original->parent;
+			$id = $original->id;
 			$copy 			= $original;
 			$copy->id 		= NULL;
-			$copy->parent 	= $a_ids[$original->parent];
+			$copy->parent 	= $a_ids[$parent];
 			$copy->menutype = $menu_name;
 			$copy->home 	= 0;
 
@@ -741,7 +743,7 @@
 				$this->setRedirect( 'index.php?option=com_menus' );
 				return;
 			}
-			$a_ids[$original->id] = $copy->id;
+			$a_ids[$id] = $copy->id;
 		}
 
 		// create the module copy
@@ -794,4 +796,4 @@
 		$msg = JText::sprintf( 'Copy of Menu created', $type, $total );
 		$mainframe->redirect( 'index.php?option=com_menus', $msg );
 	}
-}
+}
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 15/administrator/components/com_menus/helpers/helper.php 16/administrator/components/com_menus/helpers/helper.php
--- 15/administrator/components/com_menus/helpers/helper.php	2009-05-29 13:50:54.000000000 +0200
+++ 16/administrator/components/com_menus/helpers/helper.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: helper.php 11646 2009-03-01 19:34:56Z ian $
+ * @version		$Id: helper.php 14996 2010-02-22 23:15:13Z ian $
  * @package		Joomla
  * @subpackage	Menus
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
@@ -54,7 +54,7 @@
 		$db = &JFactory::getDBO();
 		$query = 'SELECT c.id, c.name, c.link, c.option' .
 				' FROM #__components AS c' .
-				' WHERE c.link <> "" AND parent = 0' .
+				' WHERE c.link <> "" AND parent = 0 AND enabled = 1' .
 				' ORDER BY c.name';
 		$db->setQuery( $query );
 		$result = $db->loadObjectList( );
@@ -150,19 +150,19 @@
 		$published = JHTML::_('select.radiolist',  $put, 'published', '', 'value', 'text', $row->published );
 		return $published;
 	}
-	
+
 	/**
 	* clean system cache
-	*/ 
+	*/
 	function cleanCache()
 	{
 		global $mainframe;
-		
+
 		if ($mainframe->getCfg('caching')) {
 			// clean system cache
 			$cache =& JFactory::getCache('_system');
 			$cache->clean();
-			
+
 			// clean mod_mainmenu cache
 			$cache2 =& JFactory::getCache('mod_mainmenu');
 			$cache2->clean();
diff -aruN --binary 15/administrator/components/com_menus/menus.xml 16/administrator/components/com_menus/menus.xml
--- 15/administrator/components/com_menus/menus.xml	2009-05-29 13:50:56.000000000 +0200
+++ 16/administrator/components/com_menus/menus.xml	2010-04-23 13:40:10.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Menus Manager</name>
 	<author>Joomla! Project</author>
 	<creationDate>2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/administrator/components/com_menus/models/item.php 16/administrator/components/com_menus/models/item.php
--- 15/administrator/components/com_menus/models/item.php	2009-05-29 13:50:54.000000000 +0200
+++ 16/administrator/components/com_menus/models/item.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: item.php 11646 2009-03-01 19:34:56Z ian $
+ * @version		$Id: item.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Menus
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_menus/models/list.php 16/administrator/components/com_menus/models/list.php
--- 15/administrator/components/com_menus/models/list.php	2009-05-29 13:50:54.000000000 +0200
+++ 16/administrator/components/com_menus/models/list.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: list.php 11646 2009-03-01 19:34:56Z ian $
+ * @version		$Id: list.php 16380 2010-04-23 09:19:48Z ian $
  * @package		Joomla
  * @subpackage	Menus
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
@@ -172,7 +172,7 @@
 						}
 						parse_str($query['query'], $view);
 					}
-					$list[$i]->view		= $list[$i]->com_name;
+					$list[$i]->view		= JText::_($list[$i]->com_name);
 					if (isset($view['view']))
 					{
 						$list[$i]->view	.= ' &raquo; '.JText::_(ucfirst($view['view']));
diff -aruN --binary 15/administrator/components/com_menus/models/menutype.php 16/administrator/components/com_menus/models/menutype.php
--- 15/administrator/components/com_menus/models/menutype.php	2009-05-29 13:50:54.000000000 +0200
+++ 16/administrator/components/com_menus/models/menutype.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: menutype.php 11646 2009-03-01 19:34:56Z ian $
+ * @version		$Id: menutype.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Menus
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_menus/views/item/view.php 16/administrator/components/com_menus/views/item/view.php
--- 15/administrator/components/com_menus/views/item/view.php	2009-05-29 13:50:56.000000000 +0200
+++ 16/administrator/components/com_menus/views/item/view.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: view.php 10559 2008-07-16 20:57:43Z instance $
+* @version		$Id: view.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Menus
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_menus/views/list/view.php 16/administrator/components/com_menus/views/list/view.php
--- 15/administrator/components/com_menus/views/list/view.php	2009-05-29 13:50:56.000000000 +0200
+++ 16/administrator/components/com_menus/views/list/view.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: view.php 11625 2009-02-15 15:32:42Z kdevine $
+ * @version		$Id: view.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Menus
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_menus/views/menus/view.php 16/administrator/components/com_menus/views/menus/view.php
--- 15/administrator/components/com_menus/views/menus/view.php	2009-05-29 13:50:54.000000000 +0200
+++ 16/administrator/components/com_menus/views/menus/view.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: view.php 11625 2009-02-15 15:32:42Z kdevine $
+ * @version		$Id: view.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Menus
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_messages/admin.messages.html.php 16/administrator/components/com_messages/admin.messages.html.php
--- 15/administrator/components/com_messages/admin.messages.html.php	2009-05-29 13:51:20.000000000 +0200
+++ 16/administrator/components/com_messages/admin.messages.html.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: admin.messages.html.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: admin.messages.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Messages
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_messages/admin.messages.php 16/administrator/components/com_messages/admin.messages.php
--- 15/administrator/components/com_messages/admin.messages.php	2009-05-29 13:51:20.000000000 +0200
+++ 16/administrator/components/com_messages/admin.messages.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: admin.messages.php 10710 2008-08-21 10:08:12Z eddieajau $
+* @version		$Id: admin.messages.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Messages
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_messages/messages.xml 16/administrator/components/com_messages/messages.xml
--- 15/administrator/components/com_messages/messages.xml	2009-05-29 13:51:20.000000000 +0200
+++ 16/administrator/components/com_messages/messages.xml	2010-04-23 13:40:10.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Messaging</name>
 	<author>Joomla! Project</author>
 	<creationDate>2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/administrator/components/com_messages/tables/message.php 16/administrator/components/com_messages/tables/message.php
--- 15/administrator/components/com_messages/tables/message.php	2009-05-29 13:51:20.000000000 +0200
+++ 16/administrator/components/com_messages/tables/message.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
- * @version		$Id: message.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: message.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_messages/toolbar.messages.html.php 16/administrator/components/com_messages/toolbar.messages.html.php
--- 15/administrator/components/com_messages/toolbar.messages.html.php	2009-05-29 13:51:20.000000000 +0200
+++ 16/administrator/components/com_messages/toolbar.messages.html.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: toolbar.messages.html.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: toolbar.messages.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Messages
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_messages/toolbar.messages.php 16/administrator/components/com_messages/toolbar.messages.php
--- 15/administrator/components/com_messages/toolbar.messages.php	2009-05-29 13:51:20.000000000 +0200
+++ 16/administrator/components/com_messages/toolbar.messages.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: toolbar.messages.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: toolbar.messages.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Messages
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_modules/admin.modules.html.php 16/administrator/components/com_modules/admin.modules.html.php
--- 15/administrator/components/com_modules/admin.modules.html.php	2009-05-29 13:51:22.000000000 +0200
+++ 16/administrator/components/com_modules/admin.modules.html.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: admin.modules.html.php 11672 2009-03-08 20:39:41Z willebil $
+* @version		$Id: admin.modules.html.php 15182 2010-03-04 23:11:09Z ian $
 * @package		Joomla
 * @subpackage	Modules
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
@@ -313,8 +313,7 @@
 								foreach ($positions as $position) {
 									echo '<li>'.$position.'</li>';
 								}
-							?>
-							</ul>
+							?></ul>
 							<script language="javascript" type="text/javascript">
 								window.addEvent('domready', function() { 
 									$('combobox-position-select').addEvent('change', function() {
diff -aruN --binary 15/administrator/components/com_modules/admin.modules.php 16/administrator/components/com_modules/admin.modules.php
--- 15/administrator/components/com_modules/admin.modules.php	2009-05-29 13:51:22.000000000 +0200
+++ 16/administrator/components/com_modules/admin.modules.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: admin.modules.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: admin.modules.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Modules
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_modules/controller.php 16/administrator/components/com_modules/controller.php
--- 15/administrator/components/com_modules/controller.php	2009-05-29 13:51:22.000000000 +0200
+++ 16/administrator/components/com_modules/controller.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: controller.php 11655 2009-03-08 20:04:17Z willebil $
+ * @version		$Id: controller.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Modules
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_modules/helpers/xml.php 16/administrator/components/com_modules/helpers/xml.php
--- 15/administrator/components/com_modules/helpers/xml.php	2009-05-29 13:51:22.000000000 +0200
+++ 16/administrator/components/com_modules/helpers/xml.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: xml.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: xml.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Modules
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_modules/models/module.php 16/administrator/components/com_modules/models/module.php
--- 15/administrator/components/com_modules/models/module.php	2009-05-29 13:51:22.000000000 +0200
+++ 16/administrator/components/com_modules/models/module.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: module.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: module.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Modules
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_modules/modules.xml 16/administrator/components/com_modules/modules.xml
--- 15/administrator/components/com_modules/modules.xml	2009-05-29 13:51:22.000000000 +0200
+++ 16/administrator/components/com_modules/modules.xml	2010-04-23 13:40:10.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Module Manager</name>
 	<author>Joomla! Project</author>
 	<creationDate>2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/administrator/components/com_modules/toolbar.modules.html.php 16/administrator/components/com_modules/toolbar.modules.html.php
--- 15/administrator/components/com_modules/toolbar.modules.html.php	2009-05-29 13:51:22.000000000 +0200
+++ 16/administrator/components/com_modules/toolbar.modules.html.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: toolbar.modules.html.php 10863 2008-08-30 06:52:50Z willebil $
+ * @version		$Id: toolbar.modules.html.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Modules
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_modules/toolbar.modules.php 16/administrator/components/com_modules/toolbar.modules.php
--- 15/administrator/components/com_modules/toolbar.modules.php	2009-05-29 13:51:22.000000000 +0200
+++ 16/administrator/components/com_modules/toolbar.modules.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: toolbar.modules.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: toolbar.modules.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Modules
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_newsfeeds/admin.newsfeeds.html.php 16/administrator/components/com_newsfeeds/admin.newsfeeds.html.php
--- 15/administrator/components/com_newsfeeds/admin.newsfeeds.html.php	2009-05-29 13:50:50.000000000 +0200
+++ 16/administrator/components/com_newsfeeds/admin.newsfeeds.html.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: admin.newsfeeds.html.php 11655 2009-03-08 20:04:17Z willebil $
+* @version		$Id: admin.newsfeeds.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Newsfeeds
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_newsfeeds/admin.newsfeeds.php 16/administrator/components/com_newsfeeds/admin.newsfeeds.php
--- 15/administrator/components/com_newsfeeds/admin.newsfeeds.php	2009-05-29 13:50:50.000000000 +0200
+++ 16/administrator/components/com_newsfeeds/admin.newsfeeds.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: admin.newsfeeds.php 11371 2008-12-30 01:31:50Z ian $
+* @version		$Id: admin.newsfeeds.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Newsfeeds
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_newsfeeds/elements/newsfeed.php 16/administrator/components/com_newsfeeds/elements/newsfeed.php
--- 15/administrator/components/com_newsfeeds/elements/newsfeed.php	2009-05-29 13:50:48.000000000 +0200
+++ 16/administrator/components/com_newsfeeds/elements/newsfeed.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: newsfeed.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: newsfeed.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_newsfeeds/newsfeeds.xml 16/administrator/components/com_newsfeeds/newsfeeds.xml
--- 15/administrator/components/com_newsfeeds/newsfeeds.xml	2009-05-29 13:50:50.000000000 +0200
+++ 16/administrator/components/com_newsfeeds/newsfeeds.xml	2010-04-23 13:40:10.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Newsfeeds</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/administrator/components/com_newsfeeds/tables/newsfeed.php 16/administrator/components/com_newsfeeds/tables/newsfeed.php
--- 15/administrator/components/com_newsfeeds/tables/newsfeed.php	2009-05-29 13:50:48.000000000 +0200
+++ 16/administrator/components/com_newsfeeds/tables/newsfeed.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: newsfeed.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: newsfeed.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Newsfeeds
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_newsfeeds/toolbar.newsfeeds.html.php 16/administrator/components/com_newsfeeds/toolbar.newsfeeds.html.php
--- 15/administrator/components/com_newsfeeds/toolbar.newsfeeds.html.php	2009-05-29 13:50:50.000000000 +0200
+++ 16/administrator/components/com_newsfeeds/toolbar.newsfeeds.html.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: toolbar.newsfeeds.html.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: toolbar.newsfeeds.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Newsfeeds
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_newsfeeds/toolbar.newsfeeds.php 16/administrator/components/com_newsfeeds/toolbar.newsfeeds.php
--- 15/administrator/components/com_newsfeeds/toolbar.newsfeeds.php	2009-05-29 13:50:50.000000000 +0200
+++ 16/administrator/components/com_newsfeeds/toolbar.newsfeeds.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: toolbar.newsfeeds.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: toolbar.newsfeeds.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Newsfeeds
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_plugins/controller.php 16/administrator/components/com_plugins/controller.php
--- 15/administrator/components/com_plugins/controller.php	2009-05-29 13:50:48.000000000 +0200
+++ 16/administrator/components/com_plugins/controller.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: controller.php 11386 2009-01-04 02:34:35Z ian $
+ * @version		$Id: controller.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Config
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_plugins/plugins.php 16/administrator/components/com_plugins/plugins.php
--- 15/administrator/components/com_plugins/plugins.php	2009-05-29 13:50:48.000000000 +0200
+++ 16/administrator/components/com_plugins/plugins.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: plugins.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: plugins.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Plugins
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_plugins/plugins.xml 16/administrator/components/com_plugins/plugins.xml
--- 15/administrator/components/com_plugins/plugins.xml	2009-05-29 13:50:48.000000000 +0200
+++ 16/administrator/components/com_plugins/plugins.xml	2010-04-23 13:40:10.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Plugin Manager</name>
 	<author>Joomla! Project</author>
 	<creationDate>2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/administrator/components/com_plugins/views/plugin/view.html.php 16/administrator/components/com_plugins/views/plugin/view.html.php
--- 15/administrator/components/com_plugins/views/plugin/view.html.php	2009-05-29 13:50:46.000000000 +0200
+++ 16/administrator/components/com_plugins/views/plugin/view.html.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: view.html.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: view.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Config
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_plugins/views/plugins/view.html.php 16/administrator/components/com_plugins/views/plugins/view.html.php
--- 15/administrator/components/com_plugins/views/plugins/view.html.php	2009-05-29 13:50:46.000000000 +0200
+++ 16/administrator/components/com_plugins/views/plugins/view.html.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: view.html.php 11655 2009-03-08 20:04:17Z willebil $
+* @version		$Id: view.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Config
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_poll/controller.php 16/administrator/components/com_poll/controller.php
--- 15/administrator/components/com_poll/controller.php	2009-05-29 13:51:20.000000000 +0200
+++ 16/administrator/components/com_poll/controller.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: controller.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: controller.php 15096 2010-02-27 14:16:40Z ian $
  * @package		Joomla
  * @subpackage	Config
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
@@ -135,7 +135,7 @@
 				break;
 		}
 
-		$this->setRedirect($link);
+		$this->setRedirect($link, $msg);
 	}
 
 	function remove()
diff -aruN --binary 15/administrator/components/com_poll/elements/poll.php 16/administrator/components/com_poll/elements/poll.php
--- 15/administrator/components/com_poll/elements/poll.php	2009-05-29 13:51:20.000000000 +0200
+++ 16/administrator/components/com_poll/elements/poll.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: poll.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: poll.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_poll/poll.php 16/administrator/components/com_poll/poll.php
--- 15/administrator/components/com_poll/poll.php	2009-05-29 13:51:20.000000000 +0200
+++ 16/administrator/components/com_poll/poll.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: poll.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: poll.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Polls
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_poll/poll.xml 16/administrator/components/com_poll/poll.xml
--- 15/administrator/components/com_poll/poll.xml	2009-05-29 13:51:20.000000000 +0200
+++ 16/administrator/components/com_poll/poll.xml	2010-04-23 13:40:10.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Polls</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/administrator/components/com_poll/tables/poll.php 16/administrator/components/com_poll/tables/poll.php
--- 15/administrator/components/com_poll/tables/poll.php	2009-05-29 13:51:20.000000000 +0200
+++ 16/administrator/components/com_poll/tables/poll.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: poll.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: poll.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Polls
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_poll/views/poll/view.html.php 16/administrator/components/com_poll/views/poll/view.html.php
--- 15/administrator/components/com_poll/views/poll/view.html.php	2009-05-29 13:51:20.000000000 +0200
+++ 16/administrator/components/com_poll/views/poll/view.html.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: view.html.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: view.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Config
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_poll/views/polls/view.html.php 16/administrator/components/com_poll/views/polls/view.html.php
--- 15/administrator/components/com_poll/views/polls/view.html.php	2009-05-29 13:51:20.000000000 +0200
+++ 16/administrator/components/com_poll/views/polls/view.html.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: view.html.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: view.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Config
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_search/controller.php 16/administrator/components/com_search/controller.php
--- 15/administrator/components/com_search/controller.php	2009-05-29 13:51:18.000000000 +0200
+++ 16/administrator/components/com_search/controller.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: controller.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: controller.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Search
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_search/helpers/search.php 16/administrator/components/com_search/helpers/search.php
--- 15/administrator/components/com_search/helpers/search.php	2009-06-30 21:01:32.000000000 +0200
+++ 16/administrator/components/com_search/helpers/search.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: search.php 12389 2009-07-01 00:34:45Z ian $
+ * @version		$Id: search.php 14401 2010-01-26 14:10:00Z louis $
  * @package  Joomla
  * @subpackage	Search
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_search/helpers/site.php 16/administrator/components/com_search/helpers/site.php
--- 15/administrator/components/com_search/helpers/site.php	2009-06-30 21:01:32.000000000 +0200
+++ 16/administrator/components/com_search/helpers/site.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: site.php 12389 2009-07-01 00:34:45Z ian $
+ * @version		$Id: site.php 14401 2010-01-26 14:10:00Z louis $
  * @package  Joomla
  * @subpackage	Search
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_search/models/search.php 16/administrator/components/com_search/models/search.php
--- 15/administrator/components/com_search/models/search.php	2009-05-29 13:51:18.000000000 +0200
+++ 16/administrator/components/com_search/models/search.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: search.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: search.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Search
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_search/search.php 16/administrator/components/com_search/search.php
--- 15/administrator/components/com_search/search.php	2009-05-29 13:51:18.000000000 +0200
+++ 16/administrator/components/com_search/search.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: search.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: search.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Search
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_search/search.xml 16/administrator/components/com_search/search.xml
--- 15/administrator/components/com_search/search.xml	2009-05-29 13:51:18.000000000 +0200
+++ 16/administrator/components/com_search/search.xml	2010-04-23 13:40:10.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Search</name>
 	<author>Joomla! Project</author>
 	<creationDate>2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/administrator/components/com_search/views/search/view.php 16/administrator/components/com_search/views/search/view.php
--- 15/administrator/components/com_search/views/search/view.php	2009-05-29 13:51:18.000000000 +0200
+++ 16/administrator/components/com_search/views/search/view.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: view.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: view.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Search
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_sections/admin.sections.html.php 16/administrator/components/com_sections/admin.sections.html.php
--- 15/administrator/components/com_sections/admin.sections.html.php	2009-05-29 13:50:58.000000000 +0200
+++ 16/administrator/components/com_sections/admin.sections.html.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: admin.sections.html.php 11655 2009-03-08 20:04:17Z willebil $
+* @version		$Id: admin.sections.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Sections
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_sections/admin.sections.php 16/administrator/components/com_sections/admin.sections.php
--- 15/administrator/components/com_sections/admin.sections.php	2009-05-29 13:50:58.000000000 +0200
+++ 16/administrator/components/com_sections/admin.sections.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: admin.sections.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: admin.sections.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Sections
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_sections/toolbar.sections.html.php 16/administrator/components/com_sections/toolbar.sections.html.php
--- 15/administrator/components/com_sections/toolbar.sections.html.php	2009-05-29 13:50:58.000000000 +0200
+++ 16/administrator/components/com_sections/toolbar.sections.html.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: toolbar.sections.html.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: toolbar.sections.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Sections
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_sections/toolbar.sections.php 16/administrator/components/com_sections/toolbar.sections.php
--- 15/administrator/components/com_sections/toolbar.sections.php	2009-05-29 13:50:58.000000000 +0200
+++ 16/administrator/components/com_sections/toolbar.sections.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: toolbar.sections.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: toolbar.sections.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Sections
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_templates/admin.templates.html.php 16/administrator/components/com_templates/admin.templates.html.php
--- 15/administrator/components/com_templates/admin.templates.html.php	2009-06-30 21:01:32.000000000 +0200
+++ 16/administrator/components/com_templates/admin.templates.html.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: admin.templates.html.php 12351 2009-06-24 13:48:00Z ian $
+* @version		$Id: admin.templates.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Templates
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_templates/admin.templates.php 16/administrator/components/com_templates/admin.templates.php
--- 15/administrator/components/com_templates/admin.templates.php	2009-05-29 13:51:12.000000000 +0200
+++ 16/administrator/components/com_templates/admin.templates.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: admin.templates.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: admin.templates.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Templates
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_templates/controller.php 16/administrator/components/com_templates/controller.php
--- 15/administrator/components/com_templates/controller.php	2009-05-29 13:51:12.000000000 +0200
+++ 16/administrator/components/com_templates/controller.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: controller.php 10836 2008-08-28 10:56:44Z eddieajau $
+ * @version		$Id: controller.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Templates
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_templates/helpers/template.php 16/administrator/components/com_templates/helpers/template.php
--- 15/administrator/components/com_templates/helpers/template.php	2009-05-29 13:51:12.000000000 +0200
+++ 16/administrator/components/com_templates/helpers/template.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: template.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: template.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Templates
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_templates/templates.xml 16/administrator/components/com_templates/templates.xml
--- 15/administrator/components/com_templates/templates.xml	2009-05-29 13:51:12.000000000 +0200
+++ 16/administrator/components/com_templates/templates.xml	2010-04-23 13:40:12.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Template Manager</name>
 	<author>Joomla! Project</author>
 	<creationDate>2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/administrator/components/com_templates/toolbar.templates.html.php 16/administrator/components/com_templates/toolbar.templates.html.php
--- 15/administrator/components/com_templates/toolbar.templates.html.php	2009-05-29 13:51:12.000000000 +0200
+++ 16/administrator/components/com_templates/toolbar.templates.html.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: toolbar.templates.html.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: toolbar.templates.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Templates
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_templates/toolbar.templates.php 16/administrator/components/com_templates/toolbar.templates.php
--- 15/administrator/components/com_templates/toolbar.templates.php	2009-05-29 13:51:12.000000000 +0200
+++ 16/administrator/components/com_templates/toolbar.templates.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: toolbar.templates.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: toolbar.templates.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Templates
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_trash/admin.trash.html.php 16/administrator/components/com_trash/admin.trash.html.php
--- 15/administrator/components/com_trash/admin.trash.html.php	2009-05-29 13:50:48.000000000 +0200
+++ 16/administrator/components/com_trash/admin.trash.html.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: admin.trash.html.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: admin.trash.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Trash
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_trash/admin.trash.php 16/administrator/components/com_trash/admin.trash.php
--- 15/administrator/components/com_trash/admin.trash.php	2009-05-29 13:50:48.000000000 +0200
+++ 16/administrator/components/com_trash/admin.trash.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: admin.trash.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: admin.trash.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Trash
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_trash/toolbar.trash.html.php 16/administrator/components/com_trash/toolbar.trash.html.php
--- 15/administrator/components/com_trash/toolbar.trash.html.php	2009-05-29 13:50:48.000000000 +0200
+++ 16/administrator/components/com_trash/toolbar.trash.html.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: toolbar.trash.html.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: toolbar.trash.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Trash
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_trash/toolbar.trash.php 16/administrator/components/com_trash/toolbar.trash.php
--- 15/administrator/components/com_trash/toolbar.trash.php	2009-05-29 13:50:48.000000000 +0200
+++ 16/administrator/components/com_trash/toolbar.trash.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: toolbar.trash.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: toolbar.trash.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Trash
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_trash/trash.xml 16/administrator/components/com_trash/trash.xml
--- 15/administrator/components/com_trash/trash.xml	2009-05-29 13:50:48.000000000 +0200
+++ 16/administrator/components/com_trash/trash.xml	2010-04-23 13:40:12.000000000 +0200
@@ -2,7 +2,7 @@
 <install type="component" version="1.0.0">
 	<name>Trash</name>
 	<author>Joomla! Project</author>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/administrator/components/com_users/controller.php 16/administrator/components/com_users/controller.php
--- 15/administrator/components/com_users/controller.php	2009-05-29 13:51:12.000000000 +0200
+++ 16/administrator/components/com_users/controller.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: controller.php 11299 2008-11-22 01:40:44Z ian $
+ * @version		$Id: controller.php 15176 2010-03-04 21:49:55Z ian $
  * @package		Joomla
  * @subpackage	Users
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
@@ -344,6 +344,7 @@
 			$groups 	= $acl->get_object_groups( $objectID, 'ARO' );
 			$this_group = strtolower( $acl->get_group_name( $groups[0], 'ARO' ) );
 
+			$msg = '';
 			$success = false;
 			if ( $this_group == 'super administrator' )
 			{
diff -aruN --binary 15/administrator/components/com_users/users.class.php 16/administrator/components/com_users/users.class.php
--- 15/administrator/components/com_users/users.class.php	2009-05-29 13:51:12.000000000 +0200
+++ 16/administrator/components/com_users/users.class.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: users.class.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: users.class.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Users
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_users/users.php 16/administrator/components/com_users/users.php
--- 15/administrator/components/com_users/users.php	2009-05-29 13:51:12.000000000 +0200
+++ 16/administrator/components/com_users/users.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: users.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: users.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Users
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_users/users.xml 16/administrator/components/com_users/users.xml
--- 15/administrator/components/com_users/users.xml	2009-05-29 13:51:12.000000000 +0200
+++ 16/administrator/components/com_users/users.xml	2010-04-23 13:40:12.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>User Manager</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/administrator/components/com_users/views/user/view.html.php 16/administrator/components/com_users/views/user/view.html.php
--- 15/administrator/components/com_users/views/user/view.html.php	2009-05-29 13:51:12.000000000 +0200
+++ 16/administrator/components/com_users/views/user/view.html.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: view.html.php 10496 2008-07-03 07:08:39Z ircmaxell $
+* @version		$Id: view.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Users
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_users/views/users/view.html.php 16/administrator/components/com_users/views/users/view.html.php
--- 15/administrator/components/com_users/views/users/view.html.php	2009-05-29 13:51:12.000000000 +0200
+++ 16/administrator/components/com_users/views/users/view.html.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: view.html.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: view.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Users
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_weblinks/controller.php 16/administrator/components/com_weblinks/controller.php
--- 15/administrator/components/com_weblinks/controller.php	2009-05-29 13:51:26.000000000 +0200
+++ 16/administrator/components/com_weblinks/controller.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: controller.php 11002 2008-10-07 01:12:20Z ian $
+ * @version		$Id: controller.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_weblinks/models/weblink.php 16/administrator/components/com_weblinks/models/weblink.php
--- 15/administrator/components/com_weblinks/models/weblink.php	2009-05-29 13:51:24.000000000 +0200
+++ 16/administrator/components/com_weblinks/models/weblink.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: weblink.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: weblink.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_weblinks/models/weblinks.php 16/administrator/components/com_weblinks/models/weblinks.php
--- 15/administrator/components/com_weblinks/models/weblinks.php	2009-05-29 13:51:24.000000000 +0200
+++ 16/administrator/components/com_weblinks/models/weblinks.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: weblinks.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: weblinks.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/components/com_weblinks/tables/weblink.php 16/administrator/components/com_weblinks/tables/weblink.php
--- 15/administrator/components/com_weblinks/tables/weblink.php	2009-11-04 18:51:18.000000000 +0100
+++ 16/administrator/components/com_weblinks/tables/weblink.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: weblink.php 12694 2009-09-11 21:03:02Z ian $
+* @version		$Id: weblink.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Weblinks
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_weblinks/views/weblink/view.html.php 16/administrator/components/com_weblinks/views/weblink/view.html.php
--- 15/administrator/components/com_weblinks/views/weblink/view.html.php	2009-05-29 13:51:26.000000000 +0200
+++ 16/administrator/components/com_weblinks/views/weblink/view.html.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: view.html.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: view.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Weblinks
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_weblinks/views/weblinks/view.html.php 16/administrator/components/com_weblinks/views/weblinks/view.html.php
--- 15/administrator/components/com_weblinks/views/weblinks/view.html.php	2009-05-29 13:51:26.000000000 +0200
+++ 16/administrator/components/com_weblinks/views/weblinks/view.html.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: view.html.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: view.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Weblinks
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_weblinks/weblinks.php 16/administrator/components/com_weblinks/weblinks.php
--- 15/administrator/components/com_weblinks/weblinks.php	2009-05-29 13:51:26.000000000 +0200
+++ 16/administrator/components/com_weblinks/weblinks.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: weblinks.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: weblinks.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Weblinks
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/components/com_weblinks/weblinks.xml 16/administrator/components/com_weblinks/weblinks.xml
--- 15/administrator/components/com_weblinks/weblinks.xml	2009-05-29 13:51:26.000000000 +0200
+++ 16/administrator/components/com_weblinks/weblinks.xml	2010-04-23 13:40:12.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Weblinks</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/administrator/help/en-GB/joomla.credits.html 16/administrator/help/en-GB/joomla.credits.html
--- 15/administrator/help/en-GB/joomla.credits.html	2009-05-29 13:51:40.000000000 +0200
+++ 16/administrator/help/en-GB/joomla.credits.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Credits</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/joomla.glossary.html 16/administrator/help/en-GB/joomla.glossary.html
--- 15/administrator/help/en-GB/joomla.glossary.html	2009-05-29 13:51:40.000000000 +0200
+++ 16/administrator/help/en-GB/joomla.glossary.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Glossary</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/joomla.support.html 16/administrator/help/en-GB/joomla.support.html
--- 15/administrator/help/en-GB/joomla.support.html	2009-05-29 13:51:40.000000000 +0200
+++ 16/administrator/help/en-GB/joomla.support.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Support</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/joomla.whatsnew10.html 16/administrator/help/en-GB/joomla.whatsnew10.html
--- 15/administrator/help/en-GB/joomla.whatsnew10.html	2009-05-29 13:51:40.000000000 +0200
+++ 16/administrator/help/en-GB/joomla.whatsnew10.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>What's New in Version 1.0</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/joomla.whatsnew15.html 16/administrator/help/en-GB/joomla.whatsnew15.html
--- 15/administrator/help/en-GB/joomla.whatsnew15.html	2009-05-29 13:51:40.000000000 +0200
+++ 16/administrator/help/en-GB/joomla.whatsnew15.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>What's New in Version 1.5</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.banner.categories.edit.html 16/administrator/help/en-GB/screen.banner.categories.edit.html
--- 15/administrator/help/en-GB/screen.banner.categories.edit.html	2009-05-29 13:51:40.000000000 +0200
+++ 16/administrator/help/en-GB/screen.banner.categories.edit.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Banner Category Manager - New/Edit</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.banner.categories.html 16/administrator/help/en-GB/screen.banner.categories.html
--- 15/administrator/help/en-GB/screen.banner.categories.html	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/help/en-GB/screen.banner.categories.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Banner Category Manager</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.banners.client.edit.html 16/administrator/help/en-GB/screen.banners.client.edit.html
--- 15/administrator/help/en-GB/screen.banners.client.edit.html	2009-05-29 13:51:40.000000000 +0200
+++ 16/administrator/help/en-GB/screen.banners.client.edit.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Banner Client Manager - New/Edit</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.banners.client.html 16/administrator/help/en-GB/screen.banners.client.html
--- 15/administrator/help/en-GB/screen.banners.client.html	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/help/en-GB/screen.banners.client.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Banner Client Manager</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.banners.edit.html 16/administrator/help/en-GB/screen.banners.edit.html
--- 15/administrator/help/en-GB/screen.banners.edit.html	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/help/en-GB/screen.banners.edit.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Banner Manager - New/Edit</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.banners.html 16/administrator/help/en-GB/screen.banners.html
--- 15/administrator/help/en-GB/screen.banners.html	2009-05-29 13:51:40.000000000 +0200
+++ 16/administrator/help/en-GB/screen.banners.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Banner Manager</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.cache.html 16/administrator/help/en-GB/screen.cache.html
--- 15/administrator/help/en-GB/screen.cache.html	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/help/en-GB/screen.cache.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Clean Cache</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.categories.edit.html 16/administrator/help/en-GB/screen.categories.edit.html
--- 15/administrator/help/en-GB/screen.categories.edit.html	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/help/en-GB/screen.categories.edit.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Category Manager - New/Edit</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.categories.html 16/administrator/help/en-GB/screen.categories.html
--- 15/administrator/help/en-GB/screen.categories.html	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/help/en-GB/screen.categories.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Category Manager</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.checkin.html 16/administrator/help/en-GB/screen.checkin.html
--- 15/administrator/help/en-GB/screen.checkin.html	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/help/en-GB/screen.checkin.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Global Check-in</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.config.html 16/administrator/help/en-GB/screen.config.html
--- 15/administrator/help/en-GB/screen.config.html	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/help/en-GB/screen.config.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Global Configuration</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.contact_details.categories.edit.html 16/administrator/help/en-GB/screen.contact_details.categories.edit.html
--- 15/administrator/help/en-GB/screen.contact_details.categories.edit.html	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/help/en-GB/screen.contact_details.categories.edit.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Contact Category Manager - New/Edit</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.contact_details.categories.html 16/administrator/help/en-GB/screen.contact_details.categories.html
--- 15/administrator/help/en-GB/screen.contact_details.categories.html	2009-05-29 13:51:40.000000000 +0200
+++ 16/administrator/help/en-GB/screen.contact_details.categories.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Contact Category Manager</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.contactmanager.edit.html 16/administrator/help/en-GB/screen.contactmanager.edit.html
--- 15/administrator/help/en-GB/screen.contactmanager.edit.html	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/help/en-GB/screen.contactmanager.edit.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Contact Manager - New/Edit</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.contactmanager.html 16/administrator/help/en-GB/screen.contactmanager.html
--- 15/administrator/help/en-GB/screen.contactmanager.html	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/help/en-GB/screen.contactmanager.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Contact Manager</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.content.categories.edit.html 16/administrator/help/en-GB/screen.content.categories.edit.html
--- 15/administrator/help/en-GB/screen.content.categories.edit.html	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/help/en-GB/screen.content.categories.edit.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Content Category Manager - New/Edit</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.content.categories.html 16/administrator/help/en-GB/screen.content.categories.html
--- 15/administrator/help/en-GB/screen.content.categories.html	2009-05-29 13:51:40.000000000 +0200
+++ 16/administrator/help/en-GB/screen.content.categories.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Content Category Manager</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.content.edit.html 16/administrator/help/en-GB/screen.content.edit.html
--- 15/administrator/help/en-GB/screen.content.edit.html	2009-05-29 13:51:40.000000000 +0200
+++ 16/administrator/help/en-GB/screen.content.edit.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Article Manager - New/Edit</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.content.html 16/administrator/help/en-GB/screen.content.html
--- 15/administrator/help/en-GB/screen.content.html	2009-05-29 13:51:40.000000000 +0200
+++ 16/administrator/help/en-GB/screen.content.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Article Manager</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.cpanel.html 16/administrator/help/en-GB/screen.cpanel.html
--- 15/administrator/help/en-GB/screen.cpanel.html	2009-05-29 13:51:40.000000000 +0200
+++ 16/administrator/help/en-GB/screen.cpanel.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Control Panel</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.frontpage.html 16/administrator/help/en-GB/screen.frontpage.html
--- 15/administrator/help/en-GB/screen.frontpage.html	2009-05-29 13:51:40.000000000 +0200
+++ 16/administrator/help/en-GB/screen.frontpage.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Frontpage Manager</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.installer.html 16/administrator/help/en-GB/screen.installer.html
--- 15/administrator/help/en-GB/screen.installer.html	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/help/en-GB/screen.installer.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Extension Manager - Install</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.languages.html 16/administrator/help/en-GB/screen.languages.html
--- 15/administrator/help/en-GB/screen.languages.html	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/help/en-GB/screen.languages.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Language Manager</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.mediamanager.html 16/administrator/help/en-GB/screen.mediamanager.html
--- 15/administrator/help/en-GB/screen.mediamanager.html	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/help/en-GB/screen.mediamanager.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Media Manager</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.menumanager.html 16/administrator/help/en-GB/screen.menumanager.html
--- 15/administrator/help/en-GB/screen.menumanager.html	2009-05-29 13:51:40.000000000 +0200
+++ 16/administrator/help/en-GB/screen.menumanager.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Menu Manager</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.menumanager.new.html 16/administrator/help/en-GB/screen.menumanager.new.html
--- 15/administrator/help/en-GB/screen.menumanager.new.html	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/help/en-GB/screen.menumanager.new.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Menu Manager - New/Edit</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.menus.edit.html 16/administrator/help/en-GB/screen.menus.edit.html
--- 15/administrator/help/en-GB/screen.menus.edit.html	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/help/en-GB/screen.menus.edit.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Menu Item Manager - New/Edit</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.menus.html 16/administrator/help/en-GB/screen.menus.html
--- 15/administrator/help/en-GB/screen.menus.html	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/help/en-GB/screen.menus.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Menu Item Manager</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.messages.edit.html 16/administrator/help/en-GB/screen.messages.edit.html
--- 15/administrator/help/en-GB/screen.messages.edit.html	2009-05-29 13:51:40.000000000 +0200
+++ 16/administrator/help/en-GB/screen.messages.edit.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Private Messages - Edit</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.messages.inbox.html 16/administrator/help/en-GB/screen.messages.inbox.html
--- 15/administrator/help/en-GB/screen.messages.inbox.html	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/help/en-GB/screen.messages.inbox.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Private Messages - Inbox</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.messages.read.html 16/administrator/help/en-GB/screen.messages.read.html
--- 15/administrator/help/en-GB/screen.messages.read.html	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/help/en-GB/screen.messages.read.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Private Messages - Read</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.modulesadministrator.edit.html 16/administrator/help/en-GB/screen.modulesadministrator.edit.html
--- 15/administrator/help/en-GB/screen.modulesadministrator.edit.html	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/help/en-GB/screen.modulesadministrator.edit.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Modules Administrator</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.modules.edit.html 16/administrator/help/en-GB/screen.modules.edit.html
--- 15/administrator/help/en-GB/screen.modules.edit.html	2009-05-29 13:51:40.000000000 +0200
+++ 16/administrator/help/en-GB/screen.modules.edit.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Module - Edit</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.modules.html 16/administrator/help/en-GB/screen.modules.html
--- 15/administrator/help/en-GB/screen.modules.html	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/help/en-GB/screen.modules.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Module Manager</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.modules.new.html 16/administrator/help/en-GB/screen.modules.new.html
--- 15/administrator/help/en-GB/screen.modules.new.html	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/help/en-GB/screen.modules.new.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Module - New</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.modulessite.edit.html 16/administrator/help/en-GB/screen.modulessite.edit.html
--- 15/administrator/help/en-GB/screen.modulessite.edit.html	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/help/en-GB/screen.modulessite.edit.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Modules Site</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.newsfeeds.categories.edit.html 16/administrator/help/en-GB/screen.newsfeeds.categories.edit.html
--- 15/administrator/help/en-GB/screen.newsfeeds.categories.edit.html	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/help/en-GB/screen.newsfeeds.categories.edit.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>News Feeds Category Manager - New/Edit</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.newsfeeds.categories.html 16/administrator/help/en-GB/screen.newsfeeds.categories.html
--- 15/administrator/help/en-GB/screen.newsfeeds.categories.html	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/help/en-GB/screen.newsfeeds.categories.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>News Feeds Category Manager</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.newsfeeds.edit.html 16/administrator/help/en-GB/screen.newsfeeds.edit.html
--- 15/administrator/help/en-GB/screen.newsfeeds.edit.html	2009-05-29 13:51:40.000000000 +0200
+++ 16/administrator/help/en-GB/screen.newsfeeds.edit.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>News Feeds Manager - New/Edit</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.newsfeeds.html 16/administrator/help/en-GB/screen.newsfeeds.html
--- 15/administrator/help/en-GB/screen.newsfeeds.html	2009-05-29 13:51:40.000000000 +0200
+++ 16/administrator/help/en-GB/screen.newsfeeds.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>News Feeds Manager</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.plugins.edit.html 16/administrator/help/en-GB/screen.plugins.edit.html
--- 15/administrator/help/en-GB/screen.plugins.edit.html	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/help/en-GB/screen.plugins.edit.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Plugins - New/Edit</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All Rights Reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All Rights Reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.plugins.html 16/administrator/help/en-GB/screen.plugins.html
--- 15/administrator/help/en-GB/screen.plugins.html	2009-05-29 13:51:40.000000000 +0200
+++ 16/administrator/help/en-GB/screen.plugins.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Plugin Manager</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All Rights Reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All Rights Reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.polls.edit.html 16/administrator/help/en-GB/screen.polls.edit.html
--- 15/administrator/help/en-GB/screen.polls.edit.html	2009-05-29 13:51:40.000000000 +0200
+++ 16/administrator/help/en-GB/screen.polls.edit.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Poll Manager - New/Edit</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.polls.html 16/administrator/help/en-GB/screen.polls.html
--- 15/administrator/help/en-GB/screen.polls.html	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/help/en-GB/screen.polls.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Poll Manager</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.sections.edit.html 16/administrator/help/en-GB/screen.sections.edit.html
--- 15/administrator/help/en-GB/screen.sections.edit.html	2009-05-29 13:51:40.000000000 +0200
+++ 16/administrator/help/en-GB/screen.sections.edit.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Sections Manager - New/Edit</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.sections.html 16/administrator/help/en-GB/screen.sections.html
--- 15/administrator/help/en-GB/screen.sections.html	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/help/en-GB/screen.sections.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Section Manager</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.stats.searches.html 16/administrator/help/en-GB/screen.stats.searches.html
--- 15/administrator/help/en-GB/screen.stats.searches.html	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/help/en-GB/screen.stats.searches.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Search Statistics</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.system.info.html 16/administrator/help/en-GB/screen.system.info.html
--- 15/administrator/help/en-GB/screen.system.info.html	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/help/en-GB/screen.system.info.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>System Information</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.templates.html 16/administrator/help/en-GB/screen.templates.html
--- 15/administrator/help/en-GB/screen.templates.html	2009-05-29 13:51:40.000000000 +0200
+++ 16/administrator/help/en-GB/screen.templates.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Template Manager</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.trashmanager.html 16/administrator/help/en-GB/screen.trashmanager.html
--- 15/administrator/help/en-GB/screen.trashmanager.html	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/help/en-GB/screen.trashmanager.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Trash Manager</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.users.edit.html 16/administrator/help/en-GB/screen.users.edit.html
--- 15/administrator/help/en-GB/screen.users.edit.html	2009-05-29 13:51:40.000000000 +0200
+++ 16/administrator/help/en-GB/screen.users.edit.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>User Manager - Add or Edit Users</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.users.html 16/administrator/help/en-GB/screen.users.html
--- 15/administrator/help/en-GB/screen.users.html	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/help/en-GB/screen.users.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>User Manager</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.users.massmail.html 16/administrator/help/en-GB/screen.users.massmail.html
--- 15/administrator/help/en-GB/screen.users.massmail.html	2009-05-29 13:51:40.000000000 +0200
+++ 16/administrator/help/en-GB/screen.users.massmail.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Mass Mail Users</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.weblink.edit.html 16/administrator/help/en-GB/screen.weblink.edit.html
--- 15/administrator/help/en-GB/screen.weblink.edit.html	2009-05-29 13:51:40.000000000 +0200
+++ 16/administrator/help/en-GB/screen.weblink.edit.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Web Link Manager : New / Edit</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.weblink.html 16/administrator/help/en-GB/screen.weblink.html
--- 15/administrator/help/en-GB/screen.weblink.html	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/help/en-GB/screen.weblink.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Web Link Manager</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.weblinks.categories.edit.html 16/administrator/help/en-GB/screen.weblinks.categories.edit.html
--- 15/administrator/help/en-GB/screen.weblinks.categories.edit.html	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/help/en-GB/screen.weblinks.categories.edit.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Web Link Category Manager - New/Edit</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/en-GB/screen.weblinks.categories.html 16/administrator/help/en-GB/screen.weblinks.categories.html
--- 15/administrator/help/en-GB/screen.weblinks.categories.html	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/help/en-GB/screen.weblinks.categories.html	2010-04-23 13:40:12.000000000 +0200
@@ -4,7 +4,7 @@
 <head>
 <title>Web Link Category Manager</title>
 <link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved." />
+<meta name="copyright" content="Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved." />
 <meta name="license" content="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL" />
 </head>
 <body>
diff -aruN --binary 15/administrator/help/helpsites-15.xml 16/administrator/help/helpsites-15.xml
--- 15/administrator/help/helpsites-15.xml	2009-11-04 18:51:18.000000000 +0100
+++ 16/administrator/help/helpsites-15.xml	2010-04-23 13:40:12.000000000 +0200
@@ -10,5 +10,6 @@
     <site tag="ca-ES" url="http://www.joomla.cat"> Catalan - joomla.cat</site>
 	<site tag="fr-FR" url="http://help.joomla.fr"> French - Joomla.fr</site>
 	<site tag="fa-IR" url="http://joomfa.org"> Farsi - Joomfa.org</site>
+	<site tag="nb-NO" url="http://help15.joomlainorge.no/"> Norwegian - joomlainorge.no</site>
 </sites>
 </joshelp>
diff -aruN --binary 15/administrator/includes/application.php 16/administrator/includes/application.php
--- 15/administrator/includes/application.php	2009-05-29 13:51:38.000000000 +0200
+++ 16/administrator/includes/application.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: application.php 11409 2009-01-10 02:27:08Z willebil $
+* @version		$Id: application.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/includes/defines.php 16/administrator/includes/defines.php
--- 15/administrator/includes/defines.php	2009-05-29 13:51:38.000000000 +0200
+++ 16/administrator/includes/defines.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: defines.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: defines.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/includes/framework.php 16/administrator/includes/framework.php
--- 15/administrator/includes/framework.php	2009-11-04 18:51:18.000000000 +0100
+++ 16/administrator/includes/framework.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: framework.php 13415 2009-11-03 15:53:25Z ian $
+* @version		$Id: framework.php 16385 2010-04-23 10:44:15Z ian $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/includes/helper.php 16/administrator/includes/helper.php
--- 15/administrator/includes/helper.php	2009-05-29 13:51:38.000000000 +0200
+++ 16/administrator/includes/helper.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: helper.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: helper.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/includes/router.php 16/administrator/includes/router.php
--- 15/administrator/includes/router.php	2009-05-29 13:51:38.000000000 +0200
+++ 16/administrator/includes/router.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: router.php 10702 2008-08-21 09:31:31Z eddieajau $
+* @version		$Id: router.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Application
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/includes/toolbar.php 16/administrator/includes/toolbar.php
--- 15/administrator/includes/toolbar.php	2009-05-29 13:51:38.000000000 +0200
+++ 16/administrator/includes/toolbar.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: toolbar.php 11307 2008-11-24 00:21:48Z ian $
+* @version		$Id: toolbar.php 15180 2010-03-04 22:58:32Z ian $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
@@ -155,11 +155,11 @@
 	* @param string The sub-drectory to upload the media to
 	* @since 1.0
 	*/
-	function media_manager($directory = '', $alt = 'Upload')
+	function media_manager($folder = '', $alt = 'Upload')
 	{
 		$bar = & JToolBar::getInstance('toolbar');
 		// Add an upload button
-		$bar->appendButton( 'Popup', 'upload', $alt, "index.php?option=com_media&tmpl=component&task=popupUpload&directory=$directory", 640, 520 );
+		$bar->appendButton( 'Popup', 'upload', $alt, "index.php?option=com_media&tmpl=component&task=popupUpload&folder=$folder", 640, 520 );
 	}
 
 	/**
diff -aruN --binary 15/administrator/index2.php 16/administrator/index2.php
--- 15/administrator/index2.php	2009-05-29 13:51:56.000000000 +0200
+++ 16/administrator/index2.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: index2.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: index2.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/index3.php 16/administrator/index3.php
--- 15/administrator/index3.php	2009-05-29 13:51:56.000000000 +0200
+++ 16/administrator/index3.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: index3.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: index3.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/index.php 16/administrator/index.php
--- 15/administrator/index.php	2009-05-29 13:51:56.000000000 +0200
+++ 16/administrator/index.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: index.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: index.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/language/en-GB/en-GB.com_admin.ini 16/administrator/language/en-GB/en-GB.com_admin.ini
--- 15/administrator/language/en-GB/en-GB.com_admin.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.com_admin.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.com_admin.ini 11613 2009-02-07 13:41:23Z kdevine $
+# $Id: en-GB.com_admin.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.com_banners.ini 16/administrator/language/en-GB/en-GB.com_banners.ini
--- 15/administrator/language/en-GB/en-GB.com_banners.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.com_banners.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.com_banners.ini 10554 2008-07-15 17:15:19Z ircmaxell $
+# $Id: en-GB.com_banners.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.com_banners.menu.ini 16/administrator/language/en-GB/en-GB.com_banners.menu.ini
--- 15/administrator/language/en-GB/en-GB.com_banners.menu.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.com_banners.menu.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.com_banners.menu.ini 10388 2008-06-03 11:16:20Z pasamio $
+# $Id: en-GB.com_banners.menu.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.com_cache.ini 16/administrator/language/en-GB/en-GB.com_cache.ini
--- 15/administrator/language/en-GB/en-GB.com_cache.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.com_cache.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.com_cache.ini 11403 2009-01-06 06:19:31Z ian $
+# $Id: en-GB.com_cache.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.com_categories.ini 16/administrator/language/en-GB/en-GB.com_categories.ini
--- 15/administrator/language/en-GB/en-GB.com_categories.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.com_categories.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.com_categories.ini 11622 2009-02-15 15:16:27Z kdevine $
+# $Id: en-GB.com_categories.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.com_checkin.ini 16/administrator/language/en-GB/en-GB.com_checkin.ini
--- 15/administrator/language/en-GB/en-GB.com_checkin.ini	2009-05-29 13:50:46.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.com_checkin.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.com_checkin.ini 10388 2008-06-03 11:16:20Z pasamio $
+# $Id: en-GB.com_checkin.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.com_config.ini 16/administrator/language/en-GB/en-GB.com_config.ini
--- 15/administrator/language/en-GB/en-GB.com_config.ini	2009-06-30 21:01:32.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.com_config.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.com_config.ini 12308 2009-06-23 04:05:28Z ian $
+# $Id: en-GB.com_config.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.com_contact.ini 16/administrator/language/en-GB/en-GB.com_contact.ini
--- 15/administrator/language/en-GB/en-GB.com_contact.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.com_contact.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.com_contact.ini 11624 2009-02-15 15:26:38Z kdevine $
+# $Id: en-GB.com_contact.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.com_contact.menu.ini 16/administrator/language/en-GB/en-GB.com_contact.menu.ini
--- 15/administrator/language/en-GB/en-GB.com_contact.menu.ini	2009-05-29 13:50:46.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.com_contact.menu.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.com_contact.menu.ini 10388 2008-06-03 11:16:20Z pasamio $
+# $Id: en-GB.com_contact.menu.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.com_content.ini 16/administrator/language/en-GB/en-GB.com_content.ini
--- 15/administrator/language/en-GB/en-GB.com_content.ini	2009-11-04 18:51:18.000000000 +0100
+++ 16/administrator/language/en-GB/en-GB.com_content.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.com_content.ini 12768 2009-09-17 04:46:46Z ian $
+# $Id: en-GB.com_content.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.com_cpanel.ini 16/administrator/language/en-GB/en-GB.com_cpanel.ini
--- 15/administrator/language/en-GB/en-GB.com_cpanel.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.com_cpanel.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.com_cpanel.ini $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.com_frontpage.ini 16/administrator/language/en-GB/en-GB.com_frontpage.ini
--- 15/administrator/language/en-GB/en-GB.com_frontpage.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.com_frontpage.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.com_frontpage.ini 10496 2008-07-03 07:08:39Z ircmaxell $
+# $Id: en-GB.com_frontpage.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.com_installer.ini 16/administrator/language/en-GB/en-GB.com_installer.ini
--- 15/administrator/language/en-GB/en-GB.com_installer.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.com_installer.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.com_installer.ini 11788 2009-04-24 18:32:46Z kdevine $
+# $Id: en-GB.com_installer.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.com_languages.ini 16/administrator/language/en-GB/en-GB.com_languages.ini
--- 15/administrator/language/en-GB/en-GB.com_languages.ini	2009-05-29 13:50:46.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.com_languages.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.com_languages.ini 10496 2008-07-03 07:08:39Z ircmaxell $
+# $Id: en-GB.com_languages.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.com_login.ini 16/administrator/language/en-GB/en-GB.com_login.ini
--- 15/administrator/language/en-GB/en-GB.com_login.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.com_login.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.com_login.ini 10388 2008-06-03 11:16:20Z pasamio $
+# $Id: en-GB.com_login.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.com_massmail.ini 16/administrator/language/en-GB/en-GB.com_massmail.ini
--- 15/administrator/language/en-GB/en-GB.com_massmail.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.com_massmail.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.com_massmail.ini 10496 2008-07-03 07:08:39Z ircmaxell $
+# $Id: en-GB.com_massmail.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.com_media.ini 16/administrator/language/en-GB/en-GB.com_media.ini
--- 15/administrator/language/en-GB/en-GB.com_media.ini	2009-11-04 18:51:18.000000000 +0100
+++ 16/administrator/language/en-GB/en-GB.com_media.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.com_media.ini 13311 2009-10-24 04:13:49Z ian $
+# $Id: en-GB.com_media.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.com_menus.ini 16/administrator/language/en-GB/en-GB.com_menus.ini
--- 15/administrator/language/en-GB/en-GB.com_menus.ini	2009-05-29 13:50:46.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.com_menus.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.com_menus.ini 11625 2009-02-15 15:32:42Z kdevine $
+# $Id: en-GB.com_menus.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.com_menus.menu.ini 16/administrator/language/en-GB/en-GB.com_menus.menu.ini
--- 15/administrator/language/en-GB/en-GB.com_menus.menu.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.com_menus.menu.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.com_menus.menu.ini 9076 2007-09-29 13:11:48Z humvee $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.com_messages.ini 16/administrator/language/en-GB/en-GB.com_messages.ini
--- 15/administrator/language/en-GB/en-GB.com_messages.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.com_messages.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.com_messages.ini 10496 2008-07-03 07:08:39Z ircmaxell $
+# $Id: en-GB.com_messages.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.com_modules.ini 16/administrator/language/en-GB/en-GB.com_modules.ini
--- 15/administrator/language/en-GB/en-GB.com_modules.ini	2009-05-29 13:50:46.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.com_modules.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.com_modules.ini 10496 2008-07-03 07:08:39Z ircmaxell $
+# $Id: en-GB.com_modules.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.com_newsfeeds.ini 16/administrator/language/en-GB/en-GB.com_newsfeeds.ini
--- 15/administrator/language/en-GB/en-GB.com_newsfeeds.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.com_newsfeeds.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.com_newsfeeds.ini 11371 2008-12-30 01:31:50Z ian $
+# $Id: en-GB.com_newsfeeds.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.com_newsfeeds.menu.ini 16/administrator/language/en-GB/en-GB.com_newsfeeds.menu.ini
--- 15/administrator/language/en-GB/en-GB.com_newsfeeds.menu.ini	2009-05-29 13:50:46.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.com_newsfeeds.menu.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.com_newsfeeds.menu.ini 10388 2008-06-03 11:16:20Z pasamio $
+# $Id: en-GB.com_newsfeeds.menu.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.com_plugins.ini 16/administrator/language/en-GB/en-GB.com_plugins.ini
--- 15/administrator/language/en-GB/en-GB.com_plugins.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.com_plugins.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.com_plugins.ini 10388 2008-06-03 11:16:20Z pasamio $
+# $Id: en-GB.com_plugins.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.com_poll.ini 16/administrator/language/en-GB/en-GB.com_poll.ini
--- 15/administrator/language/en-GB/en-GB.com_poll.ini	2009-05-29 13:50:46.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.com_poll.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.com_poll.ini 10496 2008-07-03 07:08:39Z ircmaxell $
+# $Id: en-GB.com_poll.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.com_poll.menu.ini 16/administrator/language/en-GB/en-GB.com_poll.menu.ini
--- 15/administrator/language/en-GB/en-GB.com_poll.menu.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.com_poll.menu.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.com_poll.menu.ini 10388 2008-06-03 11:16:20Z pasamio $
+# $Id: en-GB.com_poll.menu.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.com_search.ini 16/administrator/language/en-GB/en-GB.com_search.ini
--- 15/administrator/language/en-GB/en-GB.com_search.ini	2009-05-29 13:50:46.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.com_search.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.com_search.ini 10388 2008-06-03 11:16:20Z pasamio $
+# $Id: en-GB.com_search.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.com_search.menu.ini 16/administrator/language/en-GB/en-GB.com_search.menu.ini
--- 15/administrator/language/en-GB/en-GB.com_search.menu.ini	2009-05-29 13:50:46.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.com_search.menu.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.com_search.menu.ini 10388 2008-06-03 11:16:20Z pasamio $
+# $Id: en-GB.com_search.menu.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.com_sections.ini 16/administrator/language/en-GB/en-GB.com_sections.ini
--- 15/administrator/language/en-GB/en-GB.com_sections.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.com_sections.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.com_sections.ini 10388 2008-06-03 11:16:20Z pasamio $
+# $Id: en-GB.com_sections.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.com_templates.ini 16/administrator/language/en-GB/en-GB.com_templates.ini
--- 15/administrator/language/en-GB/en-GB.com_templates.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.com_templates.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.com_templates.ini 10496 2008-07-03 07:08:39Z ircmaxell $
+# $Id: en-GB.com_templates.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.com_trash.ini 16/administrator/language/en-GB/en-GB.com_trash.ini
--- 15/administrator/language/en-GB/en-GB.com_trash.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.com_trash.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.com_trash.ini 10496 2008-07-03 07:08:39Z ircmaxell $
+# $Id: en-GB.com_trash.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.com_user.ini 16/administrator/language/en-GB/en-GB.com_user.ini
--- 15/administrator/language/en-GB/en-GB.com_user.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.com_user.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.com_login.ini 8913 2007-09-15 11:00:25Z humvee $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.com_users.ini 16/administrator/language/en-GB/en-GB.com_users.ini
--- 15/administrator/language/en-GB/en-GB.com_users.ini	2009-05-29 13:50:46.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.com_users.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.com_users.ini 10496 2008-07-03 07:08:39Z ircmaxell $
+# $Id: en-GB.com_users.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.com_weblinks.ini 16/administrator/language/en-GB/en-GB.com_weblinks.ini
--- 15/administrator/language/en-GB/en-GB.com_weblinks.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.com_weblinks.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.com_weblinks.ini 10496 2008-07-03 07:08:39Z ircmaxell $
+# $Id: en-GB.com_weblinks.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.com_weblinks.menu.ini 16/administrator/language/en-GB/en-GB.com_weblinks.menu.ini
--- 15/administrator/language/en-GB/en-GB.com_weblinks.menu.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.com_weblinks.menu.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.com_weblinks.menu.ini 10388 2008-06-03 11:16:20Z pasamio $
+# $Id: en-GB.com_weblinks.menu.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.com_wrapper.ini 16/administrator/language/en-GB/en-GB.com_wrapper.ini
--- 15/administrator/language/en-GB/en-GB.com_wrapper.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.com_wrapper.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.com_wrapper.ini 10496 2008-07-03 07:08:39Z ircmaxell $
+# $Id: en-GB.com_wrapper.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.ini 16/administrator/language/en-GB/en-GB.ini
--- 15/administrator/language/en-GB/en-GB.ini	2009-11-04 18:51:18.000000000 +0100
+++ 16/administrator/language/en-GB/en-GB.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.ini 13243 2009-10-20 04:01:04Z ian $
+# $Id: en-GB.ini 16380 2010-04-23 09:19:48Z ian $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
@@ -95,7 +95,7 @@
 (UTC -03:00) BRAZIL, BUENOS AIRES, GEORGETOWN=(UTC -03:00) Brazil, Buenos Aires, Georgetown
 (UTC -02:00) MID-ATLANTIC=(UTC -02:00) Mid-Atlantic
 (UTC -01:00) AZORES, CAPE VERDE ISLANDS=(UTC -01:00) Azores, Cape Verde Islands
-(UTC 00:00) WESTERN EUROPE TIME, LONDON, LISBON, CASABLANCA=(UTC 00:00) Western Europe Time, London, Lisbon, Casablanca
+(UTC 00:00) WESTERN EUROPE TIME, LONDON, LISBON, CASABLANCA=(UTC 00:00) Western Europe Time, London, Lisbon, Casablanca, Reykjavik
 (UTC +01:00) AMSTERDAM, BERLIN, BRUSSELS, COPENHAGEN, MADRID, PARIS=(UTC +01:00) Amsterdam, Berlin, Brussels, Copenhagen, Madrid, Paris
 (UTC +02:00) ISTANBUL, JERUSALEM, KALININGRAD, SOUTH AFRICA=(UTC +02:00) Istanbul, Jerusalem, Kaliningrad, South Africa
 (UTC +03:00) BAGHDAD, RIYADH, MOSCOW, ST. PETERSBURG=(UTC +03:00) Baghdad, Riyadh, Moscow, St. Petersburg
@@ -107,7 +107,7 @@
 (UTC +05:45) KATHMANDU=(UTC +05:45) Kathmandu
 (UTC +06:00) ALMATY, DHAKA=(UTC +06:00) Almaty, Dhaka
 (UTC +06:30) YAGOON=(UTC +06:30) Yagoon
-(UTC +07:00) BANGKOK, HANOI, JAKARTA=(UTC +07:00) Bangkok, Hanoi, Jakarta
+(UTC +07:00) BANGKOK, HANOI, JAKARTA=(UTC +07:00) Bangkok, Hanoi, Jakarta, Phnom Penh
 (UTC +08:00) BEIJING, PERTH, SINGAPORE, HONG KONG=(UTC +08:00) Beijing, Perth, Singapore, Hong Kong
 (UTC +08:00) ULAANBAATAR, WESTERN AUSTRALIA=(UTC +08:00) Ulaanbaatar, Western Australia
 (UTC +09:00) TOKYO, SEOUL, OSAKA, SAPPORO, YAKUTSK=(UTC +09:00) Tokyo, Seoul, Osaka, Sapporo, Yakutsk
diff -aruN --binary 15/administrator/language/en-GB/en-GB.mod_components.ini 16/administrator/language/en-GB/en-GB.mod_components.ini
--- 15/administrator/language/en-GB/en-GB.mod_components.ini	2009-05-29 13:50:46.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.mod_components.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.mod_components.ini 10388 2008-06-03 11:16:20Z pasamio $
+# $Id: en-GB.mod_components.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.mod_custom.ini 16/administrator/language/en-GB/en-GB.mod_custom.ini
--- 15/administrator/language/en-GB/en-GB.mod_custom.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.mod_custom.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.mod_custom.ini 10388 2008-06-03 11:16:20Z pasamio $
+# $Id: en-GB.mod_custom.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.mod_feed.ini 16/administrator/language/en-GB/en-GB.mod_feed.ini
--- 15/administrator/language/en-GB/en-GB.mod_feed.ini	2009-05-29 13:50:46.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.mod_feed.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.mod_feed.ini 11299 2008-11-22 01:40:44Z ian $
+# $Id: en-GB.mod_feed.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.mod_footer.ini 16/administrator/language/en-GB/en-GB.mod_footer.ini
--- 15/administrator/language/en-GB/en-GB.mod_footer.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.mod_footer.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.mod_footer.ini 10496 2008-07-03 07:08:39Z ircmaxell $
+# $Id: en-GB.mod_footer.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.mod_latest.ini 16/administrator/language/en-GB/en-GB.mod_latest.ini
--- 15/administrator/language/en-GB/en-GB.mod_latest.ini	2009-05-29 13:50:46.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.mod_latest.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.mod_latest.ini 10388 2008-06-03 11:16:20Z pasamio $
+# $Id: en-GB.mod_latest.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.mod_logged.ini 16/administrator/language/en-GB/en-GB.mod_logged.ini
--- 15/administrator/language/en-GB/en-GB.mod_logged.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.mod_logged.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.mod_logged.ini 10388 2008-06-03 11:16:20Z pasamio $
+# $Id: en-GB.mod_logged.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.mod_login.ini 16/administrator/language/en-GB/en-GB.mod_login.ini
--- 15/administrator/language/en-GB/en-GB.mod_login.ini	2009-05-29 13:50:46.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.mod_login.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.mod_login.ini 10388 2008-06-03 11:16:20Z pasamio $
+# $Id: en-GB.mod_login.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.mod_menu.ini 16/administrator/language/en-GB/en-GB.mod_menu.ini
--- 15/administrator/language/en-GB/en-GB.mod_menu.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.mod_menu.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.mod_menu.ini 11393 2009-01-05 02:11:06Z ian $
+# $Id: en-GB.mod_menu.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.mod_online.ini 16/administrator/language/en-GB/en-GB.mod_online.ini
--- 15/administrator/language/en-GB/en-GB.mod_online.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.mod_online.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.mod_online.ini 10388 2008-06-03 11:16:20Z pasamio $
+# $Id: en-GB.mod_online.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.mod_popular.ini 16/administrator/language/en-GB/en-GB.mod_popular.ini
--- 15/administrator/language/en-GB/en-GB.mod_popular.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.mod_popular.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.mod_popular.ini 10388 2008-06-03 11:16:20Z pasamio $
+# $Id: en-GB.mod_popular.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.mod_quickicon.ini 16/administrator/language/en-GB/en-GB.mod_quickicon.ini
--- 15/administrator/language/en-GB/en-GB.mod_quickicon.ini	2009-06-25 13:03:52.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.mod_quickicon.ini	2010-04-25 01:22:16.000000000 +0200
@@ -1,8 +1,9 @@
-# $Id: en-GB.mod_quickicon.ini 10388 2008-06-03 11:16:20Z pasamio $
-# Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
-# License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
-# Note : All ini files need to be saved as UTF-8 - No BOM
+# $Id: en-GB.mod_quickicon.ini 14401 2010-04-25 01:22:15 louis ~0 $
+# author Joomla! Project
+# copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
+# license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
+
+# Note : All ini files need to be saved as UTF-8
 
 ADD NEW ARTICLE=Add New Article
 CATEGORY MANAGER=Category Manager
diff -aruN --binary 15/administrator/language/en-GB/en-GB.mod_stats.ini 16/administrator/language/en-GB/en-GB.mod_stats.ini
--- 15/administrator/language/en-GB/en-GB.mod_stats.ini	2009-05-29 13:50:46.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.mod_stats.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.mod_stats.ini 10388 2008-06-03 11:16:20Z pasamio $
+# $Id: en-GB.mod_stats.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.mod_status.ini 16/administrator/language/en-GB/en-GB.mod_status.ini
--- 15/administrator/language/en-GB/en-GB.mod_status.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.mod_status.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.mod_status.ini 10388 2008-06-03 11:16:20Z pasamio $
+# $Id: en-GB.mod_status.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.mod_submenu.ini 16/administrator/language/en-GB/en-GB.mod_submenu.ini
--- 15/administrator/language/en-GB/en-GB.mod_submenu.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.mod_submenu.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.mod_submenu.ini 10388 2008-06-03 11:16:20Z pasamio $
+# $Id: en-GB.mod_submenu.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.mod_title.ini 16/administrator/language/en-GB/en-GB.mod_title.ini
--- 15/administrator/language/en-GB/en-GB.mod_title.ini	2009-05-29 13:50:46.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.mod_title.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.mod_title.ini 10388 2008-06-03 11:16:20Z pasamio $
+# $Id: en-GB.mod_title.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.mod_toolbar.ini 16/administrator/language/en-GB/en-GB.mod_toolbar.ini
--- 15/administrator/language/en-GB/en-GB.mod_toolbar.ini	2009-05-29 13:50:46.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.mod_toolbar.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.mod_toolbar.ini 10496 2008-07-03 07:08:39Z ircmaxell $
+# $Id: en-GB.mod_toolbar.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.mod_unread.ini 16/administrator/language/en-GB/en-GB.mod_unread.ini
--- 15/administrator/language/en-GB/en-GB.mod_unread.ini	2009-05-29 13:50:46.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.mod_unread.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.mod_unread.ini 10388 2008-06-03 11:16:20Z pasamio $
+# $Id: en-GB.mod_unread.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.plg_authentication_example.ini 16/administrator/language/en-GB/en-GB.plg_authentication_example.ini
--- 15/administrator/language/en-GB/en-GB.plg_authentication_example.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.plg_authentication_example.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.plg_authentication_example.ini 10496 2008-07-03 07:08:39Z ircmaxell $
+# $Id: en-GB.plg_authentication_example.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.plg_authentication_gmail.ini 16/administrator/language/en-GB/en-GB.plg_authentication_gmail.ini
--- 15/administrator/language/en-GB/en-GB.plg_authentication_gmail.ini	2009-05-29 13:50:46.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.plg_authentication_gmail.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.plg_authentication_gmail.ini 10388 2008-06-03 11:16:20Z pasamio $
+# $Id: en-GB.plg_authentication_gmail.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.plg_authentication_joomla.ini 16/administrator/language/en-GB/en-GB.plg_authentication_joomla.ini
--- 15/administrator/language/en-GB/en-GB.plg_authentication_joomla.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.plg_authentication_joomla.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.plg_authentication_joomla.ini 10496 2008-07-03 07:08:39Z ircmaxell $
+# $Id: en-GB.plg_authentication_joomla.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.plg_authentication_ldap.ini 16/administrator/language/en-GB/en-GB.plg_authentication_ldap.ini
--- 15/administrator/language/en-GB/en-GB.plg_authentication_ldap.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.plg_authentication_ldap.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.plg_authentication_ldap.ini 10496 2008-07-03 07:08:39Z ircmaxell $
+# $Id: en-GB.plg_authentication_ldap.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.plg_authentication_openid.ini 16/administrator/language/en-GB/en-GB.plg_authentication_openid.ini
--- 15/administrator/language/en-GB/en-GB.plg_authentication_openid.ini	2009-05-29 13:50:46.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.plg_authentication_openid.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.plg_authentication_openid.ini
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.plg_content_code.ini 16/administrator/language/en-GB/en-GB.plg_content_code.ini
--- 15/administrator/language/en-GB/en-GB.plg_content_code.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.plg_content_code.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.plg_content_code.ini 10388 2008-06-03 11:16:20Z pasamio $
+# $Id: en-GB.plg_content_code.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.plg_content_emailcloak.ini 16/administrator/language/en-GB/en-GB.plg_content_emailcloak.ini
--- 15/administrator/language/en-GB/en-GB.plg_content_emailcloak.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.plg_content_emailcloak.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.plg_content_emailcloak.ini 10496 2008-07-03 07:08:39Z ircmaxell $
+# $Id: en-GB.plg_content_emailcloak.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.plg_content_geshi.ini 16/administrator/language/en-GB/en-GB.plg_content_geshi.ini
--- 15/administrator/language/en-GB/en-GB.plg_content_geshi.ini	2009-05-29 13:50:46.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.plg_content_geshi.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.plg_content_geshi.ini 10388 2008-06-03 11:16:20Z pasamio $
+# $Id: en-GB.plg_content_geshi.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.plg_content_image.ini 16/administrator/language/en-GB/en-GB.plg_content_image.ini
--- 15/administrator/language/en-GB/en-GB.plg_content_image.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.plg_content_image.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.plg_content_image.ini 10496 2008-07-03 07:08:39Z ircmaxell $
+# $Id: en-GB.plg_content_image.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.plg_content_loadmodule.ini 16/administrator/language/en-GB/en-GB.plg_content_loadmodule.ini
--- 15/administrator/language/en-GB/en-GB.plg_content_loadmodule.ini	2009-05-29 13:50:46.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.plg_content_loadmodule.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.plg_content_loadmodule.ini 10496 2008-07-03 07:08:39Z ircmaxell $
+# $Id: en-GB.plg_content_loadmodule.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.plg_content_pagebreak.ini 16/administrator/language/en-GB/en-GB.plg_content_pagebreak.ini
--- 15/administrator/language/en-GB/en-GB.plg_content_pagebreak.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.plg_content_pagebreak.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.plg_content_pagebreak.ini 10496 2008-07-03 07:08:39Z ircmaxell $
+# $Id: en-GB.plg_content_pagebreak.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.plg_content_pagenavigation.ini 16/administrator/language/en-GB/en-GB.plg_content_pagenavigation.ini
--- 15/administrator/language/en-GB/en-GB.plg_content_pagenavigation.ini	2009-05-29 13:50:46.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.plg_content_pagenavigation.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.plg_content_pagenavigation.ini 10388 2008-06-03 11:16:20Z pasamio $
+# $Id: en-GB.plg_content_pagenavigation.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.plg_content_vote.ini 16/administrator/language/en-GB/en-GB.plg_content_vote.ini
--- 15/administrator/language/en-GB/en-GB.plg_content_vote.ini	2009-05-29 13:50:46.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.plg_content_vote.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.plg_content_vote.ini 10388 2008-06-03 11:16:20Z pasamio $
+# $Id: en-GB.plg_content_vote.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.plg_editors_none.ini 16/administrator/language/en-GB/en-GB.plg_editors_none.ini
--- 15/administrator/language/en-GB/en-GB.plg_editors_none.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.plg_editors_none.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.plg_editors_none.ini 10496 2008-07-03 07:08:39Z ircmaxell $
+# $Id: en-GB.plg_editors_none.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini 16/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini
--- 15/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini	2009-11-04 18:51:18.000000000 +0100
+++ 16/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.plg_editors_tinymce.ini 13247 2009-10-20 04:27:52Z ian $
+# $Id: en-GB.plg_editors_tinymce.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.plg_editors_xstandard.ini 16/administrator/language/en-GB/en-GB.plg_editors_xstandard.ini
--- 15/administrator/language/en-GB/en-GB.plg_editors_xstandard.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.plg_editors_xstandard.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.plg_editors_xstandard.ini 10496 2008-07-03 07:08:39Z ircmaxell $
+# $Id: en-GB.plg_editors_xstandard.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.plg_editors-xtd_image.ini 16/administrator/language/en-GB/en-GB.plg_editors-xtd_image.ini
--- 15/administrator/language/en-GB/en-GB.plg_editors-xtd_image.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.plg_editors-xtd_image.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.plg_editors-xtd_image.ini 10496 2008-07-03 07:08:39Z ircmaxell $
+# $Id: en-GB.plg_editors-xtd_image.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.ini 16/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.ini
--- 15/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.plg_editors-xtd_pagebreak.ini 10388 2008-06-03 11:16:20Z pasamio $
+# $Id: en-GB.plg_editors-xtd_pagebreak.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.ini 16/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.ini
--- 15/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.plg_editors-xtd_readmore.ini 10496 2008-07-03 07:08:39Z ircmaxell $
+# $Id: en-GB.plg_editors-xtd_readmore.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.plg_search_categories.ini 16/administrator/language/en-GB/en-GB.plg_search_categories.ini
--- 15/administrator/language/en-GB/en-GB.plg_search_categories.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.plg_search_categories.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.plg_search_categories.ini 10388 2008-06-03 11:16:20Z pasamio $
+# $Id: en-GB.plg_search_categories.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.plg_search_contacts.ini 16/administrator/language/en-GB/en-GB.plg_search_contacts.ini
--- 15/administrator/language/en-GB/en-GB.plg_search_contacts.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.plg_search_contacts.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.plg_search_contacts.ini 10496 2008-07-03 07:08:39Z ircmaxell $
+# $Id: en-GB.plg_search_contacts.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.plg_search_content.ini 16/administrator/language/en-GB/en-GB.plg_search_content.ini
--- 15/administrator/language/en-GB/en-GB.plg_search_content.ini	2009-05-29 13:50:46.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.plg_search_content.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.plg_search_content.ini 10388 2008-06-03 11:16:20Z pasamio $
+# $Id: en-GB.plg_search_content.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.plg_search_newsfeeds.ini 16/administrator/language/en-GB/en-GB.plg_search_newsfeeds.ini
--- 15/administrator/language/en-GB/en-GB.plg_search_newsfeeds.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.plg_search_newsfeeds.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.plg_search_newsfeeds.ini 10388 2008-06-03 11:16:20Z pasamio $
+# $Id: en-GB.plg_search_newsfeeds.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.plg_search_sections.ini 16/administrator/language/en-GB/en-GB.plg_search_sections.ini
--- 15/administrator/language/en-GB/en-GB.plg_search_sections.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.plg_search_sections.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.plg_search_sections.ini 10388 2008-06-03 11:16:20Z pasamio $
+# $Id: en-GB.plg_search_sections.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.plg_search_weblinks.ini 16/administrator/language/en-GB/en-GB.plg_search_weblinks.ini
--- 15/administrator/language/en-GB/en-GB.plg_search_weblinks.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.plg_search_weblinks.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.plg_search_weblinks.ini 10388 2008-06-03 11:16:20Z pasamio $
+# $Id: en-GB.plg_search_weblinks.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.plg_system_backlink.ini 16/administrator/language/en-GB/en-GB.plg_system_backlink.ini
--- 15/administrator/language/en-GB/en-GB.plg_system_backlink.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.plg_system_backlink.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.plg_system_backlink.ini  2007-09-29 11:00:25Z humvee $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.plg_system_cache.ini 16/administrator/language/en-GB/en-GB.plg_system_cache.ini
--- 15/administrator/language/en-GB/en-GB.plg_system_cache.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.plg_system_cache.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.plg_system_cache.ini
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.plg_system_debug.ini 16/administrator/language/en-GB/en-GB.plg_system_debug.ini
--- 15/administrator/language/en-GB/en-GB.plg_system_debug.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.plg_system_debug.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.plg_system_debug.ini 10496 2008-07-03 07:08:39Z ircmaxell $
+# $Id: en-GB.plg_system_debug.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.plg_system_legacy.ini 16/administrator/language/en-GB/en-GB.plg_system_legacy.ini
--- 15/administrator/language/en-GB/en-GB.plg_system_legacy.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.plg_system_legacy.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.plg_system_legacy.ini
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.plg_system_sef.ini 16/administrator/language/en-GB/en-GB.plg_system_sef.ini
--- 15/administrator/language/en-GB/en-GB.plg_system_sef.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.plg_system_sef.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.plg_system_sef.ini 10388 2008-06-03 11:16:20Z pasamio $
+# $Id: en-GB.plg_system_sef.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.plg_user_joomla.ini 16/administrator/language/en-GB/en-GB.plg_user_joomla.ini
--- 15/administrator/language/en-GB/en-GB.plg_user_joomla.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.plg_user_joomla.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.plg_user_joomla.ini 10388 2008-06-03 11:16:20Z pasamio $
+# $Id: en-GB.plg_user_joomla.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.plg_xmlrpc_blogger.ini 16/administrator/language/en-GB/en-GB.plg_xmlrpc_blogger.ini
--- 15/administrator/language/en-GB/en-GB.plg_xmlrpc_blogger.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.plg_xmlrpc_blogger.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.plg_xmlrpc_blogger.ini 10496 2008-07-03 07:08:39Z ircmaxell $
+# $Id: en-GB.plg_xmlrpc_blogger.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.plg_xmlrpc_joomla.ini 16/administrator/language/en-GB/en-GB.plg_xmlrpc_joomla.ini
--- 15/administrator/language/en-GB/en-GB.plg_xmlrpc_joomla.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.plg_xmlrpc_joomla.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.plg_xmlrpc_joomla.ini 10388 2008-06-03 11:16:20Z pasamio $
+# $Id: en-GB.plg_xmlrpc_joomla.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.tpl_beez.ini 16/administrator/language/en-GB/en-GB.tpl_beez.ini
--- 15/administrator/language/en-GB/en-GB.tpl_beez.ini	2009-05-29 13:50:46.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.tpl_beez.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.tpl_beez.ini 1.5.0 2007-04-13 11:55:43 ff 0$
 # author Joomla! Project
-# copyright Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 # Note : All ini files need to be saved as UTF-8 - No BOM
 HEADER LEVEL COMPONENT=Header level Component
diff -aruN --binary 15/administrator/language/en-GB/en-GB.tpl_ja_purity.ini 16/administrator/language/en-GB/en-GB.tpl_ja_purity.ini
--- 15/administrator/language/en-GB/en-GB.tpl_ja_purity.ini	2009-05-29 13:50:46.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.tpl_ja_purity.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.tpl_ja_purity.ini 11403 2009-01-06 06:19:31Z ian $
+# $Id: en-GB.tpl_ja_purity.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2007 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.tpl_khepri.ini 16/administrator/language/en-GB/en-GB.tpl_khepri.ini
--- 15/administrator/language/en-GB/en-GB.tpl_khepri.ini	2009-05-29 13:50:44.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.tpl_khepri.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.tpl_khepri.ini 8057 2007-07-18 15:05:56Z humvee $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.tpl_rhuk_milkyway.ini 16/administrator/language/en-GB/en-GB.tpl_rhuk_milkyway.ini
--- 15/administrator/language/en-GB/en-GB.tpl_rhuk_milkyway.ini	2009-05-29 13:50:46.000000000 +0200
+++ 16/administrator/language/en-GB/en-GB.tpl_rhuk_milkyway.ini	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.tpl_rhuk_milkyway.ini 11394 2009-01-05 15:28:11Z kdevine $
+# $Id: en-GB.tpl_rhuk_milkyway.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/administrator/language/en-GB/en-GB.xml 16/administrator/language/en-GB/en-GB.xml
--- 15/administrator/language/en-GB/en-GB.xml	2009-11-04 18:51:18.000000000 +0100
+++ 16/administrator/language/en-GB/en-GB.xml	2010-04-23 13:40:12.000000000 +0200
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id: en-GB.xml 13357 2009-10-28 02:45:40Z ian $ -->
+<!-- $Id: en-GB.xml 14401 2010-01-26 14:10:00Z louis $ -->
 <metafile version="1.5" client="administrator">
 	<name>English(United Kingdom)</name>
 	<version>1.5.15</version>
@@ -7,7 +7,7 @@
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
-	<copyright>Copyright (C) 2005 - 2009 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<description></description>
 	<metadata>
diff -aruN --binary 15/administrator/language/es-ES/es-ES.com_admin.ini 16/administrator/language/es-ES/es-ES.com_admin.ini
--- 15/administrator/language/es-ES/es-ES.com_admin.ini	2009-07-25 17:10:26.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.com_admin.ini	2010-04-25 01:59:40.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_admin.ini 1.5.0 2009-05-21 08:09:42 17:00:11 ~0 $
+# $Id: es-ES.com_admin.ini 1.5.0 2010-04-25 01:59:38 17:00:11 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.com_banners.ini 16/administrator/language/es-ES/es-ES.com_banners.ini
--- 15/administrator/language/es-ES/es-ES.com_banners.ini	2009-07-25 17:10:26.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.com_banners.ini	2010-04-25 02:00:20.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_banners.ini 1.5.0 2009-05-21 08:11:47 15:27:36 ~0 $
+# $Id: es-ES.com_banners.ini 1.5.0 2010-04-25 02:00:19 15:27:36 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.com_banners.menu.ini 16/administrator/language/es-ES/es-ES.com_banners.menu.ini
--- 15/administrator/language/es-ES/es-ES.com_banners.menu.ini	2009-07-25 17:10:26.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.com_banners.menu.ini	2010-04-25 02:05:42.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_banners.menu.ini 1.5.0 2009-05-21 08:12:21 02:29:07 ~0 $
+# $Id: es-ES.com_banners.menu.ini 1.5.0 2010-04-25 02:05:40 02:29:07 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.com_cache.ini 16/administrator/language/es-ES/es-ES.com_cache.ini
--- 15/administrator/language/es-ES/es-ES.com_cache.ini	2009-07-25 17:10:26.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.com_cache.ini	2010-04-25 02:06:08.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_cache.ini 1.5.0 2009-05-21 08:14:11 15:28:17 ~0 $
+# $Id: es-ES.com_cache.ini 1.5.0 2010-04-25 02:06:07 15:28:17 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.com_categories.ini 16/administrator/language/es-ES/es-ES.com_categories.ini
--- 15/administrator/language/es-ES/es-ES.com_categories.ini	2009-07-25 17:10:26.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.com_categories.ini	2010-04-25 14:10:10.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_categories.ini 1.5.0 2009-05-21 08:19:41 15:32:16 ~0 $
+# $Id: es-ES.com_categories.ini 1.5.0 2010-04-25 14:10:08 15:32:16 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
@@ -59,7 +59,7 @@
 NEWS FEEDS CATEGORIES=Categorías del servidor de noticias
 NEWS FEEDS MANAGER=Gestor del servidor de noticias
 NEWSFEED CATEGORY TABLE=Tabla de categorías del servidor de noticias
-NOTE: IF SAME SECTION=NOTa: Si se selecciona una sección, una nueva "copia del <em>nombredelacategoría</em>" se creará en la sección actual.
+NOTE: IF SAME SECTION=NOTa: Si se selecciona una sección, una nueva "copia del <em>nombre de la categoría</em>" se creará en la sección actual.
 ORDER BY=Ordenar por
 ORDERING=Orden de la categoría
 PLEASE ENTER A NAME FOR THIS MENU ITEM=Por favor, introduce un nombre para este elemento del menú
diff -aruN --binary 15/administrator/language/es-ES/es-ES.com_checkin.ini 16/administrator/language/es-ES/es-ES.com_checkin.ini
--- 15/administrator/language/es-ES/es-ES.com_checkin.ini	2009-07-25 17:10:26.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.com_checkin.ini	2010-04-25 14:10:30.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_checkin.ini 1.5.0 2009-06-28 06:42:35 15:32:52 ~0 $
+# $Id: es-ES.com_checkin.ini 1.5.0 2010-04-25 14:10:29 15:32:52 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.com_config.ini 16/administrator/language/es-ES/es-ES.com_config.ini
--- 15/administrator/language/es-ES/es-ES.com_config.ini	2009-11-05 16:29:12.000000000 +0100
+++ 16/administrator/language/es-ES/es-ES.com_config.ini	2010-04-25 14:13:10.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_config.ini 1.5.0 2009-11-05 16:29:12 15:45:22 ~0 $
+# $Id: es-ES.com_config.ini 1.5.0 2010-04-25 14:13:09 15:45:22 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.com_contact.ini 16/administrator/language/es-ES/es-ES.com_contact.ini
--- 15/administrator/language/es-ES/es-ES.com_contact.ini	2009-07-25 17:10:24.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.com_contact.ini	2010-04-25 14:13:56.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_contact.ini 1.5.0 2009-05-21 08:37:11 15:48:25 ~0 $
+# $Id: es-ES.com_contact.ini 1.5.0 2010-04-25 14:13:55 15:48:25 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.com_contact.menu.ini 16/administrator/language/es-ES/es-ES.com_contact.menu.ini
--- 15/administrator/language/es-ES/es-ES.com_contact.menu.ini	2009-07-25 17:10:24.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.com_contact.menu.ini	2010-04-25 14:14:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_contact.menu.ini 1.5.0 2009-05-21 08:38:11 15:49:28 ~0 $
+# $Id: es-ES.com_contact.menu.ini 1.5.0 2010-04-25 14:14:11 15:49:28 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.com_content.ini 16/administrator/language/es-ES/es-ES.com_content.ini
--- 15/administrator/language/es-ES/es-ES.com_content.ini	2009-11-05 16:17:44.000000000 +0100
+++ 16/administrator/language/es-ES/es-ES.com_content.ini	2010-04-25 14:15:28.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_content.ini 1.5.0 2009-11-05 16:17:44 21:06:30 ~0 $
+# $Id: es-ES.com_content.ini 1.5.0 2010-04-25 14:15:27 21:06:30 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.com_cpanel.ini 16/administrator/language/es-ES/es-ES.com_cpanel.ini
--- 15/administrator/language/es-ES/es-ES.com_cpanel.ini	2009-07-25 17:10:24.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.com_cpanel.ini	2010-04-25 14:15:44.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_cpanel.ini 1.5.0 2009-05-21 08:46:34 02:30:34 ~0 $
+# $Id: es-ES.com_cpanel.ini 1.5.0 2010-04-25 14:15:42 02:30:34 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.com_frontpage.ini 16/administrator/language/es-ES/es-ES.com_frontpage.ini
--- 15/administrator/language/es-ES/es-ES.com_frontpage.ini	2009-07-25 17:10:24.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.com_frontpage.ini	2010-04-25 14:17:20.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_frontpage.ini 1.5.0 2009-06-28 08:55:58 02:30:43 ~0 $
+# $Id: es-ES.com_frontpage.ini 1.5.0 2010-04-25 14:17:19 02:30:43 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
@@ -56,4 +56,4 @@
 SHOW/HIDE PAGINATION SUPPORT=Mostrar/Ocultar el soporte de paginación
 SHOW/HIDE THE ITEMS TITLE=Mostrar/Ocultar título del artículo
 SHOW/HIDE THE READ MORE LINK=Mostrar/Ocultar el enlace Leer más...
-UNCATEGORIZED=Sin clasificar
\ No hay ningún carácter de nueva línea al final del fichero
+UNCATEGORIZED=Sin categoría
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 15/administrator/language/es-ES/es-ES.com_installer.ini 16/administrator/language/es-ES/es-ES.com_installer.ini
--- 15/administrator/language/es-ES/es-ES.com_installer.ini	2009-07-25 17:10:24.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.com_installer.ini	2010-04-25 14:19:02.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_installer.ini 1.5.0 2009-05-21 08:53:24 15:51:00 ~0 $
+# $Id: es-ES.com_installer.ini 1.5.0 2010-04-25 14:19:01 15:51:00 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.com_languages.ini 16/administrator/language/es-ES/es-ES.com_languages.ini
--- 15/administrator/language/es-ES/es-ES.com_languages.ini	2009-07-25 17:10:22.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.com_languages.ini	2010-04-25 14:19:24.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_languages.ini 1.5.0 2009-05-21 08:54:26 02:30:52 ~0 $
+# $Id: es-ES.com_languages.ini 1.5.0 2010-04-25 14:19:22 02:30:52 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.com_login.ini 16/administrator/language/es-ES/es-ES.com_login.ini
--- 15/administrator/language/es-ES/es-ES.com_login.ini	2009-07-25 17:10:22.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.com_login.ini	2010-04-25 14:19:40.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_login.ini 1.5.0 2009-05-21 08:55:12 02:31:17 ~0 $
+# $Id: es-ES.com_login.ini 1.5.0 2010-04-25 14:19:39 02:31:17 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.com_massmail.ini 16/administrator/language/es-ES/es-ES.com_massmail.ini
--- 15/administrator/language/es-ES/es-ES.com_massmail.ini	2009-07-25 17:10:22.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.com_massmail.ini	2010-04-25 14:20:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_massmail.ini 1.5.0 2009-05-23 04:42:49 20:30:05 ~0 $
+# $Id: es-ES.com_massmail.ini 1.5.0 2010-04-25 14:20:11 20:30:05 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.com_media.ini 16/administrator/language/es-ES/es-ES.com_media.ini
--- 15/administrator/language/es-ES/es-ES.com_media.ini	2009-11-05 16:20:24.000000000 +0100
+++ 16/administrator/language/es-ES/es-ES.com_media.ini	2010-04-25 14:21:08.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_media.ini 1.5.0 2009-11-05 16:20:24 15:24:34 ~0 $
+# $Id: es-ES.com_media.ini 1.5.0 2010-04-25 14:21:06 15:24:34 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.com_menus.ini 16/administrator/language/es-ES/es-ES.com_menus.ini
--- 15/administrator/language/es-ES/es-ES.com_menus.ini	2009-07-25 17:10:22.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.com_menus.ini	2010-04-25 14:21:48.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_menus.ini 1.5.0 2009-05-23 04:49:12 21:04:13 ~0 $
+# $Id: es-ES.com_menus.ini 1.5.0 2010-04-25 14:21:47 21:04:13 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.com_menus.menu.ini 16/administrator/language/es-ES/es-ES.com_menus.menu.ini
--- 15/administrator/language/es-ES/es-ES.com_menus.menu.ini	2009-07-25 17:10:22.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.com_menus.menu.ini	2010-04-25 14:22:06.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_menus.menu.ini 1.5.0 2009-05-23 04:45:49 14:19:09 ~0 $
+# $Id: es-ES.com_menus.menu.ini 1.5.0 2010-04-25 14:22:04 14:19:09 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.com_messages.ini 16/administrator/language/es-ES/es-ES.com_messages.ini
--- 15/administrator/language/es-ES/es-ES.com_messages.ini	2009-07-25 17:10:20.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.com_messages.ini	2010-04-25 14:24:54.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_messages.ini 1.5.0 2009-05-23 04:51:46 20:34:38 ~0 $
+# $Id: es-ES.com_messages.ini 1.5.0 2010-04-25 14:24:53 20:34:38 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.com_modules.ini 16/administrator/language/es-ES/es-ES.com_modules.ini
--- 15/administrator/language/es-ES/es-ES.com_modules.ini	2009-07-25 17:10:20.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.com_modules.ini	2010-04-25 14:25:34.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_modules.ini 1.5.0 2009-05-23 04:57:27 15:58:45 ~0 $
+# $Id: es-ES.com_modules.ini 1.5.0 2010-04-25 14:25:33 15:58:45 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
@@ -73,5 +73,5 @@
 VARIES=Varios
 WARNMAINMENU=No puedes borrar el módulo <em>mod_mainmenu</em> porque es parte del núcleo
 WARNMODULES=No puede ser borrado, solo los puedes publicar/despublicar como a otros módulos de Joomla!
-WHO\'S ONLINE=¿Quién está en línea?
-YOU CAN ONLY PREVIEW NEW MODULES.=Solo puede previsualizar los módulos nuevos.
\ No hay ningún carácter de nueva línea al final del fichero
+YOU CAN ONLY PREVIEW NEW MODULES.=Solo puede previsualizar los módulos nuevos.
+WHO'S ONLINE=¿Quién está en línea?
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 15/administrator/language/es-ES/es-ES.com_newsfeeds.ini 16/administrator/language/es-ES/es-ES.com_newsfeeds.ini
--- 15/administrator/language/es-ES/es-ES.com_newsfeeds.ini	2009-07-25 17:10:20.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.com_newsfeeds.ini	2010-04-25 14:26:58.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_newsfeeds.ini 1.5.0 2009-05-23 05:03:01 20:32:58 ~0 $
+# $Id: es-ES.com_newsfeeds.ini 1.5.0 2010-04-25 14:26:56 20:32:58 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.com_newsfeeds.menu.ini 16/administrator/language/es-ES/es-ES.com_newsfeeds.menu.ini
--- 15/administrator/language/es-ES/es-ES.com_newsfeeds.menu.ini	2009-07-25 17:10:20.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.com_newsfeeds.menu.ini	2010-04-25 14:27:14.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_newsfeeds.menu.ini 1.5.0 2009-05-23 05:03:35 02:32:18 ~0 $
+# $Id: es-ES.com_newsfeeds.menu.ini 1.5.0 2010-04-25 14:27:12 02:32:18 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.com_plugins.ini 16/administrator/language/es-ES/es-ES.com_plugins.ini
--- 15/administrator/language/es-ES/es-ES.com_plugins.ini	2009-07-25 17:10:20.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.com_plugins.ini	2010-04-25 14:27:36.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_plugins.ini 1.5.0 2009-05-23 05:04:08 20:50:03 ~0 $
+# $Id: es-ES.com_plugins.ini 1.5.0 2010-04-25 14:27:35 20:50:03 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.com_poll.ini 16/administrator/language/es-ES/es-ES.com_poll.ini
--- 15/administrator/language/es-ES/es-ES.com_poll.ini	2009-07-25 17:10:20.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.com_poll.ini	2010-04-25 14:28:16.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_poll.ini 1.5.0 2009-05-23 05:05:59 02:32:54 ~0 $
+# $Id: es-ES.com_poll.ini 1.5.0 2010-04-25 14:28:15 02:32:54 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.com_poll.menu.ini 16/administrator/language/es-ES/es-ES.com_poll.menu.ini
--- 15/administrator/language/es-ES/es-ES.com_poll.menu.ini	2009-07-25 17:10:20.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.com_poll.menu.ini	2010-04-25 14:28:52.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_poll.menu.ini 1.5.0 2009-05-23 05:06:42 02:33:02 ~0 $
+# $Id: es-ES.com_poll.menu.ini 1.5.0 2010-04-25 14:28:50 02:33:02 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.com_search.ini 16/administrator/language/es-ES/es-ES.com_search.ini
--- 15/administrator/language/es-ES/es-ES.com_search.ini	2009-07-25 17:10:20.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.com_search.ini	2010-04-25 14:29:08.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_search.ini 1.5.0 2009-05-23 05:07:52 02:35:47 ~0 $
+# $Id: es-ES.com_search.ini 1.5.0 2010-04-25 14:29:07 02:35:47 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.com_search.menu.ini 16/administrator/language/es-ES/es-ES.com_search.menu.ini
--- 15/administrator/language/es-ES/es-ES.com_search.menu.ini	2009-07-25 17:10:18.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.com_search.menu.ini	2010-04-25 14:29:24.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_search.menu.ini 1.5.0 2009-05-23 05:08:14 02:43:42 ~0 $
+# $Id: es-ES.com_search.menu.ini 1.5.0 2010-04-25 14:29:22 02:43:42 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.com_sections.ini 16/administrator/language/es-ES/es-ES.com_sections.ini
--- 15/administrator/language/es-ES/es-ES.com_sections.ini	2009-07-25 17:10:18.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.com_sections.ini	2010-04-25 14:29:54.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_sections.ini 1.5.0 2009-05-23 05:16:02 02:43:52 ~0 $
+# $Id: es-ES.com_sections.ini 1.5.0 2010-04-25 14:29:52 02:43:52 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.com_templates.ini 16/administrator/language/es-ES/es-ES.com_templates.ini
--- 15/administrator/language/es-ES/es-ES.com_templates.ini	2009-07-25 17:10:18.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.com_templates.ini	2010-04-25 14:30:40.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_templates.ini 1.5.0 2009-06-28 08:48:05 16:07:35 ~0 $
+# $Id: es-ES.com_templates.ini 1.5.0 2010-04-25 14:30:38 16:07:35 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.com_trash.ini 16/administrator/language/es-ES/es-ES.com_trash.ini
--- 15/administrator/language/es-ES/es-ES.com_trash.ini	2009-07-25 17:10:18.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.com_trash.ini	2010-04-25 14:31:36.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_trash.ini 1.5.0 2008-07-08 18:18:12 02:44:35 ~0 $
+# $Id: es-ES.com_trash.ini 1.5.0 2010-04-25 14:31:35 02:44:35 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.com_user.ini 16/administrator/language/es-ES/es-ES.com_user.ini
--- 15/administrator/language/es-ES/es-ES.com_user.ini	2009-07-25 17:10:18.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.com_user.ini	2010-04-25 14:32:16.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_user.ini 1.5.0 2009-03-28 20:25:48 20:57:43 ~0 $
+# $Id: es-ES.com_user.ini 1.5.0 2010-04-25 14:32:14 20:57:43 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.com_users.ini 16/administrator/language/es-ES/es-ES.com_users.ini
--- 15/administrator/language/es-ES/es-ES.com_users.ini	2009-07-25 17:10:18.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.com_users.ini	2010-04-25 14:32:36.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_users.ini 1.5.0 2008-07-08 18:19:31 20:48:08 ~0 $
+# $Id: es-ES.com_users.ini 1.5.0 2010-04-25 14:32:35 20:48:08 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.com_weblinks.ini 16/administrator/language/es-ES/es-ES.com_weblinks.ini
--- 15/administrator/language/es-ES/es-ES.com_weblinks.ini	2009-07-25 17:10:16.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.com_weblinks.ini	2010-04-25 14:32:56.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_weblinks.ini 1.5.0 2008-07-08 18:20:29 02:45:04 ~0 $
+# $Id: es-ES.com_weblinks.ini 1.5.0 2010-04-25 14:32:54 02:45:04 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.com_weblinks.menu.ini 16/administrator/language/es-ES/es-ES.com_weblinks.menu.ini
--- 15/administrator/language/es-ES/es-ES.com_weblinks.menu.ini	2009-07-25 17:10:16.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.com_weblinks.menu.ini	2010-04-25 14:33:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_weblinks.menu.ini 1.5.0 2008-07-08 18:21:09 02:45:13 ~0 $
+# $Id: es-ES.com_weblinks.menu.ini 1.5.0 2010-04-25 14:33:10 02:45:13 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.com_wrapper.ini 16/administrator/language/es-ES/es-ES.com_wrapper.ini
--- 15/administrator/language/es-ES/es-ES.com_wrapper.ini	2009-07-25 17:10:16.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.com_wrapper.ini	2010-04-25 14:33:30.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_wrapper.ini 1.5.0 2008-07-08 18:21:43 02:45:21 ~0 $
+# $Id: es-ES.com_wrapper.ini 1.5.0 2010-04-25 14:33:28 02:45:21 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.ini 16/administrator/language/es-ES/es-ES.ini
--- 15/administrator/language/es-ES/es-ES.ini	2009-11-05 16:22:38.000000000 +0100
+++ 16/administrator/language/es-ES/es-ES.ini	2010-04-25 01:59:00.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.ini 1.5.0 2009-11-05 16:22:39 16:28:06 ~0 $
+# $Id: es-ES.ini 1.5.0 2010-04-25 01:58:59 16:28:06 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.mod_components.ini 16/administrator/language/es-ES/es-ES.mod_components.ini
--- 15/administrator/language/es-ES/es-ES.mod_components.ini	2009-07-25 17:10:16.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.mod_components.ini	2010-04-25 14:33:44.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.mod_components.ini 1.5.0 2008-07-08 18:22:21 02:45:29 ~0 $
+# $Id: es-ES.mod_components.ini 1.5.0 2010-04-25 14:33:42 02:45:29 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.mod_custom.ini 16/administrator/language/es-ES/es-ES.mod_custom.ini
--- 15/administrator/language/es-ES/es-ES.mod_custom.ini	2009-07-25 17:10:14.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.mod_custom.ini	2010-04-25 14:33:56.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.mod_custom.ini 1.5.0 2008-07-08 18:23:31 20:46:46 ~0 $
+# $Id: es-ES.mod_custom.ini 1.5.0 2010-04-25 14:33:54 20:46:46 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.mod_feed.ini 16/administrator/language/es-ES/es-ES.mod_feed.ini
--- 15/administrator/language/es-ES/es-ES.mod_feed.ini	2009-07-25 17:10:14.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.mod_feed.ini	2010-04-25 22:29:10.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.mod_feed.ini 1.5.5 2009-07-04 12:52:49 ff ~0 $
+# $Id: es-ES.mod_feed.ini 1.5.5 2010-04-25 22:29:08 ff ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.mod_footer.ini 16/administrator/language/es-ES/es-ES.mod_footer.ini
--- 15/administrator/language/es-ES/es-ES.mod_footer.ini	2009-07-25 17:10:14.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.mod_footer.ini	2010-04-25 22:29:20.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.mod_footer.ini 1.5.0 2008-07-08 18:24:03 20:46:25 ~0 $
+# $Id: es-ES.mod_footer.ini 1.5.0 2010-04-25 22:29:19 20:46:25 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.mod_latest.ini 16/administrator/language/es-ES/es-ES.mod_latest.ini
--- 15/administrator/language/es-ES/es-ES.mod_latest.ini	2009-07-25 17:10:14.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.mod_latest.ini	2010-04-25 22:29:34.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.mod_latest.ini 1.5.0 2008-07-08 18:24:49 20:46:08 ~0 $
+# $Id: es-ES.mod_latest.ini 1.5.0 2010-04-25 22:29:32 20:46:08 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.mod_logged.ini 16/administrator/language/es-ES/es-ES.mod_logged.ini
--- 15/administrator/language/es-ES/es-ES.mod_logged.ini	2009-07-25 17:10:14.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.mod_logged.ini	2010-04-25 22:31:06.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.mod_logged.ini 1.5.0 2008-07-08 18:25:36 20:45:48 ~0 $
+# $Id: es-ES.mod_logged.ini 1.5.0 2010-04-25 22:31:04 20:45:48 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.mod_login.ini 16/administrator/language/es-ES/es-ES.mod_login.ini
--- 15/administrator/language/es-ES/es-ES.mod_login.ini	2009-07-25 17:10:14.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.mod_login.ini	2010-04-25 22:31:20.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.mod_login.ini 1.5.0 2008-07-08 18:26:28 20:45:31 ~0 $
+# $Id: es-ES.mod_login.ini 1.5.0 2010-04-25 22:31:19 20:45:31 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.mod_menu.ini 16/administrator/language/es-ES/es-ES.mod_menu.ini
--- 15/administrator/language/es-ES/es-ES.mod_menu.ini	2009-07-25 17:10:14.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.mod_menu.ini	2010-04-25 22:31:42.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.mod_menu.ini 1.5.0 2009-01-11 02:34:29 20:45:11 ~0 $
+# $Id: es-ES.mod_menu.ini 1.5.0 2010-04-25 22:31:41 20:45:11 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.mod_online.ini 16/administrator/language/es-ES/es-ES.mod_online.ini
--- 15/administrator/language/es-ES/es-ES.mod_online.ini	2009-07-25 17:10:14.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.mod_online.ini	2010-04-25 22:32:36.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.mod_online.ini 1.5.0 2008-07-08 18:28:28 20:44:19 ~0 $
+# $Id: es-ES.mod_online.ini 1.5.0 2010-04-25 22:32:34 20:44:19 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.mod_popular.ini 16/administrator/language/es-ES/es-ES.mod_popular.ini
--- 15/administrator/language/es-ES/es-ES.mod_popular.ini	2009-07-25 17:10:12.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.mod_popular.ini	2010-04-25 22:32:52.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.mod_popular.ini 1.5.0 2008-07-08 18:29:05 20:43:58 ~0 $
+# $Id: es-ES.mod_popular.ini 1.5.0 2010-04-25 22:32:50 20:43:58 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.mod_quickicon.ini 16/administrator/language/es-ES/es-ES.mod_quickicon.ini
--- 15/administrator/language/es-ES/es-ES.mod_quickicon.ini	2009-07-25 17:10:12.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.mod_quickicon.ini	2010-04-25 22:33:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.mod_quickicon.ini 1.5.0 2008-07-08 18:32:08 20:43:40 ~0 $
+# $Id: es-ES.mod_quickicon.ini 1.5.0 2010-04-25 22:33:11 20:43:40 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.mod_stats.ini 16/administrator/language/es-ES/es-ES.mod_stats.ini
--- 15/administrator/language/es-ES/es-ES.mod_stats.ini	2009-07-25 17:10:12.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.mod_stats.ini	2010-04-25 22:33:26.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.mod_stats.ini 1.5.0 2008-07-08 18:32:41 20:43:15 ~0 $
+# $Id: es-ES.mod_stats.ini 1.5.0 2010-04-25 22:33:24 20:43:15 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.mod_status.ini 16/administrator/language/es-ES/es-ES.mod_status.ini
--- 15/administrator/language/es-ES/es-ES.mod_status.ini	2009-07-25 17:10:12.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.mod_status.ini	2010-04-25 22:33:40.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.mod_status.ini 1.5.0 2008-07-08 18:32:58 20:42:55 ~0 $
+# $Id: es-ES.mod_status.ini 1.5.0 2010-04-25 22:33:38 20:42:55 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.mod_submenu.ini 16/administrator/language/es-ES/es-ES.mod_submenu.ini
--- 15/administrator/language/es-ES/es-ES.mod_submenu.ini	2009-07-25 17:10:12.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.mod_submenu.ini	2010-04-25 22:33:54.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.mod_submenu.ini 1.5.0 2008-07-08 18:33:35 20:42:29 ~0 $
+# $Id: es-ES.mod_submenu.ini 1.5.0 2010-04-25 22:33:53 20:42:29 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.mod_title.ini 16/administrator/language/es-ES/es-ES.mod_title.ini
--- 15/administrator/language/es-ES/es-ES.mod_title.ini	2009-07-25 17:10:12.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.mod_title.ini	2010-04-25 22:34:14.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.mod_title.ini 1.5.0 2008-07-08 18:33:51 20:42:02 ~0 $
+# $Id: es-ES.mod_title.ini 1.5.0 2010-04-25 22:34:12 20:42:02 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.mod_toolbar.ini 16/administrator/language/es-ES/es-ES.mod_toolbar.ini
--- 15/administrator/language/es-ES/es-ES.mod_toolbar.ini	2009-07-25 17:10:12.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.mod_toolbar.ini	2010-04-25 22:34:30.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.mod_toolbar.ini 1.5.0 2008-07-08 18:34:10 20:41:44 ~0 $
+# $Id: es-ES.mod_toolbar.ini 1.5.0 2010-04-25 22:34:29 20:41:44 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.mod_unread.ini 16/administrator/language/es-ES/es-ES.mod_unread.ini
--- 15/administrator/language/es-ES/es-ES.mod_unread.ini	2009-07-25 17:10:12.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.mod_unread.ini	2010-04-25 22:34:44.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.mod_unread.ini 1.5.0 2008-07-08 18:34:25 20:41:21 ~0 $
+# $Id: es-ES.mod_unread.ini 1.5.0 2010-04-25 22:34:43 20:41:21 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.plg_authentication_example.ini 16/administrator/language/es-ES/es-ES.plg_authentication_example.ini
--- 15/administrator/language/es-ES/es-ES.plg_authentication_example.ini	2009-07-25 17:10:10.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.plg_authentication_example.ini	2010-04-25 22:35:02.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.plg_authentication_example.ini 1.5.0 2008-07-08 18:34:45 02:48:53 ~0 $
+# $Id: es-ES.plg_authentication_example.ini 1.5.0 2010-04-25 22:35:00 02:48:53 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.plg_authentication_gmail.ini 16/administrator/language/es-ES/es-ES.plg_authentication_gmail.ini
--- 15/administrator/language/es-ES/es-ES.plg_authentication_gmail.ini	2009-07-25 17:10:10.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.plg_authentication_gmail.ini	2010-04-25 22:35:14.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.plg_authentication_gmail.ini 1.5.0 2008-07-08 18:35:04 02:48:02 ~0 $
+# $Id: es-ES.plg_authentication_gmail.ini 1.5.0 2010-04-25 22:35:13 02:48:02 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.plg_authentication_joomla.ini 16/administrator/language/es-ES/es-ES.plg_authentication_joomla.ini
--- 15/administrator/language/es-ES/es-ES.plg_authentication_joomla.ini	2009-07-25 17:10:10.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.plg_authentication_joomla.ini	2010-04-25 22:35:28.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.plg_authentication_joomla.ini 1.5.0 2008-07-08 18:35:27 02:48:12 ~0 $
+# $Id: es-ES.plg_authentication_joomla.ini 1.5.0 2010-04-25 22:35:27 02:48:12 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.plg_authentication_ldap.ini 16/administrator/language/es-ES/es-ES.plg_authentication_ldap.ini
--- 15/administrator/language/es-ES/es-ES.plg_authentication_ldap.ini	2009-07-25 17:10:10.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.plg_authentication_ldap.ini	2010-04-25 22:36:02.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.plg_authentication_ldap.ini 1.5.0 2008-07-08 18:36:45 20:41:02 ~0 $
+# $Id: es-ES.plg_authentication_ldap.ini 1.5.0 2010-04-25 22:36:00 20:41:02 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.plg_authentication_openid.ini 16/administrator/language/es-ES/es-ES.plg_authentication_openid.ini
--- 15/administrator/language/es-ES/es-ES.plg_authentication_openid.ini	2009-07-25 17:10:10.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.plg_authentication_openid.ini	2010-04-25 22:36:36.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.plg_authentication_openid.ini 1.5.0 2009-01-11 02:41:42 02:48:36 ~0 $
+# $Id: es-ES.plg_authentication_openid.ini 1.5.0 2010-04-25 22:36:35 02:48:36 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.plg_content_code.ini 16/administrator/language/es-ES/es-ES.plg_content_code.ini
--- 15/administrator/language/es-ES/es-ES.plg_content_code.ini	2009-07-25 17:10:10.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.plg_content_code.ini	2010-04-25 22:36:58.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.plg_content_code.ini 1.5.0 2008-07-08 18:37:45 02:48:45 ~0 $
+# $Id: es-ES.plg_content_code.ini 1.5.0 2010-04-25 22:36:56 02:48:45 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.plg_content_emailcloak.ini 16/administrator/language/es-ES/es-ES.plg_content_emailcloak.ini
--- 15/administrator/language/es-ES/es-ES.plg_content_emailcloak.ini	2009-07-25 17:10:10.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.plg_content_emailcloak.ini	2010-04-25 22:37:10.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.plg_content_emailcloak.ini 1.5.0 2008-07-08 18:38:05 20:40:02 ~0 $
+# $Id: es-ES.plg_content_emailcloak.ini 1.5.0 2010-04-25 22:37:09 20:40:02 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.plg_content_geshi.ini 16/administrator/language/es-ES/es-ES.plg_content_geshi.ini
--- 15/administrator/language/es-ES/es-ES.plg_content_geshi.ini	2009-07-25 17:10:10.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.plg_content_geshi.ini	2010-04-25 22:37:24.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.plg_content_geshi.ini 1.5.0 2008-07-08 18:38:26 20:39:33 ~0 $
+# $Id: es-ES.plg_content_geshi.ini 1.5.0 2010-04-25 22:37:23 20:39:33 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.plg_content_image.ini 16/administrator/language/es-ES/es-ES.plg_content_image.ini
--- 15/administrator/language/es-ES/es-ES.plg_content_image.ini	2009-07-25 17:10:08.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.plg_content_image.ini	2010-04-25 22:37:40.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.plg_content_image.ini 1.5.0 2008-07-08 18:39:20 RC3 ~0 $
+# $Id: es-ES.plg_content_image.ini 1.5.0 2010-04-25 22:37:39 RC3 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.plg_content_loadmodule.ini 16/administrator/language/es-ES/es-ES.plg_content_loadmodule.ini
--- 15/administrator/language/es-ES/es-ES.plg_content_loadmodule.ini	2009-07-25 17:10:08.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.plg_content_loadmodule.ini	2010-04-25 22:37:58.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.plg_content_loadmodule.ini 1.5.0 2008-07-08 18:40:30 20:38:34 ~0 $
+# $Id: es-ES.plg_content_loadmodule.ini 1.5.0 2010-04-25 22:37:56 20:38:34 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.plg_content_pagebreak.ini 16/administrator/language/es-ES/es-ES.plg_content_pagebreak.ini
--- 15/administrator/language/es-ES/es-ES.plg_content_pagebreak.ini	2009-07-25 17:10:08.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.plg_content_pagebreak.ini	2010-04-25 22:38:30.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.plg_content_pagebreak.ini 1.5.0 2008-07-08 18:41:43 20:37:58 ~0 $
+# $Id: es-ES.plg_content_pagebreak.ini 1.5.0 2010-04-25 22:38:29 20:37:58 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.plg_content_pagenavigation.ini 16/administrator/language/es-ES/es-ES.plg_content_pagenavigation.ini
--- 15/administrator/language/es-ES/es-ES.plg_content_pagenavigation.ini	2009-07-25 17:10:08.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.plg_content_pagenavigation.ini	2010-04-25 22:38:50.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.plg_content_pagenavigation.ini 1.5.0 2008-07-08 18:42:59 02:50:09 ~0 $
+# $Id: es-ES.plg_content_pagenavigation.ini 1.5.0 2010-04-25 22:38:49 02:50:09 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.plg_content_vote.ini 16/administrator/language/es-ES/es-ES.plg_content_vote.ini
--- 15/administrator/language/es-ES/es-ES.plg_content_vote.ini	2009-07-25 17:10:08.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.plg_content_vote.ini	2010-04-25 22:39:04.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.plg_content_vote.ini 1.5.0 2008-07-08 18:43:32 02:50:31 ~0 $
+# $Id: es-ES.plg_content_vote.ini 1.5.0 2010-04-25 22:39:02 02:50:31 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.plg_editors_none.ini 16/administrator/language/es-ES/es-ES.plg_editors_none.ini
--- 15/administrator/language/es-ES/es-ES.plg_editors_none.ini	2009-07-25 17:10:06.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.plg_editors_none.ini	2010-04-25 22:40:02.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.plg_editors_none.ini 1.5.0 2008-07-08 18:46:09 02:51:21 ~0 $
+# $Id: es-ES.plg_editors_none.ini 1.5.0 2010-04-25 22:40:01 02:51:21 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.plg_editors_tinymce.ini 16/administrator/language/es-ES/es-ES.plg_editors_tinymce.ini
--- 15/administrator/language/es-ES/es-ES.plg_editors_tinymce.ini	2009-11-05 16:24:28.000000000 +0100
+++ 16/administrator/language/es-ES/es-ES.plg_editors_tinymce.ini	2010-04-25 22:45:06.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.plg_editors_tinymce.ini 1.5.0 2009-11-05 16:24:29 20:37:15 ~0 $
+# $Id: es-ES.plg_editors_tinymce.ini 1.5.0 2010-04-25 22:45:04 20:37:15 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
@@ -17,7 +17,7 @@
 CODE CLEANUP ON STARTUP=Limpia el código al iniciar
 COMPRESSED VERSION=Versión comprimida
 CUSTOM CSS CLASSES=Clases CSS personalizadas
-CUSTOMCSSFILENOTPRESENT=The file name %s was entered in the TinyMCE Custom CSS field. This file could not be found in the default templates folder. No styles are available.
+CUSTOMCSSFILENOTPRESENT=El nombre de archivo %s fue introducido en el campo personalizado TinyMCE CSS. Este archivo no se podía encontrar en las plantillas predeterminadas de carpeta. No están los estilos disponibles.
 DATE FORMAT=Formato de fecha
 DESCLANGCODE=Idioma UI del editor. Es obligatorio que haya un valor aquí, si la selección manual del idioma está activada.
 DESCLANGMODE=Si se activa el idioma, va a coincidir automáticamente con el idioma seleccionado por el usuario. No activar en caso de que los idiomas del editor no están instalados.
@@ -89,7 +89,7 @@
 STYLE=Estilo
 TABLE=Tabla
 TEMPLATE CSS CLASSES=Clases CSS de la plantilla
-TEMPLATECSSFILENOTPRESENT=Could not find the file 'editor.css' in the template or templates/system folder. No styles are available.
+TEMPLATECSSFILENOTPRESENT=No se pudo encontrar el archivo 'editor.css' en la plantilla o plantillas / carpeta del sistema. No están los estilos disponibles.
 TEXT DIRECTION=Dirección del texto
 TIME FORMAT=Formato de la hora
 TOGGLE EDITOR=Toggle editor
@@ -111,8 +111,8 @@
 BLOCKQUOTE=Blockquote
 COLORS=Colores
 CONTEXT MENU=Contexto menu
-CUSTOM BUTTON=Custom button
-CUSTOM PLUGIN=Custom plugin
+CUSTOM BUTTON=Personalizar button
+CUSTOM PLUGIN=Personalizar plugin
 ENTITY ENCODING=Entidad de codificación
 EXTENDED=Extendido
 FONTS=Fuentes
diff -aruN --binary 15/administrator/language/es-ES/es-ES.plg_editors_xstandard.ini 16/administrator/language/es-ES/es-ES.plg_editors_xstandard.ini
--- 15/administrator/language/es-ES/es-ES.plg_editors_xstandard.ini	2009-07-25 17:10:06.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.plg_editors_xstandard.ini	2010-04-25 22:45:24.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.plg_editors_xstandard.ini 1.5.0 2008-07-08 18:47:09 16:01:34 ~0 $
+# $Id: es-ES.plg_editors_xstandard.ini 1.5.0 2010-04-25 22:45:23 16:01:34 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.plg_editors-xtd_image.ini 16/administrator/language/es-ES/es-ES.plg_editors-xtd_image.ini
--- 15/administrator/language/es-ES/es-ES.plg_editors-xtd_image.ini	2009-07-25 17:10:08.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.plg_editors-xtd_image.ini	2010-04-25 22:39:22.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.plg_editors-xtd_image.ini 1.5.0 2008-07-08 18:44:08 02:50:42 ~0 $
+# $Id: es-ES.plg_editors-xtd_image.ini 1.5.0 2010-04-25 22:39:21 02:50:42 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.plg_editors-xtd_pagebreak.ini 16/administrator/language/es-ES/es-ES.plg_editors-xtd_pagebreak.ini
--- 15/administrator/language/es-ES/es-ES.plg_editors-xtd_pagebreak.ini	2009-07-25 17:10:08.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.plg_editors-xtd_pagebreak.ini	2010-04-25 22:39:36.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.plg_editors-xtd_pagebreak.ini 1.5.0 2008-07-08 18:44:31 02:50:54 ~0 $
+# $Id: es-ES.plg_editors-xtd_pagebreak.ini 1.5.0 2010-04-25 22:39:34 02:50:54 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.plg_editors-xtd_readmore.ini 16/administrator/language/es-ES/es-ES.plg_editors-xtd_readmore.ini
--- 15/administrator/language/es-ES/es-ES.plg_editors-xtd_readmore.ini	2009-07-25 17:10:08.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.plg_editors-xtd_readmore.ini	2010-04-25 22:39:48.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.plg_editors-xtd_readmore.ini 1.5.0 2008-07-08 18:45:31 02:51:09 ~0 $
+# $Id: es-ES.plg_editors-xtd_readmore.ini 1.5.0 2010-04-25 22:39:46 02:51:09 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.plg_search_categories.ini 16/administrator/language/es-ES/es-ES.plg_search_categories.ini
--- 15/administrator/language/es-ES/es-ES.plg_search_categories.ini	2009-07-25 17:10:06.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.plg_search_categories.ini	2010-04-25 22:45:36.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.plg_search_categories.ini 1.5.0 2008-07-08 18:47:33 02:51:48 ~0 $
+# $Id: es-ES.plg_search_categories.ini 1.5.0 2010-04-25 22:45:34 02:51:48 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.plg_search_contacts.ini 16/administrator/language/es-ES/es-ES.plg_search_contacts.ini
--- 15/administrator/language/es-ES/es-ES.plg_search_contacts.ini	2009-07-25 17:10:06.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.plg_search_contacts.ini	2010-04-25 22:45:50.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.plg_search_contacts.ini 1.5.0 2008-07-08 18:48:03 02:52:04 ~0 $
+# $Id: es-ES.plg_search_contacts.ini 1.5.0 2010-04-25 22:45:49 02:52:04 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.plg_search_content.ini 16/administrator/language/es-ES/es-ES.plg_search_content.ini
--- 15/administrator/language/es-ES/es-ES.plg_search_content.ini	2009-07-25 17:10:06.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.plg_search_content.ini	2010-04-25 22:46:04.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.plg_search_content.ini 1.5.0 2008-07-08 18:48:26 20:36:00 ~0 $
+# $Id: es-ES.plg_search_content.ini 1.5.0 2010-04-25 22:46:03 20:36:00 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.plg_search_newsfeeds.ini 16/administrator/language/es-ES/es-ES.plg_search_newsfeeds.ini
--- 15/administrator/language/es-ES/es-ES.plg_search_newsfeeds.ini	2009-07-25 17:10:06.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.plg_search_newsfeeds.ini	2010-04-25 22:46:20.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.plg_search_newsfeeds.ini 1.5.0 2008-07-08 18:48:49 02:52:22 ~0 $
+# $Id: es-ES.plg_search_newsfeeds.ini 1.5.0 2010-04-25 22:46:18 02:52:22 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.plg_search_sections.ini 16/administrator/language/es-ES/es-ES.plg_search_sections.ini
--- 15/administrator/language/es-ES/es-ES.plg_search_sections.ini	2009-07-25 17:10:04.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.plg_search_sections.ini	2010-04-25 22:46:32.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.plg_search_sections.ini 1.5.0 2008-07-08 18:49:13 02:52:31 ~0 $
+# $Id: es-ES.plg_search_sections.ini 1.5.0 2010-04-25 22:46:30 02:52:31 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.plg_search_weblinks.ini 16/administrator/language/es-ES/es-ES.plg_search_weblinks.ini
--- 15/administrator/language/es-ES/es-ES.plg_search_weblinks.ini	2009-07-25 17:10:04.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.plg_search_weblinks.ini	2010-04-25 22:46:42.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.plg_search_weblinks.ini 1.5.0 2008-07-08 18:49:37 02:52:42 ~0 $
+# $Id: es-ES.plg_search_weblinks.ini 1.5.0 2010-04-25 22:46:41 02:52:42 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.plg_system_backlink.ini 16/administrator/language/es-ES/es-ES.plg_system_backlink.ini
--- 15/administrator/language/es-ES/es-ES.plg_system_backlink.ini	2009-07-25 17:10:04.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.plg_system_backlink.ini	2010-04-25 22:47:54.000000000 +0200
@@ -1,13 +1,13 @@
-# $Id: es-ES.plg_system_backlink.ini 1.5.0 2008-07-08 18:51:30 14:16:12 ~0 $
+# $Id: es-ES.plg_system_backlink.ini 1.5.0 2010-04-25 22:47:52 14:16:12 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
 
 ATTEMPT LEGACY SEF=Compatibilidad hacia atrás con SEF
 IF YES, IT SEARCHES FOR OLD QUERY STRINGS THAT MIGHT MATCH AND REDIRECTS=Si seleccionas <strong>Sí</strong>, el sistema buscará antiguas cadenas de texto que ya no se usan y las redirigirá a las correctas.
-IF YES, IT USES OLD STYLE SEF AND ATTEMPTS TO GENERATE A VALID LINK=Si seleccionas <strong>Sí</strong>, el sistema usará el estilo en formato antigo de SEF e intentará generar un enlace válido.
+IF YES, IT USES OLD STYLE SEF AND ATTEMPTS TO GENERATE A VALID LINK=Si seleccionas <strong>Sí</strong>, el sistema usará el estilo en formato antiguo de SEF e intentará generar un enlace válido.
 IF YES, IT USES OLD STYLE SEF AND DIRECTS IT TO THE NEW LINK=Si seleccionas <strong>Sí</strong>, el sistema usará el estilo en formato antiguo de SEF y lo redireccionará al nuevo estilo de enlace.
 PROVIDES BACKLINK SUPPORT=El plugin Backlink ofrece soporte para la compatibilidad hacia atrás con los enlaces de Joomla!1.0.x. Gracias a ello se redirigirán las URLs y documentos del antiguo formato al correcto que se debe usar sobre Joomla! 1.5.
 SEARCH QUERY STRINGS=Buscar cadenas de texto
diff -aruN --binary 15/administrator/language/es-ES/es-ES.plg_system_cache.ini 16/administrator/language/es-ES/es-ES.plg_system_cache.ini
--- 15/administrator/language/es-ES/es-ES.plg_system_cache.ini	2009-07-25 17:10:04.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.plg_system_cache.ini	2010-04-25 22:48:10.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.plg_system_cache.ini 1.5.0 2008-07-08 18:52:24 02:52:51 ~0 $
+# $Id: es-ES.plg_system_cache.ini 1.5.0 2010-04-25 22:48:08 02:52:51 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.plg_system_debug.ini 16/administrator/language/es-ES/es-ES.plg_system_debug.ini
--- 15/administrator/language/es-ES/es-ES.plg_system_debug.ini	2009-07-25 17:10:04.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.plg_system_debug.ini	2010-04-25 22:50:16.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.plg_system_debug.ini 1.5.0 2008-07-08 18:59:29 15:55:47 ~0 $
+# $Id: es-ES.plg_system_debug.ini 1.5.0 2010-04-25 22:50:15 15:55:47 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
@@ -30,5 +30,5 @@
 QUERIES LOGGED=%s consultas que han entrado
 LEGACY QUERIES LOGGED=Registro de solicitudes para la compatibilidad hacia atrás
 UNTRANSLATED STRINGS=Palabras sin traducir
-UNTRANSLATED STRINGS DESIGNER=Untranslated Strings Designer
-UNTRANSLATED STRINGS DIAGNOSTIC=Untranslated Strings Diagnostic
\ No hay ningún carácter de nueva línea al final del fichero
+UNTRANSLATED STRINGS DESIGNER=Las cadenas no traducidas de diseñador
+UNTRANSLATED STRINGS DIAGNOSTIC=Cadenas sin traducir de diagnóstico
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 15/administrator/language/es-ES/es-ES.plg_system_legacy.ini 16/administrator/language/es-ES/es-ES.plg_system_legacy.ini
--- 15/administrator/language/es-ES/es-ES.plg_system_legacy.ini	2009-07-25 17:10:04.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.plg_system_legacy.ini	2010-04-25 22:51:12.000000000 +0200
@@ -1,10 +1,10 @@
-# $Id: es-ES.plg_system_legacy.ini 1.5.0 2008-07-08 19:00:43 02:53:10 ~0 $
+# $Id: es-ES.plg_system_legacy.ini 1.5.0 2010-04-25 22:51:10 02:53:10 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
 
 USE LEGACY URL ROUTING=Utilizar el ruteo de URL compatible con versiones anteriores de Joomla!
-IF YES, USE LEGACY URL ROUTING MECHANISM=Si es afirmativo, se usa el mecanismo de enrutamiento URL heredado para dar compatibilidad hacia atrás.
+IF YES, USE LEGACY URL ROUTING MECHANISM=Si es afirmativo, se usa el mecanismo de enrutamiento URL.
 PROVIDES LEGACY SUPPORT FOR OLDER VERSION OF JOOMLA!=Suministra soporte de legado para versiones antiguas de Joomla!
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 15/administrator/language/es-ES/es-ES.plg_system_sef.ini 16/administrator/language/es-ES/es-ES.plg_system_sef.ini
--- 15/administrator/language/es-ES/es-ES.plg_system_sef.ini	2009-07-25 17:10:04.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.plg_system_sef.ini	2010-04-25 22:51:26.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.plg_system_sef.ini 1.5.0 2008-07-08 19:01:39 22:15:02 ~0 $
+# $Id: es-ES.plg_system_sef.ini 1.5.0 2010-04-25 22:51:25 22:15:02 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.plg_user_joomla.ini 16/administrator/language/es-ES/es-ES.plg_user_joomla.ini
--- 15/administrator/language/es-ES/es-ES.plg_user_joomla.ini	2009-07-25 17:10:04.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.plg_user_joomla.ini	2010-04-25 22:51:38.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.plg_user_joomla.ini 1.5.0 2008-07-08 19:02:24 02:53:19 ~0 $
+# $Id: es-ES.plg_user_joomla.ini 1.5.0 2010-04-25 22:51:36 02:53:19 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.plg_xmlrpc_blogger.ini 16/administrator/language/es-ES/es-ES.plg_xmlrpc_blogger.ini
--- 15/administrator/language/es-ES/es-ES.plg_xmlrpc_blogger.ini	2009-07-25 17:10:02.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.plg_xmlrpc_blogger.ini	2010-04-25 22:51:50.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.plg_xmlrpc_blogger.ini 1.5.0 2008-07-08 19:02:55 02:53:29 ~0 $
+# $Id: es-ES.plg_xmlrpc_blogger.ini 1.5.0 2010-04-25 22:51:48 02:53:29 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.plg_xmlrpc_joomla.ini 16/administrator/language/es-ES/es-ES.plg_xmlrpc_joomla.ini
--- 15/administrator/language/es-ES/es-ES.plg_xmlrpc_joomla.ini	2009-07-25 17:10:02.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.plg_xmlrpc_joomla.ini	2010-04-25 22:52:02.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.plg_xmlrpc_joomla.ini 1.5.0 2008-07-08 19:03:13 02:53:38 ~0 $
+# $Id: es-ES.plg_xmlrpc_joomla.ini 1.5.0 2010-04-25 22:52:01 02:53:38 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.tpl_beez.ini 16/administrator/language/es-ES/es-ES.tpl_beez.ini
--- 15/administrator/language/es-ES/es-ES.tpl_beez.ini	2009-07-25 17:10:02.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.tpl_beez.ini	2010-04-25 22:52:18.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.tpl_beez.ini 1.5.0 2008-07-08 19:03:32 20:35:34 ~0 $
+# $Id: es-ES.tpl_beez.ini 1.5.0 2010-04-25 22:52:17 20:35:34 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.tpl_ja_purity.ini 16/administrator/language/es-ES/es-ES.tpl_ja_purity.ini
--- 15/administrator/language/es-ES/es-ES.tpl_ja_purity.ini	2009-07-25 17:10:02.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.tpl_ja_purity.ini	2010-04-25 02:06:44.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.tpl_ja_purity.ini 1.5.4 2009-06-25 13:35:31 ff ~0 $
+# $Id: es-ES.tpl_ja_purity.ini 1.5.4 2010-04-25 02:06:43 ff ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.tpl_khepri.ini 16/administrator/language/es-ES/es-ES.tpl_khepri.ini
--- 15/administrator/language/es-ES/es-ES.tpl_khepri.ini	2009-07-25 17:10:02.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.tpl_khepri.ini	2010-04-25 02:07:38.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.tpl_khepri.ini 1.5.0 2008-07-08 19:05:08 17:02:58 ~0 $
+# $Id: es-ES.tpl_khepri.ini 1.5.0 2010-04-25 02:07:36 17:02:58 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.tpl_rhuk_milkyway.ini 16/administrator/language/es-ES/es-ES.tpl_rhuk_milkyway.ini
--- 15/administrator/language/es-ES/es-ES.tpl_rhuk_milkyway.ini	2009-07-25 17:10:02.000000000 +0200
+++ 16/administrator/language/es-ES/es-ES.tpl_rhuk_milkyway.ini	2010-04-25 02:07:16.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.tpl_rhuk_milkyway.ini 1.5.0 2009-01-11 02:42:51 02:54:08 ~0 $
+# $Id: es-ES.tpl_rhuk_milkyway.ini 1.5.0 2010-04-25 02:07:14 02:54:08 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/administrator/language/es-ES/es-ES.xml 16/administrator/language/es-ES/es-ES.xml
--- 15/administrator/language/es-ES/es-ES.xml	2009-11-05 16:16:00.000000000 +0100
+++ 16/administrator/language/es-ES/es-ES.xml	2010-04-24 22:11:10.000000000 +0200
@@ -3,12 +3,12 @@
 	<tag>es-ES</tag>
 	<name>Español (spanish formal Internacional)</name>
 	<description>Idioma para usar en la parte administrativa de Joomla! 1.5. Creado por Joomla! Spanish - Traductor oficial asociado</description>
-	<version>1.5.15</version>
-	<creationDate>2009-05-21</creationDate>
+	<version>1.5.16</version>
+	<creationDate>2010-04-24</creationDate>
 	<author>Joomla! Spanish</author>
 	<authorUrl>www.joomlaspanish.org</authorUrl>
 	<authorEmail>extensiones@joomlaspanish.org</authorEmail>
-	<copyright>copyright (C) 2009 JoomlaSpanish.org  All rights reserved.</copyright>
+	<copyright>copyright (C) 2010 JoomlaSpanish.org  All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<metadata>
 		<name>Español (spanish formal Internacional)</name>
diff -aruN --binary 15/administrator/modules/mod_custom/mod_custom.xml 16/administrator/modules/mod_custom/mod_custom.xml
--- 15/administrator/modules/mod_custom/mod_custom.xml	2009-05-29 13:51:46.000000000 +0200
+++ 16/administrator/modules/mod_custom/mod_custom.xml	2010-04-23 13:40:12.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Custom HTML</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/administrator/modules/mod_feed/helper.php 16/administrator/modules/mod_feed/helper.php
--- 15/administrator/modules/mod_feed/helper.php	2009-05-29 13:51:46.000000000 +0200
+++ 16/administrator/modules/mod_feed/helper.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: helper.php 11617 2009-02-07 14:16:17Z kdevine $
+* @version		$Id: helper.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/modules/mod_feed/mod_feed.php 16/administrator/modules/mod_feed/mod_feed.php
--- 15/administrator/modules/mod_feed/mod_feed.php	2009-05-29 13:51:46.000000000 +0200
+++ 16/administrator/modules/mod_feed/mod_feed.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: mod_feed.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: mod_feed.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/modules/mod_feed/mod_feed.xml 16/administrator/modules/mod_feed/mod_feed.xml
--- 15/administrator/modules/mod_feed/mod_feed.xml	2009-05-29 13:51:46.000000000 +0200
+++ 16/administrator/modules/mod_feed/mod_feed.xml	2010-04-23 13:40:12.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Feed Display</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/administrator/modules/mod_footer/mod_footer.php 16/administrator/modules/mod_footer/mod_footer.php
--- 15/administrator/modules/mod_footer/mod_footer.php	2009-05-29 13:51:44.000000000 +0200
+++ 16/administrator/modules/mod_footer/mod_footer.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: mod_footer.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: mod_footer.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/modules/mod_footer/mod_footer.xml 16/administrator/modules/mod_footer/mod_footer.xml
--- 15/administrator/modules/mod_footer/mod_footer.xml	2009-05-29 13:51:44.000000000 +0200
+++ 16/administrator/modules/mod_footer/mod_footer.xml	2010-04-23 13:40:12.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Footer</name>
 	<author>Joomla! Project</author>
 	<creationDate>Nov 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/administrator/modules/mod_latest/mod_latest.php 16/administrator/modules/mod_latest/mod_latest.php
--- 15/administrator/modules/mod_latest/mod_latest.php	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/modules/mod_latest/mod_latest.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: mod_latest.php 10867 2008-08-30 07:11:13Z willebil $
+* @version		$Id: mod_latest.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/modules/mod_latest/mod_latest.xml 16/administrator/modules/mod_latest/mod_latest.xml
--- 15/administrator/modules/mod_latest/mod_latest.xml	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/modules/mod_latest/mod_latest.xml	2010-04-23 13:40:12.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Latest News</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/administrator/modules/mod_logged/mod_logged.php 16/administrator/modules/mod_logged/mod_logged.php
--- 15/administrator/modules/mod_logged/mod_logged.php	2009-05-29 13:51:44.000000000 +0200
+++ 16/administrator/modules/mod_logged/mod_logged.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: mod_logged.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: mod_logged.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright		Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright		Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/modules/mod_logged/mod_logged.xml 16/administrator/modules/mod_logged/mod_logged.xml
--- 15/administrator/modules/mod_logged/mod_logged.xml	2009-05-29 13:51:44.000000000 +0200
+++ 16/administrator/modules/mod_logged/mod_logged.xml	2010-04-23 13:40:12.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Logged in Users</name>
 	<author>Joomla! Project</author>
 	<creationDate>January 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/administrator/modules/mod_login/mod_login.php 16/administrator/modules/mod_login/mod_login.php
--- 15/administrator/modules/mod_login/mod_login.php	2009-05-29 13:51:46.000000000 +0200
+++ 16/administrator/modules/mod_login/mod_login.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: mod_login.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: mod_login.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/modules/mod_login/mod_login.xml 16/administrator/modules/mod_login/mod_login.xml
--- 15/administrator/modules/mod_login/mod_login.xml	2009-05-29 13:51:46.000000000 +0200
+++ 16/administrator/modules/mod_login/mod_login.xml	2010-04-23 13:40:12.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Login Form</name>
 	<author>Joomla! Project</author>
 	<creationDate>March 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/administrator/modules/mod_menu/helper.php 16/administrator/modules/mod_menu/helper.php
--- 15/administrator/modules/mod_menu/helper.php	2009-05-29 13:51:46.000000000 +0200
+++ 16/administrator/modules/mod_menu/helper.php	2010-04-23 13:40:12.000000000 +0200
@@ -2,7 +2,7 @@
 /**
 * @version		$Id:mod_menu.php 2463 2006-02-18 06:05:38Z webImagery $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/modules/mod_menu/menu.php 16/administrator/modules/mod_menu/menu.php
--- 15/administrator/modules/mod_menu/menu.php	2009-05-29 13:51:46.000000000 +0200
+++ 16/administrator/modules/mod_menu/menu.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
- * @version		$Id: menu.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: menu.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/administrator/modules/mod_menu/mod_menu.php 16/administrator/modules/mod_menu/mod_menu.php
--- 15/administrator/modules/mod_menu/mod_menu.php	2009-05-29 13:51:46.000000000 +0200
+++ 16/administrator/modules/mod_menu/mod_menu.php	2010-04-23 13:40:12.000000000 +0200
@@ -2,7 +2,7 @@
 /**
 * @version		$Id:mod_menu.php 2463 2006-02-18 06:05:38Z webImagery $
 * @package		Joomla
-* @copyright		Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright		Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/modules/mod_menu/mod_menu.xml 16/administrator/modules/mod_menu/mod_menu.xml
--- 15/administrator/modules/mod_menu/mod_menu.xml	2009-05-29 13:51:46.000000000 +0200
+++ 16/administrator/modules/mod_menu/mod_menu.xml	2010-04-23 13:40:12.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Admin Menu</name>
 	<author>Joomla! Project</author>
 	<creationDate>March 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/administrator/modules/mod_online/mod_online.php 16/administrator/modules/mod_online/mod_online.php
--- 15/administrator/modules/mod_online/mod_online.php	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/modules/mod_online/mod_online.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: mod_online.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: mod_online.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/modules/mod_online/mod_online.xml 16/administrator/modules/mod_online/mod_online.xml
--- 15/administrator/modules/mod_online/mod_online.xml	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/modules/mod_online/mod_online.xml	2010-04-23 13:40:12.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Online Users</name>
 	<author>Joomla! Project</author>
 	<creationDate>Jan 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/administrator/modules/mod_popular/mod_popular.php 16/administrator/modules/mod_popular/mod_popular.php
--- 15/administrator/modules/mod_popular/mod_popular.php	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/modules/mod_popular/mod_popular.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: mod_popular.php 10460 2008-06-27 10:03:09Z eddieajau $
+* @version		$Id: mod_popular.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/modules/mod_popular/mod_popular.xml 16/administrator/modules/mod_popular/mod_popular.xml
--- 15/administrator/modules/mod_popular/mod_popular.xml	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/modules/mod_popular/mod_popular.xml	2010-04-23 13:40:12.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Popular Items</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/administrator/modules/mod_quickicon/mod_quickicon.php 16/administrator/modules/mod_quickicon/mod_quickicon.php
--- 15/administrator/modules/mod_quickicon/mod_quickicon.php	2009-06-28 05:34:54.000000000 +0200
+++ 16/administrator/modules/mod_quickicon/mod_quickicon.php	2010-04-24 21:58:20.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: mod_quickicon.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: mod_quickicon.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/modules/mod_quickicon/mod_quickicon.xml 16/administrator/modules/mod_quickicon/mod_quickicon.xml
--- 15/administrator/modules/mod_quickicon/mod_quickicon.xml	2009-06-29 01:04:04.000000000 +0200
+++ 16/administrator/modules/mod_quickicon/mod_quickicon.xml	2010-04-23 13:40:12.000000000 +0200
@@ -3,18 +3,18 @@
 	<name>Quick Icons</name>
 	<author>Joomla! Project</author>
 	<creationDate>Nov 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>1.0.0</version>
-	<description>Este módulo muestra los iconos rápidos que son visibles en el área de administración de la Página de inicio</description>
+	<description>This module shows Quick Icons that are visible on the Admin area Home Page</description>
 	<files>
 		<filename module="mod_quickicon">mod_quickicon.php</filename>
 	</files>
 	<params>
-		<param name="cache" type="list" default="1" label="Caching" description="Seleccione si desea la caché del contenido en este módulo">
-			<option value="1">Usar global</option>
+		<param name="cache" type="list" default="1" label="Caching" description="Select whether to cache the content of this module">
+			<option value="1">Use global</option>
 			<option value="0">No caching</option>
 		</param>
 	</params>
diff -aruN --binary 15/administrator/modules/mod_stats/mod_stats.php 16/administrator/modules/mod_stats/mod_stats.php
--- 15/administrator/modules/mod_stats/mod_stats.php	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/modules/mod_stats/mod_stats.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: mod_stats.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: mod_stats.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/modules/mod_stats/mod_stats.xml 16/administrator/modules/mod_stats/mod_stats.xml
--- 15/administrator/modules/mod_stats/mod_stats.xml	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/modules/mod_stats/mod_stats.xml	2010-04-23 13:40:12.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Items Stats</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/administrator/modules/mod_status/mod_status.php 16/administrator/modules/mod_status/mod_status.php
--- 15/administrator/modules/mod_status/mod_status.php	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/modules/mod_status/mod_status.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: mod_status.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: mod_status.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/modules/mod_status/mod_status.xml 16/administrator/modules/mod_status/mod_status.xml
--- 15/administrator/modules/mod_status/mod_status.xml	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/modules/mod_status/mod_status.xml	2010-04-23 13:40:12.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>User Status</name>
 	<author>Joomla! Project</author>
 	<creationDate>Feb 2006</creationDate>
-	<copyright>(C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/administrator/modules/mod_submenu/mod_submenu.php 16/administrator/modules/mod_submenu/mod_submenu.php
--- 15/administrator/modules/mod_submenu/mod_submenu.php	2009-05-29 13:51:48.000000000 +0200
+++ 16/administrator/modules/mod_submenu/mod_submenu.php	2010-04-23 13:40:12.000000000 +0200
@@ -2,7 +2,7 @@
 /**
 * @version		$Id:mod_menu.php 2463 2006-02-18 06:05:38Z webImagery $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/modules/mod_submenu/mod_submenu.xml 16/administrator/modules/mod_submenu/mod_submenu.xml
--- 15/administrator/modules/mod_submenu/mod_submenu.xml	2009-05-29 13:51:48.000000000 +0200
+++ 16/administrator/modules/mod_submenu/mod_submenu.xml	2010-04-23 13:40:12.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Admin Submenu</name>
 	<author>Joomla! Project</author>
 	<creationDate>Feb 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/administrator/modules/mod_title/mod_title.php 16/administrator/modules/mod_title/mod_title.php
--- 15/administrator/modules/mod_title/mod_title.php	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/modules/mod_title/mod_title.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: mod_title.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: mod_title.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/modules/mod_title/mod_title.xml 16/administrator/modules/mod_title/mod_title.xml
--- 15/administrator/modules/mod_title/mod_title.xml	2009-05-29 13:51:42.000000000 +0200
+++ 16/administrator/modules/mod_title/mod_title.xml	2010-04-23 13:40:12.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Title</name>
 	<author>Joomla! Project</author>
 	<creationDate>Nov 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/administrator/modules/mod_toolbar/mod_toolbar.php 16/administrator/modules/mod_toolbar/mod_toolbar.php
--- 15/administrator/modules/mod_toolbar/mod_toolbar.php	2009-05-29 13:51:44.000000000 +0200
+++ 16/administrator/modules/mod_toolbar/mod_toolbar.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: mod_toolbar.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: mod_toolbar.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/modules/mod_toolbar/mod_toolbar.xml 16/administrator/modules/mod_toolbar/mod_toolbar.xml
--- 15/administrator/modules/mod_toolbar/mod_toolbar.xml	2009-05-29 13:51:44.000000000 +0200
+++ 16/administrator/modules/mod_toolbar/mod_toolbar.xml	2010-04-23 13:40:12.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Toolbar</name>
 	<author>Joomla! Project</author>
 	<creationDate>Nov 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/administrator/modules/mod_unread/mod_unread.php 16/administrator/modules/mod_unread/mod_unread.php
--- 15/administrator/modules/mod_unread/mod_unread.php	2009-05-29 13:51:48.000000000 +0200
+++ 16/administrator/modules/mod_unread/mod_unread.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: mod_unread.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: mod_unread.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/modules/mod_unread/mod_unread.xml 16/administrator/modules/mod_unread/mod_unread.xml
--- 15/administrator/modules/mod_unread/mod_unread.xml	2009-05-29 13:51:48.000000000 +0200
+++ 16/administrator/modules/mod_unread/mod_unread.xml	2010-04-23 13:40:12.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Unread Items</name>
 	<author>Joomla! Project</author>
 	<creationDate>Nov 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/administrator/templates/khepri/component.php 16/administrator/templates/khepri/component.php
--- 15/administrator/templates/khepri/component.php	2009-05-29 13:51:56.000000000 +0200
+++ 16/administrator/templates/khepri/component.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/templates/khepri/cpanel.php 16/administrator/templates/khepri/cpanel.php
--- 15/administrator/templates/khepri/cpanel.php	2009-06-28 04:47:32.000000000 +0200
+++ 16/administrator/templates/khepri/cpanel.php	2010-04-25 01:02:26.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
@@ -102,7 +102,7 @@
 		<p class="copyright">
 			<a href="http://www.joomla.org" target="_blank">Joomla!</a>
 			<?php echo  JText::_('ISFREESOFTWARE') ?>
-			<br /><a href="http://www.joomlaspanish.org/" target="_blank">Pack creado por Joomla! Spanish 2009</a> - <a href="http://www.webempresa.com/" target="_blank" title="Dise&ntilde;o web">Patrocinado por Web Empresa</a>
+			<br /><a href="http://www.joomlaspanish.org/" target="_blank">Pack creado por Joomla! Spanish 2010</a> - <a href="http://www.webempresa.com/" target="_blank" title="Dise&ntilde;o web">Patrocinado por Web Empresa</a>
 		</p>
 	</div>
 </body>
diff -aruN --binary 15/administrator/templates/khepri/css/component.css 16/administrator/templates/khepri/css/component.css
--- 15/administrator/templates/khepri/css/component.css	2008-07-06 23:38:50.000000000 +0200
+++ 16/administrator/templates/khepri/css/component.css	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
 /**
-* @version $Id: component.css 10387 2008-06-03 10:59:16Z pasamio $
-* @copyright Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved.
+* @version $Id: component.css 14401 2010-01-26 14:10:00Z louis $
+* @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/templates/khepri/css/general.css 16/administrator/templates/khepri/css/general.css
--- 15/administrator/templates/khepri/css/general.css	2008-07-09 14:22:32.000000000 +0200
+++ 16/administrator/templates/khepri/css/general.css	2010-04-24 22:35:48.000000000 +0200
@@ -1,6 +1,6 @@
 /**
-* @version $Id: general.css 10387 2008-06-03 10:59:16Z pasamio $
-* @copyright Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved.
+* @version $Id: general.css 14401 2010-01-26 14:10:00Z louis $
+* @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/templates/khepri/css/general_rtl.css 16/administrator/templates/khepri/css/general_rtl.css
--- 15/administrator/templates/khepri/css/general_rtl.css	2009-03-28 01:43:46.000000000 +0100
+++ 16/administrator/templates/khepri/css/general_rtl.css	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
 /**
-* @version $Id: general_rtl.css 11663 2009-03-08 20:27:58Z willebil $
-* @copyright Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @version $Id: general_rtl.css 14401 2010-01-26 14:10:00Z louis $
+* @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/templates/khepri/css/ie7.css 16/administrator/templates/khepri/css/ie7.css
--- 15/administrator/templates/khepri/css/ie7.css	2008-07-06 23:38:50.000000000 +0200
+++ 16/administrator/templates/khepri/css/ie7.css	2010-04-23 13:40:12.000000000 +0200
@@ -9,3 +9,10 @@
 
 }
 
+.button2-left .page a, .button2-right .page a, .button2-left .page span, .button2-right .page span, .button2-left .blank a, .button2-right .blank a, .button2-left .blank span, .button2-right .blank span{
+	float: left;
+}
+
+ #sbox-window {
+margin:30%; � � � �
+}
diff -aruN --binary 15/administrator/templates/khepri/css/login.css 16/administrator/templates/khepri/css/login.css
--- 15/administrator/templates/khepri/css/login.css	2008-07-06 23:38:50.000000000 +0200
+++ 16/administrator/templates/khepri/css/login.css	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
 /**
-* @version $Id: login.css 10387 2008-06-03 10:59:16Z pasamio $
-* @copyright Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @version $Id: login.css 14401 2010-01-26 14:10:00Z louis $
+* @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/templates/khepri/css/login_rtl.css 16/administrator/templates/khepri/css/login_rtl.css
--- 15/administrator/templates/khepri/css/login_rtl.css	2008-07-06 23:38:50.000000000 +0200
+++ 16/administrator/templates/khepri/css/login_rtl.css	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
 /**
-* @version $Id: login_rtl.css 10387 2008-06-03 10:59:16Z pasamio $
-* @copyright Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @version $Id: login_rtl.css 14401 2010-01-26 14:10:00Z louis $
+* @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/templates/khepri/css/menu.css 16/administrator/templates/khepri/css/menu.css
--- 15/administrator/templates/khepri/css/menu.css	2008-07-06 23:38:50.000000000 +0200
+++ 16/administrator/templates/khepri/css/menu.css	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
 /**
-* @version $Id: menu.css 10387 2008-06-03 10:59:16Z pasamio $
-* @copyright Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @version $Id: menu.css 14401 2010-01-26 14:10:00Z louis $
+* @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/templates/khepri/css/menu_rtl.css 16/administrator/templates/khepri/css/menu_rtl.css
--- 15/administrator/templates/khepri/css/menu_rtl.css	2008-07-06 23:38:50.000000000 +0200
+++ 16/administrator/templates/khepri/css/menu_rtl.css	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
 /**
-* @version $Id: menu_rtl.css 10387 2008-06-03 10:59:16Z pasamio $
-* @copyright Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @version $Id: menu_rtl.css 14401 2010-01-26 14:10:00Z louis $
+* @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/templates/khepri/css/norounded.css 16/administrator/templates/khepri/css/norounded.css
--- 15/administrator/templates/khepri/css/norounded.css	2008-07-06 23:38:50.000000000 +0200
+++ 16/administrator/templates/khepri/css/norounded.css	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
 /**
-* @version $Id: norounded.css 10387 2008-06-03 10:59:16Z pasamio $
-* @copyright Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @version $Id: norounded.css 14401 2010-01-26 14:10:00Z louis $
+* @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/templates/khepri/css/template.css 16/administrator/templates/khepri/css/template.css
--- 15/administrator/templates/khepri/css/template.css	2008-07-06 23:38:50.000000000 +0200
+++ 16/administrator/templates/khepri/css/template.css	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
 /**
-* @version $Id: template.css 10387 2008-06-03 10:59:16Z pasamio $
-* @copyright Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved.
+* @version $Id: template.css 14401 2010-01-26 14:10:00Z louis $
+* @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/templates/khepri/css/template_rtl.css 16/administrator/templates/khepri/css/template_rtl.css
--- 15/administrator/templates/khepri/css/template_rtl.css	2008-07-06 23:38:50.000000000 +0200
+++ 16/administrator/templates/khepri/css/template_rtl.css	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
 /**
-* @version $Id: template_rtl.css 10387 2008-06-03 10:59:16Z pasamio $
-* @copyright Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @version $Id: template_rtl.css 14401 2010-01-26 14:10:00Z louis $
+* @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/templates/khepri/html/modules.php 16/administrator/templates/khepri/html/modules.php
--- 15/administrator/templates/khepri/html/modules.php	2009-05-29 13:51:48.000000000 +0200
+++ 16/administrator/templates/khepri/html/modules.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
- * @version		$Id: modules.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: modules.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/templates/khepri/html/pagination.php 16/administrator/templates/khepri/html/pagination.php
--- 15/administrator/templates/khepri/html/pagination.php	2009-05-29 13:51:48.000000000 +0200
+++ 16/administrator/templates/khepri/html/pagination.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
- * @version		$Id: pagination.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: pagination.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/templates/khepri/index.php 16/administrator/templates/khepri/index.php
--- 15/administrator/templates/khepri/index.php	2009-06-28 04:47:00.000000000 +0200
+++ 16/administrator/templates/khepri/index.php	2010-04-25 01:01:52.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
@@ -116,7 +116,7 @@
 		<p class="copyright">
 			<a href="http://www.joomla.org" target="_blank">Joomla!</a>
 			<?php echo  JText::_('ISFREESOFTWARE') ?>
-			<br /><a href="http://www.joomlaspanish.org/" target="_blank">Pack creado por Joomla! Spanish 2009</a> - <a href="http://www.webempresa.com/" target="_blank" title="Dise&ntilde;o web">Patrocinado por Web Empresa</a>
+			<br /><a href="http://www.joomlaspanish.org/" target="_blank">Pack creado por Joomla! Spanish 2010</a> - <a href="http://www.webempresa.com/" target="_blank" title="Dise&ntilde;o web">Patrocinado por Web Empresa</a>
 		</p>
 	</div>
 </body>
diff -aruN --binary 15/administrator/templates/khepri/js/index.js 16/administrator/templates/khepri/js/index.js
--- 15/administrator/templates/khepri/js/index.js	2009-05-29 13:51:56.000000000 +0200
+++ 16/administrator/templates/khepri/js/index.js	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
 /**
-* @version		$Id: index.js 10702 2008-08-21 09:31:31Z eddieajau $
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @version		$Id: index.js 14401 2010-01-26 14:10:00Z louis $
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/templates/khepri/js/menu.js 16/administrator/templates/khepri/js/menu.js
--- 15/administrator/templates/khepri/js/menu.js	2009-05-29 13:51:56.000000000 +0200
+++ 16/administrator/templates/khepri/js/menu.js	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
 /**
-* @version		$Id: menu.js 10702 2008-08-21 09:31:31Z eddieajau $
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @version		$Id: menu.js 14401 2010-01-26 14:10:00Z louis $
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/templates/khepri/login.php 16/administrator/templates/khepri/login.php
--- 15/administrator/templates/khepri/login.php	2009-06-28 04:46:32.000000000 +0200
+++ 16/administrator/templates/khepri/login.php	2010-04-25 01:02:08.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
@@ -91,7 +91,7 @@
 	<p class="copyright">
 		<a href="http://www.joomla.org" target="_blank">Joomla!</a>
 		<?php echo JText::_('ISFREESOFTWARE') ?>
-		<br /><a href="http://www.joomlaspanish.org/" target="_blank">Pack creado por Joomla! Spanish 2009</a> - <a href="http://www.webempresa.com/" target="_blank" title="Dise&ntilde;o web">Patrocinado por Web Empresa</a>
+		<br /><a href="http://www.joomlaspanish.org/" target="_blank">Pack creado por Joomla! Spanish 2010</a> - <a href="http://www.webempresa.com/" target="_blank" title="Dise&ntilde;o web">Patrocinado por Web Empresa</a>
 	</p>
 </div>
 </body>
diff -aruN --binary 15/administrator/templates/system/component.php 16/administrator/templates/system/component.php
--- 15/administrator/templates/system/component.php	2009-05-29 13:51:56.000000000 +0200
+++ 16/administrator/templates/system/component.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/templates/system/css/error.css 16/administrator/templates/system/css/error.css
--- 15/administrator/templates/system/css/error.css	2009-05-29 13:51:56.000000000 +0200
+++ 16/administrator/templates/system/css/error.css	2010-04-23 13:40:12.000000000 +0200
@@ -2,7 +2,7 @@
  * CSS Document for offline page
  * @version $Id: error.css 1264 2005-11-30 19:37:13Z Jinx $
  * @package Joomla
- * @copyright Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license GNU/GPL, see LICENSE.php
  * Joomla! is free software and parts of it may contain or be derived from the
  * GNU General Public License or other free or open source software licenses.
diff -aruN --binary 15/administrator/templates/system/error.php 16/administrator/templates/system/error.php
--- 15/administrator/templates/system/error.php	2009-05-29 13:51:56.000000000 +0200
+++ 16/administrator/templates/system/error.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/administrator/templates/system/html/modules.php 16/administrator/templates/system/html/modules.php
--- 15/administrator/templates/system/html/modules.php	2009-05-29 13:51:56.000000000 +0200
+++ 16/administrator/templates/system/html/modules.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
- * @version		$Id: modules.php 10559 2008-07-16 20:57:43Z instance $
+ * @version		$Id: modules.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/CHANGELOG.php 16/CHANGELOG.php
--- 15/CHANGELOG.php	2009-11-04 18:51:18.000000000 +0100
+++ 16/CHANGELOG.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: CHANGELOG.php 13426 2009-11-04 16:36:00Z ian $
+* @version		$Id: CHANGELOG.php 16385 2010-04-23 10:44:15Z ian $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2009 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
@@ -37,7 +37,78 @@
 - -> Removed
 ! -> Note
 
+-------------------- 1.5.16 Stable Release [23-April-2010] ------------------
+
+23-Apr-2010 Ian MacLennan
+ $ [#20195] Language credit update
+ $ [#20055] Language bug in "Menus"
+ # [#20043] JApplication::redirect() using a 301 error code incorrect.
+ # [#20025] Adding Reykjavik in timezone
+ $ [#20024] More updates on installation ini files
+ $ [#19966] New hi-IN installation language
+ $ [#19871] Missing string in a few installation ini files
+ # [#19859] Graceful handling of failing Apache plugins
+ # [#18046] $theURI not correctly set on IIS7 in environment\uri.php
+ # [#20184] Removal of searchwords from SEF urls to ensure cross platform compatibility
+
+07-Mar-2010 Ian MacLennan
+ # [#16930] Reverting patch from #16930 because it breaks the installer
+
+05-Mar-2010 Ian MacLennan
+ $ [#19864] Missing string in is-IS installation ini
+ # [#18648] News Feeds -> Categories can throw a SQL error when it tries to sort by section_name
+ # [#18619] Validation error of mod_search
+ # [#18570] Button select article in back-end ( RTL) ie7 + modal centering
+ # [#18403] Possible typo in mod_latestnews xml
+ # [#17762] Mod_login\helper.php: Trying to get property of non-object
+ # [#17235] SEF URL for contacts gives 404 error
+ # [#17000] Core related items and other modules non-functional with cache module on
+ # [#16974] Checking wrong cache field in com_content _loaddata() function
+ # [#16930] live_site$ in configuration.php ignored by some JS-based functions - breaks joomla 1.5 behind reverse proxy
+ # [#16506] JFolder::makeSafe removes dot
+
+04-Mar-2010 Ian MacLennan
+ $ [#19836] New Arabic Unitag installation language ar_AA
+ # [#19831] Preventing mod_login redirect to display trashed menu items
+ # [#19798] Undefined variable notice when enabling or disabling a user in com_user
+ # [#19680] Media manager folder param incorrectly named
+ # [#19245] Pagination in category blog layout not shown in specific case
+ # [#18848] Last module position in <select> is with space at end
+ # [#18683] The "search result Itemid" fix (15780) doesn't apply to beez
+ # [#18672] Issue with some feeds in release 1.5.15
+
+27-Feb-2010 Ian MacLennan
+ # [#19816] Adding a missing string in many installation ini, added helpfile listing
+ # [#19763] _JEXEC check missing from joomla file
+ # [#19681] Copying menus does not maintain parent child relationship
+ # [#19655] Poll component save task missing successful results message
+ # [#19555] Timezone code setting incorrect for 6:30 (Yagoon) and 11:30 (Norfolk) in Global Configuration
+ # [#19055] Tinymce bug prevents adding the valid id extended element for the anchor tag
+ # [#19009] Author Alias not properly escaped in Article Manager
+ # [#18936] Atom feed image url incorrect
+
+22-Feb-2010 Ian MacLennan
+ # [#17878] Installing modules with upgrade method
+ # [#18614] Incorrect bracketing in templates/system/component.php
+ # [#18617] Disabled components still show in the "menu type" tree of com_menus
+ # [#18612] Pathway error when using php4
+ # [#17986] A bug causes a space to appear after email links
+
+21-Feb-2010 Ian MacLennan
+ $ [#19715] Adding Phnom-Penh to UTC strings
+ $ [#19627] Add sr-YU in installation
+ $ [#19604] Missing ini string in installation
+ # [#19435] New caching of com_contact in 1.5.15 results in "Invalid Token"
+ # [#19405] Improvements to caption
+ # [#18987] Minor bug in module updater code
+
+
+26-Jan-2010 Louis Landry
+ ^ Updated copyright notices for 2010
+ ^ Moved testing infrastructure from the /testing/ folder into the tree.
+
 -------------------- 1.5.15 Stable Release [05-November-2009] ------------------
+
 04-Nov-2009 Ian MacLennan
  # [#17475] Fixed missing = in patch (parse error)
 
@@ -99,7 +170,7 @@
  # [#17559] Change to Beez Template to make it more generic
  # [#17231] mod_newsflash doesn't honour alternative read more text
  # [#17215] Missing <blockquote> button in TinyMCE 3
- 
+
 25-Sept-2009 Ian MacLennan
  # [#16484] Password field changed in configuration.php by Administration > Global Configuration
  # [#16804] Linked image in Beez template jumps in IE8
@@ -166,7 +237,7 @@
  $ [#16950] Lots of missing language strings in TinyMCE v3
  # [#16593] JFile::upload() uses chmod 777 in FTP mode
  # [#15673] Different time create date and start publishing in beez
- # [#16601] Section filter on article manager showing non content sections as well 
+ # [#16601] Section filter on article manager showing non content sections as well
  # [#16607] Mod Newsflash read more link broken with Beez template
  # [#16719] JHTML::tooltip quote problem
  # [#16753] CSS file is not updated when you edit the joomla
diff -aruN --binary 15/components/com_banners/banners.php 16/components/com_banners/banners.php
--- 15/components/com_banners/banners.php	2009-05-29 13:52:56.000000000 +0200
+++ 16/components/com_banners/banners.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: banners.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: banners.php 14401 2010-01-26 14:10:00Z louis $
  * @package  Joomla
  * @subpackage	Banners
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_banners/controller.php 16/components/com_banners/controller.php
--- 15/components/com_banners/controller.php	2009-05-29 13:52:56.000000000 +0200
+++ 16/components/com_banners/controller.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: controller.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: controller.php 14401 2010-01-26 14:10:00Z louis $
  * @package  	Joomla
  * @subpackage	Banners
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_banners/models/banner.php 16/components/com_banners/models/banner.php
--- 15/components/com_banners/models/banner.php	2009-05-29 13:52:56.000000000 +0200
+++ 16/components/com_banners/models/banner.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: banner.php 11393 2009-01-05 02:11:06Z ian $
+ * @version		$Id: banner.php 14401 2010-01-26 14:10:00Z louis $
  * @package  Joomla
  * @subpackage	Banners
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_banners/router.php 16/components/com_banners/router.php
--- 15/components/com_banners/router.php	2009-05-29 13:52:56.000000000 +0200
+++ 16/components/com_banners/router.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: router.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: router.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Banners
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_contact/contact.php 16/components/com_contact/contact.php
--- 15/components/com_contact/contact.php	2009-05-29 13:53:02.000000000 +0200
+++ 16/components/com_contact/contact.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: contact.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: contact.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Contact
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_contact/controller.php 16/components/com_contact/controller.php
--- 15/components/com_contact/controller.php	2009-11-04 18:51:18.000000000 +0100
+++ 16/components/com_contact/controller.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: controller.php 13426 2009-11-04 16:36:00Z ian $
+ * @version		$Id: controller.php 14974 2010-02-21 14:32:22Z ian $
  * @package		Joomla
  * @subpackage	Contact
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
@@ -78,9 +78,29 @@
 		if ($user->get('id') || ($viewnow == 'category' && $viewcache == 0)) {
 			$view->display();
 		} else {
+
+			// Workaround for token caching
+			if ($viewName == 'contact')
+			{
+				ob_start();
+			}
+			
 			$option = JRequest::getCmd('option');
 			$cache =& JFactory::getCache($option, 'view');
 			$cache->get($view, 'display');
+			
+			// Workaround for token caching
+			if ($viewName == 'contact')
+			{
+				$contents = ob_get_contents();
+				ob_end_clean();
+				
+				$token			= JUtility::getToken();
+				$search 		= '#<input type="hidden" name="[0-9a-f]{32}" value="1" />#';
+				$replacement 	= '<input type="hidden" name="'.$token.'" value="1" />';
+
+				echo preg_replace($search, $replacement, $contents);
+			}
 		}
 	}
 
diff -aruN --binary 15/components/com_contact/models/category.php 16/components/com_contact/models/category.php
--- 15/components/com_contact/models/category.php	2009-05-29 13:53:02.000000000 +0200
+++ 16/components/com_contact/models/category.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: category.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: category.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Contact
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_contact/models/contact.php 16/components/com_contact/models/contact.php
--- 15/components/com_contact/models/contact.php	2009-05-29 13:53:02.000000000 +0200
+++ 16/components/com_contact/models/contact.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: contact.php 11393 2009-01-05 02:11:06Z ian $
+ * @version		$Id: contact.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Contact
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_contact/router.php 16/components/com_contact/router.php
--- 15/components/com_contact/router.php	2009-05-29 13:53:02.000000000 +0200
+++ 16/components/com_contact/router.php	2010-04-23 13:40:12.000000000 +0200
@@ -2,7 +2,7 @@
 /**
  * @version		$Id: router.php 7380 2007-05-06 21:26:03Z eddieajau $
  * @package		Joomla
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
@@ -79,7 +79,7 @@
 				{
 				    continue;
 				}
-				if (isset($query['view']) && $query['view'] == 'contact'
+				if (isset($query['view']) && $query['view'] == 'contact' && !isset($item->query['catid'])
 					&& isset($item->query['view']) && $item->query['view'] == 'category')
 				{
 					// Check for an undealt with contact id.
diff -aruN --binary 15/components/com_contact/views/category/view.feed.php 16/components/com_contact/views/category/view.feed.php
--- 15/components/com_contact/views/category/view.feed.php	2009-05-29 13:53:02.000000000 +0200
+++ 16/components/com_contact/views/category/view.feed.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: view.feed.php 11782 2009-04-24 17:25:58Z kdevine $
+ * @version		$Id: view.feed.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Contact
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_contact/views/category/view.html.php 16/components/com_contact/views/category/view.html.php
--- 15/components/com_contact/views/category/view.html.php	2009-11-04 18:51:18.000000000 +0100
+++ 16/components/com_contact/views/category/view.html.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: view.html.php 13339 2009-10-27 02:27:05Z ian $
+ * @version		$Id: view.html.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Contact
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_contact/views/contact/view.html.php 16/components/com_contact/views/contact/view.html.php
--- 15/components/com_contact/views/contact/view.html.php	2009-05-29 13:53:02.000000000 +0200
+++ 16/components/com_contact/views/contact/view.html.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: view.html.php 11393 2009-01-05 02:11:06Z ian $
+ * @version		$Id: view.html.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Contact
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_content/content.php 16/components/com_content/content.php
--- 15/components/com_content/content.php	2009-05-29 13:53:00.000000000 +0200
+++ 16/components/com_content/content.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: content.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: content.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_content/controller.php 16/components/com_content/controller.php
--- 15/components/com_content/controller.php	2009-11-04 18:51:18.000000000 +0100
+++ 16/components/com_content/controller.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: controller.php 13338 2009-10-27 02:15:55Z ian $
+ * @version		$Id: controller.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_content/helpers/icon.php 16/components/com_content/helpers/icon.php
--- 15/components/com_content/helpers/icon.php	2009-05-29 14:32:52.000000000 +0200
+++ 16/components/com_content/helpers/icon.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: icon.php 11917 2009-05-29 19:37:05Z ian $
+ * @version		$Id: icon.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_content/helpers/query.php 16/components/com_content/helpers/query.php
--- 15/components/com_content/helpers/query.php	2009-05-29 13:52:56.000000000 +0200
+++ 16/components/com_content/helpers/query.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: query.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: query.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_content/helpers/route.php 16/components/com_content/helpers/route.php
--- 15/components/com_content/helpers/route.php	2009-05-29 13:52:56.000000000 +0200
+++ 16/components/com_content/helpers/route.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: route.php 11190 2008-10-20 00:49:55Z ian $
+ * @version		$Id: route.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_content/models/archive.php 16/components/com_content/models/archive.php
--- 15/components/com_content/models/archive.php	2009-05-29 13:52:58.000000000 +0200
+++ 16/components/com_content/models/archive.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: archive.php 11681 2009-03-08 20:52:50Z willebil $
+ * @version		$Id: archive.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_content/models/article.php 16/components/com_content/models/article.php
--- 15/components/com_content/models/article.php	2009-11-04 18:51:18.000000000 +0100
+++ 16/components/com_content/models/article.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: article.php 13415 2009-11-03 15:53:25Z ian $
+ * @version		$Id: article.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_content/models/category.php 16/components/com_content/models/category.php
--- 15/components/com_content/models/category.php	2009-06-30 21:01:32.000000000 +0200
+++ 16/components/com_content/models/category.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: category.php 12028 2009-06-10 02:06:27Z ian $
+ * @version		$Id: category.php 15201 2010-03-05 09:15:01Z ian $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
@@ -322,7 +322,7 @@
 		}
 
 		// Lets load the siblings if they don't already exist
-		if (empty($this->_content[$state]))
+		if (empty($this->_data[$state]))
 		{
 			// Get the pagination request variables
 			$limit		= JRequest::getVar('limit', 0, '', 'int');
diff -aruN --binary 15/components/com_content/models/frontpage.php 16/components/com_content/models/frontpage.php
--- 15/components/com_content/models/frontpage.php	2009-05-29 13:52:58.000000000 +0200
+++ 16/components/com_content/models/frontpage.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: frontpage.php 11687 2009-03-11 17:49:23Z ian $
+ * @version		$Id: frontpage.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_content/models/section.php 16/components/com_content/models/section.php
--- 15/components/com_content/models/section.php	2009-05-29 13:52:58.000000000 +0200
+++ 16/components/com_content/models/section.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: section.php 11687 2009-03-11 17:49:23Z ian $
+ * @version		$Id: section.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_content/router.php 16/components/com_content/router.php
--- 15/components/com_content/router.php	2009-11-04 18:51:18.000000000 +0100
+++ 16/components/com_content/router.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: router.php 13420 2009-11-04 02:17:02Z ian $
+* @version		$Id: router.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/components/com_content/views/archive/view.html.php 16/components/com_content/views/archive/view.html.php
--- 15/components/com_content/views/archive/view.html.php	2009-05-29 13:52:58.000000000 +0200
+++ 16/components/com_content/views/archive/view.html.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: view.html.php 11398 2009-01-05 20:03:27Z kdevine $
+ * @version		$Id: view.html.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_content/views/article/view.html.php 16/components/com_content/views/article/view.html.php
--- 15/components/com_content/views/article/view.html.php	2009-11-04 18:51:18.000000000 +0100
+++ 16/components/com_content/views/article/view.html.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: view.html.php 13361 2009-10-28 04:34:03Z ian $
+ * @version		$Id: view.html.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_content/views/article/view.pdf.php 16/components/com_content/views/article/view.pdf.php
--- 15/components/com_content/views/article/view.pdf.php	2009-05-29 13:52:58.000000000 +0200
+++ 16/components/com_content/views/article/view.pdf.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: view.pdf.php 11371 2008-12-30 01:31:50Z ian $
+ * @version		$Id: view.pdf.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_content/views/category/view.feed.php 16/components/com_content/views/category/view.feed.php
--- 15/components/com_content/views/category/view.feed.php	2009-05-29 13:53:00.000000000 +0200
+++ 16/components/com_content/views/category/view.feed.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: view.feed.php 11795 2009-05-06 01:59:19Z ian $
+ * @version		$Id: view.feed.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_content/views/category/view.html.php 16/components/com_content/views/category/view.html.php
--- 15/components/com_content/views/category/view.html.php	2009-05-29 13:53:00.000000000 +0200
+++ 16/components/com_content/views/category/view.html.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: view.html.php 11713 2009-03-27 09:18:26Z willebil $
+ * @version		$Id: view.html.php 15181 2010-03-04 23:06:32Z ian $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
@@ -130,7 +130,7 @@
 
 		jimport('joomla.html.pagination');
 		//In case we are in a blog view set the limit
-		if ($layout == 'blog') {
+		if ($layout == 'blog' && ($limit - $links != 0)) {
 			$pagination = new JPagination($total, $limitstart, $limit - $links);
 		} else {
 			$pagination = new JPagination($total, $limitstart, $limit);
diff -aruN --binary 15/components/com_content/views/frontpage/view.feed.php 16/components/com_content/views/frontpage/view.feed.php
--- 15/components/com_content/views/frontpage/view.feed.php	2009-05-29 13:53:00.000000000 +0200
+++ 16/components/com_content/views/frontpage/view.feed.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: view.feed.php 11795 2009-05-06 01:59:19Z ian $
+ * @version		$Id: view.feed.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_content/views/frontpage/view.html.php 16/components/com_content/views/frontpage/view.html.php
--- 15/components/com_content/views/frontpage/view.html.php	2009-05-29 13:53:00.000000000 +0200
+++ 16/components/com_content/views/frontpage/view.html.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: view.html.php 10868 2008-08-30 07:22:26Z willebil $
+ * @version		$Id: view.html.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_content/views/section/view.feed.php 16/components/com_content/views/section/view.feed.php
--- 15/components/com_content/views/section/view.feed.php	2009-05-29 13:52:58.000000000 +0200
+++ 16/components/com_content/views/section/view.feed.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: view.feed.php 11795 2009-05-06 01:59:19Z ian $
+ * @version		$Id: view.feed.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_content/views/section/view.html.php 16/components/com_content/views/section/view.html.php
--- 15/components/com_content/views/section/view.html.php	2009-05-29 13:52:58.000000000 +0200
+++ 16/components/com_content/views/section/view.html.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: view.html.php 11664 2009-03-08 20:29:17Z willebil $
+ * @version		$Id: view.html.php 15181 2010-03-04 23:06:32Z ian $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
@@ -104,7 +104,7 @@
 		}
 
 		jimport('joomla.html.pagination');
-		$pagination = new JPagination($total, $limitstart, $limit - $links);
+		$pagination = new JPagination($total, $limitstart, $limit );
 
 		$this->assign('total',			$total);
 
diff -aruN --binary 15/components/com_mailto/controller.php 16/components/com_mailto/controller.php
--- 15/components/com_mailto/controller.php	2009-07-30 20:02:22.000000000 +0200
+++ 16/components/com_mailto/controller.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: controller.php 12584 2009-07-30 17:46:47Z ian $
+ * @version		$Id: controller.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	MailTo
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_mailto/mailto.php 16/components/com_mailto/mailto.php
--- 15/components/com_mailto/mailto.php	2009-05-29 13:52:54.000000000 +0200
+++ 16/components/com_mailto/mailto.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: mailto.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: mailto.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	MailTo
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_mailto/mailto.xml 16/components/com_mailto/mailto.xml
--- 15/components/com_mailto/mailto.xml	2009-05-29 13:52:54.000000000 +0200
+++ 16/components/com_mailto/mailto.xml	2010-04-23 13:40:12.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>MailTo</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/components/com_mailto/views/mailto/view.html.php 16/components/com_mailto/views/mailto/view.html.php
--- 15/components/com_mailto/views/mailto/view.html.php	2009-05-29 13:52:52.000000000 +0200
+++ 16/components/com_mailto/views/mailto/view.html.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: view.html.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: view.html.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	MailTo
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_mailto/views/sent/metadata.xml 16/components/com_mailto/views/sent/metadata.xml
--- 15/components/com_mailto/views/sent/metadata.xml	2009-05-29 13:52:54.000000000 +0200
+++ 16/components/com_mailto/views/sent/metadata.xml	2010-04-23 13:40:12.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Mailto</name>
 	<author>Andrew Eddie</author>
 	<creationDate>13 Mar 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/components/com_mailto/views/sent/view.html.php 16/components/com_mailto/views/sent/view.html.php
--- 15/components/com_mailto/views/sent/view.html.php	2009-05-29 13:52:54.000000000 +0200
+++ 16/components/com_mailto/views/sent/view.html.php	2010-04-23 13:40:12.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: view.html.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: view.html.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	MailTo
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_media/assets/popup-imagelist.css 16/components/com_media/assets/popup-imagelist.css
--- 15/components/com_media/assets/popup-imagelist.css	2009-05-29 13:53:10.000000000 +0200
+++ 16/components/com_media/assets/popup-imagelist.css	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
 /**
 * @version $Id: popup-imagelist.css 3997 2006-06-12 03:59:51Z spacemonkey $
-* @copyright Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/components/com_media/assets/popup-imagemanager.css 16/components/com_media/assets/popup-imagemanager.css
--- 15/components/com_media/assets/popup-imagemanager.css	2009-05-29 13:53:10.000000000 +0200
+++ 16/components/com_media/assets/popup-imagemanager.css	2010-04-23 13:40:12.000000000 +0200
@@ -1,6 +1,6 @@
 /**
 * @version $Id: popup-imagemanager.css 6668 2007-02-18 19:13:36Z hackwar $
-* @copyright Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/components/com_media/assets/popup-imagemanager.js 16/components/com_media/assets/popup-imagemanager.js
--- 15/components/com_media/assets/popup-imagemanager.js	2009-05-29 13:53:10.000000000 +0200
+++ 16/components/com_media/assets/popup-imagemanager.js	2010-04-23 13:40:12.000000000 +0200
@@ -1,7 +1,7 @@
 /**
 * @version		$Id: popup-imagemanager.js 8656 2007-08-30 22:40:39Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/components/com_media/controller.php 16/components/com_media/controller.php
--- 15/components/com_media/controller.php	2009-05-29 13:53:10.000000000 +0200
+++ 16/components/com_media/controller.php	2010-04-23 13:40:14.000000000 +0200
@@ -3,7 +3,7 @@
  * @version		$Id: media.php 8660 2007-08-30 23:53:21Z louis $
  * @package		Joomla
  * @subpackage	Massmail
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_media/helpers/media.php 16/components/com_media/helpers/media.php
--- 15/components/com_media/helpers/media.php	2009-05-29 13:53:10.000000000 +0200
+++ 16/components/com_media/helpers/media.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: media.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: media.php 15177 2010-03-04 21:54:31Z ian $
  * @package		Joomla
  * @subpackage	Media
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
@@ -12,6 +12,9 @@
  * details.
  */
 
+// no direct access
+defined('_JEXEC') or die('Restricted access');
+
 /**
  * @package		Joomla
  * @subpackage	Media
@@ -128,4 +131,4 @@
 	}
 
 }
-?>
\ No hay ningún carácter de nueva línea al final del fichero
+?>
diff -aruN --binary 15/components/com_media/media.php 16/components/com_media/media.php
--- 15/components/com_media/media.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/components/com_media/media.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: media.php 12696 2009-09-12 02:08:54Z ian $
+ * @version		$Id: media.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Massmail
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_newsfeeds/controller.php 16/components/com_newsfeeds/controller.php
--- 15/components/com_newsfeeds/controller.php	2009-05-29 13:52:52.000000000 +0200
+++ 16/components/com_newsfeeds/controller.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: controller.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: controller.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_newsfeeds/models/categories.php 16/components/com_newsfeeds/models/categories.php
--- 15/components/com_newsfeeds/models/categories.php	2009-05-29 13:52:50.000000000 +0200
+++ 16/components/com_newsfeeds/models/categories.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: categories.php 10704 2008-08-21 09:38:40Z eddieajau $
+ * @version		$Id: categories.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_newsfeeds/models/category.php 16/components/com_newsfeeds/models/category.php
--- 15/components/com_newsfeeds/models/category.php	2009-05-29 13:52:50.000000000 +0200
+++ 16/components/com_newsfeeds/models/category.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: category.php 10704 2008-08-21 09:38:40Z eddieajau $
+ * @version		$Id: category.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_newsfeeds/models/newsfeed.php 16/components/com_newsfeeds/models/newsfeed.php
--- 15/components/com_newsfeeds/models/newsfeed.php	2009-05-29 13:52:50.000000000 +0200
+++ 16/components/com_newsfeeds/models/newsfeed.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: newsfeed.php 10704 2008-08-21 09:38:40Z eddieajau $
+ * @version		$Id: newsfeed.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_newsfeeds/newsfeeds.php 16/components/com_newsfeeds/newsfeeds.php
--- 15/components/com_newsfeeds/newsfeeds.php	2009-05-29 13:52:52.000000000 +0200
+++ 16/components/com_newsfeeds/newsfeeds.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* version $Id: newsfeeds.php 10381 2008-06-01 03:35:53Z pasamio $
+* version $Id: newsfeeds.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Newsfeeds
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/components/com_newsfeeds/router.php 16/components/com_newsfeeds/router.php
--- 15/components/com_newsfeeds/router.php	2009-05-29 13:52:52.000000000 +0200
+++ 16/components/com_newsfeeds/router.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: router.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: router.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/components/com_newsfeeds/views/categories/view.html.php 16/components/com_newsfeeds/views/categories/view.html.php
--- 15/components/com_newsfeeds/views/categories/view.html.php	2009-05-29 13:52:50.000000000 +0200
+++ 16/components/com_newsfeeds/views/categories/view.html.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* version $Id: view.html.php 10498 2008-07-04 00:05:36Z ian $
+* version $Id: view.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Newsfeeds
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 *
 * Joomla! is free software. This version may have been modified pursuant
diff -aruN --binary 15/components/com_newsfeeds/views/category/view.html.php 16/components/com_newsfeeds/views/category/view.html.php
--- 15/components/com_newsfeeds/views/category/view.html.php	2009-05-29 13:52:52.000000000 +0200
+++ 16/components/com_newsfeeds/views/category/view.html.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* version $Id: view.html.php 10498 2008-07-04 00:05:36Z ian $
+* version $Id: view.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Newsfeeds
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 *
 * Joomla! is free software. This version may have been modified pursuant
diff -aruN --binary 15/components/com_newsfeeds/views/newsfeed/view.html.php 16/components/com_newsfeeds/views/newsfeed/view.html.php
--- 15/components/com_newsfeeds/views/newsfeed/view.html.php	2009-05-29 13:52:50.000000000 +0200
+++ 16/components/com_newsfeeds/views/newsfeed/view.html.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* version $Id: view.html.php 10498 2008-07-04 00:05:36Z ian $
+* version $Id: view.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Newsfeeds
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 *
 * Joomla! is free software. This version may have been modified pursuant
diff -aruN --binary 15/components/com_poll/controller.php 16/components/com_poll/controller.php
--- 15/components/com_poll/controller.php	2009-05-29 13:52:56.000000000 +0200
+++ 16/components/com_poll/controller.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: controller.php 10869 2008-08-30 07:24:03Z willebil $
+* @version		$Id: controller.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Polls
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/components/com_poll/models/poll.php 16/components/com_poll/models/poll.php
--- 15/components/com_poll/models/poll.php	2009-05-29 13:52:54.000000000 +0200
+++ 16/components/com_poll/models/poll.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: poll.php 10752 2008-08-23 01:53:31Z eddieajau $
+* @version		$Id: poll.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Polls
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/components/com_poll/poll.php 16/components/com_poll/poll.php
--- 15/components/com_poll/poll.php	2009-05-29 13:52:56.000000000 +0200
+++ 16/components/com_poll/poll.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: poll.php 10752 2008-08-23 01:53:31Z eddieajau $
+* @version		$Id: poll.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Polls
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/components/com_poll/router.php 16/components/com_poll/router.php
--- 15/components/com_poll/router.php	2009-05-29 13:52:56.000000000 +0200
+++ 16/components/com_poll/router.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
- * @version		$Id: router.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: router.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/components/com_poll/views/poll/view.html.php 16/components/com_poll/views/poll/view.html.php
--- 15/components/com_poll/views/poll/view.html.php	2009-05-29 13:52:56.000000000 +0200
+++ 16/components/com_poll/views/poll/view.html.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: view.html.php 10711 2008-08-21 10:09:03Z eddieajau $
+* @version		$Id: view.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Poll
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/components/com_search/controller.php 16/components/com_search/controller.php
--- 15/components/com_search/controller.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/components/com_search/controller.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: controller.php 13338 2009-10-27 02:15:55Z ian $
+ * @version		$Id: controller.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_search/models/search.php 16/components/com_search/models/search.php
--- 15/components/com_search/models/search.php	2009-05-29 13:52:54.000000000 +0200
+++ 16/components/com_search/models/search.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: search.php 10752 2008-08-23 01:53:31Z eddieajau $
+ * @version		$Id: search.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Search
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_search/router.php 16/components/com_search/router.php
--- 15/components/com_search/router.php	2009-05-29 13:52:54.000000000 +0200
+++ 16/components/com_search/router.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
- * @version		$Id: router.php 11002 2008-10-07 01:12:20Z ian $
+ * @version		$Id: router.php 16385 2010-04-23 10:44:15Z ian $
  * @package		Joomla
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
@@ -19,18 +19,6 @@
 {
 	$segments = array();
 
-	if (isset($query['searchword'])) {
-		$segments[] = $query['searchword'];
-		unset($query['searchword']);
-	}
-
-	// Retrieve configuration options - needed to know which SEF URLs are used
-	$app =& JFactory::getApplication();
-	// Allows for searching on strings that include ".xxx" that appear to Apache as an extension
-	if (($app->getCfg('sef')) && ($app->getCfg('sef_rewrite')) && !($app->getCfg('sef_suffix'))) {
-		$segments[] .= '/';
-	}
-
 	if (isset($query['view'])) {
 		unset($query['view']);
 	}
diff -aruN --binary 15/components/com_search/search.php 16/components/com_search/search.php
--- 15/components/com_search/search.php	2009-05-29 13:52:54.000000000 +0200
+++ 16/components/com_search/search.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: search.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: search.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Search
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/components/com_search/views/search/view.html.php 16/components/com_search/views/search/view.html.php
--- 15/components/com_search/views/search/view.html.php	2009-05-29 13:52:54.000000000 +0200
+++ 16/components/com_search/views/search/view.html.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: view.html.php 11646 2009-03-01 19:34:56Z ian $
+ * @version		$Id: view.html.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Weblinks
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/components/com_user/controller.php 16/components/com_user/controller.php
--- 15/components/com_user/controller.php	2009-07-23 03:25:36.000000000 +0200
+++ 16/components/com_user/controller.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: controller.php 12538 2009-07-22 17:26:51Z ian $
+ * @version		$Id: controller.php 16385 2010-04-23 10:44:15Z ian $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
@@ -403,18 +403,18 @@
 
 		// Get the input
 		$token = JRequest::getVar('token', null, 'post', 'alnum');
+		$username = JRequest::getVar('username', null, 'post');
 
 		// Get the model
 		$model = &$this->getModel('Reset');
 
 		// Verify the token
-		if ($model->confirmReset($token) === false)
+		if ($model->confirmReset($token, $username) !== true)
 		{
 			$message = JText::sprintf('PASSWORD_RESET_CONFIRMATION_FAILED', $model->getError());
 			$this->setRedirect('index.php?option=com_user&view=reset&layout=confirm', $message);
 			return false;
 		}
-
 		$this->setRedirect('index.php?option=com_user&view=reset&layout=complete');
 	}
 
diff -aruN --binary 15/components/com_user/models/remind.php 16/components/com_user/models/remind.php
--- 15/components/com_user/models/remind.php	2009-05-29 13:53:04.000000000 +0200
+++ 16/components/com_user/models/remind.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: remind.php 10752 2008-08-23 01:53:31Z eddieajau $
+ * @version		$Id: remind.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	User
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_user/models/reset.php 16/components/com_user/models/reset.php
--- 15/components/com_user/models/reset.php	2009-05-29 13:53:04.000000000 +0200
+++ 16/components/com_user/models/reset.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: reset.php 10919 2008-09-09 20:50:29Z willebil $
+ * @version		$Id: reset.php 16385 2010-04-23 10:44:15Z ian $
  * @package		Joomla
  * @subpackage	User
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
@@ -74,9 +74,11 @@
 
 		// Generate a new token
 		$token = JUtility::getHash(JUserHelper::genRandomPassword());
+		$salt = JUserHelper::getSalt('crypt-md5');
+		$hashedToken = md5($token.$salt).':'.$salt;
 
 		$query	= 'UPDATE #__users'
-				. ' SET activation = '.$db->Quote($token)
+				. ' SET activation = '.$db->Quote($hashedToken)
 				. ' WHERE id = '.(int) $id
 				. ' AND block = 0';
 
@@ -107,28 +109,48 @@
 	 * @param	token	An md5 hashed randomly generated string
 	 * @return	bool	True on success/false on failure
 	 */
-	function confirmReset($token)
+	function confirmReset($token, $username)
 	{
 		global $mainframe;
 
+		jimport('joomla.user.helper');
+
 		if(strlen($token) != 32) {
 			$this->setError(JText::_('INVALID_TOKEN'));
 			return false;
 		}
 
 		$db	= &JFactory::getDBO();
-		$db->setQuery('SELECT id FROM #__users WHERE block = 0 AND activation = '.$db->Quote($token));
+		$db->setQuery('SELECT id, activation FROM #__users WHERE block = 0 AND username = '.$db->Quote($username));
+
+		$row = $db->loadObject();
 
 		// Verify the token
-		if (!($id = $db->loadResult()))
+		if (!($row = $db->loadObject()))
+		{
+			$this->setError(JText::_('INVALID_TOKEN'));
+			return false;
+		}
+
+		$parts	= explode( ':', $row->activation );
+		$crypt	= $parts[0];
+		if (!isset($parts[1])) {
+			$this->setError(JText::_('INVALID_TOKEN'));
+			return false;
+		}
+		$salt	= $parts[1];
+		$testcrypt = JUserHelper::getCryptedPassword($token, $salt);
+
+		// Verify the token
+		if (!($crypt == $testcrypt))
 		{
 			$this->setError(JText::_('INVALID_TOKEN'));
 			return false;
 		}
 
 		// Push the token and user id into the session
-		$mainframe->setUserState($this->_namespace.'token',	$token);
-		$mainframe->setUserState($this->_namespace.'id',	$id);
+		$mainframe->setUserState($this->_namespace.'token',	$crypt.':'.$salt);
+		$mainframe->setUserState($this->_namespace.'id',	$row->id);
 
 		return true;
 	}
diff -aruN --binary 15/components/com_user/models/user.php 16/components/com_user/models/user.php
--- 15/components/com_user/models/user.php	2009-05-29 13:53:04.000000000 +0200
+++ 16/components/com_user/models/user.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: user.php 10704 2008-08-21 09:38:40Z eddieajau $
+ * @version		$Id: user.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	User
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_user/router.php 16/components/com_user/router.php
--- 15/components/com_user/router.php	2009-05-29 13:53:06.000000000 +0200
+++ 16/components/com_user/router.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: router.php 10752 2008-08-23 01:53:31Z eddieajau $
+* @version		$Id: router.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/components/com_user/user.php 16/components/com_user/user.php
--- 15/components/com_user/user.php	2009-05-29 13:53:06.000000000 +0200
+++ 16/components/com_user/user.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: user.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: user.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Users
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/components/com_user/user.xml 16/components/com_user/user.xml
--- 15/components/com_user/user.xml	2009-05-29 13:53:06.000000000 +0200
+++ 16/components/com_user/user.xml	2010-04-23 13:40:14.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>User</name>
 	<author>Joomla! Project</author>
 	<creationDate>2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/components/com_user/views/login/view.html.php 16/components/com_user/views/login/view.html.php
--- 15/components/com_user/views/login/view.html.php	2009-06-30 21:01:32.000000000 +0200
+++ 16/components/com_user/views/login/view.html.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: view.html.php 12352 2009-06-24 13:52:57Z ian $
+* @version		$Id: view.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Login
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/components/com_user/views/register/view.html.php 16/components/com_user/views/register/view.html.php
--- 15/components/com_user/views/register/view.html.php	2009-05-29 13:53:04.000000000 +0200
+++ 16/components/com_user/views/register/view.html.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: view.html.php 11673 2009-03-08 20:41:00Z willebil $
+* @version		$Id: view.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Registration
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/components/com_user/views/remind/view.html.php 16/components/com_user/views/remind/view.html.php
--- 15/components/com_user/views/remind/view.html.php	2009-05-29 13:53:06.000000000 +0200
+++ 16/components/com_user/views/remind/view.html.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: view.html.php 10752 2008-08-23 01:53:31Z eddieajau $
+ * @version		$Id: view.html.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	User
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_user/views/reset/tmpl/confirm.php 16/components/com_user/views/reset/tmpl/confirm.php
--- 15/components/com_user/views/reset/tmpl/confirm.php	2009-05-29 13:53:04.000000000 +0200
+++ 16/components/com_user/views/reset/tmpl/confirm.php	2010-04-23 13:40:14.000000000 +0200
@@ -13,6 +13,14 @@
 		</tr>
 		<tr>
 			<td height="40">
+				<label for="username" class="hasTip" title="<?php echo JText::_('RESET_PASSWORD_USERNAME_TIP_TITLE'); ?>::<?php echo JText::_('RESET_PASSWORD_USERNAME_TIP_TEXT'); ?>"><?php echo JText::_('User Name'); ?>:</label>
+			</td>
+			<td>
+				<input id="username" name="username" type="text" class="required" size="36" />
+			</td>
+		</tr>
+		<tr>
+			<td height="40">
 				<label for="token" class="hasTip" title="<?php echo JText::_('RESET_PASSWORD_TOKEN_TIP_TITLE'); ?>::<?php echo JText::_('RESET_PASSWORD_TOKEN_TIP_TEXT'); ?>"><?php echo JText::_('Token'); ?>:</label>
 			</td>
 			<td>
diff -aruN --binary 15/components/com_user/views/reset/view.html.php 16/components/com_user/views/reset/view.html.php
--- 15/components/com_user/views/reset/view.html.php	2009-05-29 13:53:04.000000000 +0200
+++ 16/components/com_user/views/reset/view.html.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: view.html.php 10752 2008-08-23 01:53:31Z eddieajau $
+ * @version		$Id: view.html.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	User
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_user/views/user/view.html.php 16/components/com_user/views/user/view.html.php
--- 15/components/com_user/views/user/view.html.php	2009-05-29 13:53:06.000000000 +0200
+++ 16/components/com_user/views/user/view.html.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: view.html.php 11623 2009-02-15 15:23:08Z kdevine $
+* @version		$Id: view.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Weblinks
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/components/com_weblinks/controller.php 16/components/com_weblinks/controller.php
--- 15/components/com_weblinks/controller.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/components/com_weblinks/controller.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: controller.php 13339 2009-10-27 02:27:05Z ian $
+ * @version		$Id: controller.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_weblinks/controllers/weblink.php 16/components/com_weblinks/controllers/weblink.php
--- 15/components/com_weblinks/controllers/weblink.php	2009-05-29 13:53:08.000000000 +0200
+++ 16/components/com_weblinks/controllers/weblink.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: weblink.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: weblink.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_weblinks/helpers/route.php 16/components/com_weblinks/helpers/route.php
--- 15/components/com_weblinks/helpers/route.php	2009-05-29 13:53:06.000000000 +0200
+++ 16/components/com_weblinks/helpers/route.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: route.php 10752 2008-08-23 01:53:31Z eddieajau $
+ * @version		$Id: route.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Weblinks
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_weblinks/models/categories.php 16/components/com_weblinks/models/categories.php
--- 15/components/com_weblinks/models/categories.php	2009-05-29 13:53:08.000000000 +0200
+++ 16/components/com_weblinks/models/categories.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: categories.php 10704 2008-08-21 09:38:40Z eddieajau $
+ * @version		$Id: categories.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_weblinks/models/category.php 16/components/com_weblinks/models/category.php
--- 15/components/com_weblinks/models/category.php	2009-05-29 13:53:08.000000000 +0200
+++ 16/components/com_weblinks/models/category.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: category.php 10752 2008-08-23 01:53:31Z eddieajau $
+ * @version		$Id: category.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_weblinks/models/weblink.php 16/components/com_weblinks/models/weblink.php
--- 15/components/com_weblinks/models/weblink.php	2009-05-29 13:53:08.000000000 +0200
+++ 16/components/com_weblinks/models/weblink.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: weblink.php 10752 2008-08-23 01:53:31Z eddieajau $
+ * @version		$Id: weblink.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/components/com_weblinks/router.php 16/components/com_weblinks/router.php
--- 15/components/com_weblinks/router.php	2009-05-29 13:53:10.000000000 +0200
+++ 16/components/com_weblinks/router.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: router.php 11678 2009-03-08 20:48:42Z willebil $
+* @version		$Id: router.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/components/com_weblinks/views/categories/view.html.php 16/components/com_weblinks/views/categories/view.html.php
--- 15/components/com_weblinks/views/categories/view.html.php	2009-05-29 13:53:08.000000000 +0200
+++ 16/components/com_weblinks/views/categories/view.html.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: view.html.php 10498 2008-07-04 00:05:36Z ian $
+* @version		$Id: view.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Weblinks
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/components/com_weblinks/views/category/view.feed.php 16/components/com_weblinks/views/category/view.feed.php
--- 15/components/com_weblinks/views/category/view.feed.php	2009-05-29 13:53:10.000000000 +0200
+++ 16/components/com_weblinks/views/category/view.feed.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: view.feed.php 11782 2009-04-24 17:25:58Z kdevine $
+* @version		$Id: view.feed.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Weblinks
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/components/com_weblinks/views/category/view.html.php 16/components/com_weblinks/views/category/view.html.php
--- 15/components/com_weblinks/views/category/view.html.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/components/com_weblinks/views/category/view.html.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: view.html.php 12694 2009-09-11 21:03:02Z ian $
+* @version		$Id: view.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Weblinks
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/components/com_weblinks/views/weblink/view.html.php 16/components/com_weblinks/views/weblink/view.html.php
--- 15/components/com_weblinks/views/weblink/view.html.php	2009-05-29 13:53:08.000000000 +0200
+++ 16/components/com_weblinks/views/weblink/view.html.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: view.html.php 11299 2008-11-22 01:40:44Z ian $
+* @version		$Id: view.html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Weblinks
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/components/com_weblinks/weblinks.php 16/components/com_weblinks/weblinks.php
--- 15/components/com_weblinks/weblinks.php	2009-05-29 13:53:10.000000000 +0200
+++ 16/components/com_weblinks/weblinks.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: weblinks.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: weblinks.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Weblinks
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/components/com_wrapper/router.php 16/components/com_wrapper/router.php
--- 15/components/com_wrapper/router.php	2009-05-29 13:53:12.000000000 +0200
+++ 16/components/com_wrapper/router.php	2010-04-23 13:40:14.000000000 +0200
@@ -2,7 +2,7 @@
 /**
  * @version		$Id: router.php 9764 2007-12-30 07:48:11Z ircmaxell $
  * @package		Joomla
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/components/com_wrapper/views/wrapper/view.php 16/components/com_wrapper/views/wrapper/view.php
--- 15/components/com_wrapper/views/wrapper/view.php	2009-05-29 13:53:12.000000000 +0200
+++ 16/components/com_wrapper/views/wrapper/view.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: view.php 10498 2008-07-04 00:05:36Z ian $
+* @version		$Id: view.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Wrapper
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/components/com_wrapper/wrapper.php 16/components/com_wrapper/wrapper.php
--- 15/components/com_wrapper/wrapper.php	2009-05-29 13:53:12.000000000 +0200
+++ 16/components/com_wrapper/wrapper.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: wrapper.php 10704 2008-08-21 09:38:40Z eddieajau $
+* @version		$Id: wrapper.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Wrapper
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/components/com_wrapper/wrapper.xml 16/components/com_wrapper/wrapper.xml
--- 15/components/com_wrapper/wrapper.xml	2009-05-29 13:53:12.000000000 +0200
+++ 16/components/com_wrapper/wrapper.xml	2010-04-23 13:40:14.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Wrapper</name>
 	<author>Joomla! Project</author>
 	<creationDate>2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/configuration.php-dist 16/configuration.php-dist
--- 15/configuration.php-dist	2009-05-29 13:54:48.000000000 +0200
+++ 16/configuration.php-dist	2010-04-23 13:40:14.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: configuration.php-dist 11687 2009-03-11 17:49:23Z ian $
+* @version		$Id: configuration.php-dist 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software and parts of it may contain or be derived from the
 * GNU General Public License or other free or open source software licenses.
diff -aruN --binary 15/COPYRIGHT.php 16/COPYRIGHT.php
--- 15/COPYRIGHT.php	2009-05-29 13:54:48.000000000 +0200
+++ 16/COPYRIGHT.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
- * @version		$Id: COPYRIGHT.php 11416 2009-01-17 09:55:02Z willebil $
+ * @version		$Id: COPYRIGHT.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
- * @copyright	Copyright (C) 2005 - 2009 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/CREDITS.php 16/CREDITS.php
--- 15/CREDITS.php	2009-11-04 18:51:18.000000000 +0100
+++ 16/CREDITS.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
- * @version		$Id: CREDITS.php 13370 2009-10-28 14:48:04Z ian $
+ * @version		$Id: CREDITS.php 16380 2010-04-23 09:19:48Z ian $
  * @package		Joomla
- * @copyright	Copyright (C) 2005 - 2009 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
@@ -67,7 +67,7 @@
 Translation contributors:
 -------------------------
 Albanian (sp-AL) - Blendi Kraja
-Arabic Algeria (ar-DZ) - Saber Bousba
+Arabic Unitag (ar-AA) - Arabic Unitag Translation Team - Mahmood Alhaj Kassem
 Azeri (az-AZ) - Azeri Translation Team - Mahmud and Yusif
 Basque (eu-ES) - Basque Translation Team (Basque Language School of Santurtzi) - Abel Camacho, Pedro Lonbide
 Belarusian (be-BY) - Dennis Hermacki
@@ -90,7 +90,7 @@
 Greek (el-GR) - Greek Joomla Community - Aris Ntatsis
 Gujarati (gu-IN) - Gujarati Translation Team
 Hebrew (he-IL) - Joomla!Hebrew - Mati (MtK) Kochen
-Hindi-Devanagari (hi-IN) - IndicJoomla! Team - Vishal Pahuja
+Hindi (India) (hi-IN) - Hindi (India) Translation Team - Sanjeev Naroliya, Ronak Bhagdev, Aminuddin Sheikh
 Hungarian (hu-HU) - Magyar Joomla! Felhasznalok Nemzetkozi Egyesulete - Jozsef Tamas Herczeg, Annamaria Ban
 Icelandic (is-IS) - Joomlis! Icelandic Joomla Community [joomlis.net] - Magnús Guðlaugsson
 Indonesian (id-ID) - Indonesian (Bahasa Indonesia) Translation Community - Andy Sikumbang
@@ -111,6 +111,7 @@
 Romanian (ro-RO) - Romanian Joomla! Community - Cosmin Lebu
 Russian (ru-RU) - Russian Translation Team - Serge Litvinov
 Serbian (sr-RS) - Joomla! Serbia team - Marko Milenovic
+Serbian (sr-YU) - Joomla! Serbia team - Svetlana Zec, Marko Milenovic
 Sindhi (sd-PK) - Raheel H. Kaghzi, Shafiq-ur-rehman Khatri
 Sinhala (si-LK) - Rashan Anushka
 Slovak (sk-SK) - Slovak Translation Team - Karol Cejka, Viliam Kmec, Alexander Horvath, Marek Sabo
diff -aruN --binary 15/htaccess.txt 16/htaccess.txt
--- 15/htaccess.txt	2009-11-04 18:51:20.000000000 +0100
+++ 16/htaccess.txt	2010-04-23 13:40:14.000000000 +0200
@@ -1,7 +1,7 @@
 ##
-# @version $Id: htaccess.txt 13415 2009-11-03 15:53:25Z ian $
+# @version $Id: htaccess.txt 14401 2010-01-26 14:10:00Z louis $
 # @package Joomla
-# @copyright Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 # Joomla! is Free Software
 ##
diff -aruN --binary 15/includes/application.php 16/includes/application.php
--- 15/includes/application.php	2009-05-29 13:54:02.000000000 +0200
+++ 16/includes/application.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: application.php 10912 2008-09-05 19:45:22Z willebil $
+* @version		$Id: application.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/includes/defines.php 16/includes/defines.php
--- 15/includes/defines.php	2009-05-29 13:54:02.000000000 +0200
+++ 16/includes/defines.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: defines.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: defines.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/includes/footer.php 16/includes/footer.php
--- 15/includes/footer.php	2009-05-29 13:54:02.000000000 +0200
+++ 16/includes/footer.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: footer.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: footer.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/includes/framework.php 16/includes/framework.php
--- 15/includes/framework.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/includes/framework.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: framework.php 13415 2009-11-03 15:53:25Z ian $
+* @version		$Id: framework.php 16385 2010-04-23 10:44:15Z ian $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/includes/js/joomla.javascript.js 16/includes/js/joomla.javascript.js
--- 15/includes/js/joomla.javascript.js	2009-05-29 13:54:02.000000000 +0200
+++ 16/includes/js/joomla.javascript.js	2010-04-23 13:40:14.000000000 +0200
@@ -1,8 +1,8 @@
 // <?php !! This fools phpdocumentor into parsing this file
 /**
-* @version		$Id: joomla.javascript.js 10389 2008-06-03 11:27:38Z pasamio $
+* @version		$Id: joomla.javascript.js 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL
 * Joomla! is Free Software
 */
diff -aruN --binary 15/includes/js/mambojavascript.js 16/includes/js/mambojavascript.js
--- 15/includes/js/mambojavascript.js	2009-05-29 13:54:02.000000000 +0200
+++ 16/includes/js/mambojavascript.js	2010-04-23 13:40:14.000000000 +0200
@@ -1,8 +1,8 @@
 // <?php !! This fools phpdocumentor into parsing this file
 /**
-* @version		$Id: mambojavascript.js 10389 2008-06-03 11:27:38Z pasamio $
+* @version		$Id: mambojavascript.js 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL
 * Joomla! is Free Software
 */
diff -aruN --binary 15/includes/menu.php 16/includes/menu.php
--- 15/includes/menu.php	2009-05-29 13:54:02.000000000 +0200
+++ 16/includes/menu.php	2010-04-23 13:40:14.000000000 +0200
@@ -3,7 +3,7 @@
  * @version		$Id: menu.php 8682 2007-08-31 18:36:45Z jinx $
  * @package		Joomla.Framework
  * @subpackage	Application
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/includes/pathway.php 16/includes/pathway.php
--- 15/includes/pathway.php	2009-05-29 13:54:02.000000000 +0200
+++ 16/includes/pathway.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: pathway.php 10752 2008-08-23 01:53:31Z eddieajau $
+* @version		$Id: pathway.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Application
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/includes/router.php 16/includes/router.php
--- 15/includes/router.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/includes/router.php	2010-04-23 13:40:14.000000000 +0200
@@ -3,7 +3,7 @@
 * @version		$Id: router.php 8180 2007-07-23 05:52:29Z eddieajau $
 * @package		Joomla.Framework
 * @subpackage	Application
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/index2.php 16/index2.php
--- 15/index2.php	2009-05-29 13:54:48.000000000 +0200
+++ 16/index2.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: index2.php 11407 2009-01-09 17:23:42Z willebil $
+* @version		$Id: index2.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2009 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/index.php 16/index.php
--- 15/index.php	2009-05-29 13:54:48.000000000 +0200
+++ 16/index.php	2010-04-23 13:40:14.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: index.php 11407 2009-01-09 17:23:42Z willebil $
+* @version		$Id: index.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2009 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/INSTALL.php 16/INSTALL.php
--- 15/INSTALL.php	2009-05-29 13:54:48.000000000 +0200
+++ 16/INSTALL.php	2010-04-23 13:40:10.000000000 +0200
@@ -2,7 +2,7 @@
 /**
 * @version		$Id: INSTALL.php 10381 2008-06-01 03:35:53Z pasamio $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2009 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/language/ca-ES/ca-ES.ini 16/language/ca-ES/ca-ES.ini
--- 15/language/ca-ES/ca-ES.ini	2009-07-05 21:41:58.000000000 +0200
+++ 16/language/ca-ES/ca-ES.ini	2010-04-25 23:18:40.000000000 +0200
@@ -1,15 +1,19 @@
-# $Id: ca-ES.ini 12073 2009-06-28 23:11:35Z dverger $
+﻿# $Id: ca-ES.ini 12073 2009-06-28 23:11:35Z dverger $
+
 # Joomla! Catalan Translation
 # Copyright (C) 2005 - 2009 Open Source Matters. All rights reserved.
+
 # Copyright (C) Translation 2008 - 2009  Catalan Joomla Translation Team - joomla.cat
+
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 
+
 # Note : All ini files need to be saved as UTF-8
 
-
-DATE_FORMAT_LC=%A, %e de %B de %Y
-DATE_FORMAT_LC1=%A, %e de %B de %Y
-DATE_FORMAT_LC2=%A, %e de %B de %Y %H:%M
+
+DATE_FORMAT_LC=%A, %e de %B de %Y
+DATE_FORMAT_LC1=%A, %e de %B de %Y
+DATE_FORMAT_LC2=%A, %e de %B de %Y %H:%M
 DATE_FORMAT_LC3=%e de %B de %Y
 DATE_FORMAT_LC4=%d.%m.%y
 DATE_FORMAT_JS1=y-m-d
@@ -196,6 +200,7 @@
 IMAGE=Imatge
 ITEMS=ítems
 JOOMLA WARNING=<font color="red">Avís del Joomla!</font>
+JPAGE_CURRENT_OF_TOTAL=Pàgina %s de %s
 LAST=darrer
 LAST UPDATED=Darrera actualització
 LAST_UPDATED2=Darrera actualització de %s
diff -aruN --binary 15/language/en-GB/en-GB.com_banners.ini 16/language/en-GB/en-GB.com_banners.ini
--- 15/language/en-GB/en-GB.com_banners.ini	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.com_banners.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: en-GB.com_banners.ini 10388 2008-06-03 11:16:20Z pasamio $
+# $Id: en-GB.com_banners.ini 14401 2010-01-26 14:10:00Z louis $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.com_contact.ini 16/language/en-GB/en-GB.com_contact.ini
--- 15/language/en-GB/en-GB.com_contact.ini	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.com_contact.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.com_contact.ini 11624 2009-02-15 15:26:38Z kdevine $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.com_content.ini 16/language/en-GB/en-GB.com_content.ini
--- 15/language/en-GB/en-GB.com_content.ini	2009-06-30 21:01:32.000000000 +0200
+++ 16/language/en-GB/en-GB.com_content.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.com_content.ini 11654 2009-03-08 19:57:29Z willebil $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.com_frontpage.ini 16/language/en-GB/en-GB.com_frontpage.ini
--- 15/language/en-GB/en-GB.com_frontpage.ini	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.com_frontpage.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.com_frontpage.ini 10498 2008-07-04 00:05:36Z ian $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.com_mailto.ini 16/language/en-GB/en-GB.com_mailto.ini
--- 15/language/en-GB/en-GB.com_mailto.ini	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.com_mailto.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.com_mailto.ini 11391 2009-01-04 13:35:50Z ian $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.com_media.ini 16/language/en-GB/en-GB.com_media.ini
--- 15/language/en-GB/en-GB.com_media.ini	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.com_media.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.com_media.ini 10388 2008-06-03 11:16:20Z pasamio $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.com_messages.ini 16/language/en-GB/en-GB.com_messages.ini
--- 15/language/en-GB/en-GB.com_messages.ini	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.com_messages.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.com_messages.ini 10498 2008-07-04 00:05:36Z ian $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.com_newsfeeds.ini 16/language/en-GB/en-GB.com_newsfeeds.ini
--- 15/language/en-GB/en-GB.com_newsfeeds.ini	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.com_newsfeeds.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.com_newsfeeds.ini 10498 2008-07-04 00:05:36Z ian $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.com_poll.ini 16/language/en-GB/en-GB.com_poll.ini
--- 15/language/en-GB/en-GB.com_poll.ini	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.com_poll.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.com_poll.ini 10498 2008-07-04 00:05:36Z ian $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.com_search.ini 16/language/en-GB/en-GB.com_search.ini
--- 15/language/en-GB/en-GB.com_search.ini	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.com_search.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.com_search.ini 10498 2008-07-04 00:05:36Z ian $
 # author Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/en-GB/en-GB.com_user.ini 16/language/en-GB/en-GB.com_user.ini
--- 15/language/en-GB/en-GB.com_user.ini	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.com_user.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.com_user.ini 11623 2009-02-15 15:23:08Z kdevine $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.com_weblinks.ini 16/language/en-GB/en-GB.com_weblinks.ini
--- 15/language/en-GB/en-GB.com_weblinks.ini	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.com_weblinks.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.com_weblinks.ini 10498 2008-07-04 00:05:36Z ian $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.com_wrapper.ini 16/language/en-GB/en-GB.com_wrapper.ini
--- 15/language/en-GB/en-GB.com_wrapper.ini	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.com_wrapper.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.com_wrapper.ini 10498 2008-07-04 00:05:36Z ian $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.ignore.php 16/language/en-GB/en-GB.ignore.php
--- 15/language/en-GB/en-GB.ignore.php	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.ignore.php	2010-04-23 13:40:16.000000000 +0200
@@ -2,7 +2,7 @@
 /**
 * @version		$Id: en-GB.ignore.php 10381 2008-06-01 03:35:53Z pasamio $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/language/en-GB/en-GB.ini 16/language/en-GB/en-GB.ini
--- 15/language/en-GB/en-GB.ini	2009-11-04 18:51:20.000000000 +0100
+++ 16/language/en-GB/en-GB.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.ini 11391 2009-01-04 13:35:50Z ian $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
@@ -93,7 +93,7 @@
 (UTC -03:00) BRAZIL, BUENOS AIRES, GEORGETOWN=(UTC -03:00) Brazil, Buenos Aires, Georgetown
 (UTC -02:00) MID-ATLANTIC=(UTC -02:00) Mid-Atlantic
 (UTC -01:00) AZORES, CAPE VERDE ISLANDS=(UTC -01:00) Azores, Cape Verde Islands
-(UTC 00:00) WESTERN EUROPE TIME, LONDON, LISBON, CASABLANCA=(UTC 00:00) Western Europe Time, London, Lisbon, Casablanca
+(UTC 00:00) WESTERN EUROPE TIME, LONDON, LISBON, CASABLANCA=(UTC 00:00) Western Europe Time, London, Lisbon, Casablanca, Reykjavik
 (UTC +01:00) AMSTERDAM, BERLIN, BRUSSELS, COPENHAGEN, MADRID, PARIS=(UTC +01:00) Amsterdam, Berlin, Brussels, Copenhagen, Madrid, Paris
 (UTC +02:00) ISTANBUL, JERUSALEM, KALININGRAD, SOUTH AFRICA=(UTC +02:00) Istanbul, Jerusalem, Kaliningrad, South Africa
 (UTC +03:00) BAGHDAD, RIYADH, MOSCOW, ST. PETERSBURG=(UTC +03:00) Baghdad, Riyadh, Moscow, St. Petersburg
@@ -105,7 +105,7 @@
 (UTC +05:45) KATHMANDU=(UTC +05:45) Kathmandu
 (UTC +06:00) ALMATY, DHAKA=(UTC +06:00) Almaty, Dhaka
 (UTC +06:30) YAGOON=(UTC +06:30) Yagoon
-(UTC +07:00) BANGKOK, HANOI, JAKARTA=(UTC +07:00) Bangkok, Hanoi, Jakarta
+(UTC +07:00) BANGKOK, HANOI, JAKARTA=(UTC +07:00) Bangkok, Hanoi, Jakarta, Phnom Penh
 (UTC +08:00) BEIJING, PERTH, SINGAPORE, HONG KONG=(UTC +08:00) Beijing, Perth, Singapore, Hong Kong
 (UTC +08:00) ULAANBAATAR, WESTERN AUSTRALIA=(UTC +08:00) Ulaanbaatar, Western Australia
 (UTC +09:00) TOKYO, SEOUL, OSAKA, SAPPORO, YAKUTSK=(UTC +09:00) Tokyo, Seoul, Osaka, Sapporo, Yakutsk
diff -aruN --binary 15/language/en-GB/en-GB.mod_archive.ini 16/language/en-GB/en-GB.mod_archive.ini
--- 15/language/en-GB/en-GB.mod_archive.ini	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.mod_archive.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.mod_archive.ini 11308 2008-11-24 12:49:47Z ian $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.mod_banners.ini 16/language/en-GB/en-GB.mod_banners.ini
--- 15/language/en-GB/en-GB.mod_banners.ini	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.mod_banners.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.mod_banners.ini 10498 2008-07-04 00:05:36Z ian $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.mod_breadcrumbs.ini 16/language/en-GB/en-GB.mod_breadcrumbs.ini
--- 15/language/en-GB/en-GB.mod_breadcrumbs.ini	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.mod_breadcrumbs.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.mod_breadcrumbs.ini 11394 2009-01-05 15:28:11Z kdevine $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.mod_custom.ini 16/language/en-GB/en-GB.mod_custom.ini
--- 15/language/en-GB/en-GB.mod_custom.ini	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.mod_custom.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.mod_custom.ini 10498 2008-07-04 00:05:36Z ian $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.mod_feed.ini 16/language/en-GB/en-GB.mod_feed.ini
--- 15/language/en-GB/en-GB.mod_feed.ini	2009-06-30 21:01:32.000000000 +0200
+++ 16/language/en-GB/en-GB.mod_feed.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.mod_feed.ini 11371 2008-12-30 01:31:50Z ian $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.mod_footer.ini 16/language/en-GB/en-GB.mod_footer.ini
--- 15/language/en-GB/en-GB.mod_footer.ini	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.mod_footer.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.mod_footer.ini 10498 2008-07-04 00:05:36Z ian $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 # Note : %date% will be auto replaced by current year !Don't translate
diff -aruN --binary 15/language/en-GB/en-GB.mod_latestnews.ini 16/language/en-GB/en-GB.mod_latestnews.ini
--- 15/language/en-GB/en-GB.mod_latestnews.ini	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.mod_latestnews.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.mod_latestnews.ini 11236 2008-11-02 02:44:35Z ian $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.mod_login.ini 16/language/en-GB/en-GB.mod_login.ini
--- 15/language/en-GB/en-GB.mod_login.ini	2009-05-29 13:52:50.000000000 +0200
+++ 16/language/en-GB/en-GB.mod_login.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.mod_login.ini 10498 2008-07-04 00:05:36Z ian $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.mod_mainmenu.ini 16/language/en-GB/en-GB.mod_mainmenu.ini
--- 15/language/en-GB/en-GB.mod_mainmenu.ini	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.mod_mainmenu.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.mod_mainmenu.ini 10498 2008-07-04 00:05:36Z ian $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.mod_mostread.ini 16/language/en-GB/en-GB.mod_mostread.ini
--- 15/language/en-GB/en-GB.mod_mostread.ini	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.mod_mostread.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.mod_mostread.ini 10498 2008-07-04 00:05:36Z ian $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.mod_newsflash.ini 16/language/en-GB/en-GB.mod_newsflash.ini
--- 15/language/en-GB/en-GB.mod_newsflash.ini	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.mod_newsflash.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.mod_newsflash.ini 10579 2008-07-22 14:54:24Z ircmaxell $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.mod_online.ini 16/language/en-GB/en-GB.mod_online.ini
--- 15/language/en-GB/en-GB.mod_online.ini	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.mod_online.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.mod_online.ini 10388 2008-06-03 11:16:20Z pasamio $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.mod_poll.ini 16/language/en-GB/en-GB.mod_poll.ini
--- 15/language/en-GB/en-GB.mod_poll.ini	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.mod_poll.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.mod_poll.ini 10388 2008-06-03 11:16:20Z pasamio $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.mod_random_image.ini 16/language/en-GB/en-GB.mod_random_image.ini
--- 15/language/en-GB/en-GB.mod_random_image.ini	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.mod_random_image.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.mod_random_image.ini 10498 2008-07-04 00:05:36Z ian $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.mod_related_items.ini 16/language/en-GB/en-GB.mod_related_items.ini
--- 15/language/en-GB/en-GB.mod_related_items.ini	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.mod_related_items.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.mod_related_items.ini 10388 2008-06-03 11:16:20Z pasamio $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.mod_search.ini 16/language/en-GB/en-GB.mod_search.ini
--- 15/language/en-GB/en-GB.mod_search.ini	2009-11-04 18:51:20.000000000 +0100
+++ 16/language/en-GB/en-GB.mod_search.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.mod_search.ini 11391 2009-01-04 13:35:50Z ian $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.mod_sections.ini 16/language/en-GB/en-GB.mod_sections.ini
--- 15/language/en-GB/en-GB.mod_sections.ini	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.mod_sections.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.mod_sections.ini 10498 2008-07-04 00:05:36Z ian $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.mod_stats.ini 16/language/en-GB/en-GB.mod_stats.ini
--- 15/language/en-GB/en-GB.mod_stats.ini	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.mod_stats.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.mod_stats.ini 10498 2008-07-04 00:05:36Z ian $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.mod_syndicate.ini 16/language/en-GB/en-GB.mod_syndicate.ini
--- 15/language/en-GB/en-GB.mod_syndicate.ini	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.mod_syndicate.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.mod_syndicate.ini 10388 2008-06-03 11:16:20Z pasamio $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.mod_whosonline.ini 16/language/en-GB/en-GB.mod_whosonline.ini
--- 15/language/en-GB/en-GB.mod_whosonline.ini	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.mod_whosonline.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.mod_whosonline.ini 10498 2008-07-04 00:05:36Z ian $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.mod_wrapper.ini 16/language/en-GB/en-GB.mod_wrapper.ini
--- 15/language/en-GB/en-GB.mod_wrapper.ini	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.mod_wrapper.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.mod_wrapper.ini 10498 2008-07-04 00:05:36Z ian $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.plg_content_pagebreak.ini 16/language/en-GB/en-GB.plg_content_pagebreak.ini
--- 15/language/en-GB/en-GB.plg_content_pagebreak.ini	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.plg_content_pagebreak.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id$
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.plg_content_vote.ini 16/language/en-GB/en-GB.plg_content_vote.ini
--- 15/language/en-GB/en-GB.plg_content_vote.ini	2009-05-29 13:52:50.000000000 +0200
+++ 16/language/en-GB/en-GB.plg_content_vote.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.plg_content_vote.ini 8234 2007-07-28 23:16:01Z humvee $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.plg_search_categories.ini 16/language/en-GB/en-GB.plg_search_categories.ini
--- 15/language/en-GB/en-GB.plg_search_categories.ini	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.plg_search_categories.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.plg_search_categories.ini 6273 2007-01-14 03:56:33Z eddiea $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.plg_search_contacts.ini 16/language/en-GB/en-GB.plg_search_contacts.ini
--- 15/language/en-GB/en-GB.plg_search_contacts.ini	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.plg_search_contacts.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.plg_search_contacts.ini 6273 2007-01-14 03:56:33Z eddiea $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.plg_search_content.ini 16/language/en-GB/en-GB.plg_search_content.ini
--- 15/language/en-GB/en-GB.plg_search_content.ini	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.plg_search_content.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.plg_search_content.ini 6273 2007-01-14 03:56:33Z eddiea $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.plg_search_newsfeeds.ini 16/language/en-GB/en-GB.plg_search_newsfeeds.ini
--- 15/language/en-GB/en-GB.plg_search_newsfeeds.ini	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.plg_search_newsfeeds.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.plg_search_newsfeeds.ini 6273 2007-01-14 03:56:33Z eddiea $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.plg_search_sections.ini 16/language/en-GB/en-GB.plg_search_sections.ini
--- 15/language/en-GB/en-GB.plg_search_sections.ini	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.plg_search_sections.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.plg_search_sections.ini 6273 2007-01-14 03:56:33Z eddiea $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.plg_search_weblinks.ini 16/language/en-GB/en-GB.plg_search_weblinks.ini
--- 15/language/en-GB/en-GB.plg_search_weblinks.ini	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.plg_search_weblinks.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.plg_search_weblinks.ini 6273 2007-01-14 03:56:33Z eddiea $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.plg_system_debug.ini 16/language/en-GB/en-GB.plg_system_debug.ini
--- 15/language/en-GB/en-GB.plg_system_debug.ini	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.plg_system_debug.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.plg_system_debug.ini 8057 2007-07-18 15:05:56Z humvee $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.tpl_beez.ini 16/language/en-GB/en-GB.tpl_beez.ini
--- 15/language/en-GB/en-GB.tpl_beez.ini	2009-06-30 21:01:32.000000000 +0200
+++ 16/language/en-GB/en-GB.tpl_beez.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.tpl_beez.ini 10388 2008-06-03 11:16:20Z pasamio $
 # author Joomla! Project
-# copyright Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/en-GB/en-GB.tpl_ja_purity.ini 16/language/en-GB/en-GB.tpl_ja_purity.ini
--- 15/language/en-GB/en-GB.tpl_ja_purity.ini	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.tpl_ja_purity.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.tpl_ja_purity.ini 10498 2008-07-04 00:05:36Z ian $
 # Joomla! Project
-# Copyright (C) 2005 - 2007 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8
 
diff -aruN --binary 15/language/en-GB/en-GB.tpl_rhuk_milkyway.ini 16/language/en-GB/en-GB.tpl_rhuk_milkyway.ini
--- 15/language/en-GB/en-GB.tpl_rhuk_milkyway.ini	2009-05-29 13:52:48.000000000 +0200
+++ 16/language/en-GB/en-GB.tpl_rhuk_milkyway.ini	2010-04-23 13:40:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Id: en-GB.tpl_rhuk_milkyway.ini 10388 2008-06-03 11:16:20Z pasamio $
 # Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 # Note : All ini files need to be saved as UTF-8 - No BOM
 
diff -aruN --binary 15/language/en-GB/en-GB.xml 16/language/en-GB/en-GB.xml
--- 15/language/en-GB/en-GB.xml	2009-11-04 18:51:20.000000000 +0100
+++ 16/language/en-GB/en-GB.xml	2010-04-23 13:40:16.000000000 +0200
@@ -8,7 +8,7 @@
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
-	<copyright>Copyright (C) 2005 - 2009 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<description></description>
 	<metadata>
diff -aruN --binary 15/language/es-ES/es-ES.com_banners.ini 16/language/es-ES/es-ES.com_banners.ini
--- 15/language/es-ES/es-ES.com_banners.ini	2009-07-25 17:09:52.000000000 +0200
+++ 16/language/es-ES/es-ES.com_banners.ini	2010-04-24 22:45:24.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_banners.ini 1.5.0 2009-06-28 09:27:54 2007-10-06 ~0 $
+# $Id: es-ES.com_banners.ini 1.5.0 2010-04-24 22:45:22 2007-10-06 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.com_contact.ini 16/language/es-ES/es-ES.com_contact.ini
--- 15/language/es-ES/es-ES.com_contact.ini	2009-07-25 17:09:52.000000000 +0200
+++ 16/language/es-ES/es-ES.com_contact.ini	2010-04-24 22:46:10.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_contact.ini 1.5.0 2009-06-28 09:31:41 2007-09-18 ~0 $
+# $Id: es-ES.com_contact.ini 1.5.0 2010-04-24 22:46:09 2007-09-18 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.com_content.ini 16/language/es-ES/es-ES.com_content.ini
--- 15/language/es-ES/es-ES.com_content.ini	2009-07-25 17:09:52.000000000 +0200
+++ 16/language/es-ES/es-ES.com_content.ini	2010-04-24 22:47:04.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_content.ini 1.5.0 2009-07-01 10:15:40 2007-10-06 ~0 $
+# $Id: es-ES.com_content.ini 1.5.0 2010-04-24 22:47:02 2007-10-06 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.com_frontpage.ini 16/language/es-ES/es-ES.com_frontpage.ini
--- 15/language/es-ES/es-ES.com_frontpage.ini	2009-07-25 17:09:52.000000000 +0200
+++ 16/language/es-ES/es-ES.com_frontpage.ini	2010-04-24 22:47:44.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_frontpage.ini 1.5.0 2009-06-28 09:32:48 2007-09-01 ~0 $
+# $Id: es-ES.com_frontpage.ini 1.5.0 2010-04-24 22:47:43 2007-09-01 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.com_mailto.ini 16/language/es-ES/es-ES.com_mailto.ini
--- 15/language/es-ES/es-ES.com_mailto.ini	2009-07-25 17:09:52.000000000 +0200
+++ 16/language/es-ES/es-ES.com_mailto.ini	2010-04-25 00:59:44.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_mailto.ini 1.5.0 2009-06-28 09:34:10 2007-09-01 ~0 $
+# $Id: es-ES.com_mailto.ini 1.5.0 2010-04-25 00:59:42 2007-09-01 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.com_media.ini 16/language/es-ES/es-ES.com_media.ini
--- 15/language/es-ES/es-ES.com_media.ini	2009-07-25 17:09:52.000000000 +0200
+++ 16/language/es-ES/es-ES.com_media.ini	2010-04-25 00:59:58.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_media.ini 1.5.0 2009-06-28 09:35:30 ian ~0 $
+# $Id: es-ES.com_media.ini 1.5.0 2010-04-25 00:59:57 ian ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.com_messages.ini 16/language/es-ES/es-ES.com_messages.ini
--- 15/language/es-ES/es-ES.com_messages.ini	2009-07-25 17:09:52.000000000 +0200
+++ 16/language/es-ES/es-ES.com_messages.ini	2010-04-25 01:00:30.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_messages.ini 1.5.0 2009-06-28 09:37:07 version ~0 $
+# $Id: es-ES.com_messages.ini 1.5.0 2010-04-25 01:00:29 version ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.com_newsfeeds.ini 16/language/es-ES/es-ES.com_newsfeeds.ini
--- 15/language/es-ES/es-ES.com_newsfeeds.ini	2009-07-25 17:09:50.000000000 +0200
+++ 16/language/es-ES/es-ES.com_newsfeeds.ini	2010-04-25 01:00:52.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_newsfeeds.ini 1.5.0 2009-06-28 09:37:48 2007-09-01 ~0 $
+# $Id: es-ES.com_newsfeeds.ini 1.5.0 2010-04-25 01:00:51 2007-09-01 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.com_poll.ini 16/language/es-ES/es-ES.com_poll.ini
--- 15/language/es-ES/es-ES.com_poll.ini	2009-07-25 17:09:50.000000000 +0200
+++ 16/language/es-ES/es-ES.com_poll.ini	2010-04-25 01:03:26.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_poll.ini 1.5.0 2009-06-28 09:39:23 2007-09-01 ~0 $
+# $Id: es-ES.com_poll.ini 1.5.0 2010-04-25 01:03:24 2007-09-01 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.com_search.ini 16/language/es-ES/es-ES.com_search.ini
--- 15/language/es-ES/es-ES.com_search.ini	2009-07-25 17:09:50.000000000 +0200
+++ 16/language/es-ES/es-ES.com_search.ini	2010-04-25 01:08:04.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_search.ini 1.5.0 2009-06-28 09:41:58 2007-10-06 ~0 $
+# $Id: es-ES.com_search.ini 1.5.0 2010-04-25 01:08:03 2007-10-06 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.com_user.ini 16/language/es-ES/es-ES.com_user.ini
--- 15/language/es-ES/es-ES.com_user.ini	2009-07-25 17:09:50.000000000 +0200
+++ 16/language/es-ES/es-ES.com_user.ini	2010-04-25 01:10:00.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_user.ini 1.5.0 2009-06-28 09:52:44 2007-10-06 ~0 $
+# $Id: es-ES.com_user.ini 1.5.0 2010-04-25 01:09:58 2007-10-06 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.com_weblinks.ini 16/language/es-ES/es-ES.com_weblinks.ini
--- 15/language/es-ES/es-ES.com_weblinks.ini	2009-07-25 17:09:50.000000000 +0200
+++ 16/language/es-ES/es-ES.com_weblinks.ini	2010-04-25 01:10:48.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_weblinks.ini 1.5.0 2009-06-28 09:54:48 2007-09-01 ~0 $
+# $Id: es-ES.com_weblinks.ini 1.5.0 2010-04-25 01:10:47 2007-09-01 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.com_wrapper.ini 16/language/es-ES/es-ES.com_wrapper.ini
--- 15/language/es-ES/es-ES.com_wrapper.ini	2009-07-25 17:09:50.000000000 +0200
+++ 16/language/es-ES/es-ES.com_wrapper.ini	2010-04-25 01:11:08.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_wrapper.ini 1.5.0 2009-06-28 09:55:55 2007-09-01 ~0 $
+# $Id: es-ES.com_wrapper.ini 1.5.0 2010-04-25 01:11:07 2007-09-01 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.ignore.php 16/language/es-ES/es-ES.ignore.php
--- 15/language/es-ES/es-ES.ignore.php	2009-07-25 17:09:48.000000000 +0200
+++ 16/language/es-ES/es-ES.ignore.php	2010-04-25 22:56:04.000000000 +0200
@@ -2,7 +2,7 @@
 /**
 * @version		$Id: es-ES.ignore.php 6140 2007-01-02 03:44:18Z eddiea $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2007 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/language/es-ES/es-ES.ini 16/language/es-ES/es-ES.ini
--- 15/language/es-ES/es-ES.ini	2009-11-05 16:03:14.000000000 +0100
+++ 16/language/es-ES/es-ES.ini	2010-04-24 22:44:56.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.ini 1.5.0 2009-11-05 16:03:14 2007-10-06 ~0 $
+# $Id: es-ES.ini 1.5.0 2010-04-24 22:44:54 2007-10-06 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
@@ -89,12 +89,12 @@
 (UTC -05:00) EASTERN TIME (US &AMP; CANADA), BOGOTA, LIMA=(UTC -05:00) Eastern Time (US &amp; Canada), Bogota, Lima
 (UTC -04:30) VENEZUELA=(UTC -04:30) Venezuela
 (UTC -04:00) ATLANTIC TIME (CANADA), CARACAS, LA PAZ=(UTC -04:00) Atlantic Time (Canada), Caracas, La Paz
-(UTC -03:30) ST. JOHN'S, NEWFOUNDLAND, LABRADOR=(UTC -03:30) St. John`s, Newfoundland, Labrador
+(UTC -03:30) ST. JOHN'S, NEWFOUNDLAND, LABRADOR=(UTC -03:30) St. John's, Newfoundland, Labrador
 (UTC -03:00) BRAZIL, BUENOS AIRES, GEORGETOWN=(UTC -03:00) Brazil, Buenos Aires, Georgetown
 (UTC -02:00) MID-ATLANTIC=(UTC -02:00) Mid-Atlantic
 (UTC -01:00) AZORES, CAPE VERDE ISLANDS=(UTC -01:00) Azores, Cape Verde Islands
-(UTC 00:00) WESTERN EUROPE TIME, LONDON, LISBON, CASABLANCA=(UTC 00:00) Western Europe Time, London, Lisbon, Casablanca
-(UTC +01:00) AMSTERDAM, BERLIN, BRUSSELS, COPENHAGEN, MADRID, PARIS=(UTC +01:00) Amsterdam, Berlin, Brussels, Copenhagen, Madrid, París,horario de invierno España,Francia
+(UTC 00:00) WESTERN EUROPE TIME, LONDON, LISBON, CASABLANCA=(UTC 00:00) Western Europe Time, London, Lisbon, Casablanca, Reykjavik
+(UTC +01:00) AMSTERDAM, BERLIN, BRUSSELS, COPENHAGEN, MADRID, PARIS=(UTC +01:00) Amsterdam, Barcelona, Berlin, Brussels, Copenhagen, Madrid, París,horario de invierno España,Francia
 (UTC +02:00) ISTANBUL, JERUSALEM, KALININGRAD, SOUTH AFRICA=(UTC +02:00) Istanbul, Jerusalem, Kaliningrad, South Africa
 (UTC +03:00) BAGHDAD, RIYADH, MOSCOW, ST. PETERSBURG=(UTC +03:00) Baghdad, Riyadh, Moscow, St. Petersburg
 (UTC +03:30) TEHRAN=(UTC +03:30) Tehran
@@ -105,7 +105,7 @@
 (UTC +05:45) KATHMANDU=(UTC +05:45) Kathmandu
 (UTC +06:00) ALMATY, DHAKA=(UTC +06:00) Almaty, Dhaka
 (UTC +06:30) YAGOON=(UTC +06:30) Yagoon
-(UTC +07:00) BANGKOK, HANOI, JAKARTA=(UTC +07:00) Bangkok, Hanoi, Jakarta
+(UTC +07:00) BANGKOK, HANOI, JAKARTA=(UTC +07:00) Bangkok, Hanoi, Jakarta, Phnom Penh
 (UTC +08:00) BEIJING, PERTH, SINGAPORE, HONG KONG=(UTC +08:00) Beijing, Perth, Singapore, Hong Kong
 (UTC +08:00) ULAANBAATAR, WESTERN AUSTRALIA=(UTC +08:00) Ulaanbaatar, Western Australia
 (UTC +09:00) TOKYO, SEOUL, OSAKA, SAPPORO, YAKUTSK=(UTC +09:00) Tokyo, Seoul, Osaka, Sapporo, Yakutsk
@@ -282,7 +282,7 @@
 STORE FAILED=Error al almacenar
 SUBURB=Ciudad/Pueblo
 TASK=Tarea
-TEMPLATE_WARN=<font color="red"><b>El archivo del Template-Plantilla no pudo ser encontrado! Buscando el Template-Plantilla: %s</b></font>
+TEMPLATE_WARN=El archivo del Template-Plantilla no pudo ser encontrado! Buscando el Template-Plantilla: %s
 THE MEMCACHE EXTENSION IS NOT AVAILABLE=La extensión <abbr title="memory object caching">memcache</abbr>  no está disponible
 THE APC EXTENSION IS NOT AVAILABLE=La extensión <abbr title="Alternative PHP Cache">APC</abbr> no está disponible
 THE EACCELERATOR EXTENSION IS NOT AVAILABLE=La extensión <dfn title="A free, Open Source, PHP accelerator and dynamic content cache optimizer.">eAccelerator</dfn> no está disponible
diff -aruN --binary 15/language/es-ES/es-ES.mod_archive.ini 16/language/es-ES/es-ES.mod_archive.ini
--- 15/language/es-ES/es-ES.mod_archive.ini	2009-07-25 17:09:48.000000000 +0200
+++ 16/language/es-ES/es-ES.mod_archive.ini	2010-04-25 01:11:30.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.mod_archive.ini 1.5.0 2009-06-28 09:56:53 19:14:51 ~0 $
+# $Id: es-ES.mod_archive.ini 1.5.0 2010-04-25 01:11:29 19:14:51 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.mod_banners.ini 16/language/es-ES/es-ES.mod_banners.ini
--- 15/language/es-ES/es-ES.mod_banners.ini	2009-07-25 17:09:48.000000000 +0200
+++ 16/language/es-ES/es-ES.mod_banners.ini	2010-04-25 01:16:46.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.mod_banners.ini 1.5.0 2009-06-28 09:57:56 2007-09-01 ~0 $
+# $Id: es-ES.mod_banners.ini 1.5.0 2010-04-25 01:16:44 2007-09-01 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.mod_breadcrumbs.ini 16/language/es-ES/es-ES.mod_breadcrumbs.ini
--- 15/language/es-ES/es-ES.mod_breadcrumbs.ini	2009-07-25 17:09:48.000000000 +0200
+++ 16/language/es-ES/es-ES.mod_breadcrumbs.ini	2010-04-25 01:17:04.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.mod_breadcrumbs.ini 1.5.0 2009-06-28 10:02:59 2007-09-01 ~0 $
+# $Id: es-ES.mod_breadcrumbs.ini 1.5.0 2010-04-25 01:17:03 2007-09-01 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.mod_custom.ini 16/language/es-ES/es-ES.mod_custom.ini
--- 15/language/es-ES/es-ES.mod_custom.ini	2009-07-25 17:09:48.000000000 +0200
+++ 16/language/es-ES/es-ES.mod_custom.ini	2010-04-25 01:23:30.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.mod_custom.ini 1.5.0 2009-06-28 10:03:47 19:19:58 ~0 $
+# $Id: es-ES.mod_custom.ini 1.5.0 2010-04-25 01:23:28 19:19:58 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.mod_feed.ini 16/language/es-ES/es-ES.mod_feed.ini
--- 15/language/es-ES/es-ES.mod_feed.ini	2009-07-25 17:09:48.000000000 +0200
+++ 16/language/es-ES/es-ES.mod_feed.ini	2010-04-25 01:24:52.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.mod_feed.ini 1.5.0 2009-07-04 12:57:18 2007-10-06 ~0 $
+# $Id: es-ES.mod_feed.ini 1.5.0 2010-04-25 01:24:50 2007-10-06 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.mod_footer.ini 16/language/es-ES/es-ES.mod_footer.ini
--- 15/language/es-ES/es-ES.mod_footer.ini	2009-07-25 17:09:46.000000000 +0200
+++ 16/language/es-ES/es-ES.mod_footer.ini	2010-04-25 01:15:36.000000000 +0200
@@ -1,12 +1,12 @@
-# $Id: es-ES.mod_footer.ini 1.5.0 2009-07-06 13:37:55 2007-09-01 ~0 $
+# $Id: es-ES.mod_footer.ini 1.5.0 2010-04-25 01:15:34 2007-09-01 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
 
 FOOTER=Footer (pie de página)
 FOOTER_LINE1=Copyright &#169; %date% %sitename%. Todos los derechos reservados.
-FOOTER_LINE2=<a href="http://www.joomlaspanish.org/">Pack creado por Joomla! Spanish 2008</a> - <a href="http://www.webempresa.com/" title="Diseño web" target="_blank">Patrocinado por Web Empresa</a><br /><a href="http://www.joomla.org">Joomla!</a> es un software libre publicado bajo la <a href="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL">licencia GNU/GPL.</a>
+FOOTER_LINE2=<a href="http://www.joomlaspanish.org/">Pack creado por Joomla! Spanish 2010</a> - <a href="http://www.webempresa.com/" title="Diseño web" target="_blank">Patrocinado por Web Empresa</a><br /><a href="http://www.joomla.org">Joomla!</a> es un software libre publicado bajo la <a href="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL">licencia GNU/GPL.</a>
 MOD_FOOTER=<em>mod_footer</em>
 THIS MODULE SHOWS THE JOOMLA! COPYRIGHT INFORMATION=Este módulo muestra información del Copyright de Joomla!
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 15/language/es-ES/es-ES.mod_latestnews.ini 16/language/es-ES/es-ES.mod_latestnews.ini
--- 15/language/es-ES/es-ES.mod_latestnews.ini	2009-07-25 17:09:46.000000000 +0200
+++ 16/language/es-ES/es-ES.mod_latestnews.ini	2010-04-25 01:30:10.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.mod_latestnews.ini 1.5.0 2008-11-11 13:19:31 2007-09-01 ~0 $
+# $Id: es-ES.mod_latestnews.ini 1.5.0 2010-04-25 01:30:08 2007-09-01 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
@@ -13,7 +13,7 @@
 LATEST NEWS=Últimas noticias
 MOD_LATESTNEWS=<em>mod_latestnews</em>
 MODULE MODE=Modo del módulo
-PARAMCATEGORYID=Permite seleccionar artículos de una categoría especifica o un grupo de categorías. (Para especificar más de una categoría separelas con una coma , ).
+PARAMCATEGORYID=Permite seleccionar artículos de una categoría especifica o un grupo de categorías. Introduzca el ID de categoría desde el Gestor de categoría. Para especificar más de una categoría separelas con una coma ,
 PARAMENABLECACHE=Seleccione para almacenar en la caché el contenido de este módulo.
 PARAMFRONTPAGEITEMS=Mostrar/ocultar los artículos asignados a la página inicial
 PARAMSECTIONID=Permite seleccionar ítems de una sección especifica o un grupo de secciones.Introduzca la Sección ID tomado de la Sección Manager.(Para especificar más de una sección separe con una coma ,).
diff -aruN --binary 15/language/es-ES/es-ES.mod_login.ini 16/language/es-ES/es-ES.mod_login.ini
--- 15/language/es-ES/es-ES.mod_login.ini	2009-07-25 17:09:46.000000000 +0200
+++ 16/language/es-ES/es-ES.mod_login.ini	2010-04-25 01:31:16.000000000 +0200
@@ -1,6 +1,6 @@
-# version 1.5.0 2008-07-08 20:04:56 ~0
+# version 1.5.0 2010-04-25 01:31:14 ~0
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.mod_mainmenu.ini 16/language/es-ES/es-ES.mod_mainmenu.ini
--- 15/language/es-ES/es-ES.mod_mainmenu.ini	2009-07-25 17:09:46.000000000 +0200
+++ 16/language/es-ES/es-ES.mod_mainmenu.ini	2010-04-25 01:32:04.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.mod_mainmenu.ini 1.5.0 2008-07-08 20:05:33 2007-09-01 ~0 $
+# $Id: es-ES.mod_mainmenu.ini 1.5.0 2010-04-25 01:32:03 2007-09-01 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.mod_mostread.ini 16/language/es-ES/es-ES.mod_mostread.ini
--- 15/language/es-ES/es-ES.mod_mostread.ini	2009-07-25 17:09:46.000000000 +0200
+++ 16/language/es-ES/es-ES.mod_mostread.ini	2010-04-25 01:36:00.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.mod_mostread.ini 1.5.0 2008-07-08 20:07:40 2007-09-01 ~0 $
+# $Id: es-ES.mod_mostread.ini 1.5.0 2010-04-25 01:35:59 2007-09-01 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
@@ -13,8 +13,8 @@
 MOD_MOSTREAD=<em>mod_mostread</em>
 MODULE MODE=Modo del módulo
 MOST READ CONTENT=Contenido más leído
-PARAMCATEGORYID=Seleccionar artículos de una categoría específica o de un conjunto de categorías (para especificar más de una categoría, sepárelas con una coma , ).
+PARAMCATEGORYID=Seleccionar artículos de una categoría específica o de un conjunto de categorías Introduzca el ID de categoría desde el Gestor de categorías.(para especificar más de una categoría, sepárelas con una coma , ).
 PARAMFRONTPAGEITEMS=Mostrar/Ocultar artículos designados para la Página Principal - Solo funciona en 'artículos y páginas estáticas' no en otros artículos de contenido.
-PARAMSECTIONID=Seleccionar artículos de una Sección específica o de un conjunto de Secciones ((para especificar más de una Sección, sepárelas con una coma , ).
+PARAMSECTIONID=Seleccionar artículos de una sección específica o de un conjunto de Secciones. Introduzca el ID de sección desde el Gestor de secciones. (para especificar más de una Sección, sepárelas con una coma , ).
 SECTION ID=ID de la sección
 THE NUMBER OF ITEMS TO DISPLAY (DEFAULT IS 5)=El número de artículos a mostrar (predeterminado: 5)
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 15/language/es-ES/es-ES.mod_newsflash.ini 16/language/es-ES/es-ES.mod_newsflash.ini
--- 15/language/es-ES/es-ES.mod_newsflash.ini	2009-07-25 17:09:46.000000000 +0200
+++ 16/language/es-ES/es-ES.mod_newsflash.ini	2010-04-25 01:36:52.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.mod_newsflash.ini 1.5.0 2008-07-28 16:12:23 2007-09-18 ~0 $
+# $Id: es-ES.mod_newsflash.ini 1.5.0 2010-04-25 01:36:50 2007-09-18 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.mod_online.ini 16/language/es-ES/es-ES.mod_online.ini
--- 15/language/es-ES/es-ES.mod_online.ini	2009-07-25 17:09:46.000000000 +0200
+++ 16/language/es-ES/es-ES.mod_online.ini	2010-04-25 01:37:10.000000000 +0200
@@ -1,6 +1,6 @@
-# version 1.5.0 2008-07-08 20:09:36 ~0
+# version 1.5.0 2010-04-25 01:37:08 ~0
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.mod_poll.ini 16/language/es-ES/es-ES.mod_poll.ini
--- 15/language/es-ES/es-ES.mod_poll.ini	2009-07-25 17:09:46.000000000 +0200
+++ 16/language/es-ES/es-ES.mod_poll.ini	2010-04-25 01:37:24.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.mod_poll.ini 1.5.0 2008-07-08 20:09:57 2007-09-01 ~0 $
+# $Id: es-ES.mod_poll.ini 1.5.0 2010-04-25 01:37:23 2007-09-01 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.mod_random_image.ini 16/language/es-ES/es-ES.mod_random_image.ini
--- 15/language/es-ES/es-ES.mod_random_image.ini	2009-07-25 17:09:44.000000000 +0200
+++ 16/language/es-ES/es-ES.mod_random_image.ini	2010-04-25 01:38:10.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.mod_random_image.ini 1.5.0 2008-07-08 20:10:25 2007-09-01 ~0 $
+# $Id: es-ES.mod_random_image.ini 1.5.0 2010-04-25 01:38:08 2007-09-01 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.mod_related_items.ini 16/language/es-ES/es-ES.mod_related_items.ini
--- 15/language/es-ES/es-ES.mod_related_items.ini	2009-07-25 17:09:44.000000000 +0200
+++ 16/language/es-ES/es-ES.mod_related_items.ini	2010-04-25 01:39:14.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.mod_related_items.ini 1.5.0 2008-07-08 20:10:50 2007-09-01 ~0 $
+# $Id: es-ES.mod_related_items.ini 1.5.0 2010-04-25 01:39:13 2007-09-01 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.mod_search.ini 16/language/es-ES/es-ES.mod_search.ini
--- 15/language/es-ES/es-ES.mod_search.ini	2009-11-05 16:05:58.000000000 +0100
+++ 16/language/es-ES/es-ES.mod_search.ini	2010-04-25 01:39:46.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.mod_search.ini 1.5.0 2009-11-05 16:05:58 2007-09-01 ~0 $
+# $Id: es-ES.mod_search.ini 1.5.0 2010-04-25 01:39:45 2007-09-01 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.mod_sections.ini 16/language/es-ES/es-ES.mod_sections.ini
--- 15/language/es-ES/es-ES.mod_sections.ini	2009-07-25 17:09:44.000000000 +0200
+++ 16/language/es-ES/es-ES.mod_sections.ini	2010-04-25 01:41:30.000000000 +0200
@@ -1,12 +1,12 @@
-# $Id: es-ES.mod_sections.ini 1.5.0 2008-07-08 20:11:46 2007-09-01 ~0 $
+# $Id: es-ES.mod_sections.ini 1.5.0 2010-04-25 01:41:29 2007-09-01 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
 
 COUNT=Contador
-DESCSECTIONS=El módulo Secciones muestra una lista de todas las secciones configuradas en su Base de Datos. Las secciones se refieren aquí solamente a los artículos de secciones. Si la configuración "Mostrar Enlaces No Autorizados" no está habilitada, la lista estará limitada a las secciones que el usuario tiene acceso.
+DESCSECTIONS=El módulo Secciones muestra una lista de todas las secciones configuradas en su Base de Datos. Las secciones se refieren aquí solamente a los artículos de secciones. Si la configuración <em>"Mostrar Enlaces No Autorizados"</em> no está habilitada, la lista estará limitada a las secciones que el usuario tiene acceso.
 MOD_SECTIONS=<em>mod_sections</em>
 SECTIONS=Secciones
 SHOW UNAUTHORIZED LINKS=Mostrar enlaces no autorizados
diff -aruN --binary 15/language/es-ES/es-ES.mod_stats.ini 16/language/es-ES/es-ES.mod_stats.ini
--- 15/language/es-ES/es-ES.mod_stats.ini	2009-07-25 17:09:44.000000000 +0200
+++ 16/language/es-ES/es-ES.mod_stats.ini	2010-04-25 01:41:48.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.mod_stats.ini 1.5.0 2008-07-08 20:12:20 2007-09-01 ~0 $
+# $Id: es-ES.mod_stats.ini 1.5.0 2010-04-25 01:41:46 2007-09-01 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.mod_syndicate.ini 16/language/es-ES/es-ES.mod_syndicate.ini
--- 15/language/es-ES/es-ES.mod_syndicate.ini	2009-07-25 17:09:44.000000000 +0200
+++ 16/language/es-ES/es-ES.mod_syndicate.ini	2010-04-25 01:42:34.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.mod_syndicate.ini 1.5.0 2008-07-08 20:12:40 2007-09-01 ~0 $
+# $Id: es-ES.mod_syndicate.ini 1.5.0 2010-04-25 01:42:33 2007-09-01 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.mod_whosonline.ini 16/language/es-ES/es-ES.mod_whosonline.ini
--- 15/language/es-ES/es-ES.mod_whosonline.ini	2009-07-25 17:09:44.000000000 +0200
+++ 16/language/es-ES/es-ES.mod_whosonline.ini	2010-04-25 01:43:36.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.mod_whosonline.ini 1.5.0 2009-07-06 10:55:42 2007-09-01 ~0 $
+# $Id: es-ES.mod_whosonline.ini 1.5.0 2010-04-25 01:43:34 2007-09-01 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.mod_wrapper.ini 16/language/es-ES/es-ES.mod_wrapper.ini
--- 15/language/es-ES/es-ES.mod_wrapper.ini	2009-07-25 17:09:44.000000000 +0200
+++ 16/language/es-ES/es-ES.mod_wrapper.ini	2010-04-25 01:44:48.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.mod_wrapper.ini 1.5.0 2009-06-28 09:25:32 2007-09-01 ~0 $
+# $Id: es-ES.mod_wrapper.ini 1.5.0 2010-04-25 01:44:46 2007-09-01 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.plg_content_pagebreak.ini 16/language/es-ES/es-ES.plg_content_pagebreak.ini
--- 15/language/es-ES/es-ES.plg_content_pagebreak.ini	2009-07-25 17:09:42.000000000 +0200
+++ 16/language/es-ES/es-ES.plg_content_pagebreak.ini	2010-04-25 01:45:32.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.plg_content_pagebreak.ini 1.5.9 2009-03-28 20:02:28 ff ~0 $
+# $Id: es-ES.plg_content_pagebreak.ini 1.5.16 2010-04-25 01:45:30 ff ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.plg_content_vote.ini 16/language/es-ES/es-ES.plg_content_vote.ini
--- 15/language/es-ES/es-ES.plg_content_vote.ini	2009-07-25 17:09:42.000000000 +0200
+++ 16/language/es-ES/es-ES.plg_content_vote.ini	2010-04-25 01:46:32.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.plg_content_vote.ini 1.5.0 2008-07-08 20:15:07 19:57:13 ~0 $
+# $Id: es-ES.plg_content_vote.ini 1.5.0 2010-04-25 01:46:30 19:57:13 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.plg_search_categories.ini 16/language/es-ES/es-ES.plg_search_categories.ini
--- 15/language/es-ES/es-ES.plg_search_categories.ini	2009-07-25 17:09:42.000000000 +0200
+++ 16/language/es-ES/es-ES.plg_search_categories.ini	2010-04-25 01:46:50.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.plg_search_categories.ini 1.5.0 2008-07-08 20:15:27 2007-09-01 ~0 $
+# $Id: es-ES.plg_search_categories.ini 1.5.0 2010-04-25 01:46:48 2007-09-01 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.plg_search_contacts.ini 16/language/es-ES/es-ES.plg_search_contacts.ini
--- 15/language/es-ES/es-ES.plg_search_contacts.ini	2009-07-25 17:09:42.000000000 +0200
+++ 16/language/es-ES/es-ES.plg_search_contacts.ini	2010-04-25 01:47:08.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.plg_search_contacts.ini 1.5.0 2008-07-08 20:16:04 2007-09-01 ~0 $
+# $Id: es-ES.plg_search_contacts.ini 1.5.0 2010-04-25 01:47:07 2007-09-01 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.plg_search_content.ini 16/language/es-ES/es-ES.plg_search_content.ini
--- 15/language/es-ES/es-ES.plg_search_content.ini	2009-07-25 17:09:42.000000000 +0200
+++ 16/language/es-ES/es-ES.plg_search_content.ini	2010-04-25 01:47:26.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.plg_search_content.ini 1.5.0 2008-07-08 20:16:21 2007-09-01 ~0 $
+# $Id: es-ES.plg_search_content.ini 1.5.0 2010-04-25 01:47:24 2007-09-01 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.plg_search_newsfeeds.ini 16/language/es-ES/es-ES.plg_search_newsfeeds.ini
--- 15/language/es-ES/es-ES.plg_search_newsfeeds.ini	2009-07-25 17:09:42.000000000 +0200
+++ 16/language/es-ES/es-ES.plg_search_newsfeeds.ini	2010-04-25 01:47:48.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.plg_search_newsfeeds.ini 1.5.0 2008-07-08 20:16:39 2007-09-01 ~0 $
+# $Id: es-ES.plg_search_newsfeeds.ini 1.5.0 2010-04-25 01:47:47 2007-09-01 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.plg_search_sections.ini 16/language/es-ES/es-ES.plg_search_sections.ini
--- 15/language/es-ES/es-ES.plg_search_sections.ini	2009-07-25 17:09:42.000000000 +0200
+++ 16/language/es-ES/es-ES.plg_search_sections.ini	2010-04-25 01:48:04.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.plg_search_sections.ini 1.5.0 2008-07-08 20:17:19 2007-09-01 ~0 $
+# $Id: es-ES.plg_search_sections.ini 1.5.0 2010-04-25 01:48:03 2007-09-01 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.plg_search_weblinks.ini 16/language/es-ES/es-ES.plg_search_weblinks.ini
--- 15/language/es-ES/es-ES.plg_search_weblinks.ini	2009-07-25 17:09:40.000000000 +0200
+++ 16/language/es-ES/es-ES.plg_search_weblinks.ini	2010-04-25 01:48:18.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.plg_search_weblinks.ini 1.5.0 2008-07-08 20:17:38 2007-10-06 ~0 $
+# $Id: es-ES.plg_search_weblinks.ini 1.5.0 2010-04-25 01:48:16 2007-10-06 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.plg_system_debug.ini 16/language/es-ES/es-ES.plg_system_debug.ini
--- 15/language/es-ES/es-ES.plg_system_debug.ini	2009-07-25 17:09:40.000000000 +0200
+++ 16/language/es-ES/es-ES.plg_system_debug.ini	2010-04-25 01:54:34.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.plg_system_debug.ini 1.5.0 2009-06-28 09:20:28 19:15:38 ~0 $
+# $Id: es-ES.plg_system_debug.ini 1.5.0 2010-04-25 01:54:33 19:15:38 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.tpl_beez.ini 16/language/es-ES/es-ES.tpl_beez.ini
--- 15/language/es-ES/es-ES.tpl_beez.ini	2009-07-25 17:09:40.000000000 +0200
+++ 16/language/es-ES/es-ES.tpl_beez.ini	2010-04-25 01:55:00.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.tpl_beez.ini 1.5.0 2009-07-01 10:17:02 03:11:55 ~0 $
+# $Id: es-ES.tpl_beez.ini 1.5.0 2010-04-25 01:54:59 03:11:55 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.tpl_ja_purity.ini 16/language/es-ES/es-ES.tpl_ja_purity.ini
--- 15/language/es-ES/es-ES.tpl_ja_purity.ini	2009-07-25 17:09:40.000000000 +0200
+++ 16/language/es-ES/es-ES.tpl_ja_purity.ini	2010-04-25 01:55:38.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.tpl_ja_purity.ini 1.5.4 2008-07-08 20:22:30 ff ~0 $
+# $Id: es-ES.tpl_ja_purity.ini 1.5.0 2010-04-25 01:55:36 ff ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.tpl_rhuk_milkyway.ini 16/language/es-ES/es-ES.tpl_rhuk_milkyway.ini
--- 15/language/es-ES/es-ES.tpl_rhuk_milkyway.ini	2009-07-25 17:09:40.000000000 +0200
+++ 16/language/es-ES/es-ES.tpl_rhuk_milkyway.ini	2010-04-25 01:55:50.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.tpl_rhuk_milkyway.ini 1.5.0 2008-07-08 20:22:46 19:16:45 ~0 $
+# $Id: es-ES.tpl_rhuk_milkyway.ini 1.5.0 2010-04-25 01:55:49 19:16:45 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2010 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 15/language/es-ES/es-ES.xml 16/language/es-ES/es-ES.xml
--- 15/language/es-ES/es-ES.xml	2009-11-05 15:59:38.000000000 +0100
+++ 16/language/es-ES/es-ES.xml	2010-04-24 22:11:44.000000000 +0200
@@ -3,12 +3,12 @@
 	<tag>es-ES</tag>
 	<name>Español (spanish formal Internacional)</name>
 	<description>Idioma creado por Joomla! Spanish para Joomla 1.5 zona frontal - Traductor oficial asociado</description>
-	<version>1.5.15</version>
-	<creationDate>2009-05-21</creationDate>
+	<version>1.5.16</version>
+	<creationDate>2010-04-24</creationDate>
 	<author>Joomla! Spanish</author>
 	<authorUrl>www.joomlaspanish.org</authorUrl>
 	<authorEmail>extensiones@joomlaspanish.org</authorEmail>
-	<copyright>(C) 2009 JoomlaSpanish.org  All rights reserved.</copyright>
+	<copyright>(C) 2010 JoomlaSpanish.org  All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<metadata>
 		<name>Español (spanish formal Internacional)</name>
@@ -20,4 +20,4 @@
 		<pdfFontName>freesans</pdfFontName>
 	</metadata>
 	<params></params>
-</metafile>
+</metafile>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 15/libraries/joomla/application/application.php 16/libraries/joomla/application/application.php
--- 15/libraries/joomla/application/application.php	2009-05-29 13:54:26.000000000 +0200
+++ 16/libraries/joomla/application/application.php	2010-04-23 13:40:16.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: application.php 11409 2009-01-10 02:27:08Z willebil $
+* @version		$Id: application.php 16385 2010-04-23 10:44:15Z ian $
 * @package		Joomla.Framework
 * @subpackage	Application
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
@@ -256,19 +256,20 @@
 	 *
 	 * Optionally enqueues a message in the system message queue (which will be displayed
 	 * the next time a page is loaded) using the enqueueMessage method. If the headers have
-	 * not been sent the redirect will be accomplished using a "301 Moved Permanently"
-	 * code in the header pointing to the new location. If the headers have already been
-	 * sent this will be accomplished using a JavaScript statement.
+	 * not been sent the redirect will be accomplished using a "301 Moved Permanently" or "303 See Other"
+	 * code in the header pointing to the new location depending upon the moved flag. If the headers
+	 * have already been sent this will be accomplished using a JavaScript statement.
 	 *
 	 * @access	public
 	 * @param	string	$url	The URL to redirect to. Can only be http/https URL
 	 * @param	string	$msg	An optional message to display on redirect.
 	 * @param	string  $msgType An optional message type.
+	 * @param	boolean	True if the page is 301 Permanently Moved, otherwise 303 See Other is assumed.
 	 * @return	none; calls exit().
 	 * @since	1.5
 	 * @see		JApplication::enqueueMessage()
 	 */
-	function redirect( $url, $msg='', $msgType='message' )
+	function redirect( $url, $msg='', $msgType='message', $moved = false )
 	{
 		// check for relative internal links
 		if (preg_match( '#^index[2]?.php#', $url )) {
@@ -310,16 +311,13 @@
 			$session->set('application.queue', $this->_messageQueue);
 		}
 
-		/*
-		 * If the headers have been sent, then we cannot send an additional location header
-		 * so we will output a javascript redirect statement.
-		 */
+		// If the headers have been sent, then we cannot send an additional location header
+		// so we will output a javascript redirect statement.
 		if (headers_sent()) {
 			echo "<script>document.location.href='$url';</script>\n";
 		} else {
-			//@ob_end_clean(); // clear output buffer
-			header( 'HTTP/1.1 301 Moved Permanently' );
-			header( 'Location: ' . $url );
+			header($moved ? 'HTTP/1.1 301 Moved Permanently' : 'HTTP/1.1 303 See other');
+			header('Location: '.$url);
 		}
 		$this->close();
 	}
@@ -529,6 +527,11 @@
 
 		if ($response->status === JAUTHENTICATE_STATUS_SUCCESS)
 		{
+			$session = &JFactory::getSession();
+
+			// we fork the session to prevent session fixation issues
+			$session->fork();
+
 			// Import the user plugin group
 			JPluginHelper::importPlugin('user');
 
diff -aruN --binary 15/libraries/joomla/application/component/controller.php 16/libraries/joomla/application/component/controller.php
--- 15/libraries/joomla/application/component/controller.php	2009-05-29 13:54:24.000000000 +0200
+++ 16/libraries/joomla/application/component/controller.php	2010-04-23 13:40:16.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: controller.php 10910 2008-09-05 19:41:09Z willebil $
+* @version		$Id: controller.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Application
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/application/component/helper.php 16/libraries/joomla/application/component/helper.php
--- 15/libraries/joomla/application/component/helper.php	2009-05-29 13:54:24.000000000 +0200
+++ 16/libraries/joomla/application/component/helper.php	2010-04-23 13:40:16.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: helper.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: helper.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Application
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/application/component/model.php 16/libraries/joomla/application/component/model.php
--- 15/libraries/joomla/application/component/model.php	2009-05-29 13:54:24.000000000 +0200
+++ 16/libraries/joomla/application/component/model.php	2010-04-23 13:40:16.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: model.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: model.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Application
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/application/component/view.php 16/libraries/joomla/application/component/view.php
--- 15/libraries/joomla/application/component/view.php	2009-05-29 13:54:24.000000000 +0200
+++ 16/libraries/joomla/application/component/view.php	2010-04-23 13:40:16.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: view.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: view.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	Application
- * @copyright Copyright Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright Copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/application/helper.php 16/libraries/joomla/application/helper.php
--- 15/libraries/joomla/application/helper.php	2009-05-29 13:54:26.000000000 +0200
+++ 16/libraries/joomla/application/helper.php	2010-04-23 13:40:16.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: helper.php 11626 2009-02-15 15:40:39Z kdevine $
+* @version		$Id: helper.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Application
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/application/menu.php 16/libraries/joomla/application/menu.php
--- 15/libraries/joomla/application/menu.php	2009-05-29 13:54:26.000000000 +0200
+++ 16/libraries/joomla/application/menu.php	2010-04-23 13:40:16.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: menu.php 11299 2008-11-22 01:40:44Z ian $
+ * @version		$Id: menu.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	Application
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/application/module/helper.php 16/libraries/joomla/application/module/helper.php
--- 15/libraries/joomla/application/module/helper.php	2009-05-29 13:54:24.000000000 +0200
+++ 16/libraries/joomla/application/module/helper.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: helper.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: helper.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Application
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/application/pathway.php 16/libraries/joomla/application/pathway.php
--- 15/libraries/joomla/application/pathway.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/libraries/joomla/application/pathway.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: pathway.php 13354 2009-10-28 02:05:38Z ian $
+* @version		$Id: pathway.php 14997 2010-02-22 23:27:02Z ian $
 * @package		Joomla.Framework
 * @subpackage	Application
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
@@ -206,7 +206,11 @@
 	function _makeItem($name, $link)
 	{
 		$item = new stdClass();
-		$item->name = html_entity_decode($name, ENT_COMPAT, 'UTF-8');
+		if((version_compare( phpversion(), '5.0' ) < 0)) {
+			$item->name = html_entity_decode($name);
+		} else {
+			$item->name = html_entity_decode($name, ENT_COMPAT, 'UTF-8');
+		}
 		$item->link = $link;
 
 		return $item;
diff -aruN --binary 15/libraries/joomla/application/router.php 16/libraries/joomla/application/router.php
--- 15/libraries/joomla/application/router.php	2009-05-29 13:54:26.000000000 +0200
+++ 16/libraries/joomla/application/router.php	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
 * @version		$Id:router.php 8876 2007-09-13 22:54:03Z jinx $
 * @package		Joomla.Framework
 * @subpackage	Application
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/base/object.php 16/libraries/joomla/base/object.php
--- 15/libraries/joomla/base/object.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/libraries/joomla/base/object.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: object.php 13341 2009-10-27 03:03:54Z ian $
+ * @version		$Id: object.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	Base
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/base/observable.php 16/libraries/joomla/base/observable.php
--- 15/libraries/joomla/base/observable.php	2009-05-29 13:54:30.000000000 +0200
+++ 16/libraries/joomla/base/observable.php	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
 * @version		$Id:observer.php 6961 2007-03-15 16:06:53Z tcp $
 * @package		Joomla.Framework
 * @subpackage	Base
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/base/observer.php 16/libraries/joomla/base/observer.php
--- 15/libraries/joomla/base/observer.php	2009-05-29 13:54:30.000000000 +0200
+++ 16/libraries/joomla/base/observer.php	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
 * @version		$Id:observer.php 6961 2007-03-15 16:06:53Z tcp $
 * @package		Joomla.Framework
 * @subpackage	Base
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/base/tree.php 16/libraries/joomla/base/tree.php
--- 15/libraries/joomla/base/tree.php	2009-05-29 13:54:30.000000000 +0200
+++ 16/libraries/joomla/base/tree.php	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
  * @version		$Id:tree.php 6961 2007-03-15 16:06:53Z tcp $
  * @package		Joomla.Framework
  * @subpackage	Base
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/libraries/joomla/cache/cache.php 16/libraries/joomla/cache/cache.php
--- 15/libraries/joomla/cache/cache.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/libraries/joomla/cache/cache.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: cache.php 12694 2009-09-11 21:03:02Z ian $
+ * @version		$Id: cache.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	Cache
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/libraries/joomla/cache/handler/callback.php 16/libraries/joomla/cache/handler/callback.php
--- 15/libraries/joomla/cache/handler/callback.php	2009-05-29 13:54:24.000000000 +0200
+++ 16/libraries/joomla/cache/handler/callback.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: callback.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: callback.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Cache
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/cache/handler/output.php 16/libraries/joomla/cache/handler/output.php
--- 15/libraries/joomla/cache/handler/output.php	2009-05-29 13:54:24.000000000 +0200
+++ 16/libraries/joomla/cache/handler/output.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: output.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: output.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Cache
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/cache/handler/page.php 16/libraries/joomla/cache/handler/page.php
--- 15/libraries/joomla/cache/handler/page.php	2009-05-29 13:54:24.000000000 +0200
+++ 16/libraries/joomla/cache/handler/page.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: page.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: page.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Cache
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/cache/handler/view.php 16/libraries/joomla/cache/handler/view.php
--- 15/libraries/joomla/cache/handler/view.php	2009-05-29 13:54:24.000000000 +0200
+++ 16/libraries/joomla/cache/handler/view.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: view.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: view.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Cache
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/cache/storage/apc.php 16/libraries/joomla/cache/storage/apc.php
--- 15/libraries/joomla/cache/storage/apc.php	2009-05-29 13:54:24.000000000 +0200
+++ 16/libraries/joomla/cache/storage/apc.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: apc.php 10707 2008-08-21 09:52:47Z eddieajau $
+ * @version		$Id: apc.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	Cache
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/cache/storage/eaccelerator.php 16/libraries/joomla/cache/storage/eaccelerator.php
--- 15/libraries/joomla/cache/storage/eaccelerator.php	2009-05-29 13:54:24.000000000 +0200
+++ 16/libraries/joomla/cache/storage/eaccelerator.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: eaccelerator.php 10707 2008-08-21 09:52:47Z eddieajau $
+ * @version		$Id: eaccelerator.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	Cache
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/cache/storage/file.php 16/libraries/joomla/cache/storage/file.php
--- 15/libraries/joomla/cache/storage/file.php	2009-05-29 13:54:24.000000000 +0200
+++ 16/libraries/joomla/cache/storage/file.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: file.php 11393 2009-01-05 02:11:06Z ian $
+ * @version		$Id: file.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	Cache
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/cache/storage/memcache.php 16/libraries/joomla/cache/storage/memcache.php
--- 15/libraries/joomla/cache/storage/memcache.php	2009-05-29 13:54:24.000000000 +0200
+++ 16/libraries/joomla/cache/storage/memcache.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: memcache.php 10707 2008-08-21 09:52:47Z eddieajau $
+ * @version		$Id: memcache.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	Cache
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/cache/storage/xcache.php 16/libraries/joomla/cache/storage/xcache.php
--- 15/libraries/joomla/cache/storage/xcache.php	2009-05-29 13:54:24.000000000 +0200
+++ 16/libraries/joomla/cache/storage/xcache.php	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
  * @version		$id:$
  * @package		Joomla.Framework
  * @subpackage	Cache
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/cache/storage.php 16/libraries/joomla/cache/storage.php
--- 15/libraries/joomla/cache/storage.php	2009-05-29 13:54:24.000000000 +0200
+++ 16/libraries/joomla/cache/storage.php	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
 * @version		$Id:storage.php 6961 2007-03-15 16:06:53Z tcp $
 * @package		Joomla.Framework
 * @subpackage	Cache
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/client/ftp.php 16/libraries/joomla/client/ftp.php
--- 15/libraries/joomla/client/ftp.php	2009-05-29 13:54:34.000000000 +0200
+++ 16/libraries/joomla/client/ftp.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: ftp.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: ftp.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Client
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software and parts of it may contain or be derived from the
 * GNU General Public License or other free or open source software licenses.
diff -aruN --binary 15/libraries/joomla/client/helper.php 16/libraries/joomla/client/helper.php
--- 15/libraries/joomla/client/helper.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/libraries/joomla/client/helper.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: helper.php 13341 2009-10-27 03:03:54Z ian $
+ * @version		$Id: helper.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	Client
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software and parts of it may contain or be derived from the
  * GNU General Public License or other free or open source software licenses.
diff -aruN --binary 15/libraries/joomla/client/ldap.php 16/libraries/joomla/client/ldap.php
--- 15/libraries/joomla/client/ldap.php	2009-07-23 03:25:36.000000000 +0200
+++ 16/libraries/joomla/client/ldap.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,10 +1,10 @@
 <?php
 
 /**
-* @version		$Id: ldap.php 12543 2009-07-23 01:47:21Z ian $
+* @version		$Id: ldap.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Client
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software and parts of it may contain or be derived from the
 * GNU General Public License or other free or open source software licenses.
diff -aruN --binary 15/libraries/joomla/database/database/mysqli.php 16/libraries/joomla/database/database/mysqli.php
--- 15/libraries/joomla/database/database/mysqli.php	2009-05-29 13:54:28.000000000 +0200
+++ 16/libraries/joomla/database/database/mysqli.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: mysqli.php 11316 2008-11-27 03:11:24Z ian $
+* @version		$Id: mysqli.php 16385 2010-04-23 10:44:15Z ian $
 * @package		Joomla.Framework
 * @subpackage	Database
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
@@ -228,7 +228,7 @@
 		// Take a local copy so that we don't modify the original query and cause issues later
 		$sql = $this->_sql;
 		if ($this->_limit > 0 || $this->_offset > 0) {
-			$sql .= ' LIMIT '.$this->_offset.', '.$this->_limit;
+			$sql .= ' LIMIT ' . max($this->_offset, 0) . ', ' . max($this->_limit, 0);
 		}
 		if ($this->_debug) {
 			$this->_ticker++;
diff -aruN --binary 15/libraries/joomla/database/database/mysql.php 16/libraries/joomla/database/database/mysql.php
--- 15/libraries/joomla/database/database/mysql.php	2009-05-29 13:54:30.000000000 +0200
+++ 16/libraries/joomla/database/database/mysql.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: mysql.php 11316 2008-11-27 03:11:24Z ian $
+* @version		$Id: mysql.php 16385 2010-04-23 10:44:15Z ian $
 * @package		Joomla.Framework
 * @subpackage	Database
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
@@ -212,7 +212,7 @@
 		// Take a local copy so that we don't modify the original query and cause issues later
 		$sql = $this->_sql;
 		if ($this->_limit > 0 || $this->_offset > 0) {
-			$sql .= ' LIMIT '.$this->_offset.', '.$this->_limit;
+			$sql .= ' LIMIT ' . max($this->_offset, 0) . ', ' . max($this->_limit, 0);
 		}
 		if ($this->_debug) {
 			$this->_ticker++;
diff -aruN --binary 15/libraries/joomla/database/database.php 16/libraries/joomla/database/database.php
--- 15/libraries/joomla/database/database.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/libraries/joomla/database/database.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: database.php 12694 2009-09-11 21:03:02Z ian $
+* @version		$Id: database.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Database
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/database/recordset.php 16/libraries/joomla/database/recordset.php
--- 15/libraries/joomla/database/recordset.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/libraries/joomla/database/recordset.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: recordset.php 13341 2009-10-27 03:03:54Z ian $
+* @version		$Id: recordset.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Database
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/database/table/arogroup.php 16/libraries/joomla/database/table/arogroup.php
--- 15/libraries/joomla/database/table/arogroup.php	2009-05-29 13:54:30.000000000 +0200
+++ 16/libraries/joomla/database/table/arogroup.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: arogroup.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: arogroup.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Table
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/database/table/aro.php 16/libraries/joomla/database/table/aro.php
--- 15/libraries/joomla/database/table/aro.php	2009-05-29 13:54:30.000000000 +0200
+++ 16/libraries/joomla/database/table/aro.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: aro.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: aro.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Table
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/database/table/category.php 16/libraries/joomla/database/table/category.php
--- 15/libraries/joomla/database/table/category.php	2009-05-29 13:54:30.000000000 +0200
+++ 16/libraries/joomla/database/table/category.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: category.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: category.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Table
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/database/table/component.php 16/libraries/joomla/database/table/component.php
--- 15/libraries/joomla/database/table/component.php	2009-05-29 13:54:30.000000000 +0200
+++ 16/libraries/joomla/database/table/component.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: component.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: component.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Table
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/database/table/content.php 16/libraries/joomla/database/table/content.php
--- 15/libraries/joomla/database/table/content.php	2009-05-29 13:54:30.000000000 +0200
+++ 16/libraries/joomla/database/table/content.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: content.php 11809 2009-05-13 16:09:23Z ian $
+* @version		$Id: content.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Table
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/database/table/menu.php 16/libraries/joomla/database/table/menu.php
--- 15/libraries/joomla/database/table/menu.php	2009-05-29 13:54:30.000000000 +0200
+++ 16/libraries/joomla/database/table/menu.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: menu.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: menu.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Table
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/database/table/menutypes.php 16/libraries/joomla/database/table/menutypes.php
--- 15/libraries/joomla/database/table/menutypes.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/libraries/joomla/database/table/menutypes.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: menutypes.php 12698 2009-09-12 02:12:51Z ian $
+ * @version		$Id: menutypes.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	Table
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/database/table/module.php 16/libraries/joomla/database/table/module.php
--- 15/libraries/joomla/database/table/module.php	2009-05-29 13:54:30.000000000 +0200
+++ 16/libraries/joomla/database/table/module.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: module.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: module.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Table
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/database/table/plugin.php 16/libraries/joomla/database/table/plugin.php
--- 15/libraries/joomla/database/table/plugin.php	2009-05-29 13:54:30.000000000 +0200
+++ 16/libraries/joomla/database/table/plugin.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: plugin.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: plugin.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	Table
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/database/table/section.php 16/libraries/joomla/database/table/section.php
--- 15/libraries/joomla/database/table/section.php	2009-05-29 13:54:30.000000000 +0200
+++ 16/libraries/joomla/database/table/section.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: section.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: section.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Table
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/database/table/session.php 16/libraries/joomla/database/table/session.php
--- 15/libraries/joomla/database/table/session.php	2009-05-29 13:54:30.000000000 +0200
+++ 16/libraries/joomla/database/table/session.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: session.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: session.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Table
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/database/table/user.php 16/libraries/joomla/database/table/user.php
--- 15/libraries/joomla/database/table/user.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/libraries/joomla/database/table/user.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: user.php 12694 2009-09-11 21:03:02Z ian $
+* @version		$Id: user.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Table
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/database/table.php 16/libraries/joomla/database/table.php
--- 15/libraries/joomla/database/table.php	2009-05-29 13:54:30.000000000 +0200
+++ 16/libraries/joomla/database/table.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: table.php 11646 2009-03-01 19:34:56Z ian $
+ * @version		$Id: table.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	Table
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/document/document.php 16/libraries/joomla/document/document.php
--- 15/libraries/joomla/document/document.php	2009-05-29 13:54:34.000000000 +0200
+++ 16/libraries/joomla/document/document.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: document.php 10816 2008-08-27 04:17:00Z tcp $
+* @version		$Id: document.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Document
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/document/error/error.php 16/libraries/joomla/document/error/error.php
--- 15/libraries/joomla/document/error/error.php	2009-05-29 13:54:34.000000000 +0200
+++ 16/libraries/joomla/document/error/error.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: error.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: error.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Document
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/document/feed/feed.php 16/libraries/joomla/document/feed/feed.php
--- 15/libraries/joomla/document/feed/feed.php	2009-05-29 13:54:32.000000000 +0200
+++ 16/libraries/joomla/document/feed/feed.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: feed.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: feed.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Document
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/document/feed/renderer/atom.php 16/libraries/joomla/document/feed/renderer/atom.php
--- 15/libraries/joomla/document/feed/renderer/atom.php	2009-05-29 13:54:32.000000000 +0200
+++ 16/libraries/joomla/document/feed/renderer/atom.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: atom.php 11687 2009-03-11 17:49:23Z ian $
+ * @version		$Id: atom.php 15105 2010-02-27 14:59:11Z ian $
  * @package		Joomla.Framework
  * @subpackage	Document
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
@@ -50,7 +50,7 @@
 	{
 		$now	=& JFactory::getDate();
 		$data	=& $this->_doc;
-		
+
 		$uri =& JFactory::getURI();
 		$url = $uri->toString(array('scheme', 'user', 'pass', 'host', 'port'));
 		$syndicationURL =& JRoute::_('&format=feed&type=atom');
@@ -100,8 +100,8 @@
 				$feed.= "		</author>\n";
 			}
 			if ($data->items[$i]->description!="") {
-				$feed.= "		<summary type=\"html\">".htmlspecialchars($data->items[$i]->description, ENT_COMPAT, 'UTF-8')."</summary>\n";
-				$feed.= "		<content type=\"html\">".htmlspecialchars($data->items[$i]->description, ENT_COMPAT, 'UTF-8')."</content>\n";
+				$feed.= "		<summary type=\"html\">".htmlspecialchars($this->_relToAbs($data->items[$i]->description))."</summary>\n";
+				$feed.= "		<content type=\"html\">".htmlspecialchars($this->_relToAbs($data->items[$i]->description))."</content>\n";
 			}
 			if ($data->items[$i]->enclosure != NULL) {
 			$feed.="		<link rel=\"enclosure\" href=\"". $data->items[$i]->enclosure->url ."\" type=\"". $data->items[$i]->enclosure->type."\"  length=\"". $data->items[$i]->enclosure->length . "\" />\n";
@@ -111,4 +111,12 @@
 		$feed.= "</feed>\n";
 		return $feed;
 	}
+
+	function _relToAbs($text)
+	{
+		$base = JURI::base();
+  		$text = preg_replace("/(href|src)=\"(?!http|ftp|https|mailto)([^\"]*)\"/", "$1=\"$base\$2\"", $text);
+
+		return $text;
+	}
 }
diff -aruN --binary 15/libraries/joomla/document/feed/renderer/rss.php 16/libraries/joomla/document/feed/renderer/rss.php
--- 15/libraries/joomla/document/feed/renderer/rss.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/libraries/joomla/document/feed/renderer/rss.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: rss.php 13310 2009-10-24 04:09:35Z ian $
+ * @version		$Id: rss.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	Document
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/document/html/html.php 16/libraries/joomla/document/html/html.php
--- 15/libraries/joomla/document/html/html.php	2009-05-29 13:54:34.000000000 +0200
+++ 16/libraries/joomla/document/html/html.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: html.php 10787 2008-08-24 07:45:36Z pasamio $
+* @version		$Id: html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Document
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/document/html/renderer/component.php 16/libraries/joomla/document/html/renderer/component.php
--- 15/libraries/joomla/document/html/renderer/component.php	2009-05-29 13:54:32.000000000 +0200
+++ 16/libraries/joomla/document/html/renderer/component.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: component.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: component.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Document
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/document/html/renderer/head.php 16/libraries/joomla/document/html/renderer/head.php
--- 15/libraries/joomla/document/html/renderer/head.php	2009-05-29 14:32:52.000000000 +0200
+++ 16/libraries/joomla/document/html/renderer/head.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: head.php 11917 2009-05-29 19:37:05Z ian $
+* @version		$Id: head.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Document
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/document/html/renderer/message.php 16/libraries/joomla/document/html/renderer/message.php
--- 15/libraries/joomla/document/html/renderer/message.php	2009-05-29 13:54:32.000000000 +0200
+++ 16/libraries/joomla/document/html/renderer/message.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: message.php 10707 2008-08-21 09:52:47Z eddieajau $
+ * @version		$Id: message.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	Document
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/document/html/renderer/module.php 16/libraries/joomla/document/html/renderer/module.php
--- 15/libraries/joomla/document/html/renderer/module.php	2009-06-30 21:01:32.000000000 +0200
+++ 16/libraries/joomla/document/html/renderer/module.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: module.php 12231 2009-06-21 02:16:14Z ian $
+* @version		$Id: module.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Document
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/document/html/renderer/modules.php 16/libraries/joomla/document/html/renderer/modules.php
--- 15/libraries/joomla/document/html/renderer/modules.php	2009-05-29 13:54:32.000000000 +0200
+++ 16/libraries/joomla/document/html/renderer/modules.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: modules.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: modules.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Document
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/document/pdf/pdf.php 16/libraries/joomla/document/pdf/pdf.php
--- 15/libraries/joomla/document/pdf/pdf.php	2009-05-29 13:54:34.000000000 +0200
+++ 16/libraries/joomla/document/pdf/pdf.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: pdf.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: pdf.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Document
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/document/raw/raw.php 16/libraries/joomla/document/raw/raw.php
--- 15/libraries/joomla/document/raw/raw.php	2009-05-29 13:54:34.000000000 +0200
+++ 16/libraries/joomla/document/raw/raw.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: raw.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: raw.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Document
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/document/renderer.php 16/libraries/joomla/document/renderer.php
--- 15/libraries/joomla/document/renderer.php	2009-05-29 13:54:34.000000000 +0200
+++ 16/libraries/joomla/document/renderer.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: renderer.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: renderer.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Document
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/environment/browser.php 16/libraries/joomla/environment/browser.php
--- 15/libraries/joomla/environment/browser.php	2009-05-29 13:54:28.000000000 +0200
+++ 16/libraries/joomla/environment/browser.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version      $Id: browser.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version      $Id: browser.php 14401 2010-01-26 14:10:00Z louis $
 * @package      Joomla.Framework
 * @subpackage   Environment
-* @copyright    Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright    Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license      GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/environment/request.php 16/libraries/joomla/environment/request.php
--- 15/libraries/joomla/environment/request.php	2009-05-29 13:54:28.000000000 +0200
+++ 16/libraries/joomla/environment/request.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: request.php 10919 2008-09-09 20:50:29Z willebil $
+ * @version		$Id: request.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	Environment
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/environment/response.php 16/libraries/joomla/environment/response.php
--- 15/libraries/joomla/environment/response.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/libraries/joomla/environment/response.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: response.php 13341 2009-10-27 03:03:54Z ian $
+ * @version		$Id: response.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	Environment
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/environment/uri.php 16/libraries/joomla/environment/uri.php
--- 15/libraries/joomla/environment/uri.php	2009-06-30 21:01:32.000000000 +0200
+++ 16/libraries/joomla/environment/uri.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: uri.php 12389 2009-07-01 00:34:45Z ian $
+ * @version		$Id: uri.php 16382 2010-04-23 09:33:59Z ian $
  * @package		Joomla.Framework
  * @subpackage	Environment
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
@@ -157,12 +157,17 @@
 				 * running on IIS and will therefore need to work some magic with the SCRIPT_NAME and
 				 * QUERY_STRING environment variables.
 				 */
+				
+				 	if (strlen($_SERVER['QUERY_STRING']) && strpos($_SERVER['REQUEST_URI'], $_SERVER['QUERY_STRING']) === false) {
+						$theURI .= '?'.$_SERVER['QUERY_STRING'];
+					}
+
 				}
 				 else
 				 {
 					// IIS uses the SCRIPT_NAME variable instead of a REQUEST_URI variable... thanks, MS
 					$theURI = 'http' . $https . $_SERVER['HTTP_HOST'] . $_SERVER['SCRIPT_NAME'];
-
+		
 					// If the query string exists append it to the URI string
 					if (isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING'])) {
 						$theURI .= '?' . $_SERVER['QUERY_STRING'];
diff -aruN --binary 15/libraries/joomla/error/error.php 16/libraries/joomla/error/error.php
--- 15/libraries/joomla/error/error.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/libraries/joomla/error/error.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: error.php 13385 2009-10-29 13:35:54Z ian $
+ * @version		$Id: error.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	Error
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/error/exception.php 16/libraries/joomla/error/exception.php
--- 15/libraries/joomla/error/exception.php	2009-05-29 13:54:22.000000000 +0200
+++ 16/libraries/joomla/error/exception.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: exception.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: exception.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	Error
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/error/log.php 16/libraries/joomla/error/log.php
--- 15/libraries/joomla/error/log.php	2009-05-29 13:54:22.000000000 +0200
+++ 16/libraries/joomla/error/log.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: log.php 10707 2008-08-21 09:52:47Z eddieajau $
+ * @version		$Id: log.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	Error
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/error/profiler.php 16/libraries/joomla/error/profiler.php
--- 15/libraries/joomla/error/profiler.php	2009-05-29 13:54:22.000000000 +0200
+++ 16/libraries/joomla/error/profiler.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,10 +1,10 @@
 <?php
 
 /**
-* @version		$Id: profiler.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: profiler.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Error
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/event/dispatcher.php 16/libraries/joomla/event/dispatcher.php
--- 15/libraries/joomla/event/dispatcher.php	2009-05-29 13:54:20.000000000 +0200
+++ 16/libraries/joomla/event/dispatcher.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: dispatcher.php 11387 2009-01-04 02:47:53Z ian $
+* @version		$Id: dispatcher.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Event
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/event/event.php 16/libraries/joomla/event/event.php
--- 15/libraries/joomla/event/event.php	2009-05-29 13:54:20.000000000 +0200
+++ 16/libraries/joomla/event/event.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: event.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: event.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Event
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/factory.php 16/libraries/joomla/factory.php
--- 15/libraries/joomla/factory.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/libraries/joomla/factory.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
- * @version		$Id: factory.php 13341 2009-10-27 03:03:54Z ian $
+ * @version		$Id: factory.php 15184 2010-03-04 23:18:17Z ian $
  * @package		Joomla.Framework
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
@@ -331,6 +331,7 @@
 						JPATH_BASE.DS.'cache',
 						isset( $options['cache_time'] ) ? $options['cache_time'] : 0
 					);
+					$simplepie->force_feed(true);
 					$simplepie->handle_content_type();
 					if ($simplepie->init()) {
 						$doc = $simplepie;
diff -aruN --binary 15/libraries/joomla/filesystem/archive/bzip2.php 16/libraries/joomla/filesystem/archive/bzip2.php
--- 15/libraries/joomla/filesystem/archive/bzip2.php	2009-05-29 13:54:22.000000000 +0200
+++ 16/libraries/joomla/filesystem/archive/bzip2.php	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
  * @version		$Id:bzip2.php 6961 2007-03-15 16:06:53Z tcp $
  * @package		Joomla.Framework
  * @subpackage	FileSystem
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/filesystem/archive/gzip.php 16/libraries/joomla/filesystem/archive/gzip.php
--- 15/libraries/joomla/filesystem/archive/gzip.php	2009-05-29 13:54:22.000000000 +0200
+++ 16/libraries/joomla/filesystem/archive/gzip.php	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
  * @version		$Id:gzip.php 6961 2007-03-15 16:06:53Z tcp $
  * @package		Joomla.Framework
  * @subpackage	FileSystem
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/filesystem/archive/tar.php 16/libraries/joomla/filesystem/archive/tar.php
--- 15/libraries/joomla/filesystem/archive/tar.php	2009-05-29 13:54:22.000000000 +0200
+++ 16/libraries/joomla/filesystem/archive/tar.php	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
  * @version		$Id:tar.php 6961 2007-03-15 16:06:53Z tcp $
  * @package		Joomla.Framework
  * @subpackage	FileSystem
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/filesystem/archive/zip.php 16/libraries/joomla/filesystem/archive/zip.php
--- 15/libraries/joomla/filesystem/archive/zip.php	2009-05-29 13:54:22.000000000 +0200
+++ 16/libraries/joomla/filesystem/archive/zip.php	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
  * @version		$Id:zip.php 6961 2007-03-15 16:06:53Z tcp $
  * @package		Joomla.Framework
  * @subpackage	FileSystem
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/filesystem/archive.php 16/libraries/joomla/filesystem/archive.php
--- 15/libraries/joomla/filesystem/archive.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/libraries/joomla/filesystem/archive.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: archive.php 13341 2009-10-27 03:03:54Z ian $
+ * @version		$Id: archive.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	FileSystem
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/filesystem/file.php 16/libraries/joomla/filesystem/file.php
--- 15/libraries/joomla/filesystem/file.php	2009-07-23 03:25:36.000000000 +0200
+++ 16/libraries/joomla/filesystem/file.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: file.php 12541 2009-07-22 17:36:38Z ian $
+ * @version		$Id: file.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	FileSystem
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/filesystem/folder.php 16/libraries/joomla/filesystem/folder.php
--- 15/libraries/joomla/filesystem/folder.php	2009-05-29 13:54:22.000000000 +0200
+++ 16/libraries/joomla/filesystem/folder.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: folder.php 11675 2009-03-08 20:43:54Z willebil $
+ * @version		$Id: folder.php 15203 2010-03-05 09:21:16Z ian $
  * @package		Joomla.Framework
  * @subpackage	FileSystem
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
@@ -564,8 +564,16 @@
 	function makeSafe($path)
 	{
 		$ds = (DS == '\\') ? '\\' . DS : DS;
-		$regex = array('#[^A-Za-z0-9:\_\-' . $ds . ' ]#');
-		return preg_replace($regex, '', $path);
+		$regex = array('#[^A-Za-z0-9:\_\-\.' . $ds . ' ]#');
+		$safepath = preg_replace($regex, '', $path);  // check if all chars are legal
+		$parts = explode('\\', $safepath);
+		$safepath = '';
+		foreach ($parts as $part) {
+		  if ( ($part !== '.') & ($part !== '..') ) {
+		    $safepath .=  '\\'. trim(str_replace('..', '.', $part),'.');
+		  }
+		}
+		return $safepath;
 	}
 
 }
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 15/libraries/joomla/filesystem/path.php 16/libraries/joomla/filesystem/path.php
--- 15/libraries/joomla/filesystem/path.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/libraries/joomla/filesystem/path.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: path.php 13341 2009-10-27 03:03:54Z ian $
+ * @version		$Id: path.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	FileSystem
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/filter/filterinput.php 16/libraries/joomla/filter/filterinput.php
--- 15/libraries/joomla/filter/filterinput.php	2009-05-29 13:54:22.000000000 +0200
+++ 16/libraries/joomla/filter/filterinput.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: filterinput.php 11324 2008-12-05 19:06:24Z kdevine $
+ * @version		$Id: filterinput.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	Filter
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/libraries/joomla/filter/filteroutput.php 16/libraries/joomla/filter/filteroutput.php
--- 15/libraries/joomla/filter/filteroutput.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/libraries/joomla/filter/filteroutput.php	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
  * @version		$Id:output.php 6961 2007-03-15 16:06:53Z tcp $
  * @package		Joomla.Framework
  * @subpackage	Filter
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/libraries/joomla/html/editor.php 16/libraries/joomla/html/editor.php
--- 15/libraries/joomla/html/editor.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/libraries/joomla/html/editor.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: editor.php 13376 2009-10-29 01:44:22Z ian $
+ * @version		$Id: editor.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	HTML
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/html/behavior.php 16/libraries/joomla/html/html/behavior.php
--- 15/libraries/joomla/html/html/behavior.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/libraries/joomla/html/html/behavior.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: behavior.php 13341 2009-10-27 03:03:54Z ian $
+* @version		$Id: behavior.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	HTML
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/html/content.php 16/libraries/joomla/html/html/content.php
--- 15/libraries/joomla/html/html/content.php	2009-07-23 03:25:36.000000000 +0200
+++ 16/libraries/joomla/html/html/content.php	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
 * @version		$Id:  $
 * @package		Joomla.Framework
 * @subpackage	HTML
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/html/email.php 16/libraries/joomla/html/html/email.php
--- 15/libraries/joomla/html/html/email.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/libraries/joomla/html/html/email.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: email.php 13341 2009-10-27 03:03:54Z ian $
+* @version		$Id: email.php 14998 2010-02-22 23:32:02Z ian $
 * @package		Joomla.Framework
 * @subpackage	HTML
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
@@ -73,7 +73,7 @@
 			$replacement 	.= "\n document.write( addy". $rand ." );";
 		}
 		$replacement 	.= "\n //-->";
-		$replacement 	.= "\n </script> ";
+		$replacement 	.= "\n </script>";
 
 		// XHTML compliance `No Javascript` text handling
 		$replacement 	.= "<script language='JavaScript' type='text/javascript'>";
diff -aruN --binary 15/libraries/joomla/html/html/form.php 16/libraries/joomla/html/html/form.php
--- 15/libraries/joomla/html/html/form.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/libraries/joomla/html/html/form.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: form.php 13341 2009-10-27 03:03:54Z ian $
+ * @version		$Id: form.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	HTML
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/html/grid.php 16/libraries/joomla/html/html/grid.php
--- 15/libraries/joomla/html/html/grid.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/libraries/joomla/html/html/grid.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: grid.php 13341 2009-10-27 03:03:54Z ian $
+* @version		$Id: grid.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	HTML
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/html/image.php 16/libraries/joomla/html/html/image.php
--- 15/libraries/joomla/html/html/image.php	2009-05-29 13:54:28.000000000 +0200
+++ 16/libraries/joomla/html/html/image.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: image.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: image.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	HTML
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/html/list.php 16/libraries/joomla/html/html/list.php
--- 15/libraries/joomla/html/html/list.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/libraries/joomla/html/html/list.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: list.php 12694 2009-09-11 21:03:02Z ian $
+* @version		$Id: list.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage		HTML
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/html/menu.php 16/libraries/joomla/html/html/menu.php
--- 15/libraries/joomla/html/html/menu.php	2009-05-29 13:54:28.000000000 +0200
+++ 16/libraries/joomla/html/html/menu.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: menu.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: menu.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage		HTML
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/html/select.php 16/libraries/joomla/html/html/select.php
--- 15/libraries/joomla/html/html/select.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/libraries/joomla/html/html/select.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: select.php 13341 2009-10-27 03:03:54Z ian $
+* @version		$Id: select.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	HTML
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/html.php 16/libraries/joomla/html/html.php
--- 15/libraries/joomla/html/html.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/libraries/joomla/html/html.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: html.php 13341 2009-10-27 03:03:54Z ian $
+ * @version		$Id: html.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	HTML
- * @copyright	Copyright (C) 2005 - 2007 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/pagination.php 16/libraries/joomla/html/pagination.php
--- 15/libraries/joomla/html/pagination.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/libraries/joomla/html/pagination.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: pagination.php 13242 2009-10-20 03:54:55Z ian $
+ * @version		$Id: pagination.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	HTML
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/pane.php 16/libraries/joomla/html/pane.php
--- 15/libraries/joomla/html/pane.php	2009-05-29 13:54:28.000000000 +0200
+++ 16/libraries/joomla/html/pane.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: pane.php 10707 2008-08-21 09:52:47Z eddieajau $
+ * @version		$Id: pane.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	HTML
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/parameter/element/calendar.php 16/libraries/joomla/html/parameter/element/calendar.php
--- 15/libraries/joomla/html/parameter/element/calendar.php	2009-05-29 13:54:26.000000000 +0200
+++ 16/libraries/joomla/html/parameter/element/calendar.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: calendar.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: calendar.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Parameter
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/parameter/element/category.php 16/libraries/joomla/html/parameter/element/category.php
--- 15/libraries/joomla/html/parameter/element/category.php	2009-05-29 13:54:26.000000000 +0200
+++ 16/libraries/joomla/html/parameter/element/category.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: category.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: category.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Parameter
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/parameter/element/editors.php 16/libraries/joomla/html/parameter/element/editors.php
--- 15/libraries/joomla/html/parameter/element/editors.php	2009-05-29 13:54:26.000000000 +0200
+++ 16/libraries/joomla/html/parameter/element/editors.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: editors.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: editors.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Parameter
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/parameter/element/filelist.php 16/libraries/joomla/html/parameter/element/filelist.php
--- 15/libraries/joomla/html/parameter/element/filelist.php	2009-05-29 13:54:26.000000000 +0200
+++ 16/libraries/joomla/html/parameter/element/filelist.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: filelist.php 11670 2009-03-08 20:37:02Z willebil $
+* @version		$Id: filelist.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Parameter
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/parameter/element/folderlist.php 16/libraries/joomla/html/parameter/element/folderlist.php
--- 15/libraries/joomla/html/parameter/element/folderlist.php	2009-05-29 13:54:26.000000000 +0200
+++ 16/libraries/joomla/html/parameter/element/folderlist.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: folderlist.php 11670 2009-03-08 20:37:02Z willebil $
+* @version		$Id: folderlist.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Parameter
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/parameter/element/helpsites.php 16/libraries/joomla/html/parameter/element/helpsites.php
--- 15/libraries/joomla/html/parameter/element/helpsites.php	2009-05-29 13:54:26.000000000 +0200
+++ 16/libraries/joomla/html/parameter/element/helpsites.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: helpsites.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: helpsites.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Parameter
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/parameter/element/hidden.php 16/libraries/joomla/html/parameter/element/hidden.php
--- 15/libraries/joomla/html/parameter/element/hidden.php	2009-05-29 13:54:26.000000000 +0200
+++ 16/libraries/joomla/html/parameter/element/hidden.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: hidden.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: hidden.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Parameter
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/parameter/element/imagelist.php 16/libraries/joomla/html/parameter/element/imagelist.php
--- 15/libraries/joomla/html/parameter/element/imagelist.php	2009-05-29 13:54:28.000000000 +0200
+++ 16/libraries/joomla/html/parameter/element/imagelist.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: imagelist.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: imagelist.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Parameter
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/parameter/element/languages.php 16/libraries/joomla/html/parameter/element/languages.php
--- 15/libraries/joomla/html/parameter/element/languages.php	2009-05-29 13:54:26.000000000 +0200
+++ 16/libraries/joomla/html/parameter/element/languages.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: languages.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: languages.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Parameter
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/parameter/element/list.php 16/libraries/joomla/html/parameter/element/list.php
--- 15/libraries/joomla/html/parameter/element/list.php	2009-05-29 13:54:26.000000000 +0200
+++ 16/libraries/joomla/html/parameter/element/list.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: list.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: list.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Parameter
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/parameter/element/menuitem.php 16/libraries/joomla/html/parameter/element/menuitem.php
--- 15/libraries/joomla/html/parameter/element/menuitem.php	2009-05-29 13:54:28.000000000 +0200
+++ 16/libraries/joomla/html/parameter/element/menuitem.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: menuitem.php 11324 2008-12-05 19:06:24Z kdevine $
+* @version		$Id: menuitem.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Parameter
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/parameter/element/menu.php 16/libraries/joomla/html/parameter/element/menu.php
--- 15/libraries/joomla/html/parameter/element/menu.php	2009-05-29 13:54:26.000000000 +0200
+++ 16/libraries/joomla/html/parameter/element/menu.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: menu.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: menu.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Parameter
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/parameter/element/password.php 16/libraries/joomla/html/parameter/element/password.php
--- 15/libraries/joomla/html/parameter/element/password.php	2009-05-29 13:54:26.000000000 +0200
+++ 16/libraries/joomla/html/parameter/element/password.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: password.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: password.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Parameter
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/parameter/element/radio.php 16/libraries/joomla/html/parameter/element/radio.php
--- 15/libraries/joomla/html/parameter/element/radio.php	2009-05-29 13:54:26.000000000 +0200
+++ 16/libraries/joomla/html/parameter/element/radio.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: radio.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: radio.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Parameter
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/parameter/element/section.php 16/libraries/joomla/html/parameter/element/section.php
--- 15/libraries/joomla/html/parameter/element/section.php	2009-05-29 13:54:26.000000000 +0200
+++ 16/libraries/joomla/html/parameter/element/section.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: section.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: section.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Parameter
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/parameter/element/spacer.php 16/libraries/joomla/html/parameter/element/spacer.php
--- 15/libraries/joomla/html/parameter/element/spacer.php	2009-05-29 13:54:26.000000000 +0200
+++ 16/libraries/joomla/html/parameter/element/spacer.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: spacer.php 11371 2008-12-30 01:31:50Z ian $
+* @version		$Id: spacer.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Parameter
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/parameter/element/sql.php 16/libraries/joomla/html/parameter/element/sql.php
--- 15/libraries/joomla/html/parameter/element/sql.php	2009-05-29 13:54:26.000000000 +0200
+++ 16/libraries/joomla/html/parameter/element/sql.php	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
 * @version		$Id:sql.php 6961 2007-03-15 16:06:53Z tcp $
 * @package		Joomla.Framework
 * @subpackage	Parameter
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/parameter/element/textarea.php 16/libraries/joomla/html/parameter/element/textarea.php
--- 15/libraries/joomla/html/parameter/element/textarea.php	2009-05-29 13:54:28.000000000 +0200
+++ 16/libraries/joomla/html/parameter/element/textarea.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: textarea.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: textarea.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Parameter
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/parameter/element/text.php 16/libraries/joomla/html/parameter/element/text.php
--- 15/libraries/joomla/html/parameter/element/text.php	2009-05-29 13:54:28.000000000 +0200
+++ 16/libraries/joomla/html/parameter/element/text.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: text.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: text.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Parameter
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/parameter/element/timezones.php 16/libraries/joomla/html/parameter/element/timezones.php
--- 15/libraries/joomla/html/parameter/element/timezones.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/libraries/joomla/html/parameter/element/timezones.php	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
 * @version		$Id:timezones.php 6961 2007-03-15 16:06:53Z tcp $
 * @package		Joomla.Framework
 * @subpackage	Parameter
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
@@ -68,7 +68,7 @@
 			JHTML::_('select.option', 5.5, JText::_('(UTC +05:30) Bombay, Calcutta, Madras, New Delhi, Colombo')),
 			JHTML::_('select.option', 5.75, JText::_('(UTC +05:45) Kathmandu')),
 			JHTML::_('select.option', 6, JText::_('(UTC +06:00) Almaty, Dhaka')),
-			JHTML::_('select.option', 6.30, JText::_('(UTC +06:30) Yagoon')),
+			JHTML::_('select.option', 6.5, JText::_('(UTC +06:30) Yagoon')),
 			JHTML::_('select.option', 7, JText::_('(UTC +07:00) Bangkok, Hanoi, Jakarta')),
 			JHTML::_('select.option', 8, JText::_('(UTC +08:00) Beijing, Perth, Singapore, Hong Kong')),
 			JHTML::_('select.option', 8.75, JText::_('(UTC +08:00) Ulaanbaatar, Western Australia')),
@@ -77,7 +77,7 @@
 			JHTML::_('select.option', 10, JText::_('(UTC +10:00) Eastern Australia, Guam, Vladivostok')),
 			JHTML::_('select.option', 10.5, JText::_('(UTC +10:30) Lord Howe Island (Australia)')),
 			JHTML::_('select.option', 11, JText::_('(UTC +11:00) Magadan, Solomon Islands, New Caledonia')),
-			JHTML::_('select.option', 11.30, JText::_('(UTC +11:30) Norfolk Island')),
+			JHTML::_('select.option', 11.5, JText::_('(UTC +11:30) Norfolk Island')),
 			JHTML::_('select.option', 12, JText::_('(UTC +12:00) Auckland, Wellington, Fiji, Kamchatka')),
 			JHTML::_('select.option', 12.75, JText::_('(UTC +12:45) Chatham Island')),
 			JHTML::_('select.option', 13, JText::_('(UTC +13:00) Tonga')),
diff -aruN --binary 15/libraries/joomla/html/parameter/element/usergroup.php 16/libraries/joomla/html/parameter/element/usergroup.php
--- 15/libraries/joomla/html/parameter/element/usergroup.php	2009-05-29 13:54:26.000000000 +0200
+++ 16/libraries/joomla/html/parameter/element/usergroup.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: usergroup.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: usergroup.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Parameter
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/parameter/element.php 16/libraries/joomla/html/parameter/element.php
--- 15/libraries/joomla/html/parameter/element.php	2009-05-29 13:54:28.000000000 +0200
+++ 16/libraries/joomla/html/parameter/element.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: element.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: element.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Parameter
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/parameter.php 16/libraries/joomla/html/parameter.php
--- 15/libraries/joomla/html/parameter.php	2009-05-29 13:54:28.000000000 +0200
+++ 16/libraries/joomla/html/parameter.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: parameter.php 10707 2008-08-21 09:52:47Z eddieajau $
+ * @version		$Id: parameter.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	Parameter
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/toolbar/button/confirm.php 16/libraries/joomla/html/toolbar/button/confirm.php
--- 15/libraries/joomla/html/toolbar/button/confirm.php	2009-05-29 13:54:28.000000000 +0200
+++ 16/libraries/joomla/html/toolbar/button/confirm.php	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
 * @version		$Id:confirm.php 6961 2007-03-15 16:06:53Z tcp $
 * @package		Joomla.Framework
 * @subpackage	HTML
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/toolbar/button/custom.php 16/libraries/joomla/html/toolbar/button/custom.php
--- 15/libraries/joomla/html/toolbar/button/custom.php	2009-05-29 13:54:28.000000000 +0200
+++ 16/libraries/joomla/html/toolbar/button/custom.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: custom.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: custom.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	HTML
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/toolbar/button/help.php 16/libraries/joomla/html/toolbar/button/help.php
--- 15/libraries/joomla/html/toolbar/button/help.php	2009-05-29 13:54:28.000000000 +0200
+++ 16/libraries/joomla/html/toolbar/button/help.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: help.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: help.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	HTML
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/toolbar/button/link.php 16/libraries/joomla/html/toolbar/button/link.php
--- 15/libraries/joomla/html/toolbar/button/link.php	2009-05-29 13:54:28.000000000 +0200
+++ 16/libraries/joomla/html/toolbar/button/link.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: link.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: link.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	HTML
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/toolbar/button/popup.php 16/libraries/joomla/html/toolbar/button/popup.php
--- 15/libraries/joomla/html/toolbar/button/popup.php	2009-05-29 13:54:28.000000000 +0200
+++ 16/libraries/joomla/html/toolbar/button/popup.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: popup.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: popup.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	HTML
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/toolbar/button/separator.php 16/libraries/joomla/html/toolbar/button/separator.php
--- 15/libraries/joomla/html/toolbar/button/separator.php	2009-05-29 13:54:28.000000000 +0200
+++ 16/libraries/joomla/html/toolbar/button/separator.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: separator.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: separator.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	HTML
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/toolbar/button/standard.php 16/libraries/joomla/html/toolbar/button/standard.php
--- 15/libraries/joomla/html/toolbar/button/standard.php	2009-05-29 13:54:28.000000000 +0200
+++ 16/libraries/joomla/html/toolbar/button/standard.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: standard.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: standard.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	HTML
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/toolbar/button.php 16/libraries/joomla/html/toolbar/button.php
--- 15/libraries/joomla/html/toolbar/button.php	2009-05-29 13:54:28.000000000 +0200
+++ 16/libraries/joomla/html/toolbar/button.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: button.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: button.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	HTML
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/html/toolbar.php 16/libraries/joomla/html/toolbar.php
--- 15/libraries/joomla/html/toolbar.php	2009-05-29 13:54:28.000000000 +0200
+++ 16/libraries/joomla/html/toolbar.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: toolbar.php 10707 2008-08-21 09:52:47Z eddieajau $
+ * @version		$Id: toolbar.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	HTML
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/import.php 16/libraries/joomla/import.php
--- 15/libraries/joomla/import.php	2009-05-29 13:54:34.000000000 +0200
+++ 16/libraries/joomla/import.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: import.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: import.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/installer/adapters/component.php 16/libraries/joomla/installer/adapters/component.php
--- 15/libraries/joomla/installer/adapters/component.php	2009-05-29 13:54:22.000000000 +0200
+++ 16/libraries/joomla/installer/adapters/component.php	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
  * @version		$Id:component.php 6961 2007-03-15 16:06:53Z tcp $
  * @package		Joomla.Framework
  * @subpackage	Installer
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/installer/adapters/language.php 16/libraries/joomla/installer/adapters/language.php
--- 15/libraries/joomla/installer/adapters/language.php	2009-05-29 13:54:22.000000000 +0200
+++ 16/libraries/joomla/installer/adapters/language.php	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
  * @version		$Id:language.php 6961 2007-03-15 16:06:53Z tcp $
  * @package		Joomla.Framework
  * @subpackage	Installer
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/installer/adapters/module.php 16/libraries/joomla/installer/adapters/module.php
--- 15/libraries/joomla/installer/adapters/module.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/libraries/joomla/installer/adapters/module.php	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
  * @version		$Id:module.php 6961 2007-03-15 16:06:53Z tcp $
  * @package		Joomla.Framework
  * @subpackage	Installer
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
@@ -180,14 +180,19 @@
 			return false;
 		}
 		$id = $db->loadResult();
-
+ 		
+ 		// load module instance
+ 		$row =& JTable::getInstance('module');
+ 		
 		// Was there a module already installed with the same name?
 		// If there was then we wouldn't be here because it would have
 		// been stopped by the above. Otherwise the files weren't there
 		// (e.g. migration) or its an upgrade (files overwritten)
 		// So all we need to do is create an entry when we can't find one
-		if (!$id) {
-			$row = & JTable::getInstance('module');
+
+		if ($id) {
+			$row->load($id);
+		} else {
 			$row->title = JText::_($this->get('name'));
 			$row->ordering = $row->getNextOrder( "position='left'" );
 			$row->position = 'left';
diff -aruN --binary 15/libraries/joomla/installer/adapters/plugin.php 16/libraries/joomla/installer/adapters/plugin.php
--- 15/libraries/joomla/installer/adapters/plugin.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/libraries/joomla/installer/adapters/plugin.php	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
  * @version		$Id:plugin.php 6961 2007-03-15 16:06:53Z tcp $
  * @package		Joomla.Framework
  * @subpackage	Installer
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/installer/adapters/template.php 16/libraries/joomla/installer/adapters/template.php
--- 15/libraries/joomla/installer/adapters/template.php	2009-05-29 13:54:22.000000000 +0200
+++ 16/libraries/joomla/installer/adapters/template.php	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
 * @version		$Id:template.php 6961 2007-03-15 16:06:53Z tcp $
 * @package		Joomla.Framework
 * @subpackage	Installer
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/installer/helper.php 16/libraries/joomla/installer/helper.php
--- 15/libraries/joomla/installer/helper.php	2009-05-29 13:54:22.000000000 +0200
+++ 16/libraries/joomla/installer/helper.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: helper.php 11299 2008-11-22 01:40:44Z ian $
+ * @version		$Id: helper.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	Installer
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/installer/installer.php 16/libraries/joomla/installer/installer.php
--- 15/libraries/joomla/installer/installer.php	2009-05-29 13:54:22.000000000 +0200
+++ 16/libraries/joomla/installer/installer.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: installer.php 11646 2009-03-01 19:34:56Z ian $
+ * @version		$Id: installer.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	Installer
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/language/helper.php 16/libraries/joomla/language/helper.php
--- 15/libraries/joomla/language/helper.php	2009-05-29 13:54:20.000000000 +0200
+++ 16/libraries/joomla/language/helper.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: helper.php 10386 2008-06-01 21:37:15Z pasamio $
+* @version		$Id: helper.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Language
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/language/help.php 16/libraries/joomla/language/help.php
--- 15/libraries/joomla/language/help.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/libraries/joomla/language/help.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: help.php 13341 2009-10-27 03:03:54Z ian $
+* @version		$Id: help.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Language
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/language/language.php 16/libraries/joomla/language/language.php
--- 15/libraries/joomla/language/language.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/libraries/joomla/language/language.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: language.php 13297 2009-10-24 01:29:37Z ian $
+* @version		$Id: language.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Language
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/mail/helper.php 16/libraries/joomla/mail/helper.php
--- 15/libraries/joomla/mail/helper.php	2009-05-29 13:54:20.000000000 +0200
+++ 16/libraries/joomla/mail/helper.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: helper.php 11380 2009-01-01 15:48:59Z ian $
+ * @version		$Id: helper.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	Mail
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/mail/mail.php 16/libraries/joomla/mail/mail.php
--- 15/libraries/joomla/mail/mail.php	2009-06-30 21:01:32.000000000 +0200
+++ 16/libraries/joomla/mail/mail.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: mail.php 12308 2009-06-23 04:05:28Z ian $
+ * @version		$Id: mail.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	Mail
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/methods.php 16/libraries/joomla/methods.php
--- 15/libraries/joomla/methods.php	2009-05-29 13:54:34.000000000 +0200
+++ 16/libraries/joomla/methods.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: methods.php 11646 2009-03-01 19:34:56Z ian $
+* @version		$Id: methods.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/plugin/helper.php 16/libraries/joomla/plugin/helper.php
--- 15/libraries/joomla/plugin/helper.php	2009-05-29 13:54:22.000000000 +0200
+++ 16/libraries/joomla/plugin/helper.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: helper.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: helper.php 16381 2010-04-23 09:28:44Z ian $
 * @package		Joomla.Framework
 * @subpackage	Plugin
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
@@ -111,10 +111,19 @@
 	function _import( &$plugin, $autocreate = true, $dispatcher = null )
 	{
 		static $paths;
+		static $shutdown_handler_installed;
+		$mainframe =& JFactory::getApplication();
 
 		if (!$paths) {
 			$paths = array();
 		}
+	
+		// Install shutdown handler if not installed yet
+		if(!$shutdown_handler_installed)
+		{
+			register_shutdown_function(array('JPluginHelper', 'shutdown'));
+			$shutdown_handler_installed = true;
+		}
 
 		$result	= false;
 		$plugin->type = preg_replace('/[^A-Z0-9_\.-]/i', '', $plugin->type);
@@ -130,6 +139,7 @@
 				global $_MAMBOTS, $mainframe;
 
 				jimport('joomla.plugin.plugin');
+				$mainframe->set('currentPlugin', $plugin);
 				require_once( $path );
 				$paths[$path] = true;
 
@@ -148,12 +158,10 @@
 
 						// create the plugin
 						$instance = new $className($dispatcher, (array)($plugin));
+						
 					}
 				}
-			}
-			else
-			{
-				$paths[$path] = false;
+				$mainframe->set('currentPlugin', NULL);
 			}
 		}
 	}
@@ -202,4 +210,86 @@
 		return $plugins;
 	}
 
+	/**
+	 * Shutdown handler called by PHP when executing plugin produces a fatal error
+	 *
+	 * @access public
+	 */
+	static function shutdown()
+	{
+		global $mainframe;
+		$currentPlugin = $mainframe->get('currentPlugin', NULL);
+
+		if($currentPlugin)
+		{
+			$error = error_get_last();
+			if($error['type'] == E_ERROR || $error['type'] == E_PARSE || $error['type'] == E_COMPILE_ERROR)
+			{
+
+				$disabled = false;
+				$cfg =& JFactory::getConfig();
+
+				/* If not in debug mode, attempt to disable the plugin */
+				if(!$cfg->getValue('config.debug'))
+				{
+					$db =& JFactory::getDBO();
+					$q = 'UPDATE #__plugins SET `published`=0 WHERE `folder`=' . $db->quote($currentPlugin->type) . 
+						 'AND `element`=' . $db->quote($currentPlugin->name) .
+						 'LIMIT 1';
+					$db->setQuery($q);
+					$disabled = $db->query();
+
+					/* Following code is based on com_weblinks */
+
+					// admin users gid
+					$gid = 25;
+
+					// list of admins
+					$query = 'SELECT email, name' .
+							' FROM #__users' .
+							' WHERE gid = ' . $gid .
+							' AND sendEmail = 1';
+					$db->setQuery($query);
+					if ($db->query()) 
+					{
+						$adminRows = $db->loadObjectList();
+						$mail =& JFactory::getMailer();
+
+						// send email notification to admins
+						foreach ($adminRows as $adminRow) 
+						{
+							$mail->addRecipient($adminRow->email, $adminRow->name);
+						}
+
+						$uri = JURI::getInstance();
+						$mail->setSubject(JText::sprintf('Problem with Joomla site at %s'), $uri->getHost());
+
+						$body = JText::sprintf('When trying to access %s, and error was detected with %s plugin %s and it has been disabled. Technical error description follows:', JURI::current(), $currentPlugin->type, $currentPlugin->name);
+						$body .= "\n";
+						$body .= "\n" . $error['message'];
+						$body .= "\n" . $error['file'] . ' : ' . $error['line'];
+						$mail->setBody($body);
+
+						$mail->send();
+					}
+				}
+
+				if($disabled)
+				{
+					$app = JFactory::getApplication();
+					$app->redirect(JURI::current());
+				}
+				else
+				{
+					JError::raise(
+							$error['type'], 
+							500, 
+							JText::sprintf('Error loading %s plugin "%s"', $currentPlugin->type, $currentPlugin->name),
+							JText::sprintf('%s : %d', $error['file'], $error['line']), 
+							$currentPlugin
+							);
+				}
+			}
+		}
+	}
 }
diff -aruN --binary 15/libraries/joomla/plugin/helper-php4.php 16/libraries/joomla/plugin/helper-php4.php
--- 15/libraries/joomla/plugin/helper-php4.php	1970-01-01 01:00:00.000000000 +0100
+++ 16/libraries/joomla/plugin/helper-php4.php	2010-04-25 00:54:26.000000000 +0200
@@ -0,0 +1,205 @@
+<?php
+/**
+* @version		$Id: helper.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @package		Joomla.Framework
+* @subpackage	Plugin
+* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @license		GNU/GPL, see LICENSE.php
+* Joomla! is free software. This version may have been modified pursuant
+* to the GNU General Public License, and as distributed it includes or
+* is derivative of works licensed under the GNU General Public License or
+* other free or open source software licenses.
+* See COPYRIGHT.php for copyright notices and details.
+*/
+
+// Check to ensure this file is within the rest of the framework
+defined('JPATH_BASE') or die();
+
+/**
+* Plugin helper class
+*
+* @static
+* @package		Joomla.Framework
+* @subpackage	Plugin
+* @since		1.5
+*/
+class JPluginHelper
+{
+	/**
+	 * Get the plugin data of a specific type if no specific plugin is specified
+	 * otherwise only the specific plugin data is returned
+	 *
+	 * @access public
+	 * @param string 	$type 	The plugin type, relates to the sub-directory in the plugins directory
+	 * @param string 	$plugin	The plugin name
+	 * @return mixed 	An array of plugin data objects, or a plugin data object
+	 */
+	function &getPlugin($type, $plugin = null)
+	{
+		$result = array();
+
+		$plugins = JPluginHelper::_load();
+
+		$total = count($plugins);
+		for($i = 0; $i < $total; $i++)
+		{
+			if(is_null($plugin))
+			{
+				if($plugins[$i]->type == $type) {
+					$result[] = $plugins[$i];
+				}
+			}
+			else
+			{
+				if($plugins[$i]->type == $type && $plugins[$i]->name == $plugin) {
+					$result = $plugins[$i];
+					break;
+				}
+			}
+
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Checks if a plugin is enabled
+	 *
+	 * @access	public
+	 * @param string 	$type 	The plugin type, relates to the sub-directory in the plugins directory
+	 * @param string 	$plugin	The plugin name
+	 * @return	boolean
+	 */
+	function isEnabled( $type, $plugin = null )
+	{
+		$result = &JPluginHelper::getPlugin( $type, $plugin);
+		return (!empty($result));
+	}
+
+	/**
+	* Loads all the plugin files for a particular type if no specific plugin is specified
+	* otherwise only the specific pugin is loaded.
+	*
+	* @access public
+	* @param string 	$type 	The plugin type, relates to the sub-directory in the plugins directory
+	* @param string 	$plugin	The plugin name
+	* @return boolean True if success
+	*/
+	function importPlugin($type, $plugin = null, $autocreate = true, $dispatcher = null)
+	{
+		$result = false;
+
+		$plugins = JPluginHelper::_load();
+
+		$total = count($plugins);
+		for($i = 0; $i < $total; $i++) {
+			if($plugins[$i]->type == $type && ($plugins[$i]->name == $plugin ||  $plugin === null)) {
+				JPluginHelper::_import( $plugins[$i], $autocreate, $dispatcher );
+				$result = true;
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Loads the plugin file
+	 *
+	 * @access private
+	 * @return boolean True if success
+	 */
+	function _import( &$plugin, $autocreate = true, $dispatcher = null )
+	{
+		static $paths;
+
+		if (!$paths) {
+			$paths = array();
+		}
+
+		$result	= false;
+		$plugin->type = preg_replace('/[^A-Z0-9_\.-]/i', '', $plugin->type);
+		$plugin->name  = preg_replace('/[^A-Z0-9_\.-]/i', '', $plugin->name);
+
+		$path	= JPATH_PLUGINS.DS.$plugin->type.DS.$plugin->name.'.php';
+
+		if (!isset( $paths[$path] ))
+		{
+			if (file_exists( $path ))
+			{
+				//needed for backwards compatibility
+				global $_MAMBOTS, $mainframe;
+
+				jimport('joomla.plugin.plugin');
+				require_once( $path );
+				$paths[$path] = true;
+
+				if($autocreate)
+				{
+					// Makes sure we have an event dispatcher
+					if(!is_object($dispatcher)) {
+						$dispatcher = & JDispatcher::getInstance();
+					}
+
+					$className = 'plg'.$plugin->type.$plugin->name;
+					if(class_exists($className))
+					{
+						// load plugin parameters
+						$plugin =& JPluginHelper::getPlugin($plugin->type, $plugin->name);
+
+						// create the plugin
+						$instance = new $className($dispatcher, (array)($plugin));
+					}
+				}
+			}
+			else
+			{
+				$paths[$path] = false;
+			}
+		}
+	}
+
+	/**
+	 * Loads the published plugins
+	 *
+	 * @access private
+	 */
+	function _load()
+	{
+		static $plugins;
+
+		if (isset($plugins)) {
+			return $plugins;
+		}
+
+		$db		=& JFactory::getDBO();
+		$user	=& JFactory::getUser();
+
+		if (isset($user))
+		{
+			$aid = $user->get('aid', 0);
+
+			$query = 'SELECT folder AS type, element AS name, params'
+				. ' FROM #__plugins'
+				. ' WHERE published >= 1'
+				. ' AND access <= ' . (int) $aid
+				. ' ORDER BY ordering';
+		}
+		else
+		{
+			$query = 'SELECT folder AS type, element AS name, params'
+				. ' FROM #__plugins'
+				. ' WHERE published >= 1'
+				. ' ORDER BY ordering';
+		}
+
+		$db->setQuery( $query );
+
+		if (!($plugins = $db->loadObjectList())) {
+			JError::raiseWarning( 'SOME_ERROR_CODE', "Error loading Plugins: " . $db->getErrorMsg());
+			return false;
+		}
+
+		return $plugins;
+	}
+
+}
diff -aruN --binary 15/libraries/joomla/plugin/plugin.php 16/libraries/joomla/plugin/plugin.php
--- 15/libraries/joomla/plugin/plugin.php	2009-05-29 13:54:22.000000000 +0200
+++ 16/libraries/joomla/plugin/plugin.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: plugin.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: plugin.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Plugin
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/registry/format/ini.php 16/libraries/joomla/registry/format/ini.php
--- 15/libraries/joomla/registry/format/ini.php	2009-05-29 13:54:30.000000000 +0200
+++ 16/libraries/joomla/registry/format/ini.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: ini.php 10707 2008-08-21 09:52:47Z eddieajau $
+ * @version		$Id: ini.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	Registry
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/registry/format/php.php 16/libraries/joomla/registry/format/php.php
--- 15/libraries/joomla/registry/format/php.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/libraries/joomla/registry/format/php.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: php.php 12849 2009-09-25 16:47:54Z ian $
+ * @version		$Id: php.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	Registry
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/registry/format/xml.php 16/libraries/joomla/registry/format/xml.php
--- 15/libraries/joomla/registry/format/xml.php	2009-05-29 13:54:30.000000000 +0200
+++ 16/libraries/joomla/registry/format/xml.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: xml.php 10707 2008-08-21 09:52:47Z eddieajau $
+ * @version		$Id: xml.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	Registry
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/registry/format.php 16/libraries/joomla/registry/format.php
--- 15/libraries/joomla/registry/format.php	2009-05-29 13:54:30.000000000 +0200
+++ 16/libraries/joomla/registry/format.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: format.php 10707 2008-08-21 09:52:47Z eddieajau $
+ * @version		$Id: format.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	Registry
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/registry/registry.php 16/libraries/joomla/registry/registry.php
--- 15/libraries/joomla/registry/registry.php	2009-05-29 13:54:30.000000000 +0200
+++ 16/libraries/joomla/registry/registry.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: registry.php 10815 2008-08-27 01:15:56Z tcp $
+ * @version		$Id: registry.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	Registry
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/session/session.php 16/libraries/joomla/session/session.php
--- 15/libraries/joomla/session/session.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/libraries/joomla/session/session.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: session.php 12694 2009-09-11 21:03:02Z ian $
+* @version		$Id: session.php 16385 2010-04-23 10:44:15Z ian $
 * @package		Joomla.Framework
 * @subpackage	Session
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
@@ -521,6 +521,9 @@
 		// create new session id
 		$id	=	$this->_createId( strlen( $this->getId() ) );
 
+		// first we grab the session data
+		$data = $this->_store->read($this->getId());
+
 		// kill session
 		session_destroy();
 
@@ -534,7 +537,10 @@
 		// restart session with new id
 		session_id( $id );
 		session_start();
+		$_SESSION = $values;
 
+		//now we put the session data back
+		$this->_store->write($id, $data);
 		return true;
 	}
 
diff -aruN --binary 15/libraries/joomla/session/storage/apc.php 16/libraries/joomla/session/storage/apc.php
--- 15/libraries/joomla/session/storage/apc.php	2009-05-29 13:54:22.000000000 +0200
+++ 16/libraries/joomla/session/storage/apc.php	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
 * @version		$Id:apc.php 6961 2007-03-15 16:06:53Z tcp $
 * @package		Joomla.Framework
 * @subpackage	Session
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/session/storage/database.php 16/libraries/joomla/session/storage/database.php
--- 15/libraries/joomla/session/storage/database.php	2009-05-29 13:54:22.000000000 +0200
+++ 16/libraries/joomla/session/storage/database.php	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
 * @version		$Id:database.php 6961 2007-03-15 16:06:53Z tcp $
 * @package		Joomla.Framework
 * @subpackage	Session
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
@@ -87,9 +87,17 @@
 		}
 
 		$session = & JTable::getInstance('session');
-		$session->load($id);
-		$session->data = $session_data;
-		$session->store();
+		if ($session->load($id)) {
+			$session->data = $session_data;
+			$session->store();
+		} else {
+			// if load failed then we assume that it is because
+			// the session doesn't exist in the database
+			// therefore we use insert instead of store
+			$app = &JFactory::getApplication();
+			$session->data = $session_data;
+			$session->insert($id, $app->getClientId());
+		}
 
 		return true;
 	}
diff -aruN --binary 15/libraries/joomla/session/storage/eaccelerator.php 16/libraries/joomla/session/storage/eaccelerator.php
--- 15/libraries/joomla/session/storage/eaccelerator.php	2009-05-29 13:54:22.000000000 +0200
+++ 16/libraries/joomla/session/storage/eaccelerator.php	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
 * @version		$Id:eaccelerator.php 6961 2007-03-15 16:06:53Z tcp $
 * @package		Joomla.Framework
 * @subpackage	Session
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/session/storage/memcache.php 16/libraries/joomla/session/storage/memcache.php
--- 15/libraries/joomla/session/storage/memcache.php	2009-05-29 13:54:22.000000000 +0200
+++ 16/libraries/joomla/session/storage/memcache.php	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
 * @version		$Id:eaccelerator.php 6961 2007-03-15 16:06:53Z tcp $
 * @package		Joomla.Framework
 * @subpackage	Session
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/session/storage/none.php 16/libraries/joomla/session/storage/none.php
--- 15/libraries/joomla/session/storage/none.php	2009-05-29 13:54:22.000000000 +0200
+++ 16/libraries/joomla/session/storage/none.php	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
 * @version		$Id:none.php 6961 2007-03-15 16:06:53Z tcp $
 * @package		Joomla.Framework
 * @subpackage	Session
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/session/storage/xcache.php 16/libraries/joomla/session/storage/xcache.php
--- 15/libraries/joomla/session/storage/xcache.php	2009-05-29 13:54:22.000000000 +0200
+++ 16/libraries/joomla/session/storage/xcache.php	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
 * @version		$Id:apc.php 6961 2007-03-15 16:06:53Z tcp $
 * @package		Joomla.Framework
 * @subpackage	Session
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/session/storage.php 16/libraries/joomla/session/storage.php
--- 15/libraries/joomla/session/storage.php	2009-05-29 13:54:22.000000000 +0200
+++ 16/libraries/joomla/session/storage.php	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
 * @version		$Id:sessionstorage.php 6961 2007-03-15 16:06:53Z tcp $
 * @package		Joomla.Framework
 * @subpackage	Session
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/template/module/function/Sef.php 16/libraries/joomla/template/module/function/Sef.php
--- 15/libraries/joomla/template/module/function/Sef.php	2009-05-29 13:54:30.000000000 +0200
+++ 16/libraries/joomla/template/module/function/Sef.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: Sef.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: Sef.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Template
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/template/module/function/Translate.php 16/libraries/joomla/template/module/function/Translate.php
--- 15/libraries/joomla/template/module/function/Translate.php	2009-05-29 13:54:30.000000000 +0200
+++ 16/libraries/joomla/template/module/function/Translate.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: Translate.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: Translate.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Template
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/template/module/modifier/SEF.php 16/libraries/joomla/template/module/modifier/SEF.php
--- 15/libraries/joomla/template/module/modifier/SEF.php	2009-05-29 13:54:30.000000000 +0200
+++ 16/libraries/joomla/template/module/modifier/SEF.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,10 +1,10 @@
 <?php
 /**
 * patTemplate modfifier for Search Engine Friendly URL's
-* @version		$Id: SEF.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: SEF.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Template
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software and parts of it may contain or be derived from the
 * GNU General Public License or other free or open source software licenses.
diff -aruN --binary 15/libraries/joomla/template/module/modifier/Translate.php 16/libraries/joomla/template/module/modifier/Translate.php
--- 15/libraries/joomla/template/module/modifier/Translate.php	2009-05-29 13:54:30.000000000 +0200
+++ 16/libraries/joomla/template/module/modifier/Translate.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,10 +1,10 @@
 <?php
 /**
 * patTemplate modfifier for Search Engine Friendly URL's
-* @version		$Id: Translate.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: Translate.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Template
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software and parts of it may contain or be derived from the
 * GNU General Public License or other free or open source software licenses.
diff -aruN --binary 15/libraries/joomla/template/template.php 16/libraries/joomla/template/template.php
--- 15/libraries/joomla/template/template.php	2009-05-29 13:54:32.000000000 +0200
+++ 16/libraries/joomla/template/template.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: template.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: template.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Template
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/template/tmpl/adminfilters.html 16/libraries/joomla/template/tmpl/adminfilters.html
--- 15/libraries/joomla/template/tmpl/adminfilters.html	2009-05-29 13:54:32.000000000 +0200
+++ 16/libraries/joomla/template/tmpl/adminfilters.html	2010-04-23 13:40:18.000000000 +0200
@@ -1,7 +1,7 @@
 <jtmpl:comment>
-@version	$Id: adminfilters.html 9765 2007-12-30 08:21:02Z ircmaxell $
+@version	$Id: adminfilters.html 14401 2010-01-26 14:10:00Z louis $
 @package	Joomla
-@copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+@copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 @license	GNU/GPL, see LICENSE.php
 Joomla! is free software. This version may have been modified pursuant
 to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/template/tmpl/adminlists.html 16/libraries/joomla/template/tmpl/adminlists.html
--- 15/libraries/joomla/template/tmpl/adminlists.html	2009-05-29 13:54:32.000000000 +0200
+++ 16/libraries/joomla/template/tmpl/adminlists.html	2010-04-23 13:40:18.000000000 +0200
@@ -1,7 +1,7 @@
 <jtmpl:comment>
-@version	$Id: adminlists.html 10871 2008-08-30 07:30:33Z willebil $
+@version	$Id: adminlists.html 14401 2010-01-26 14:10:00Z louis $
 @package	Joomla
-@copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+@copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 @license	GNU/GPL, see LICENSE.php
 Joomla! is free software. This version may have been modified pursuant
 to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/template/tmpl/breadcrumbs.html 16/libraries/joomla/template/tmpl/breadcrumbs.html
--- 15/libraries/joomla/template/tmpl/breadcrumbs.html	2009-05-29 13:54:32.000000000 +0200
+++ 16/libraries/joomla/template/tmpl/breadcrumbs.html	2010-04-23 13:40:18.000000000 +0200
@@ -1,7 +1,7 @@
 <jtmpl:comment>
-@version	$Id: breadcrumbs.html 9765 2007-12-30 08:21:02Z ircmaxell $
+@version	$Id: breadcrumbs.html 14401 2010-01-26 14:10:00Z louis $
 @package	Joomla
-@copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+@copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 @license	GNU/GPL, see LICENSE.php
 Joomla! is free software. This version may have been modified pursuant
 to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/template/tmpl/calendar.html 16/libraries/joomla/template/tmpl/calendar.html
--- 15/libraries/joomla/template/tmpl/calendar.html	2009-05-29 13:54:32.000000000 +0200
+++ 16/libraries/joomla/template/tmpl/calendar.html	2010-04-23 13:40:18.000000000 +0200
@@ -1,7 +1,7 @@
 <jtmpl:comment>
-@version	$Id: calendar.html 9765 2007-12-30 08:21:02Z ircmaxell $
+@version	$Id: calendar.html 14401 2010-01-26 14:10:00Z louis $
 @package	Joomla
-@copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+@copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 @license	GNU/GPL, see LICENSE.php
 Joomla! is free software. This version may have been modified pursuant
 to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/template/tmpl/dtree.html 16/libraries/joomla/template/tmpl/dtree.html
--- 15/libraries/joomla/template/tmpl/dtree.html	2009-05-29 13:54:32.000000000 +0200
+++ 16/libraries/joomla/template/tmpl/dtree.html	2010-04-23 13:40:18.000000000 +0200
@@ -1,7 +1,7 @@
 <jtmpl:comment>
-@version	$Id: dtree.html 9765 2007-12-30 08:21:02Z ircmaxell $
+@version	$Id: dtree.html 14401 2010-01-26 14:10:00Z louis $
 @package	Joomla
-@copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+@copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 @license	GNU/GPL, see LICENSE.php
 Joomla! is free software. This version may have been modified pursuant
 to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/template/tmpl/forms.html 16/libraries/joomla/template/tmpl/forms.html
--- 15/libraries/joomla/template/tmpl/forms.html	2009-05-29 13:54:32.000000000 +0200
+++ 16/libraries/joomla/template/tmpl/forms.html	2010-04-23 13:40:18.000000000 +0200
@@ -1,7 +1,7 @@
 <jtmpl:comment>
-@version	$Id: forms.html 9765 2007-12-30 08:21:02Z ircmaxell $
+@version	$Id: forms.html 14401 2010-01-26 14:10:00Z louis $
 @package	Joomla
-@copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+@copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 @license	GNU/GPL, see LICENSE.php
 Joomla! is free software. This version may have been modified pursuant
 to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/template/tmpl/help.html 16/libraries/joomla/template/tmpl/help.html
--- 15/libraries/joomla/template/tmpl/help.html	2009-05-29 13:54:32.000000000 +0200
+++ 16/libraries/joomla/template/tmpl/help.html	2010-04-23 13:40:18.000000000 +0200
@@ -1,7 +1,7 @@
 <jtmpl:comment>
-@version	$Id: help.html 9765 2007-12-30 08:21:02Z ircmaxell $
+@version	$Id: help.html 14401 2010-01-26 14:10:00Z louis $
 @package	Joomla
-@copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+@copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 @license	GNU/GPL, see LICENSE.php
 Joomla! is free software. This version may have been modified pursuant
 to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/template/tmpl/page.html 16/libraries/joomla/template/tmpl/page.html
--- 15/libraries/joomla/template/tmpl/page.html	2009-05-29 13:54:30.000000000 +0200
+++ 16/libraries/joomla/template/tmpl/page.html	2010-04-23 13:40:18.000000000 +0200
@@ -1,7 +1,7 @@
 <jtmpl:comment>
-@version	$Id: page.html 9765 2007-12-30 08:21:02Z ircmaxell $
+@version	$Id: page.html 14401 2010-01-26 14:10:00Z louis $
 @package	Joomla
-@copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+@copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 @license	GNU/GPL, see LICENSE.php
 Joomla! is free software. This version may have been modified pursuant
 to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/template/tmpl/tabs.html 16/libraries/joomla/template/tmpl/tabs.html
--- 15/libraries/joomla/template/tmpl/tabs.html	2009-05-29 13:54:32.000000000 +0200
+++ 16/libraries/joomla/template/tmpl/tabs.html	2010-04-23 13:40:18.000000000 +0200
@@ -1,7 +1,7 @@
 <jtmpl:comment>
-@version	$Id: tabs.html 9765 2007-12-30 08:21:02Z ircmaxell $
+@version	$Id: tabs.html 14401 2010-01-26 14:10:00Z louis $
 @package	Joomla
-@copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+@copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 @license	GNU/GPL, see LICENSE.php
 Joomla! is free software. This version may have been modified pursuant
 to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/user/authentication.php 16/libraries/joomla/user/authentication.php
--- 15/libraries/joomla/user/authentication.php	2009-05-29 13:54:34.000000000 +0200
+++ 16/libraries/joomla/user/authentication.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: authentication.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: authentication.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	User
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/user/authorization.php 16/libraries/joomla/user/authorization.php
--- 15/libraries/joomla/user/authorization.php	2009-07-23 03:25:36.000000000 +0200
+++ 16/libraries/joomla/user/authorization.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: authorization.php 12542 2009-07-22 17:40:48Z ian $
+* @version		$Id: authorization.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	User
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/user/helper.php 16/libraries/joomla/user/helper.php
--- 15/libraries/joomla/user/helper.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/libraries/joomla/user/helper.php	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
 * @version		$Id:helper.php 6961 2007-03-15 16:06:53Z tcp $
 * @package		Joomla.Framework
 * @subpackage	User
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/user/user.php 16/libraries/joomla/user/user.php
--- 15/libraries/joomla/user/user.php	2009-05-29 13:54:34.000000000 +0200
+++ 16/libraries/joomla/user/user.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: user.php 11688 2009-03-13 02:05:56Z ian $
+ * @version		$Id: user.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	User
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/libraries/joomla/utilities/arrayhelper.php 16/libraries/joomla/utilities/arrayhelper.php
--- 15/libraries/joomla/utilities/arrayhelper.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/libraries/joomla/utilities/arrayhelper.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: arrayhelper.php 13341 2009-10-27 03:03:54Z ian $
+ * @version		$Id: arrayhelper.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	Utilities
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/libraries/joomla/utilities/buffer.php 16/libraries/joomla/utilities/buffer.php
--- 15/libraries/joomla/utilities/buffer.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/libraries/joomla/utilities/buffer.php	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
  * @version		$Id:buffer.php 6961 2007-03-15 16:06:53Z tcp $
  * @package		Joomla.Framework
  * @subpackage	Utilities
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/utilities/compat/compat.php 16/libraries/joomla/utilities/compat/compat.php
--- 15/libraries/joomla/utilities/compat/compat.php	2009-05-29 13:54:32.000000000 +0200
+++ 16/libraries/joomla/utilities/compat/compat.php	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
 * @version		$Id:compat.php 6961 2007-03-15 16:06:53Z tcp $
 * @package		Joomla.Framework
 * @subpackage	Compatibility
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/utilities/compat/php50x.php 16/libraries/joomla/utilities/compat/php50x.php
--- 15/libraries/joomla/utilities/compat/php50x.php	2009-07-23 03:25:36.000000000 +0200
+++ 16/libraries/joomla/utilities/compat/php50x.php	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
 * @version		$Id:php50x.php 6961 2007-03-15 16:06:53Z tcp $
 * @package		Joomla.Framework
 * @subpackage	Compatibility
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/utilities/compat/php51x.php 16/libraries/joomla/utilities/compat/php51x.php
--- 15/libraries/joomla/utilities/compat/php51x.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/libraries/joomla/utilities/compat/php51x.php	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
 * @version		$Id:php50x.php 6961 2007-03-15 16:06:53Z tcp $
 * @package		Joomla.Framework
 * @subpackage	Compatibility
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/utilities/date.php 16/libraries/joomla/utilities/date.php
--- 15/libraries/joomla/utilities/date.php	2009-05-29 13:54:32.000000000 +0200
+++ 16/libraries/joomla/utilities/date.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: date.php 10827 2008-08-27 23:10:15Z charlvn $
+* @version		$Id: date.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Utilities
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/utilities/simplecrypt.php 16/libraries/joomla/utilities/simplecrypt.php
--- 15/libraries/joomla/utilities/simplecrypt.php	2009-05-29 13:54:32.000000000 +0200
+++ 16/libraries/joomla/utilities/simplecrypt.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: simplecrypt.php 10707 2008-08-21 09:52:47Z eddieajau $
+ * @version		$Id: simplecrypt.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	Utilities
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/libraries/joomla/utilities/simplexml.php 16/libraries/joomla/utilities/simplexml.php
--- 15/libraries/joomla/utilities/simplexml.php	2009-05-29 13:54:32.000000000 +0200
+++ 16/libraries/joomla/utilities/simplexml.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: simplexml.php 10815 2008-08-27 01:15:56Z tcp $
+* @version		$Id: simplexml.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Utilities
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/utilities/string.php 16/libraries/joomla/utilities/string.php
--- 15/libraries/joomla/utilities/string.php	2009-05-29 13:54:32.000000000 +0200
+++ 16/libraries/joomla/utilities/string.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: string.php 11550 2009-01-30 00:32:51Z kdevine $
+* @version		$Id: string.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
 * @subpackage	Utilities
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/libraries/joomla/utilities/utility.php 16/libraries/joomla/utilities/utility.php
--- 15/libraries/joomla/utilities/utility.php	2009-05-29 13:54:32.000000000 +0200
+++ 16/libraries/joomla/utilities/utility.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: utility.php 10707 2008-08-21 09:52:47Z eddieajau $
+ * @version		$Id: utility.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Framework
  * @subpackage	Utilities
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/libraries/joomla/version.php 16/libraries/joomla/version.php
--- 15/libraries/joomla/version.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/libraries/joomla/version.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
- * @version		$Id: version.php 13426 2009-11-04 16:36:00Z ian $
+ * @version		$Id: version.php 16385 2010-04-23 10:44:15Z ian $
  * @package	Joomla.Framework
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
@@ -26,19 +26,19 @@
 	/** @var string Development Status */
 	var $DEV_STATUS = 'Stable';
 	/** @var int Sub Release Level */
-	var $DEV_LEVEL 	= '15';
+	var $DEV_LEVEL 	= '16';
 	/** @var int build Number */
 	var $BUILD	= '';
 	/** @var string Codename */
-	var $CODENAME 	= 'Wojmamni Ama Mamni';
+	var $CODENAME 	= 'Wojmamni Ama Busani';
 	/** @var string Date */
-	var $RELDATE 	= '05-November-2009';
+	var $RELDATE 	= '24-April-2010';
 	/** @var string Time */
 	var $RELTIME 	= '04:00';
 	/** @var string Timezone */
 	var $RELTZ 	= 'GMT';
 	/** @var string Copyright Text */
-	var $COPYRIGHT 	= 'Copyright (C) 2005 - 2009 Open Source Matters. All rights reserved.';
+	var $COPYRIGHT 	= 'Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.';
 	/** @var string URL */
 	var $URL 	= '<a href="http://www.joomla.org">Joomla!</a> is Free Software released under the GNU General Public License.';
 
diff -aruN --binary 15/libraries/loader.php 16/libraries/loader.php
--- 15/libraries/loader.php	2009-05-29 13:54:48.000000000 +0200
+++ 16/libraries/loader.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version $Id: loader.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version $Id: loader.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Framework
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/LICENSES.php 16/LICENSES.php
--- 15/LICENSES.php	2009-06-30 21:01:32.000000000 +0200
+++ 16/LICENSES.php	2010-04-23 13:40:10.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
- * @version		$Id: LICENSES.php 12356 2009-06-24 18:20:14Z ian $
+ * @version		$Id: LICENSES.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
- * @copyright	Copyright (C) 2005 - 2009 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/media/system/js/caption.js 16/media/system/js/caption.js
--- 15/media/system/js/caption.js	2009-11-04 18:51:20.000000000 +0100
+++ 16/media/system/js/caption.js	2010-04-23 13:40:18.000000000 +0200
@@ -1,6 +1,6 @@
 /**
 * @version		$Id: caption.js 5263 2006-10-02 01:25:24Z webImagery $
-* @copyright	Copyright (C) 2005 - 2009 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
@@ -34,7 +34,10 @@
 		var text      = document.createElement("p");
 		var width     = element.getAttribute("width");
 		var align     = element.getAttribute("align");
-		var docMode = document.documentMode;
+
+		if(!width) {
+			width = element.width;
+		}
 
 		//Windows fix
 		if (!align)
@@ -42,29 +45,23 @@
 		if (!align) // IE DOM Fix
 			align = element.style.styleFloat;
 
+		if (align=="") {
+			align="none";
+		}
+
 		text.appendChild(caption);
 		text.className = this.selector.replace('.', '_');
 
-		if (align=="none") {
-			if (element.title != "") {
-				element.parentNode.replaceChild(text, element);
-				text.parentNode.insertBefore(element, text);
-			}
-		} else {
-			element.parentNode.insertBefore(container, element);
-			container.appendChild(element);
-			if ( element.title != "" ) {
-				container.appendChild(text);
-			}
-			container.className   = this.selector.replace('.', '_');
-			container.className   = container.className + " " + align;
-			container.setAttribute("style","float:"+align);
-
-			//IE8 fix
-			if (!docMode|| docMode < 8) {
-				container.style.width = width + "px";
-			}
+		element.parentNode.insertBefore(container, element);
+		container.appendChild(element);
+		if ( element.title != "" ) {
+			container.appendChild(text);
 		}
+		container.className   = this.selector.replace('.', '_');
+		container.className   = container.className + " " + align;
+		container.setAttribute("style","float:"+align);
+
+		container.style.width = width + "px";
 
 	}
 });
diff -aruN --binary 15/media/system/js/combobox.js 16/media/system/js/combobox.js
--- 15/media/system/js/combobox.js	2009-05-29 13:50:40.000000000 +0200
+++ 16/media/system/js/combobox.js	2010-04-23 13:40:18.000000000 +0200
@@ -1,6 +1,6 @@
 /**
 * @version		$Id: modal.js 5263 2006-10-02 01:25:24Z webImagery $
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/media/system/js/openid.js 16/media/system/js/openid.js
--- 15/media/system/js/openid.js	2009-05-29 13:50:40.000000000 +0200
+++ 16/media/system/js/openid.js	2010-04-23 13:40:18.000000000 +0200
@@ -1,6 +1,6 @@
 /**
 * @version		$Id: modal.js 5263 2006-10-02 01:25:24Z webImagery $
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/media/system/js/switcher.js 16/media/system/js/switcher.js
--- 15/media/system/js/switcher.js	2009-05-29 13:50:40.000000000 +0200
+++ 16/media/system/js/switcher.js	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 /**
-* @version		$Id: switcher.js 10708 2008-08-21 09:58:05Z eddieajau $
+* @version		$Id: switcher.js 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Config
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/media/system/js/tabs.js 16/media/system/js/tabs.js
--- 15/media/system/js/tabs.js	2009-05-29 13:50:40.000000000 +0200
+++ 16/media/system/js/tabs.js	2010-04-23 13:40:18.000000000 +0200
@@ -1,6 +1,6 @@
 /**
 * @version		$Id: cookie.js 6138 2007-01-02 03:44:18Z eddiea $
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/media/system/js/validate.js 16/media/system/js/validate.js
--- 15/media/system/js/validate.js	2009-05-29 13:50:40.000000000 +0200
+++ 16/media/system/js/validate.js	2010-04-23 13:40:18.000000000 +0200
@@ -1,7 +1,7 @@
 /**
 * @version		$Id: validate.js 7401 2007-05-14 04:12:55Z eddieajau $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/modules/mod_archive/helper.php 16/modules/mod_archive/helper.php
--- 15/modules/mod_archive/helper.php	2009-05-29 13:54:06.000000000 +0200
+++ 16/modules/mod_archive/helper.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: helper.php 11646 2009-03-01 19:34:56Z ian $
+* @version		$Id: helper.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/modules/mod_archive/mod_archive.php 16/modules/mod_archive/mod_archive.php
--- 15/modules/mod_archive/mod_archive.php	2009-05-29 13:54:06.000000000 +0200
+++ 16/modules/mod_archive/mod_archive.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: mod_archive.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: mod_archive.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/modules/mod_archive/mod_archive.xml 16/modules/mod_archive/mod_archive.xml
--- 15/modules/mod_archive/mod_archive.xml	2009-05-29 13:54:06.000000000 +0200
+++ 16/modules/mod_archive/mod_archive.xml	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Archived Content</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2006</creationDate>
-	<copyright>(C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/modules/mod_banners/helper.php 16/modules/mod_banners/helper.php
--- 15/modules/mod_banners/helper.php	2009-05-29 13:54:08.000000000 +0200
+++ 16/modules/mod_banners/helper.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: helper.php 10554 2008-07-15 17:15:19Z ircmaxell $
+* @version		$Id: helper.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/modules/mod_banners/mod_banners.php 16/modules/mod_banners/mod_banners.php
--- 15/modules/mod_banners/mod_banners.php	2009-05-29 13:54:08.000000000 +0200
+++ 16/modules/mod_banners/mod_banners.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: mod_banners.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: mod_banners.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/modules/mod_banners/mod_banners.xml 16/modules/mod_banners/mod_banners.xml
--- 15/modules/mod_banners/mod_banners.xml	2009-05-29 13:54:08.000000000 +0200
+++ 16/modules/mod_banners/mod_banners.xml	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Banner</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/modules/mod_breadcrumbs/helper.php 16/modules/mod_breadcrumbs/helper.php
--- 15/modules/mod_breadcrumbs/helper.php	2009-05-29 13:54:08.000000000 +0200
+++ 16/modules/mod_breadcrumbs/helper.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: helper.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: helper.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/modules/mod_breadcrumbs/mod_breadcrumbs.php 16/modules/mod_breadcrumbs/mod_breadcrumbs.php
--- 15/modules/mod_breadcrumbs/mod_breadcrumbs.php	2009-05-29 13:54:08.000000000 +0200
+++ 16/modules/mod_breadcrumbs/mod_breadcrumbs.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: mod_breadcrumbs.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: mod_breadcrumbs.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/modules/mod_breadcrumbs/mod_breadcrumbs.xml 16/modules/mod_breadcrumbs/mod_breadcrumbs.xml
--- 15/modules/mod_breadcrumbs/mod_breadcrumbs.xml	2009-05-29 13:54:08.000000000 +0200
+++ 16/modules/mod_breadcrumbs/mod_breadcrumbs.xml	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Breadcrumbs</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/modules/mod_custom/mod_custom.xml 16/modules/mod_custom/mod_custom.xml
--- 15/modules/mod_custom/mod_custom.xml	2009-05-29 13:54:14.000000000 +0200
+++ 16/modules/mod_custom/mod_custom.xml	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Custom HTML</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/modules/mod_feed/helper.php 16/modules/mod_feed/helper.php
--- 15/modules/mod_feed/helper.php	2009-05-29 13:54:12.000000000 +0200
+++ 16/modules/mod_feed/helper.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: helper.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: helper.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/modules/mod_feed/mod_feed.php 16/modules/mod_feed/mod_feed.php
--- 15/modules/mod_feed/mod_feed.php	2009-05-29 13:54:12.000000000 +0200
+++ 16/modules/mod_feed/mod_feed.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: mod_feed.php 11371 2008-12-30 01:31:50Z ian $
+* @version		$Id: mod_feed.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/modules/mod_feed/mod_feed.xml 16/modules/mod_feed/mod_feed.xml
--- 15/modules/mod_feed/mod_feed.xml	2009-06-30 21:01:32.000000000 +0200
+++ 16/modules/mod_feed/mod_feed.xml	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Feed Display</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/modules/mod_footer/mod_footer.php 16/modules/mod_footer/mod_footer.php
--- 15/modules/mod_footer/mod_footer.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/modules/mod_footer/mod_footer.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: mod_footer.php 12694 2009-09-11 21:03:02Z ian $
+* @version		$Id: mod_footer.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/modules/mod_footer/mod_footer.xml 16/modules/mod_footer/mod_footer.xml
--- 15/modules/mod_footer/mod_footer.xml	2009-05-29 13:54:10.000000000 +0200
+++ 16/modules/mod_footer/mod_footer.xml	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Footer</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/modules/mod_latestnews/helper.php 16/modules/mod_latestnews/helper.php
--- 15/modules/mod_latestnews/helper.php	2009-05-29 13:54:08.000000000 +0200
+++ 16/modules/mod_latestnews/helper.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: helper.php 10857 2008-08-30 06:41:16Z willebil $
+* @version		$Id: helper.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/modules/mod_latestnews/mod_latestnews.php 16/modules/mod_latestnews/mod_latestnews.php
--- 15/modules/mod_latestnews/mod_latestnews.php	2009-05-29 13:54:08.000000000 +0200
+++ 16/modules/mod_latestnews/mod_latestnews.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: mod_latestnews.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: mod_latestnews.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/modules/mod_latestnews/mod_latestnews.xml 16/modules/mod_latestnews/mod_latestnews.xml
--- 15/modules/mod_latestnews/mod_latestnews.xml	2009-05-29 13:54:08.000000000 +0200
+++ 16/modules/mod_latestnews/mod_latestnews.xml	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Latest News</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
@@ -14,7 +14,7 @@
 	</files>
 	<params>
 		<param name="count" type="text" default="5" label="Count" description="The number of items to display (default 5)" />
-		<param name="ordering" type="list" default="create_dsc" label="Ordering" description="Ordering options">
+		<param name="ordering" type="list" default="c_dsc" label="Ordering" description="Ordering options">
 			<option value="c_dsc">Recently Added First</option>
 			<option value="m_dsc">Recently Modified First</option>
 	  	</param>
diff -aruN --binary 15/modules/mod_login/helper.php 16/modules/mod_login/helper.php
--- 15/modules/mod_login/helper.php	2009-05-29 13:54:12.000000000 +0200
+++ 16/modules/mod_login/helper.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: helper.php 11668 2009-03-08 20:33:38Z willebil $
+* @version		$Id: helper.php 15198 2010-03-05 09:06:05Z ian $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
@@ -19,10 +19,20 @@
 	function getReturnURL($params, $type)
 	{
 		if($itemid =  $params->get($type))
-		{
-			$menu =& JSite::getMenu();
-			$item = $menu->getItem($itemid);
-			$url = JRoute::_($item->link.'&Itemid='.$itemid, false);
+		{  
+			$menu =& JSite::getMenu();  
+			$item = $menu->getItem($itemid); //var_dump($menu);die;
+			if ($item)
+			{
+				$url = JRoute::_($item->link.'&Itemid='.$itemid, false);
+			}
+			else
+			{
+			// stay on the same page
+			$uri = JFactory::getURI();
+			$url = $uri->toString(array('path', 'query', 'fragment'));
+			}
+				
 		}
 		else
 		{
diff -aruN --binary 15/modules/mod_login/mod_login.php 16/modules/mod_login/mod_login.php
--- 15/modules/mod_login/mod_login.php	2009-05-29 13:54:12.000000000 +0200
+++ 16/modules/mod_login/mod_login.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: mod_login.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: mod_login.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/modules/mod_login/mod_login.xml 16/modules/mod_login/mod_login.xml
--- 15/modules/mod_login/mod_login.xml	2009-05-29 13:54:12.000000000 +0200
+++ 16/modules/mod_login/mod_login.xml	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Login</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
@@ -20,8 +20,8 @@
 		<param name="moduleclass_sfx" type="text" default="" label="Module Class Suffix" description="PARAMMODULECLASSSUFFIX" />
 		<param name="pretext" type="textarea" cols="30" rows="5" default="" label="Pre-text" description="PARAMPRETEXT" />
 		<param name="posttext" type="textarea" cols="30" rows="5" label="Post-text" description="PARAMPOSTTEXT" />
-		<param name="login" type="menuitem" default="" disable="separator" label="Login Redirection URL" description="PARAMLOGINREDIRECTURL" />
-		<param name="logout" type="menuitem" default="" disable="separator" label="Logout Redirection URL" description="PARAMLOGOUTREDIRECTURL" />
+		<param name="login" type="menuitem" default="" disable="separator" label="Login Redirection URL" description="PARAMLOGINREDIRECTURL" state="1" />
+		<param name="logout" type="menuitem" default="" disable="separator" label="Logout Redirection URL" description="PARAMLOGOUTREDIRECTURL" state="1" />
 		<param name="greeting" type="radio" default="1" label="Greeting" description="Show/Hide the simple greeting text">
 			<option value="0">No</option>
 			<option value="1">Yes</option>
diff -aruN --binary 15/modules/mod_mainmenu/helper.php 16/modules/mod_mainmenu/helper.php
--- 15/modules/mod_mainmenu/helper.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/modules/mod_mainmenu/helper.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: helper.php 12694 2009-09-11 21:03:02Z ian $
+* @version		$Id: helper.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/modules/mod_mainmenu/legacy.php 16/modules/mod_mainmenu/legacy.php
--- 15/modules/mod_mainmenu/legacy.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/modules/mod_mainmenu/legacy.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: legacy.php 12694 2009-09-11 21:03:02Z ian $
+* @version		$Id: legacy.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/modules/mod_mainmenu/mod_mainmenu.php 16/modules/mod_mainmenu/mod_mainmenu.php
--- 15/modules/mod_mainmenu/mod_mainmenu.php	2009-05-29 13:54:12.000000000 +0200
+++ 16/modules/mod_mainmenu/mod_mainmenu.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: mod_mainmenu.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: mod_mainmenu.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/modules/mod_mainmenu/mod_mainmenu.xml 16/modules/mod_mainmenu/mod_mainmenu.xml
--- 15/modules/mod_mainmenu/mod_mainmenu.xml	2009-05-29 13:54:12.000000000 +0200
+++ 16/modules/mod_mainmenu/mod_mainmenu.xml	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Menu</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/modules/mod_mostread/helper.php 16/modules/mod_mostread/helper.php
--- 15/modules/mod_mostread/helper.php	2009-05-29 13:54:16.000000000 +0200
+++ 16/modules/mod_mostread/helper.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: helper.php 10857 2008-08-30 06:41:16Z willebil $
+* @version		$Id: helper.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/modules/mod_mostread/mod_mostread.php 16/modules/mod_mostread/mod_mostread.php
--- 15/modules/mod_mostread/mod_mostread.php	2009-05-29 13:54:14.000000000 +0200
+++ 16/modules/mod_mostread/mod_mostread.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: mod_mostread.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: mod_mostread.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/modules/mod_mostread/mod_mostread.xml 16/modules/mod_mostread/mod_mostread.xml
--- 15/modules/mod_mostread/mod_mostread.xml	2009-05-29 13:54:16.000000000 +0200
+++ 16/modules/mod_mostread/mod_mostread.xml	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Most Read Content</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/modules/mod_newsflash/helper.php 16/modules/mod_newsflash/helper.php
--- 15/modules/mod_newsflash/helper.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/modules/mod_newsflash/helper.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: helper.php 13246 2009-10-20 04:24:06Z ian $
+* @version		$Id: helper.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/modules/mod_newsflash/mod_newsflash.php 16/modules/mod_newsflash/mod_newsflash.php
--- 15/modules/mod_newsflash/mod_newsflash.php	2009-05-29 13:54:10.000000000 +0200
+++ 16/modules/mod_newsflash/mod_newsflash.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: mod_newsflash.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: mod_newsflash.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/modules/mod_newsflash/mod_newsflash.xml 16/modules/mod_newsflash/mod_newsflash.xml
--- 15/modules/mod_newsflash/mod_newsflash.xml	2009-05-29 13:54:10.000000000 +0200
+++ 16/modules/mod_newsflash/mod_newsflash.xml	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Newsflash</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/modules/mod_poll/helper.php 16/modules/mod_poll/helper.php
--- 15/modules/mod_poll/helper.php	2009-05-29 13:54:12.000000000 +0200
+++ 16/modules/mod_poll/helper.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: helper.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: helper.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/modules/mod_poll/mod_poll.php 16/modules/mod_poll/mod_poll.php
--- 15/modules/mod_poll/mod_poll.php	2009-05-29 13:54:12.000000000 +0200
+++ 16/modules/mod_poll/mod_poll.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: mod_poll.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: mod_poll.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/modules/mod_poll/mod_poll.xml 16/modules/mod_poll/mod_poll.xml
--- 15/modules/mod_poll/mod_poll.xml	2009-05-29 13:54:12.000000000 +0200
+++ 16/modules/mod_poll/mod_poll.xml	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Poll</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/modules/mod_random_image/helper.php 16/modules/mod_random_image/helper.php
--- 15/modules/mod_random_image/helper.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/modules/mod_random_image/helper.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: helper.php 12694 2009-09-11 21:03:02Z ian $
+* @version		$Id: helper.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/modules/mod_random_image/mod_random_image.php 16/modules/mod_random_image/mod_random_image.php
--- 15/modules/mod_random_image/mod_random_image.php	2009-05-29 13:54:06.000000000 +0200
+++ 16/modules/mod_random_image/mod_random_image.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: mod_random_image.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: mod_random_image.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/modules/mod_random_image/mod_random_image.xml 16/modules/mod_random_image/mod_random_image.xml
--- 15/modules/mod_random_image/mod_random_image.xml	2009-05-29 13:54:06.000000000 +0200
+++ 16/modules/mod_random_image/mod_random_image.xml	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Random Image</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/modules/mod_related_items/helper.php 16/modules/mod_related_items/helper.php
--- 15/modules/mod_related_items/helper.php	2009-05-29 13:54:04.000000000 +0200
+++ 16/modules/mod_related_items/helper.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: helper.php 11137 2008-10-15 19:47:01Z kdevine $
+* @version		$Id: helper.php 15200 2010-03-05 09:12:56Z ian $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
@@ -23,7 +23,7 @@
 		global $mainframe;
 
 		$db					=& JFactory::getDBO();
-		$user				=& JFactory::getUser();
+		$user =& JFactory::getUser();
 
 		$option				= JRequest::getCmd('option');
 		$view				= JRequest::getCmd('view');
@@ -32,75 +32,93 @@
 		$temp				= explode(':', $temp);
 		$id					= $temp[0];
 
-		$showDate			= $params->get('showDate', 0);
+		$aid = $user->get('aid', 0);
 
-		$nullDate			= $db->getNullDate();
+		$showDate			= $params->get('showDate', 0);
+		$conf =& JFactory::getConfig();
+		
+		if ($option == 'com_content' && $view == 'article' && $id)
+		{
+			if ($params->get('cache_items', 0)==1 && $conf->getValue( 'config.caching' )) {
+				$cache =& JFactory::getCache('mod_related_items', 'callback');
+				$cache->setLifeTime( $params->get( 'cache_time', $conf->getValue( 'config.cachetime' ) * 60 ) );
+				$cache->setCacheValidation(true);
+				$related = $cache->get(array('modRelatedItemsHelper', 'getRelatedItemsById'), array($id, $aid, $showDate));
+			} else {
+				$related = modRelatedItemsHelper::getRelatedItemsById($id, $aid, $showDate);
+			}
+		} else {
+			$related = array();
+		}
 
+		return $related;
+	}
 
+	function getRelatedItemsById($id, $aid, $showDate) {
+		$db =& JFactory::getDBO();
+		$user =& JFactory::getUser();
 		$date =& JFactory::getDate();
+
+		$related = array();
+
+		$nullDate = $db->getNullDate();
 		$now  = $date->toMySQL();
 
-		$related			= array();
+		// select the meta keywords from the item
+		$query = 'SELECT metakey' .
+				' FROM #__content' .
+				' WHERE id = '.(int) $id;
+		$db->setQuery($query);
 
-		if ($option == 'com_content' && $view == 'article' && $id)
+		if ($metakey = trim($db->loadResult()))
 		{
+			// explode the meta keys on a comma
+			$keys = explode(',', $metakey);
+			$likes = array ();
 
-			// select the meta keywords from the item
-			$query = 'SELECT metakey' .
-					' FROM #__content' .
-					' WHERE id = '.(int) $id;
-			$db->setQuery($query);
-
-			if ($metakey = trim($db->loadResult()))
+			// assemble any non-blank word(s)
+			foreach ($keys as $key)
 			{
-				// explode the meta keys on a comma
-				$keys = explode(',', $metakey);
-				$likes = array ();
-
-				// assemble any non-blank word(s)
-				foreach ($keys as $key)
-				{
-					$key = trim($key);
-					if ($key) {
-						$likes[] = ',' . $db->getEscaped($key) . ','; // surround with commas so first and last items have surrounding commas
-					}
+				$key = trim($key);
+				if ($key) {
+					$likes[] = ',' . $db->getEscaped($key) . ','; // surround with commas so first and last items have surrounding commas
 				}
+			}
 
-				if (count($likes))
-				{
-					// select other items based on the metakey field 'like' the keys found
-					$query = 'SELECT a.id, a.title, DATE_FORMAT(a.created, "%Y-%m-%d") AS created, a.sectionid, a.catid, cc.access AS cat_access, s.access AS sec_access, cc.published AS cat_state, s.published AS sec_state,' .
-							' CASE WHEN CHAR_LENGTH(a.alias) THEN CONCAT_WS(":", a.id, a.alias) ELSE a.id END as slug,'.
-							' CASE WHEN CHAR_LENGTH(cc.alias) THEN CONCAT_WS(":", cc.id, cc.alias) ELSE cc.id END as catslug'.
-							' FROM #__content AS a' .
-							' LEFT JOIN #__content_frontpage AS f ON f.content_id = a.id' .
-							' LEFT JOIN #__categories AS cc ON cc.id = a.catid' .
-							' LEFT JOIN #__sections AS s ON s.id = a.sectionid' .
-							' WHERE a.id != '.(int) $id .
-							' AND a.state = 1' .
-							' AND a.access <= ' .(int) $user->get('aid', 0) .
-							' AND ( CONCAT(",", REPLACE(a.metakey,", ",","),",") LIKE "%'.implode('%" OR CONCAT(",", REPLACE(a.metakey,", ",","),",") LIKE "%', $likes).'%" )' . //remove single space after commas in keywords
-							' AND ( a.publish_up = '.$db->Quote($nullDate).' OR a.publish_up <= '.$db->Quote($now).' )' .
-							' AND ( a.publish_down = '.$db->Quote($nullDate).' OR a.publish_down >= '.$db->Quote($now).' )';
-					$db->setQuery($query);
-					$temp = $db->loadObjectList();
+			if (count($likes))
+			{
+				// select other items based on the metakey field 'like' the keys found
+				$query = 'SELECT a.id, a.title, DATE_FORMAT(a.created, "%Y-%m-%d") AS created, a.sectionid, a.catid, cc.access AS cat_access, s.access AS sec_access, cc.published AS cat_state, s.published AS sec_state,' .
+						' CASE WHEN CHAR_LENGTH(a.alias) THEN CONCAT_WS(":", a.id, a.alias) ELSE a.id END as slug,'.
+						' CASE WHEN CHAR_LENGTH(cc.alias) THEN CONCAT_WS(":", cc.id, cc.alias) ELSE cc.id END as catslug'.
+						' FROM #__content AS a' .
+						' LEFT JOIN #__content_frontpage AS f ON f.content_id = a.id' .
+						' LEFT JOIN #__categories AS cc ON cc.id = a.catid' .
+						' LEFT JOIN #__sections AS s ON s.id = a.sectionid' .
+						' WHERE a.id != '.(int) $id .
+						' AND a.state = 1' .
+						' AND a.access <= ' .(int) $user->get('aid', 0) .
+						' AND ( CONCAT(",", REPLACE(a.metakey,", ",","),",") LIKE "%'.implode('%" OR CONCAT(",", REPLACE(a.metakey,", ",","),",") LIKE "%', $likes).'%" )' . //remove single space after commas in keywords
+						' AND ( a.publish_up = '.$db->Quote($nullDate).' OR a.publish_up <= '.$db->Quote($now).' )' .
+						' AND ( a.publish_down = '.$db->Quote($nullDate).' OR a.publish_down >= '.$db->Quote($now).' )';
+				$db->setQuery($query);
+				$temp = $db->loadObjectList();
 
-					if (count($temp))
+				if (count($temp))
+				{
+					foreach ($temp as $row)
 					{
-						foreach ($temp as $row)
+						if (($row->cat_state == 1 || $row->cat_state == '') && ($row->sec_state == 1 || $row->sec_state == '') && ($row->cat_access <= $user->get('aid', 0) || $row->cat_access == '') && ($row->sec_access <= $user->get('aid', 0) || $row->sec_access == ''))
 						{
-							if (($row->cat_state == 1 || $row->cat_state == '') && ($row->sec_state == 1 || $row->sec_state == '') && ($row->cat_access <= $user->get('aid', 0) || $row->cat_access == '') && ($row->sec_access <= $user->get('aid', 0) || $row->sec_access == ''))
-							{
-								$row->route = JRoute::_(ContentHelperRoute::getArticleRoute($row->slug, $row->catslug, $row->sectionid));
-								$related[] = $row;
-							}
+							$row->route = JRoute::_(ContentHelperRoute::getArticleRoute($row->slug, $row->catslug, $row->sectionid));
+							$related[] = $row;
 						}
 					}
-					unset ($temp);
 				}
+				unset ($temp);
 			}
 		}
 
 		return $related;
-	}
+	}	
 }
diff -aruN --binary 15/modules/mod_related_items/mod_related_items.php 16/modules/mod_related_items/mod_related_items.php
--- 15/modules/mod_related_items/mod_related_items.php	2009-05-29 13:54:04.000000000 +0200
+++ 16/modules/mod_related_items/mod_related_items.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: mod_related_items.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: mod_related_items.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/modules/mod_related_items/mod_related_items.xml 16/modules/mod_related_items/mod_related_items.xml
--- 15/modules/mod_related_items/mod_related_items.xml	2009-05-29 13:54:04.000000000 +0200
+++ 16/modules/mod_related_items/mod_related_items.xml	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Related Items</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
@@ -21,7 +21,7 @@
 		<param name="moduleclass_sfx" type="text" default="" label="Module Class Suffix" description="PARAMMODULECLASSSUFFIX" />
 	</params>
 	<params group="advanced">
-		<param name="cache" type="list" default="0" label="Caching" description="Select whether to cache the content of this module">
+		<param name="cache_items" type="list" default="0" label="Caching" description="Select whether to cache the content of this module">
 			<option value="1">Use global</option>
 			<option value="0">No caching</option>
 		</param>
diff -aruN --binary 15/modules/mod_search/helper.php 16/modules/mod_search/helper.php
--- 15/modules/mod_search/helper.php	2009-05-29 13:54:12.000000000 +0200
+++ 16/modules/mod_search/helper.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: helper.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: helper.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/modules/mod_search/mod_search.php 16/modules/mod_search/mod_search.php
--- 15/modules/mod_search/mod_search.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/modules/mod_search/mod_search.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: mod_search.php 13338 2009-10-27 02:15:55Z ian $
+* @version		$Id: mod_search.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/modules/mod_search/mod_search.xml 16/modules/mod_search/mod_search.xml
--- 15/modules/mod_search/mod_search.xml	2009-11-04 18:51:20.000000000 +0100
+++ 16/modules/mod_search/mod_search.xml	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Search</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/modules/mod_search/tmpl/default.php 16/modules/mod_search/tmpl/default.php
--- 15/modules/mod_search/tmpl/default.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/modules/mod_search/tmpl/default.php	2010-04-23 13:40:18.000000000 +0200
@@ -39,5 +39,5 @@
 	</div>
 	<input type="hidden" name="task"   value="search" />
 	<input type="hidden" name="option" value="com_search" />
-	<input type="hidden" name="Itemid" value=<?php echo $mitemid; ?> />
+	<input type="hidden" name="Itemid" value="<?php echo $mitemid; ?>" />
 </form>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 15/modules/mod_sections/helper.php 16/modules/mod_sections/helper.php
--- 15/modules/mod_sections/helper.php	2009-05-29 13:54:06.000000000 +0200
+++ 16/modules/mod_sections/helper.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: helper.php 11074 2008-10-13 04:54:12Z ian $
+* @version		$Id: helper.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/modules/mod_sections/mod_sections.php 16/modules/mod_sections/mod_sections.php
--- 15/modules/mod_sections/mod_sections.php	2009-05-29 13:54:06.000000000 +0200
+++ 16/modules/mod_sections/mod_sections.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: mod_sections.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: mod_sections.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/modules/mod_sections/mod_sections.xml 16/modules/mod_sections/mod_sections.xml
--- 15/modules/mod_sections/mod_sections.xml	2009-05-29 13:54:06.000000000 +0200
+++ 16/modules/mod_sections/mod_sections.xml	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Sections</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/modules/mod_stats/helper.php 16/modules/mod_stats/helper.php
--- 15/modules/mod_stats/helper.php	2009-05-29 13:54:10.000000000 +0200
+++ 16/modules/mod_stats/helper.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: helper.php 11074 2008-10-13 04:54:12Z ian $
+* @version		$Id: helper.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/modules/mod_stats/mod_stats.php 16/modules/mod_stats/mod_stats.php
--- 15/modules/mod_stats/mod_stats.php	2009-05-29 13:54:10.000000000 +0200
+++ 16/modules/mod_stats/mod_stats.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: mod_stats.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: mod_stats.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/modules/mod_stats/mod_stats.xml 16/modules/mod_stats/mod_stats.xml
--- 15/modules/mod_stats/mod_stats.xml	2009-05-29 13:54:10.000000000 +0200
+++ 16/modules/mod_stats/mod_stats.xml	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Statistics</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/modules/mod_syndicate/helper.php 16/modules/mod_syndicate/helper.php
--- 15/modules/mod_syndicate/helper.php	2009-05-29 13:54:06.000000000 +0200
+++ 16/modules/mod_syndicate/helper.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: helper.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: helper.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/modules/mod_syndicate/mod_syndicate.php 16/modules/mod_syndicate/mod_syndicate.php
--- 15/modules/mod_syndicate/mod_syndicate.php	2009-05-29 13:54:06.000000000 +0200
+++ 16/modules/mod_syndicate/mod_syndicate.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: mod_syndicate.php 10812 2008-08-26 19:36:10Z charlvn $
+* @version		$Id: mod_syndicate.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/modules/mod_syndicate/mod_syndicate.xml 16/modules/mod_syndicate/mod_syndicate.xml
--- 15/modules/mod_syndicate/mod_syndicate.xml	2009-05-29 13:54:06.000000000 +0200
+++ 16/modules/mod_syndicate/mod_syndicate.xml	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Syndicate</name>
 	<author>Joomla! Project</author>
 	<creationDate>May 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/modules/mod_whosonline/helper.php 16/modules/mod_whosonline/helper.php
--- 15/modules/mod_whosonline/helper.php	2009-05-29 13:54:06.000000000 +0200
+++ 16/modules/mod_whosonline/helper.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: helper.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: helper.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/modules/mod_whosonline/mod_whosonline.php 16/modules/mod_whosonline/mod_whosonline.php
--- 15/modules/mod_whosonline/mod_whosonline.php	2009-05-29 13:54:06.000000000 +0200
+++ 16/modules/mod_whosonline/mod_whosonline.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: mod_whosonline.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: mod_whosonline.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/modules/mod_whosonline/mod_whosonline.xml 16/modules/mod_whosonline/mod_whosonline.xml
--- 15/modules/mod_whosonline/mod_whosonline.xml	2009-05-29 13:54:06.000000000 +0200
+++ 16/modules/mod_whosonline/mod_whosonline.xml	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Who\'s Online</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/modules/mod_wrapper/helper.php 16/modules/mod_wrapper/helper.php
--- 15/modules/mod_wrapper/helper.php	2009-05-29 13:54:04.000000000 +0200
+++ 16/modules/mod_wrapper/helper.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: helper.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: helper.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/modules/mod_wrapper/mod_wrapper.php 16/modules/mod_wrapper/mod_wrapper.php
--- 15/modules/mod_wrapper/mod_wrapper.php	2009-05-29 13:54:04.000000000 +0200
+++ 16/modules/mod_wrapper/mod_wrapper.php	2010-04-23 13:40:18.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: mod_wrapper.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: mod_wrapper.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/modules/mod_wrapper/mod_wrapper.xml 16/modules/mod_wrapper/mod_wrapper.xml
--- 15/modules/mod_wrapper/mod_wrapper.xml	2009-05-29 13:54:04.000000000 +0200
+++ 16/modules/mod_wrapper/mod_wrapper.xml	2010-04-23 13:40:18.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Wrapper</name>
 	<author>Joomla! Project</author>
 	<creationDate>October 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/plugins/authentication/example.php 16/plugins/authentication/example.php
--- 15/plugins/authentication/example.php	2009-05-29 13:51:56.000000000 +0200
+++ 16/plugins/authentication/example.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: example.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: example.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	JFramework
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/authentication/example.xml 16/plugins/authentication/example.xml
--- 15/plugins/authentication/example.xml	2009-05-29 13:51:56.000000000 +0200
+++ 16/plugins/authentication/example.xml	2010-04-23 13:40:20.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Authentication - Example</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/plugins/authentication/gmail.php 16/plugins/authentication/gmail.php
--- 15/plugins/authentication/gmail.php	2009-05-29 13:51:56.000000000 +0200
+++ 16/plugins/authentication/gmail.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: gmail.php 11236 2008-11-02 02:44:35Z ian $
+ * @version		$Id: gmail.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	JFramework
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/authentication/gmail.xml 16/plugins/authentication/gmail.xml
--- 15/plugins/authentication/gmail.xml	2009-05-29 13:51:56.000000000 +0200
+++ 16/plugins/authentication/gmail.xml	2010-04-23 13:40:20.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Authentication - GMail</name>
 	<author>Joomla! Project</author>
 	<creationDate>February 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/plugins/authentication/joomla.php 16/plugins/authentication/joomla.php
--- 15/plugins/authentication/joomla.php	2009-05-29 13:51:56.000000000 +0200
+++ 16/plugins/authentication/joomla.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: joomla.php 10709 2008-08-21 09:58:52Z eddieajau $
+* @version		$Id: joomla.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	JFramework
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/authentication/joomla.xml 16/plugins/authentication/joomla.xml
--- 15/plugins/authentication/joomla.xml	2009-05-29 13:51:56.000000000 +0200
+++ 16/plugins/authentication/joomla.xml	2010-04-23 13:40:20.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Authentication - Joomla</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/plugins/authentication/ldap.php 16/plugins/authentication/ldap.php
--- 15/plugins/authentication/ldap.php	2009-05-29 13:51:56.000000000 +0200
+++ 16/plugins/authentication/ldap.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: ldap.php 10709 2008-08-21 09:58:52Z eddieajau $
+* @version		$Id: ldap.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	JFramework
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/authentication/ldap.xml 16/plugins/authentication/ldap.xml
--- 15/plugins/authentication/ldap.xml	2009-05-29 13:51:56.000000000 +0200
+++ 16/plugins/authentication/ldap.xml	2010-04-23 13:40:20.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Authentication - LDAP</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/plugins/authentication/openid.php 16/plugins/authentication/openid.php
--- 15/plugins/authentication/openid.php	2009-05-29 13:51:56.000000000 +0200
+++ 16/plugins/authentication/openid.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,10 +1,10 @@
 <?php
 
 /**
- * @version		$Id: openid.php 11403 2009-01-06 06:19:31Z ian $
+ * @version		$Id: openid.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	JFramework
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/authentication/openid.xml 16/plugins/authentication/openid.xml
--- 15/plugins/authentication/openid.xml	2009-05-29 13:51:56.000000000 +0200
+++ 16/plugins/authentication/openid.xml	2010-04-23 13:40:20.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Authentication - OpenID</name>
 	<author>Joomla! Project</author>
 	<creationDate>February 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/plugins/content/emailcloak.php 16/plugins/content/emailcloak.php
--- 15/plugins/content/emailcloak.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/plugins/content/emailcloak.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: emailcloak.php 13360 2009-10-28 04:30:10Z ian $
+* @version		$Id: emailcloak.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/content/emailcloak.xml 16/plugins/content/emailcloak.xml
--- 15/plugins/content/emailcloak.xml	2009-05-29 13:52:46.000000000 +0200
+++ 16/plugins/content/emailcloak.xml	2010-04-23 13:40:20.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Content - Email Cloaking</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/plugins/content/example.php 16/plugins/content/example.php
--- 15/plugins/content/example.php	2009-05-29 13:52:46.000000000 +0200
+++ 16/plugins/content/example.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: example.php 10714 2008-08-21 10:10:14Z eddieajau $
+ * @version		$Id: example.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	Content
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/content/example.xml 16/plugins/content/example.xml
--- 15/plugins/content/example.xml	2009-05-29 13:52:46.000000000 +0200
+++ 16/plugins/content/example.xml	2010-04-23 13:40:20.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Content - Example</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2007</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/plugins/content/geshi.php 16/plugins/content/geshi.php
--- 15/plugins/content/geshi.php	2009-05-29 13:52:46.000000000 +0200
+++ 16/plugins/content/geshi.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: geshi.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: geshi.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/content/geshi.xml 16/plugins/content/geshi.xml
--- 15/plugins/content/geshi.xml	2009-05-29 13:52:46.000000000 +0200
+++ 16/plugins/content/geshi.xml	2010-04-23 13:40:20.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Content - Code Highlighter (GeSHi)</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorUrl>qbnz.com/highlighter</authorUrl>
 	<version>1.5</version>
diff -aruN --binary 15/plugins/content/loadmodule.php 16/plugins/content/loadmodule.php
--- 15/plugins/content/loadmodule.php	2009-05-29 13:52:46.000000000 +0200
+++ 16/plugins/content/loadmodule.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: loadmodule.php 11646 2009-03-01 19:34:56Z ian $
+* @version		$Id: loadmodule.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/content/loadmodule.xml 16/plugins/content/loadmodule.xml
--- 15/plugins/content/loadmodule.xml	2009-05-29 13:52:46.000000000 +0200
+++ 16/plugins/content/loadmodule.xml	2010-04-23 13:40:20.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Content - Load Modules</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/plugins/content/pagebreak.php 16/plugins/content/pagebreak.php
--- 15/plugins/content/pagebreak.php	2009-06-30 21:01:32.000000000 +0200
+++ 16/plugins/content/pagebreak.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: pagebreak.php 12228 2009-06-21 02:01:44Z ian $
+* @version		$Id: pagebreak.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/content/pagebreak.xml 16/plugins/content/pagebreak.xml
--- 15/plugins/content/pagebreak.xml	2009-05-29 13:52:46.000000000 +0200
+++ 16/plugins/content/pagebreak.xml	2010-04-23 13:40:20.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Content - Pagebreak</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/plugins/content/pagenavigation.php 16/plugins/content/pagenavigation.php
--- 15/plugins/content/pagenavigation.php	2009-05-29 13:52:46.000000000 +0200
+++ 16/plugins/content/pagenavigation.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: pagenavigation.php 11783 2009-04-24 17:28:10Z kdevine $
+* @version		$Id: pagenavigation.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/content/pagenavigation.xml 16/plugins/content/pagenavigation.xml
--- 15/plugins/content/pagenavigation.xml	2009-05-29 13:52:46.000000000 +0200
+++ 16/plugins/content/pagenavigation.xml	2010-04-23 13:40:20.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Content - Page Navigation</name>
 	<author>Joomla! Project</author>
 	<creationDate>January 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/plugins/content/vote.php 16/plugins/content/vote.php
--- 15/plugins/content/vote.php	2009-05-29 13:52:46.000000000 +0200
+++ 16/plugins/content/vote.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: vote.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: vote.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/content/vote.xml 16/plugins/content/vote.xml
--- 15/plugins/content/vote.xml	2009-05-29 13:52:46.000000000 +0200
+++ 16/plugins/content/vote.xml	2010-04-23 13:40:20.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Content - Vote</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/plugins/editors/none.php 16/plugins/editors/none.php
--- 15/plugins/editors/none.php	2009-05-29 13:52:46.000000000 +0200
+++ 16/plugins/editors/none.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
- * @version		$Id: none.php 10709 2008-08-21 09:58:52Z eddieajau $
+ * @version		$Id: none.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/editors/none.xml 16/plugins/editors/none.xml
--- 15/plugins/editors/none.xml	2009-05-29 13:52:46.000000000 +0200
+++ 16/plugins/editors/none.xml	2010-04-23 13:40:20.000000000 +0200
@@ -6,8 +6,8 @@
 	<author></author>
 	<authorEmail>N/A</authorEmail>
 	<authorUrl></authorUrl>
-	<copyright>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</copyright>
-	<license>LGPL</license>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
+	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<description>This loads a basic text entry field</description>
 	<files>
 		<filename plugin="none">none.php</filename>
diff -aruN --binary 15/plugins/editors/tinymce/templates/template_list.js 16/plugins/editors/tinymce/templates/template_list.js
--- 15/plugins/editors/tinymce/templates/template_list.js	2009-11-04 18:56:08.000000000 +0100
+++ 16/plugins/editors/tinymce/templates/template_list.js	2010-04-23 13:40:20.000000000 +0200
@@ -2,7 +2,7 @@
  * Tinymce template_list.js sample file
  * @version tinymce 3.2.6
  * @package		Joomla
- * @copyright	Copyright (C) 2005 - 2009 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/editors/tinymce.php 16/plugins/editors/tinymce.php
--- 15/plugins/editors/tinymce.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/plugins/editors/tinymce.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
- * @version		$Id: tinymce.php 13338 2009-10-27 02:15:55Z ian $
+ * @version		$Id: tinymce.php 15099 2010-02-27 14:23:40Z ian $
  * @package		Joomla
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
@@ -357,7 +357,7 @@
 		$advlink 	= $this->params->def('advlink', 1);
 		if ($advlink) {
 			$plugins[]	= 'advlink';
-			$elements[]	= 'a[class|name|href|target|title|onclick|rel|style]';
+			$elements[]	= 'a[id|class|name|href|target|title|onclick|rel|style]';
 		}
 
 		// autosave
diff -aruN --binary 15/plugins/editors/xstandard/xstandard.js 16/plugins/editors/xstandard/xstandard.js
--- 15/plugins/editors/xstandard/xstandard.js	2009-05-29 13:52:44.000000000 +0200
+++ 16/plugins/editors/xstandard/xstandard.js	2010-04-23 13:40:20.000000000 +0200
@@ -1,7 +1,7 @@
 /**
- * @version		$Id: xstandard.js 10714 2008-08-21 10:10:14Z eddieajau $
+ * @version		$Id: xstandard.js 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/editors/xstandard.php 16/plugins/editors/xstandard.php
--- 15/plugins/editors/xstandard.php	2009-05-29 13:52:46.000000000 +0200
+++ 16/plugins/editors/xstandard.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
- * @version		$Id: xstandard.php 10709 2008-08-21 09:58:52Z eddieajau $
+ * @version		$Id: xstandard.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/editors/xstandard.xml 16/plugins/editors/xstandard.xml
--- 15/plugins/editors/xstandard.xml	2009-05-29 13:52:46.000000000 +0200
+++ 16/plugins/editors/xstandard.xml	2010-04-23 13:40:20.000000000 +0200
@@ -6,7 +6,7 @@
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<description>DESCXSTANDARD</description>
 	<files>
diff -aruN --binary 15/plugins/editors-xtd/image.php 16/plugins/editors-xtd/image.php
--- 15/plugins/editors-xtd/image.php	2009-07-23 03:25:36.000000000 +0200
+++ 16/plugins/editors-xtd/image.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
- * @version		$Id: image.php 12542 2009-07-22 17:40:48Z ian $
+ * @version		$Id: image.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/editors-xtd/image.xml 16/plugins/editors-xtd/image.xml
--- 15/plugins/editors-xtd/image.xml	2009-05-29 13:52:02.000000000 +0200
+++ 16/plugins/editors-xtd/image.xml	2010-04-23 13:40:20.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Button - Image</name>
 	<author>Joomla! Project</author>
 	<creationDate>August 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/plugins/editors-xtd/pagebreak.php 16/plugins/editors-xtd/pagebreak.php
--- 15/plugins/editors-xtd/pagebreak.php	2009-05-29 13:52:02.000000000 +0200
+++ 16/plugins/editors-xtd/pagebreak.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
- * @version		$Id: pagebreak.php 10709 2008-08-21 09:58:52Z eddieajau $
+ * @version		$Id: pagebreak.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/editors-xtd/pagebreak.xml 16/plugins/editors-xtd/pagebreak.xml
--- 15/plugins/editors-xtd/pagebreak.xml	2009-05-29 13:52:02.000000000 +0200
+++ 16/plugins/editors-xtd/pagebreak.xml	2010-04-23 13:40:20.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Button - Pagebreak</name>
 	<author>Joomla! Project</author>
 	<creationDate>August 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/plugins/editors-xtd/readmore.php 16/plugins/editors-xtd/readmore.php
--- 15/plugins/editors-xtd/readmore.php	2009-05-29 13:52:02.000000000 +0200
+++ 16/plugins/editors-xtd/readmore.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
- * @version		$Id: readmore.php 10709 2008-08-21 09:58:52Z eddieajau $
+ * @version		$Id: readmore.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/editors-xtd/readmore.xml 16/plugins/editors-xtd/readmore.xml
--- 15/plugins/editors-xtd/readmore.xml	2009-05-29 13:52:04.000000000 +0200
+++ 16/plugins/editors-xtd/readmore.xml	2010-04-23 13:40:20.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Button - Readmore</name>
 	<author>Joomla! Project</author>
 	<creationDate>March 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/plugins/search/categories.php 16/plugins/search/categories.php
--- 15/plugins/search/categories.php	2009-05-29 13:52:00.000000000 +0200
+++ 16/plugins/search/categories.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
- * @version		$Id: categories.php 10870 2008-08-30 07:26:29Z willebil $
+ * @version		$Id: categories.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/search/categories.xml 16/plugins/search/categories.xml
--- 15/plugins/search/categories.xml	2009-05-29 13:52:00.000000000 +0200
+++ 16/plugins/search/categories.xml	2010-04-23 13:40:20.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Search - Categories</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/plugins/search/contacts.php 16/plugins/search/contacts.php
--- 15/plugins/search/contacts.php	2009-05-29 13:52:00.000000000 +0200
+++ 16/plugins/search/contacts.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
- * @version		$Id: contacts.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: contacts.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/search/contacts.xml 16/plugins/search/contacts.xml
--- 15/plugins/search/contacts.xml	2009-05-29 13:52:00.000000000 +0200
+++ 16/plugins/search/contacts.xml	2010-04-23 13:40:20.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Search - Contacts</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/plugins/search/content.php 16/plugins/search/content.php
--- 15/plugins/search/content.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/plugins/search/content.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
- * @version		$Id: content.php 12697 2009-09-12 02:10:36Z ian $
+ * @version		$Id: content.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/search/content.xml 16/plugins/search/content.xml
--- 15/plugins/search/content.xml	2009-05-29 13:52:00.000000000 +0200
+++ 16/plugins/search/content.xml	2010-04-23 13:40:20.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Search - Content</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/plugins/search/newsfeeds.php 16/plugins/search/newsfeeds.php
--- 15/plugins/search/newsfeeds.php	2009-05-29 13:52:00.000000000 +0200
+++ 16/plugins/search/newsfeeds.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
- * @version		$Id: newsfeeds.php 10579 2008-07-22 14:54:24Z ircmaxell $
+ * @version		$Id: newsfeeds.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/search/newsfeeds.xml 16/plugins/search/newsfeeds.xml
--- 15/plugins/search/newsfeeds.xml	2009-05-29 13:52:00.000000000 +0200
+++ 16/plugins/search/newsfeeds.xml	2010-04-23 13:40:20.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Search - Newsfeeds</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/plugins/search/sections.php 16/plugins/search/sections.php
--- 15/plugins/search/sections.php	2009-05-29 13:52:00.000000000 +0200
+++ 16/plugins/search/sections.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
- * @version		$Id: sections.php 10579 2008-07-22 14:54:24Z ircmaxell $
+ * @version		$Id: sections.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/search/sections.xml 16/plugins/search/sections.xml
--- 15/plugins/search/sections.xml	2009-05-29 13:52:00.000000000 +0200
+++ 16/plugins/search/sections.xml	2010-04-23 13:40:20.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Search - Sections</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/plugins/search/weblinks.php 16/plugins/search/weblinks.php
--- 15/plugins/search/weblinks.php	2009-05-29 13:52:00.000000000 +0200
+++ 16/plugins/search/weblinks.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
- * @version		$Id: weblinks.php 10579 2008-07-22 14:54:24Z ircmaxell $
+ * @version		$Id: weblinks.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/search/weblinks.xml 16/plugins/search/weblinks.xml
--- 15/plugins/search/weblinks.xml	2009-05-29 13:52:00.000000000 +0200
+++ 16/plugins/search/weblinks.xml	2010-04-23 13:40:20.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>Search - Weblinks</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/plugins/system/backlink.php 16/plugins/system/backlink.php
--- 15/plugins/system/backlink.php	2009-05-29 13:51:58.000000000 +0200
+++ 16/plugins/system/backlink.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 
 /**
-* @version		$Id: backlink.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: backlink.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/system/backlink.xml 16/plugins/system/backlink.xml
--- 15/plugins/system/backlink.xml	2009-05-29 13:52:00.000000000 +0200
+++ 16/plugins/system/backlink.xml	2010-04-23 13:40:20.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>System - Backlinks</name>
 	<author>Joomla! Project</author>
 	<creationDate>September 2007</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/plugins/system/cache.php 16/plugins/system/cache.php
--- 15/plugins/system/cache.php	2009-05-29 13:51:58.000000000 +0200
+++ 16/plugins/system/cache.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: cache.php 11616 2009-02-07 14:09:52Z kdevine $
+* @version		$Id: cache.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/system/cache.xml 16/plugins/system/cache.xml
--- 15/plugins/system/cache.xml	2009-05-29 13:51:58.000000000 +0200
+++ 16/plugins/system/cache.xml	2010-04-23 13:40:20.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>System - Cache</name>
 	<author>Joomla! Project</author>
 	<creationDate>February 2007</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/plugins/system/debug.php 16/plugins/system/debug.php
--- 15/plugins/system/debug.php	2009-05-29 13:51:58.000000000 +0200
+++ 16/plugins/system/debug.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: debug.php 10709 2008-08-21 09:58:52Z eddieajau $
+* @version		$Id: debug.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/system/debug.xml 16/plugins/system/debug.xml
--- 15/plugins/system/debug.xml	2009-05-29 13:51:58.000000000 +0200
+++ 16/plugins/system/debug.xml	2010-04-23 13:40:20.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>System - Debug</name>
 	<author>Joomla! Project</author>
 	<creationDate>December 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/plugins/system/legacy/adminmenus.php 16/plugins/system/legacy/adminmenus.php
--- 15/plugins/system/legacy/adminmenus.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/plugins/system/legacy/adminmenus.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: adminmenus.php 12694 2009-09-11 21:03:02Z ian $
+* @version		$Id: adminmenus.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Legacy
 * @subpackage	1.5
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/system/legacy/cache.php 16/plugins/system/legacy/cache.php
--- 15/plugins/system/legacy/cache.php	2009-05-29 13:51:58.000000000 +0200
+++ 16/plugins/system/legacy/cache.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: cache.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: cache.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Legacy
 * @subpackage	1.5
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/system/legacy/category.php 16/plugins/system/legacy/category.php
--- 15/plugins/system/legacy/category.php	2009-05-29 13:51:58.000000000 +0200
+++ 16/plugins/system/legacy/category.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: category.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: category.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Legacy
 * @subpackage	1.5
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/system/legacy/classes.php 16/plugins/system/legacy/classes.php
--- 15/plugins/system/legacy/classes.php	2009-05-29 13:51:58.000000000 +0200
+++ 16/plugins/system/legacy/classes.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: classes.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: classes.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Legacy
 * @subpackage	1.5
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/system/legacy/commonhtml.php 16/plugins/system/legacy/commonhtml.php
--- 15/plugins/system/legacy/commonhtml.php	2009-05-29 13:51:58.000000000 +0200
+++ 16/plugins/system/legacy/commonhtml.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: commonhtml.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: commonhtml.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Legacy
  * @subpackage	1.5
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/system/legacy/component.php 16/plugins/system/legacy/component.php
--- 15/plugins/system/legacy/component.php	2009-05-29 13:51:58.000000000 +0200
+++ 16/plugins/system/legacy/component.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: component.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: component.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Legacy
 * @subpackage	1.5
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/system/legacy/content.php 16/plugins/system/legacy/content.php
--- 15/plugins/system/legacy/content.php	2009-05-29 13:51:58.000000000 +0200
+++ 16/plugins/system/legacy/content.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: content.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: content.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Legacy
 * @subpackage	1.5
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/system/legacy/dbtable.php 16/plugins/system/legacy/dbtable.php
--- 15/plugins/system/legacy/dbtable.php	2009-05-29 13:51:58.000000000 +0200
+++ 16/plugins/system/legacy/dbtable.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: dbtable.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: dbtable.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Legacy
 * @subpackage	1.5
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/system/legacy/functions.php 16/plugins/system/legacy/functions.php
--- 15/plugins/system/legacy/functions.php	2009-05-29 13:51:58.000000000 +0200
+++ 16/plugins/system/legacy/functions.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: functions.php 11214 2008-10-26 01:29:04Z ian $
+ * @version		$Id: functions.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla.Legacy
  * @subpackage	1.5
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/system/legacy/html.php 16/plugins/system/legacy/html.php
--- 15/plugins/system/legacy/html.php	2009-06-30 21:01:34.000000000 +0200
+++ 16/plugins/system/legacy/html.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: html.php 12389 2009-07-01 00:34:45Z ian $
+* @version		$Id: html.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Legacy
 * @subpackage	1.5
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/system/legacy/installer.php 16/plugins/system/legacy/installer.php
--- 15/plugins/system/legacy/installer.php	2009-05-29 13:51:58.000000000 +0200
+++ 16/plugins/system/legacy/installer.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: installer.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: installer.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Legacy
 * @subpackage	1.5
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/system/legacy/mainframe.php 16/plugins/system/legacy/mainframe.php
--- 15/plugins/system/legacy/mainframe.php	2009-05-29 13:51:58.000000000 +0200
+++ 16/plugins/system/legacy/mainframe.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: mainframe.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: mainframe.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Legacy
 * @subpackage	1.5
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/system/legacy/mambothandler.php 16/plugins/system/legacy/mambothandler.php
--- 15/plugins/system/legacy/mambothandler.php	2009-05-29 13:51:58.000000000 +0200
+++ 16/plugins/system/legacy/mambothandler.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: mambothandler.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: mambothandler.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Legacy
 * @subpackage	1.5
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/system/legacy/mambot.php 16/plugins/system/legacy/mambot.php
--- 15/plugins/system/legacy/mambot.php	2009-05-29 13:51:58.000000000 +0200
+++ 16/plugins/system/legacy/mambot.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: mambot.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: mambot.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Legacy
 * @subpackage	1.5
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/system/legacy/menubar.php 16/plugins/system/legacy/menubar.php
--- 15/plugins/system/legacy/menubar.php	2009-05-29 13:51:58.000000000 +0200
+++ 16/plugins/system/legacy/menubar.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: menubar.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: menubar.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Legacy
 * @subpackage	1.5
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/system/legacy/menu.php 16/plugins/system/legacy/menu.php
--- 15/plugins/system/legacy/menu.php	2009-05-29 13:51:58.000000000 +0200
+++ 16/plugins/system/legacy/menu.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: menu.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: menu.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Legacy
 * @subpackage	1.5
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/system/legacy/module.php 16/plugins/system/legacy/module.php
--- 15/plugins/system/legacy/module.php	2009-05-29 13:51:58.000000000 +0200
+++ 16/plugins/system/legacy/module.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: module.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: module.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Legacy
 * @subpackage	1.5
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/system/legacy/mysqli.php 16/plugins/system/legacy/mysqli.php
--- 15/plugins/system/legacy/mysqli.php	2009-05-29 13:51:58.000000000 +0200
+++ 16/plugins/system/legacy/mysqli.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: mysqli.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: mysqli.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Legacy
 * @subpackage	1.5
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/system/legacy/mysql.php 16/plugins/system/legacy/mysql.php
--- 15/plugins/system/legacy/mysql.php	2009-05-29 13:51:58.000000000 +0200
+++ 16/plugins/system/legacy/mysql.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: mysql.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: mysql.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Legacy
 * @subpackage	1.5
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/system/legacy/pagination.php 16/plugins/system/legacy/pagination.php
--- 15/plugins/system/legacy/pagination.php	2009-05-29 13:51:58.000000000 +0200
+++ 16/plugins/system/legacy/pagination.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: pagination.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: pagination.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/system/legacy/parameters.php 16/plugins/system/legacy/parameters.php
--- 15/plugins/system/legacy/parameters.php	2009-05-29 13:51:58.000000000 +0200
+++ 16/plugins/system/legacy/parameters.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: parameters.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: parameters.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Legacy
 * @subpackage	1.5
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/system/legacy/patfactory.php 16/plugins/system/legacy/patfactory.php
--- 15/plugins/system/legacy/patfactory.php	2009-06-30 21:01:34.000000000 +0200
+++ 16/plugins/system/legacy/patfactory.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: patfactory.php 12389 2009-07-01 00:34:45Z ian $
+* @version		$Id: patfactory.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Legacy
 * @subpackage	1.5
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/system/legacy/profiler.php 16/plugins/system/legacy/profiler.php
--- 15/plugins/system/legacy/profiler.php	2009-05-29 13:51:58.000000000 +0200
+++ 16/plugins/system/legacy/profiler.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: profiler.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: profiler.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Legacy
 * @subpackage	1.5
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/system/legacy/section.php 16/plugins/system/legacy/section.php
--- 15/plugins/system/legacy/section.php	2009-05-29 13:51:58.000000000 +0200
+++ 16/plugins/system/legacy/section.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: section.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: section.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Legacy
 * @subpackage	1.5
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/system/legacy/session.php 16/plugins/system/legacy/session.php
--- 15/plugins/system/legacy/session.php	2009-05-29 13:51:58.000000000 +0200
+++ 16/plugins/system/legacy/session.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: session.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: session.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Legacy
 * @subpackage	1.5
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/system/legacy/toolbar.php 16/plugins/system/legacy/toolbar.php
--- 15/plugins/system/legacy/toolbar.php	2009-05-29 13:51:58.000000000 +0200
+++ 16/plugins/system/legacy/toolbar.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: toolbar.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: toolbar.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Legacy
 * @subpackage	1.5
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/system/legacy/user.php 16/plugins/system/legacy/user.php
--- 15/plugins/system/legacy/user.php	2009-05-29 13:51:58.000000000 +0200
+++ 16/plugins/system/legacy/user.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: user.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: user.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla.Legacy
 * @subpackage	1.5
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/system/legacy.php 16/plugins/system/legacy.php
--- 15/plugins/system/legacy.php	2009-05-29 13:51:58.000000000 +0200
+++ 16/plugins/system/legacy.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: legacy.php 11299 2008-11-22 01:40:44Z ian $
+* @version		$Id: legacy.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/system/legacy.xml 16/plugins/system/legacy.xml
--- 15/plugins/system/legacy.xml	2009-05-29 13:51:58.000000000 +0200
+++ 16/plugins/system/legacy.xml	2010-04-23 13:40:20.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>System - Legacy</name>
 	<author>Joomla! Project</author>
 	<creationDate>January 2007</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/plugins/system/log.php 16/plugins/system/log.php
--- 15/plugins/system/log.php	2009-05-29 13:51:58.000000000 +0200
+++ 16/plugins/system/log.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: log.php 10709 2008-08-21 09:58:52Z eddieajau $
+* @version		$Id: log.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/system/log.xml 16/plugins/system/log.xml
--- 15/plugins/system/log.xml	2009-05-29 13:51:58.000000000 +0200
+++ 16/plugins/system/log.xml	2010-04-23 13:40:20.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>System - Log</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2007</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/plugins/system/remember.php 16/plugins/system/remember.php
--- 15/plugins/system/remember.php	2009-05-29 13:51:58.000000000 +0200
+++ 16/plugins/system/remember.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: remember.php 10709 2008-08-21 09:58:52Z eddieajau $
+* @version		$Id: remember.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/system/remember.xml 16/plugins/system/remember.xml
--- 15/plugins/system/remember.xml	2009-05-29 13:51:58.000000000 +0200
+++ 16/plugins/system/remember.xml	2010-04-23 13:40:20.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>System - Remember Me</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2007</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/plugins/system/sef.php 16/plugins/system/sef.php
--- 15/plugins/system/sef.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/plugins/system/sef.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: sef.php 13376 2009-10-29 01:44:22Z ian $
+* @version		$Id: sef.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/system/sef.xml 16/plugins/system/sef.xml
--- 15/plugins/system/sef.xml	2009-05-29 13:51:58.000000000 +0200
+++ 16/plugins/system/sef.xml	2010-04-23 13:40:20.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>System - SEF</name>
 	<author>Joomla! Project</author>
 	<creationDate>December 2007</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/plugins/user/example.php 16/plugins/user/example.php
--- 15/plugins/user/example.php	2009-05-29 13:52:46.000000000 +0200
+++ 16/plugins/user/example.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
- * @version		$Id: example.php 11720 2009-03-27 21:27:42Z ian $
+ * @version		$Id: example.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
  * @subpackage	JFramework
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/user/example.xml 16/plugins/user/example.xml
--- 15/plugins/user/example.xml	2009-05-29 13:52:46.000000000 +0200
+++ 16/plugins/user/example.xml	2010-04-23 13:40:20.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>User - Example</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/plugins/user/joomla.php 16/plugins/user/joomla.php
--- 15/plugins/user/joomla.php	2009-05-29 13:52:46.000000000 +0200
+++ 16/plugins/user/joomla.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: joomla.php 11190 2008-10-20 00:49:55Z ian $
+* @version		$Id: joomla.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	JFramework
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/user/joomla.xml 16/plugins/user/joomla.xml
--- 15/plugins/user/joomla.xml	2009-05-29 13:52:46.000000000 +0200
+++ 16/plugins/user/joomla.xml	2010-04-23 13:40:20.000000000 +0200
@@ -3,7 +3,7 @@
 	<name>User - Joomla!</name>
 	<author>Joomla! Project</author>
 	<creationDate>December 2006</creationDate>
-	<copyright>(C) 2005 - 2008 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff -aruN --binary 15/plugins/xmlrpc/blogger.php 16/plugins/xmlrpc/blogger.php
--- 15/plugins/xmlrpc/blogger.php	2009-05-29 13:52:00.000000000 +0200
+++ 16/plugins/xmlrpc/blogger.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
- * @version		$Id: blogger.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: blogger.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/xmlrpc/blogger.xml 16/plugins/xmlrpc/blogger.xml
--- 15/plugins/xmlrpc/blogger.xml	2009-05-29 13:52:00.000000000 +0200
+++ 16/plugins/xmlrpc/blogger.xml	2010-04-23 13:40:20.000000000 +0200
@@ -4,7 +4,7 @@
 	<author>Joomla! Project</author>
 	<creationDate>February 2006</creationDate>
 	<copyright>
-		Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+		Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 	</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
diff -aruN --binary 15/plugins/xmlrpc/joomla.php 16/plugins/xmlrpc/joomla.php
--- 15/plugins/xmlrpc/joomla.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/plugins/xmlrpc/joomla.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: joomla.php 12694 2009-09-11 21:03:02Z ian $
+* @version		$Id: joomla.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/plugins/xmlrpc/joomla.xml 16/plugins/xmlrpc/joomla.xml
--- 15/plugins/xmlrpc/joomla.xml	2009-05-29 13:52:00.000000000 +0200
+++ 16/plugins/xmlrpc/joomla.xml	2010-04-23 13:40:20.000000000 +0200
@@ -4,7 +4,7 @@
 	<author>Joomla! Project</author>
 	<creationDate>November 2005</creationDate>
 	<copyright>
-		Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+		Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 	</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
diff -aruN --binary 15/templates/beez/component.php 16/templates/beez/component.php
--- 15/templates/beez/component.php	2009-05-29 13:53:22.000000000 +0200
+++ 16/templates/beez/component.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/templates/beez/css/general.css 16/templates/beez/css/general.css
--- 15/templates/beez/css/general.css	2009-05-29 13:53:22.000000000 +0200
+++ 16/templates/beez/css/general.css	2010-04-23 13:40:20.000000000 +0200
@@ -131,6 +131,43 @@
 	text-align: center;
 }
 
+.img_caption.none {
+	margin-left:auto;
+	margin-right:auto;
+}
+
+.img_caption  {
+	text-align: center!important;
+}
+
+.caption.left {
+	float: left;
+	margin-right: 1em;
+}
+
+.caption.right {
+	float: right;
+	margin-left: 1em;
+}
+
+.caption.left p {
+	clear: left;
+	text-align: center;
+}
+
+.caption.right p {
+	clear: right;
+	text-align: center;
+}
+
+.caption.none {
+	margin-left:auto;
+	margin-right:auto;
+}
+
+.caption  {
+	text-align: center!important;
+}
 /* Calendar */
 a img.calendar {
 	width: 16px;
diff -aruN --binary 15/templates/beez/css/ie7only.css 16/templates/beez/css/ie7only.css
--- 15/templates/beez/css/ie7only.css	2009-05-29 13:53:22.000000000 +0200
+++ 16/templates/beez/css/ie7only.css	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 /**
- * @version $Id: ie7only.css 10387 2008-06-03 10:59:16Z pasamio $
+ * @version $Id: ie7only.css 14401 2010-01-26 14:10:00Z louis $
  * @author Design & Accessible Team ( Angie Radtke / Robert Deutz )
  * @package Joomla
  * @subpackage Accessible-Template-Beez
- * @copyright Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/templates/beez/css/ieonly.css 16/templates/beez/css/ieonly.css
--- 15/templates/beez/css/ieonly.css	2009-05-29 13:53:22.000000000 +0200
+++ 16/templates/beez/css/ieonly.css	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 /**
- * @version $Id: ieonly.css 10387 2008-06-03 10:59:16Z pasamio $
+ * @version $Id: ieonly.css 14401 2010-01-26 14:10:00Z louis $
  * @author Design & Accessible Team ( Angie Radtke / Robert Deutz )
  * @package Joomla
  * @subpackage Accessible-Template-Beez
- * @copyright Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/templates/beez/css/layout.css 16/templates/beez/css/layout.css
--- 15/templates/beez/css/layout.css	2009-11-04 18:51:20.000000000 +0100
+++ 16/templates/beez/css/layout.css	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 /**
- * @version $Id: layout.css 13293 2009-10-24 00:43:16Z ian $
+ * @version $Id: layout.css 14401 2010-01-26 14:10:00Z louis $
  * @author Design & Accessible Team ( Angie Radtke  )
  * @package Joomla
  * @subpackage Accessible-Template-Beez
- * @copyright Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/templates/beez/css/position.css 16/templates/beez/css/position.css
--- 15/templates/beez/css/position.css	2009-05-29 13:53:22.000000000 +0200
+++ 16/templates/beez/css/position.css	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 /**
- * @version $Id: position.css 10387 2008-06-03 10:59:16Z pasamio $
+ * @version $Id: position.css 14401 2010-01-26 14:10:00Z louis $
  * @author Design & Accessible Team ( Angie Radtke / Robert Deutz )
  * @package Joomla
  * @subpackage Accessible-Template-Beez
- * @copyright Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/templates/beez/css/print.css 16/templates/beez/css/print.css
--- 15/templates/beez/css/print.css	2009-05-29 13:53:22.000000000 +0200
+++ 16/templates/beez/css/print.css	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 /**
- * @version $Id: print.css 10387 2008-06-03 10:59:16Z pasamio $
+ * @version $Id: print.css 14401 2010-01-26 14:10:00Z louis $
  * @author Design & Accessible Team ( Angie Radtke / Robert Deutz )
  * @package Joomla
  * @subpackage Accessible-Template-Beez
- * @copyright Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/templates/beez/css/template.css 16/templates/beez/css/template.css
--- 15/templates/beez/css/template.css	2009-05-29 13:53:22.000000000 +0200
+++ 16/templates/beez/css/template.css	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 /**
- * @version $Id: template.css 10498 2008-07-04 00:05:36Z ian $
+ * @version $Id: template.css 14401 2010-01-26 14:10:00Z louis $
  * @author Design & Accessible Team ( Angie Radtke / Robert Deutz )
  * @package Joomla
  * @subpackage Accessible-Template-Beez
- * @copyright Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/templates/beez/css/template_rtl.css 16/templates/beez/css/template_rtl.css
--- 15/templates/beez/css/template_rtl.css	2009-05-29 13:53:22.000000000 +0200
+++ 16/templates/beez/css/template_rtl.css	2010-04-23 13:40:20.000000000 +0200
@@ -1,8 +1,8 @@
 /**
- * @version $Id: template_rtl.css 10571 2008-07-21 01:27:35Z pasamio $
+ * @version $Id: template_rtl.css 14401 2010-01-26 14:10:00Z louis $
  * @package Joomla
  * @subpackage Accessible-Template-Beez
- * @copyright Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/templates/beez/html/com_user/reset/confirm.php 16/templates/beez/html/com_user/reset/confirm.php
--- 15/templates/beez/html/com_user/reset/confirm.php	2009-05-29 13:53:20.000000000 +0200
+++ 16/templates/beez/html/com_user/reset/confirm.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,4 +1,4 @@
-<?php // @version $Id: confirm.php 11786 2009-04-24 17:48:08Z kdevine $
+<?php // @version $Id: confirm.php 16385 2010-04-23 10:44:15Z ian $
 defined('_JEXEC') or die('Restricted access');
 ?>
 
@@ -15,6 +15,14 @@
 		</tr>
 		<tr>
 			<td height="40">
+				<label for="username" class="hasTip" title="<?php echo JText::_('RESET_PASSWORD_USERNAME_TIP_TITLE'); ?>::<?php echo JText::_('RESET_PASSWORD_USERNAME_TIP_TEXT'); ?>"><?php echo JText::_('User Name'); ?>:</label>
+			</td>
+			<td>
+				<input id="username" name="username" type="text" class="required" size="36" />
+			</td>
+		</tr>
+		<tr>
+			<td height="40">
 				<label for="token" class="hasTip" title="<?php echo JText::_('RESET_PASSWORD_TOKEN_TIP_TITLE'); ?>::<?php echo JText::_('RESET_PASSWORD_TOKEN_TIP_TEXT'); ?>"><?php echo JText::_('Token'); ?>:</label>
 			</td>
 			<td>
diff -aruN --binary 15/templates/beez/html/mod_search/default.php 16/templates/beez/html/mod_search/default.php
--- 15/templates/beez/html/mod_search/default.php	2009-05-29 13:53:18.000000000 +0200
+++ 16/templates/beez/html/mod_search/default.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,5 +1,5 @@
 <?php
-// @version $Id: default.php 11215 2008-10-26 02:25:51Z ian $
+// @version $Id: default.php 15183 2010-03-04 23:15:59Z ian $
 defined('_JEXEC') or die('Restricted access');
 ?>
 
@@ -43,4 +43,5 @@
     ?>
 	<input type="hidden" name="option" value="com_search" />
 	<input type="hidden" name="task"   value="search" />
+	<input type="hidden" name="Itemid" value="<?php echo $mitemid; ?>" />
 </form>
diff -aruN --binary 15/templates/beez/html/pagination.php 16/templates/beez/html/pagination.php
--- 15/templates/beez/html/pagination.php	2009-05-29 13:53:22.000000000 +0200
+++ 16/templates/beez/html/pagination.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
- * @version		$Id: pagination.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: pagination.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/templates/beez/index.php 16/templates/beez/index.php
--- 15/templates/beez/index.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/templates/beez/index.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/templates/ja_purity/component.php 16/templates/ja_purity/component.php
--- 15/templates/ja_purity/component.php	2009-05-29 13:53:30.000000000 +0200
+++ 16/templates/ja_purity/component.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright	Copyright (C) 2005 - 2007 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/templates/ja_purity/html/modules.php 16/templates/ja_purity/html/modules.php
--- 15/templates/ja_purity/html/modules.php	2009-05-29 13:53:26.000000000 +0200
+++ 16/templates/ja_purity/html/modules.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
- * @version		$Id: modules.php 10822 2008-08-27 17:16:00Z tcp $
+ * @version		$Id: modules.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
- * @copyright	Copyright (C) 2005 - 2007 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/templates/ja_purity/html/pagination.php 16/templates/ja_purity/html/pagination.php
--- 15/templates/ja_purity/html/pagination.php	2009-05-29 13:53:26.000000000 +0200
+++ 16/templates/ja_purity/html/pagination.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
- * @version		$Id: pagination.php 10822 2008-08-27 17:16:00Z tcp $
+ * @version		$Id: pagination.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
- * @copyright	Copyright (C) 2005 - 2007 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/templates/ja_purity/index.php 16/templates/ja_purity/index.php
--- 15/templates/ja_purity/index.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/templates/ja_purity/index.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright	Copyright (C) 2005 - 2007 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/templates/ja_purity/ja_vars.php 16/templates/ja_purity/ja_vars.php
--- 15/templates/ja_purity/ja_vars.php	2009-05-29 13:53:30.000000000 +0200
+++ 16/templates/ja_purity/ja_vars.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright	Copyright (C) 2005 - 2007 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/templates/rhuk_milkyway/component.php 16/templates/rhuk_milkyway/component.php
--- 15/templates/rhuk_milkyway/component.php	2009-05-29 13:53:14.000000000 +0200
+++ 16/templates/rhuk_milkyway/component.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/templates/rhuk_milkyway/css/template.css 16/templates/rhuk_milkyway/css/template.css
--- 15/templates/rhuk_milkyway/css/template.css	2009-05-29 13:53:14.000000000 +0200
+++ 16/templates/rhuk_milkyway/css/template.css	2010-04-23 13:40:20.000000000 +0200
@@ -300,7 +300,7 @@
 
 #maincolumn_full {
 	margin-left: 0;
-	padding: 0;	
+	padding: 0;
 	width: 100%;
 }
 
@@ -661,6 +661,10 @@
 div.caption img   { border: 1px solid #CCC; }
 div.caption p     { font-size: .90em; color: #666; text-align: center; }
 
+div.img_caption       { padding: 0 10px 0 10px; }
+div.img_caption img   { border: 1px solid #CCC; }
+div.img_caption p     { font-size: .90em; color: #666; text-align: center; }
+
 /* Parameter Table */
 table.paramlist {
 	margin-top: 5px;
diff -aruN --binary 15/templates/rhuk_milkyway/css/template_rtl.css 16/templates/rhuk_milkyway/css/template_rtl.css
--- 15/templates/rhuk_milkyway/css/template_rtl.css	2009-05-29 13:53:14.000000000 +0200
+++ 16/templates/rhuk_milkyway/css/template_rtl.css	2010-04-23 13:40:20.000000000 +0200
@@ -2,7 +2,7 @@
  * @version $Id: template_rtl.css 9141 2007-10-04 08:23:14Z mtk $
  * @package Joomla
  * @subpackage Template-rhuk_milkway
- * @copyright Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/templates/rhuk_milkyway/html/modules.php 16/templates/rhuk_milkyway/html/modules.php
--- 15/templates/rhuk_milkyway/html/modules.php	2009-05-29 13:53:12.000000000 +0200
+++ 16/templates/rhuk_milkyway/html/modules.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
- * @version		$Id: modules.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: modules.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/templates/rhuk_milkyway/html/pagination.php 16/templates/rhuk_milkyway/html/pagination.php
--- 15/templates/rhuk_milkyway/html/pagination.php	2009-05-29 13:53:12.000000000 +0200
+++ 16/templates/rhuk_milkyway/html/pagination.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
- * @version		$Id: pagination.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: pagination.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/templates/rhuk_milkyway/index.php 16/templates/rhuk_milkyway/index.php
--- 15/templates/rhuk_milkyway/index.php	2009-05-29 13:53:14.000000000 +0200
+++ 16/templates/rhuk_milkyway/index.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/templates/system/component.php 16/templates/system/component.php
--- 15/templates/system/component.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/templates/system/component.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
@@ -26,7 +26,7 @@
 		$db->setQuery($query);
 		$template = $db->loadResult();
 
- if($this->direction == 'rtl' && !file_exists(JPATH_THEMES.DS.$template.DS.'css/template_rtl.css') || !file_exists(JPATH_THEMES.DS.$template.DS.'css/template.css')) : ?>
+ if($this->direction == 'rtl' && (!file_exists(JPATH_THEMES.DS.$template.DS.'css/template_rtl.css') || !file_exists(JPATH_THEMES.DS.$template.DS.'css/template.css'))) : ?>
 	<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/system/css/template_rtl.css" type="text/css" />
 <?php elseif($this->direction == 'rtl' ) : ?>
 <link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/<?php echo $template; ?>/css/template.css" type="text/css" />
diff -aruN --binary 15/templates/system/css/error.css 16/templates/system/css/error.css
--- 15/templates/system/css/error.css	2009-05-29 13:53:16.000000000 +0200
+++ 16/templates/system/css/error.css	2010-04-23 13:40:20.000000000 +0200
@@ -1,8 +1,8 @@
 /**
  * CSS Document for offline page
- * @version $Id: error.css 10387 2008-06-03 10:59:16Z pasamio $
+ * @version $Id: error.css 14401 2010-01-26 14:10:00Z louis $
  * @package Joomla
- * @copyright Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license GNU/GPL, see LICENSE.php
  * Joomla! is free software and parts of it may contain or be derived from the
  * GNU General Public License or other free or open source software licenses.
diff -aruN --binary 15/templates/system/css/error_rtl.css 16/templates/system/css/error_rtl.css
--- 15/templates/system/css/error_rtl.css	2009-11-04 18:56:08.000000000 +0100
+++ 16/templates/system/css/error_rtl.css	2010-04-23 13:40:20.000000000 +0200
@@ -2,7 +2,7 @@
  * CSS Document for error page
  * @version $Id: error_rtl.css 10387 2009-10-28 10:59:16Z infograf $
  * @package Joomla
- * @copyright Copyright (C) 2005 - 2009 Open Source Matters. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license GNU/GPL, see LICENSE.php
  * Joomla! is free software and parts of it may contain or be derived from the
  * GNU General Public License or other free or open source software licenses.
diff -aruN --binary 15/templates/system/css/general.css 16/templates/system/css/general.css
--- 15/templates/system/css/general.css	2009-11-04 18:51:20.000000000 +0100
+++ 16/templates/system/css/general.css	2010-04-23 13:40:20.000000000 +0200
@@ -140,6 +140,40 @@
 text-align: center!important;
 }
 
+.img_caption.none {
+	margin-left:auto;
+	margin-right:auto;
+}
+
+.caption.left {
+	float: left;
+	margin-right: 1em;
+}
+
+.caption.right {
+	float: right;
+	margin-left: 1em;
+}
+
+.caption.left p {
+	clear: left;
+	text-align: center;
+}
+
+.caption.right p {
+	clear: right;
+	text-align: center;
+}
+
+.caption.none {
+	margin-left:auto;
+	margin-right:auto;
+}
+
+.caption  {
+	text-align: center!important;
+}
+
 /* Calendar */
 a img.calendar {
 	width: 16px;
diff -aruN --binary 15/templates/system/css/offline.css 16/templates/system/css/offline.css
--- 15/templates/system/css/offline.css	2009-05-29 13:53:16.000000000 +0200
+++ 16/templates/system/css/offline.css	2010-04-23 13:40:20.000000000 +0200
@@ -1,8 +1,8 @@
 /**
  * CSS Document for offline page
- * @version $Id: offline.css 10387 2008-06-03 10:59:16Z pasamio $
+ * @version $Id: offline.css 14401 2010-01-26 14:10:00Z louis $
  * @package Joomla
- * @copyright Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license GNU/GPL, see LICENSE.php
  * Joomla! is free software and parts of it may contain or be derived from the
  * GNU General Public License or other free or open source software licenses.
diff -aruN --binary 15/templates/system/css/offline_rtl.css 16/templates/system/css/offline_rtl.css
--- 15/templates/system/css/offline_rtl.css	2009-05-29 13:53:16.000000000 +0200
+++ 16/templates/system/css/offline_rtl.css	2010-04-23 13:40:20.000000000 +0200
@@ -2,7 +2,7 @@
  * @version $Id: offline_rtl.css 10054 2008-02-22 11:24:37Z mtk $
  * @package Joomla
  * @subpackage Accessible-Template-Beez
- * @copyright Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff -aruN --binary 15/templates/system/css/template.css 16/templates/system/css/template.css
--- 15/templates/system/css/template.css	2009-11-04 18:56:08.000000000 +0100
+++ 16/templates/system/css/template.css	2010-04-23 13:40:20.000000000 +0200
@@ -2,7 +2,7 @@
  * CSS Document for the system template.css
  * @version $Id: template.css
  * @package Joomla
- * @copyright Copyright (C) 2005 - 2009 Open Source Matters. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license GNU/GPL, see LICENSE.php
  * Joomla! is free software and parts of it may contain or be derived from the
  * GNU General Public License or other free or open source software licenses.
diff -aruN --binary 15/templates/system/css/template_rtl.css 16/templates/system/css/template_rtl.css
--- 15/templates/system/css/template_rtl.css	2009-11-04 18:56:08.000000000 +0100
+++ 16/templates/system/css/template_rtl.css	2010-04-23 13:40:20.000000000 +0200
@@ -2,7 +2,7 @@
  * CSS Document for the system template_rtl.css
  * @version $Id: template_rtl.css
  * @package Joomla
- * @copyright Copyright (C) 2005 - 2009 Open Source Matters. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license GNU/GPL, see LICENSE.php
  * Joomla! is free software and parts of it may contain or be derived from the
  * GNU General Public License or other free or open source software licenses.
diff -aruN --binary 15/templates/system/css/toolbar.css 16/templates/system/css/toolbar.css
--- 15/templates/system/css/toolbar.css	2009-05-29 13:53:16.000000000 +0200
+++ 16/templates/system/css/toolbar.css	2010-04-23 13:40:20.000000000 +0200
@@ -1,8 +1,8 @@
 /**
  * CSS Document for edit page for toolbar control
- * @version $Id: toolbar.css 10387 2008-06-03 10:59:16Z pasamio $
+ * @version $Id: toolbar.css 14401 2010-01-26 14:10:00Z louis $
  * @package Joomla
- * @copyright Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license GNU/GPL, see LICENSE.php
  * Joomla! is free software and parts of it may contain or be derived from the
  * GNU General Public License or other free or open source software licenses.
diff -aruN --binary 15/templates/system/error.php 16/templates/system/error.php
--- 15/templates/system/error.php	2009-11-04 18:51:20.000000000 +0100
+++ 16/templates/system/error.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/templates/system/html/modules.php 16/templates/system/html/modules.php
--- 15/templates/system/html/modules.php	2009-05-29 13:53:14.000000000 +0200
+++ 16/templates/system/html/modules.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
- * @version		$Id: modules.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: modules.php 14401 2010-01-26 14:10:00Z louis $
  * @package		Joomla
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/templates/system/offline.php 16/templates/system/offline.php
--- 15/templates/system/offline.php	2009-06-01 14:21:54.000000000 +0200
+++ 16/templates/system/offline.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/xmlrpc/client.php 16/xmlrpc/client.php
--- 15/xmlrpc/client.php	2009-05-29 13:53:54.000000000 +0200
+++ 16/xmlrpc/client.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version		$Id: client.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: client.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/xmlrpc/includes/application.php 16/xmlrpc/includes/application.php
--- 15/xmlrpc/includes/application.php	2009-05-29 13:53:54.000000000 +0200
+++ 16/xmlrpc/includes/application.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: application.php 10823 2008-08-27 17:18:14Z tcp $
+* @version		$Id: application.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Installation
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/xmlrpc/includes/defines.php 16/xmlrpc/includes/defines.php
--- 15/xmlrpc/includes/defines.php	2009-05-29 13:53:54.000000000 +0200
+++ 16/xmlrpc/includes/defines.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: defines.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: defines.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Installation
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/xmlrpc/includes/framework.php 16/xmlrpc/includes/framework.php
--- 15/xmlrpc/includes/framework.php	2009-05-29 13:53:54.000000000 +0200
+++ 16/xmlrpc/includes/framework.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: framework.php 10382 2008-06-01 06:56:02Z pasamio $
+* @version		$Id: framework.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Installation
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
diff -aruN --binary 15/xmlrpc/index.php 16/xmlrpc/index.php
--- 15/xmlrpc/index.php	2009-05-29 13:53:54.000000000 +0200
+++ 16/xmlrpc/index.php	2010-04-23 13:40:20.000000000 +0200
@@ -1,9 +1,9 @@
 <?php
 /**
-* @version		$Id: index.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: index.php 14401 2010-01-26 14:10:00Z louis $
 * @package		Joomla
 * @subpackage	Installation
-* @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+* @copyright	Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software and parts of it may contain or be derived from the
 * GNU General Public License or other free or open source software licenses.
